[PATCH] clocksource: imx: define clocksource for mx27

[PATCH] clocksource: imx: define clocksource for mx27

[Philippe Reynes]

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 <tremyfr@gmail.com>
---
 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

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

[Fabio Estevam]

On Sat, Jun 27, 2015 at 6:11 PM, Philippe Reynes <tremyfr@gmail.com> 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 <tremyfr@gmail.com>

Reviewed-by: Fabio Estevam <fabio.estevam@freescale.com>

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

[Shawn Guo]

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 <tremyfr@gmail.com>

Acked-by: Shawn Guo <shawnguo@kernel.org>

Daniel,

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

Shawn

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

[Daniel Lezcano]

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 <tremyfr@gmail.com>
>
> Acked-by: Shawn Guo <shawnguo@kernel.org>
>
> 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

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

[Shawn Guo]

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 <tremyfr@gmail.com>
> >
> >Acked-by: Shawn Guo <shawnguo@kernel.org>
> >
> >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

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

[Daniel Lezcano]

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 <tremyfr@gmail.com>

Acked-by: Daniel Lezcano <daniel.lezcano@linaro.org>


-- 
  <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

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

[tip-bot for Philippe Reynes]

Commit-ID:  747d34e7313034768aac83d679db43cedc5ab778
Gitweb:     http://git.kernel.org/tip/747d34e7313034768aac83d679db43cedc5ab778
Author:     Philippe Reynes <tremyfr@gmail.com>
AuthorDate: Sat, 27 Jun 2015 23:11:44 +0200
Committer:  Thomas Gleixner <tglx@linutronix.de>
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 <tremyfr@gmail.com>
Cc: linux-arm-kernel@lists.infradead.org
Cc: daniel.lezcano@linaro.org
Cc: fabio.estevam@freescale.com
Cc: shawnguo@kernel.org
Cc: kernel@pengutronix.de
Link: http://lkml.kernel.org/r/1435439504-406-1-git-send-email-tremyfr@gmail.com
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
---
 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);