[PATCH] arm: omap2: board-generic: use omap4_local_timer_init for AM437x

[PATCH] arm: omap2: board-generic: use omap4_local_timer_init for AM437x

[Felipe Balbi]

AM437x-based boards, can use omap4_local_timer_init()
just fine. Let's use that instead.

Signed-off-by: Felipe Balbi <balbi@ti.com>
---
 arch/arm/mach-omap2/board-generic.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/mach-omap2/board-generic.c b/arch/arm/mach-omap2/board-generic.c
index fc107bdeb8ca..04a56cc04dfa 100644
--- a/arch/arm/mach-omap2/board-generic.c
+++ b/arch/arm/mach-omap2/board-generic.c
@@ -276,7 +276,7 @@ DT_MACHINE_START(AM43_DT, "Generic AM43 (Flattened Device Tree)")
 	.init_late	= am43xx_init_late,
 	.init_irq	= omap_gic_of_init,
 	.init_machine	= omap_generic_init,
-	.init_time	= omap3_gptimer_timer_init,
+	.init_time	= omap4_local_timer_init,
 	.dt_compat	= am43_boards_compat,
 	.restart	= omap44xx_restart,
 MACHINE_END
-- 
2.6.2

[PATCH] arm: omap2: board-generic: use omap4_local_timer_init for AM437x

[Tony Lindgren]

* Felipe Balbi <balbi@ti.com> [151020 14:06]:
> AM437x-based boards, can use omap4_local_timer_init()
> just fine. Let's use that instead.

Applying into omap-for-v4.4/soc thanks.

Tony

[PATCH] arm: omap2: board-generic: use omap4_local_timer_init for AM437x

[Lokesh Vutla]

On Wednesday 21 October 2015 02:35 AM, Felipe Balbi wrote:
> AM437x-based boards, can use omap4_local_timer_init()
> just fine. Let's use that instead.

This is breaking AM43x-epos board.
Today's Linux next: http://pastebin.ubuntu.com/13122620/
Reverting this patch: http://pastebin.ubuntu.com/13122621/

Thanks and regards,
Lokesh

> 
> Signed-off-by: Felipe Balbi <balbi@ti.com>
> ---
>  arch/arm/mach-omap2/board-generic.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/arch/arm/mach-omap2/board-generic.c b/arch/arm/mach-omap2/board-generic.c
> index fc107bdeb8ca..04a56cc04dfa 100644
> --- a/arch/arm/mach-omap2/board-generic.c
> +++ b/arch/arm/mach-omap2/board-generic.c
> @@ -276,7 +276,7 @@ DT_MACHINE_START(AM43_DT, "Generic AM43 (Flattened Device Tree)")
>  	.init_late	= am43xx_init_late,
>  	.init_irq	= omap_gic_of_init,
>  	.init_machine	= omap_generic_init,
> -	.init_time	= omap3_gptimer_timer_init,
> +	.init_time	= omap4_local_timer_init,
>  	.dt_compat	= am43_boards_compat,
>  	.restart	= omap44xx_restart,
>  MACHINE_END
> 

[PATCH] arm: omap2: board-generic: use omap4_local_timer_init for AM437x

[Felipe Balbi]

Hi,

Lokesh Vutla <a0131933@ti.com> writes:
> On Wednesday 21 October 2015 02:35 AM, Felipe Balbi wrote:
>> AM437x-based boards, can use omap4_local_timer_init()
>> just fine. Let's use that instead.
>
> This is breaking AM43x-epos board.
> Today's Linux next: http://pastebin.ubuntu.com/13122620/
> Reverting this patch: http://pastebin.ubuntu.com/13122621/

seems like the 32k timer isn't ticking. I don't have EPOS around, care
to confirm if that board has 32k oscillator populated ? If it doesn't,
then we should probably disable counter32k:

diff --git a/arch/arm/boot/dts/am43x-epos-evm.dts b/arch/arm/boot/dts/am43x-epos-evm.dts
index 86c2dfbe8875..e703e32b6da6 100644
--- a/arch/arm/boot/dts/am43x-epos-evm.dts
+++ b/arch/arm/boot/dts/am43x-epos-evm.dts
@@ -792,3 +792,8 @@
 	tx-num-evt = <32>;
 	rx-num-evt = <32>;
 };
+
+/* 32kHz oscillator not populated */
+&counter32k {
+	status = "disabled";
+};

-- 
balbi
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 818 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20151106/66fe5beb/attachment.sig>