2015-06-27 21:11:58

by Philippe Reynes

Subject: [PATCH] clocksource: imx: define clocksource for mx27

The clocksource imx27 wasn't defined in timer-imx-gpt.c,
so the kernel no longer boot on imx27. Just define
clocksource imx27 as an imx21.

Signed-off-by: Philippe Reynes <[email protected]>
---
drivers/clocksource/timer-imx-gpt.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/drivers/clocksource/timer-imx-gpt.c b/drivers/clocksource/timer-imx-gpt.c
index 879c784..2d59038 100644
--- a/drivers/clocksource/timer-imx-gpt.c
+++ b/drivers/clocksource/timer-imx-gpt.c
@@ -529,6 +529,7 @@ static void __init imx6dl_timer_init_dt(struct device_node *np)

CLOCKSOURCE_OF_DECLARE(imx1_timer, "fsl,imx1-gpt", imx1_timer_init_dt);
CLOCKSOURCE_OF_DECLARE(imx21_timer, "fsl,imx21-gpt", imx21_timer_init_dt);
+CLOCKSOURCE_OF_DECLARE(imx27_timer, "fsl,imx27-gpt", imx21_timer_init_dt);
CLOCKSOURCE_OF_DECLARE(imx31_timer, "fsl,imx31-gpt", imx31_timer_init_dt);
CLOCKSOURCE_OF_DECLARE(imx25_timer, "fsl,imx25-gpt", imx31_timer_init_dt);
CLOCKSOURCE_OF_DECLARE(imx50_timer, "fsl,imx50-gpt", imx31_timer_init_dt);
--
1.7.4.4

2015-06-27 21:20:26

by Fabio Estevam

Subject: Re: [PATCH] clocksource: imx: define clocksource for mx27

On Sat, Jun 27, 2015 at 6:11 PM, Philippe Reynes <[email protected]> wrote:
> The clocksource imx27 wasn't defined in timer-imx-gpt.c,
> so the kernel no longer boot on imx27. Just define
> clocksource imx27 as an imx21.
>
> Signed-off-by: Philippe Reynes <[email protected]>

Reviewed-by: Fabio Estevam <[email protected]>

2015-06-28 04:44:57

by Shawn Guo

Subject: Re: [PATCH] clocksource: imx: define clocksource for mx27

On Sat, Jun 27, 2015 at 11:11:44PM +0200, Philippe Reynes wrote:
> The clocksource imx27 wasn't defined in timer-imx-gpt.c,
> so the kernel no longer boot on imx27. Just define
> clocksource imx27 as an imx21.
>
> Signed-off-by: Philippe Reynes <[email protected]>

Acked-by: Shawn Guo <[email protected]>

Daniel,

Please help send this as a fix for 4.2-rc, thanks.

Shawn

2015-06-29 09:21:31

by Daniel Lezcano

Subject: Re: [PATCH] clocksource: imx: define clocksource for mx27

On 06/28/2015 06:44 AM, Shawn Guo wrote:
> On Sat, Jun 27, 2015 at 11:11:44PM +0200, Philippe Reynes wrote:
>> The clocksource imx27 wasn't defined in timer-imx-gpt.c,
>> so the kernel no longer boot on imx27. Just define
>> clocksource imx27 as an imx21.
>>
>> Signed-off-by: Philippe Reynes <[email protected]>
>
> Acked-by: Shawn Guo <[email protected]>
>
> Daniel,
>
> Please help send this as a fix for 4.2-rc, thanks.

Ok.

stable@ ?

--
<http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs

Follow Linaro: <http://www.facebook.com/pages/Linaro> Facebook |
<http://twitter.com/#!/linaroorg> Twitter |
<http://www.linaro.org/linaro-blog/> Blog

2015-06-29 10:20:06

by Daniel Lezcano

Subject: Re: [PATCH] clocksource: imx: define clocksource for mx27

On 06/27/2015 11:11 PM, Philippe Reynes wrote:
> The clocksource imx27 wasn't defined in timer-imx-gpt.c,
> so the kernel no longer boot on imx27. Just define
> clocksource imx27 as an imx21.
>
> Signed-off-by: Philippe Reynes <[email protected]>

Acked-by: Daniel Lezcano <[email protected]>


--
<http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs

Follow Linaro: <http://www.facebook.com/pages/Linaro> Facebook |
<http://twitter.com/#!/linaroorg> Twitter |
<http://www.linaro.org/linaro-blog/> Blog

2015-06-29 10:56:10

by Shawn Guo

Subject: Re: [PATCH] clocksource: imx: define clocksource for mx27

On Mon, Jun 29, 2015 at 11:21:24AM +0200, Daniel Lezcano wrote:
> On 06/28/2015 06:44 AM, Shawn Guo wrote:
> >On Sat, Jun 27, 2015 at 11:11:44PM +0200, Philippe Reynes wrote:
> >>The clocksource imx27 wasn't defined in timer-imx-gpt.c,
> >>so the kernel no longer boot on imx27. Just define
> >>clocksource imx27 as an imx21.
> >>
> >>Signed-off-by: Philippe Reynes <[email protected]>
> >
> >Acked-by: Shawn Guo <[email protected]>
> >
> >Daniel,
> >
> >Please help send this as a fix for 4.2-rc, thanks.
>
> Ok.
>
> stable@ ?

No. The regression was introduced only in 4.2 merge window.

Shawn

2015-07-07 08:49:21

by tip-bot for Vasyl Gomonovych

Subject: [tip:timers/urgent] clocksource/imx: Define clocksource for mx27

Commit-ID: 747d34e7313034768aac83d679db43cedc5ab778
Gitweb: http://git.kernel.org/tip/747d34e7313034768aac83d679db43cedc5ab778
Author: Philippe Reynes <[email protected]>
AuthorDate: Sat, 27 Jun 2015 23:11:44 +0200
Committer: Thomas Gleixner <[email protected]>
CommitDate: Tue, 7 Jul 2015 10:44:45 +0200

clocksource/imx: Define clocksource for mx27

The rework of the imx clocksource driver missed to add an entry for
imx27 which results in a boot failure on those machines.

Add the proper CLOCKSOURCE_OF_DECLARE() entry for imx27 and map it to
the imx21 init.

Fixes: bef11c881ba5 'ARM: imx: initialize gpt device type for DT boot'
Signed-off-by: Philippe Reynes <[email protected]>
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Link: http://lkml.kernel.org/r/[email protected]
Signed-off-by: Thomas Gleixner <[email protected]>
---
drivers/clocksource/timer-imx-gpt.c | 1 +
1 file changed, 1 insertion(+)

diff --git a/drivers/clocksource/timer-imx-gpt.c b/drivers/clocksource/timer-imx-gpt.c
index 879c784..2d59038 100644
--- a/drivers/clocksource/timer-imx-gpt.c
+++ b/drivers/clocksource/timer-imx-gpt.c
@@ -529,6 +529,7 @@ static void __init imx6dl_timer_init_dt(struct device_node *np)

CLOCKSOURCE_OF_DECLARE(imx1_timer, "fsl,imx1-gpt", imx1_timer_init_dt);
CLOCKSOURCE_OF_DECLARE(imx21_timer, "fsl,imx21-gpt", imx21_timer_init_dt);
+CLOCKSOURCE_OF_DECLARE(imx27_timer, "fsl,imx27-gpt", imx21_timer_init_dt);
CLOCKSOURCE_OF_DECLARE(imx31_timer, "fsl,imx31-gpt", imx31_timer_init_dt);
CLOCKSOURCE_OF_DECLARE(imx25_timer, "fsl,imx25-gpt", imx31_timer_init_dt);
CLOCKSOURCE_OF_DECLARE(imx50_timer, "fsl,imx50-gpt", imx31_timer_init_dt);