| Message ID | 1421406528-26704-1-git-send-email-geert+renesas@glider.be (mailing list archive) |
|---|---|
| State | Superseded |
| Commit | e42c8385cfec0579a103b365d61748f199bfe239 |
| Delegated to: | Simon Horman |
| Headers | show |
On Fri, Jan 16, 2015 at 12:08:48PM +0100, Geert Uytterhoeven wrote: > Add a node for the Private Timer and Watchdog, as found in the Cortex-A9 > MPCore. > > Without this, there's no clocksource available during early kernel > initialization, before cmt1 is initialized, leading to a lock-up if > CONFIG_CPU_IDLE=y. > > Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> > --- > As the TWD driver does not support DT without CCF, this should NOT be > applied to a branch that still has kzm9g-reference support, as this > would lead to another lock-up. > Hence the first choice "dt-for-v3.20" is NOT OK. > "sh73a0-multiplatform-for-v3.20" is OK. > > v2: > - The clock is twd_clk Thanks, for your detailed notes regarding branches. I plan to push this a little later today. Please take a moment to check that I flowed your advice correctly. -- 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
On Sat, Jan 17, 2015 at 09:37:44AM +0900, Simon Horman wrote: > On Fri, Jan 16, 2015 at 12:08:48PM +0100, Geert Uytterhoeven wrote: > > Add a node for the Private Timer and Watchdog, as found in the Cortex-A9 > > MPCore. > > > > Without this, there's no clocksource available during early kernel > > initialization, before cmt1 is initialized, leading to a lock-up if > > CONFIG_CPU_IDLE=y. > > > > Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> > > --- > > As the TWD driver does not support DT without CCF, this should NOT be > > applied to a branch that still has kzm9g-reference support, as this > > would lead to another lock-up. > > Hence the first choice "dt-for-v3.20" is NOT OK. > > "sh73a0-multiplatform-for-v3.20" is OK. > > > > v2: > > - The clock is twd_clk > > Thanks, for your detailed notes regarding branches. > > I plan to push this a little later today. Please take a moment > to check that I flowed your advice correctly. For reference, I have pushed the above as part of renesas-next-20150117-v3.19-rc1. -- 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
On Sat, Jan 17, 2015 at 10:13:10AM +0900, Simon Horman wrote: > On Sat, Jan 17, 2015 at 09:37:44AM +0900, Simon Horman wrote: > > On Fri, Jan 16, 2015 at 12:08:48PM +0100, Geert Uytterhoeven wrote: > > > Add a node for the Private Timer and Watchdog, as found in the Cortex-A9 > > > MPCore. > > > > > > Without this, there's no clocksource available during early kernel > > > initialization, before cmt1 is initialized, leading to a lock-up if > > > CONFIG_CPU_IDLE=y. > > > > > > Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> > > > --- > > > As the TWD driver does not support DT without CCF, this should NOT be > > > applied to a branch that still has kzm9g-reference support, as this > > > would lead to another lock-up. > > > Hence the first choice "dt-for-v3.20" is NOT OK. > > > "sh73a0-multiplatform-for-v3.20" is OK. > > > > > > v2: > > > - The clock is twd_clk > > > > Thanks, for your detailed notes regarding branches. > > > > I plan to push this a little later today. Please take a moment > > to check that I flowed your advice correctly. > > For reference, I have pushed the above as part of > renesas-next-20150117-v3.19-rc1. For the record: Olof has asked for review comments for the BSC driver and binding patches. Accordingly I have dropped them, and these patches which depend on them, from next. This dependency may be due to the way the branches are arranged, rather than actual dependencies of the code. But regardless I am dropping all affected branches for now. -- 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 121bbeba8f3f6695..9aa55d52b556b4b1 100644 --- a/arch/arm/boot/dts/sh73a0.dtsi +++ b/arch/arm/boot/dts/sh73a0.dtsi @@ -11,6 +11,7 @@ /include/ "skeleton.dtsi" #include <dt-bindings/clock/sh73a0-clock.h> +#include <dt-bindings/interrupt-controller/arm-gic.h> #include <dt-bindings/interrupt-controller/irq.h> / { @@ -37,6 +38,13 @@ }; }; + timer@f0000600 { + compatible = "arm,cortex-a9-twd-timer"; + reg = <0xf0000600 0x20>; + interrupts = <GIC_PPI 13 (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_LEVEL_HIGH)>; + clocks = <&twd_clk>; + }; + gic: interrupt-controller@f0001000 { compatible = "arm,cortex-a9-gic"; #interrupt-cells = <3>;
Add a node for the Private Timer and Watchdog, as found in the Cortex-A9 MPCore. Without this, there's no clocksource available during early kernel initialization, before cmt1 is initialized, leading to a lock-up if CONFIG_CPU_IDLE=y. Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> --- As the TWD driver does not support DT without CCF, this should NOT be applied to a branch that still has kzm9g-reference support, as this would lead to another lock-up. Hence the first choice "dt-for-v3.20" is NOT OK. "sh73a0-multiplatform-for-v3.20" is OK. v2: - The clock is twd_clk --- arch/arm/boot/dts/sh73a0.dtsi | 8 ++++++++ 1 file changed, 8 insertions(+)