| Message ID | 1365679443-25456-5-git-send-email-hechtb+renesas@gmail.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | d51915edd9f5a01208fd2ae704420d4cb544c078 |
| Headers | show |
On Thu, Apr 11, 2013 at 01:24:01PM +0200, Bastian Hecht wrote: > We can now use the Device Tree for bringing up our timer device CMT10 on > the SoC sh73a0. > > Signed-off-by: Bastian Hecht <hechtb+renesas@gmail.com> I had queued-up this patch for v3.11 inthe soc-sh73a0 branch. However, on request from Magnus, I am dropping it as it prevents the kzm9g (non-reference) from booting if CONFIG_TMU is not enabled. This is particularly problematic as I am told it is not desirable to enable TMU in production as it conflicts with power management. The problem that this patch introduces appears to be that CMT is now started too late for it to be used as a clocks source when Calibrating the delay loop. If TMU is present then it masks this problem by providing a clocksource at this point. With this in mind Magnus has indicated that for the forseable future he would like CMT and TMU to be initialised using C-code rather than using DT. Magnus, please feel free to jump in an correct anything above that is incomplete or incorrect. > --- > v4: same. only patch 2 and 3 changed > > arch/arm/boot/dts/sh73a0.dtsi | 11 +++++++++++ > arch/arm/mach-shmobile/setup-sh73a0.c | 32 -------------------------------- > 2 files changed, 11 insertions(+), 32 deletions(-) > > diff --git a/arch/arm/boot/dts/sh73a0.dtsi b/arch/arm/boot/dts/sh73a0.dtsi > index ec40bf7..67b5089 100644 > --- a/arch/arm/boot/dts/sh73a0.dtsi > +++ b/arch/arm/boot/dts/sh73a0.dtsi > @@ -222,4 +222,15 @@ > cap-sd-highspeed; > status = "disabled"; > }; > + > + timer@e6138010 { > + compatible = "renesas,cmt-timer"; > + interrupt-parent = <&gic>; > + reg = <0xe6138010 0xc>; > + interrupts = <0 65 0x4>; > + renesas,device-id = <1>; > + renesas,channel-id = <0>; > + renesas,source-quality = <3>; > + renesas,event-quality = <3>; > + }; > }; > diff --git a/arch/arm/mach-shmobile/setup-sh73a0.c b/arch/arm/mach-shmobile/setup-sh73a0.c > index d10ded0..024b7a6 100644 > --- a/arch/arm/mach-shmobile/setup-sh73a0.c > +++ b/arch/arm/mach-shmobile/setup-sh73a0.c > @@ -235,37 +235,6 @@ static struct platform_device scif8_device = { > }, > }; > > -static struct sh_timer_config cmt10_platform_data = { > - .name = "CMT10", > - .channel_offset = 0x10, > - .timer_bit = 0, > - .clockevent_rating = 125, > - .clocksource_rating = 125, > -}; > - > -static struct resource cmt10_resources[] = { > - [0] = { > - .name = "CMT10", > - .start = 0xe6138010, > - .end = 0xe613801b, > - .flags = IORESOURCE_MEM, > - }, > - [1] = { > - .start = gic_spi(65), > - .flags = IORESOURCE_IRQ, > - }, > -}; > - > -static struct platform_device cmt10_device = { > - .name = "sh_cmt", > - .id = 10, > - .dev = { > - .platform_data = &cmt10_platform_data, > - }, > - .resource = cmt10_resources, > - .num_resources = ARRAY_SIZE(cmt10_resources), > -}; > - > /* TMU */ > static struct sh_timer_config tmu00_platform_data = { > .name = "TMU00", > @@ -930,7 +899,6 @@ static struct platform_device *sh73a0_devices_dt[] __initdata = { > &scif6_device, > &scif7_device, > &scif8_device, > - &cmt10_device, > }; > > static struct platform_device *sh73a0_early_devices[] __initdata = { > -- > 1.7.9.5 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-sh" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > -- To unsubscribe from this list: send the line "unsubscribe linux-sh" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/arch/arm/boot/dts/sh73a0.dtsi b/arch/arm/boot/dts/sh73a0.dtsi index ec40bf7..67b5089 100644 --- a/arch/arm/boot/dts/sh73a0.dtsi +++ b/arch/arm/boot/dts/sh73a0.dtsi @@ -222,4 +222,15 @@ cap-sd-highspeed; status = "disabled"; }; + + timer@e6138010 { + compatible = "renesas,cmt-timer"; + interrupt-parent = <&gic>; + reg = <0xe6138010 0xc>; + interrupts = <0 65 0x4>; + renesas,device-id = <1>; + renesas,channel-id = <0>; + renesas,source-quality = <3>; + renesas,event-quality = <3>; + }; }; diff --git a/arch/arm/mach-shmobile/setup-sh73a0.c b/arch/arm/mach-shmobile/setup-sh73a0.c index d10ded0..024b7a6 100644 --- a/arch/arm/mach-shmobile/setup-sh73a0.c +++ b/arch/arm/mach-shmobile/setup-sh73a0.c @@ -235,37 +235,6 @@ static struct platform_device scif8_device = { }, }; -static struct sh_timer_config cmt10_platform_data = { - .name = "CMT10", - .channel_offset = 0x10, - .timer_bit = 0, - .clockevent_rating = 125, - .clocksource_rating = 125, -}; - -static struct resource cmt10_resources[] = { - [0] = { - .name = "CMT10", - .start = 0xe6138010, - .end = 0xe613801b, - .flags = IORESOURCE_MEM, - }, - [1] = { - .start = gic_spi(65), - .flags = IORESOURCE_IRQ, - }, -}; - -static struct platform_device cmt10_device = { - .name = "sh_cmt", - .id = 10, - .dev = { - .platform_data = &cmt10_platform_data, - }, - .resource = cmt10_resources, - .num_resources = ARRAY_SIZE(cmt10_resources), -}; - /* TMU */ static struct sh_timer_config tmu00_platform_data = { .name = "TMU00", @@ -930,7 +899,6 @@ static struct platform_device *sh73a0_devices_dt[] __initdata = { &scif6_device, &scif7_device, &scif8_device, - &cmt10_device, }; static struct platform_device *sh73a0_early_devices[] __initdata = {
We can now use the Device Tree for bringing up our timer device CMT10 on the SoC sh73a0. Signed-off-by: Bastian Hecht <hechtb+renesas@gmail.com> --- v4: same. only patch 2 and 3 changed arch/arm/boot/dts/sh73a0.dtsi | 11 +++++++++++ arch/arm/mach-shmobile/setup-sh73a0.c | 32 -------------------------------- 2 files changed, 11 insertions(+), 32 deletions(-)