| Message ID | 1464774351-23604-3-git-send-email-k.kozlowski@samsung.com (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
Hello Krzysztof, On 06/01/2016 05:45 AM, Krzysztof Kozlowski wrote: > Move watchdog and Security SubSystem nodes from exynos5420.dtsi to file > shared with Exynos5410 and configure the clocks on the latter. > > Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com> > --- [snip] > > +&sss { > + clocks = <&clock CLK_SSS>; > + clock-names = "secss"; > +}; > + [snip] > > +&watchdog { > + clocks = <&clock CLK_WDT>; > + clock-names = "watchdog"; > + samsung,syscon-phandle = <&pmu_system_controller>; > +}; > + Since you used the same ID than Exynos5420 for the SSS and WDT clocks, I wonder if the clock and clock-names shouldn't be just defined in the shared exynos54xx.dtsi as is the case for the interrupts that are also the same? The patch looks good to me though, so whatever you decide: Reviewed-by: Javier Martinez Canillas <javier@osg.samsung.com> Best regards,
On 06/01/2016 05:16 PM, Javier Martinez Canillas wrote: > Hello Krzysztof, > > On 06/01/2016 05:45 AM, Krzysztof Kozlowski wrote: >> Move watchdog and Security SubSystem nodes from exynos5420.dtsi to file >> shared with Exynos5410 and configure the clocks on the latter. >> >> Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com> >> --- > > [snip] > >> >> +&sss { >> + clocks = <&clock CLK_SSS>; >> + clock-names = "secss"; >> +}; >> + > > [snip] > >> >> +&watchdog { >> + clocks = <&clock CLK_WDT>; >> + clock-names = "watchdog"; >> + samsung,syscon-phandle = <&pmu_system_controller>; >> +}; >> + > > Since you used the same ID than Exynos5420 for the SSS and WDT clocks, > I wonder if the clock and clock-names shouldn't be just defined in the > shared exynos54xx.dtsi as is the case for the interrupts that are also > the same? > > The patch looks good to me though, so whatever you decide: > > Reviewed-by: Javier Martinez Canillas <javier@osg.samsung.com> Thanks for review and comments. The 'clock' property cannot be moved - there is no clock phandle and the clock IDs are not included in 54xx. Best regards, Krzysztof -- To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Hello Krzysztof, On 06/02/2016 02:18 AM, Krzysztof Kozlowski wrote: > On 06/01/2016 05:16 PM, Javier Martinez Canillas wrote: [snip] >>> >>> +&watchdog { >>> + clocks = <&clock CLK_WDT>; >>> + clock-names = "watchdog"; >>> + samsung,syscon-phandle = <&pmu_system_controller>; >>> +}; >>> + >> >> Since you used the same ID than Exynos5420 for the SSS and WDT clocks, >> I wonder if the clock and clock-names shouldn't be just defined in the >> shared exynos54xx.dtsi as is the case for the interrupts that are also >> the same? >> >> The patch looks good to me though, so whatever you decide: >> >> Reviewed-by: Javier Martinez Canillas <javier@osg.samsung.com> > > Thanks for review and comments. > > The 'clock' property cannot be moved - there is no clock phandle and the > clock IDs are not included in 54xx. > You are right, I missed that. Thanks a lot for the clarification. > Best regards, > Krzysztof > Best regards,
diff --git a/arch/arm/boot/dts/exynos5410.dtsi b/arch/arm/boot/dts/exynos5410.dtsi index f1effd3f03c4..b76f56c2fe8b 100644 --- a/arch/arm/boot/dts/exynos5410.dtsi +++ b/arch/arm/boot/dts/exynos5410.dtsi @@ -297,6 +297,11 @@ clock-names = "uart", "clk_uart_baud0"; }; +&sss { + clocks = <&clock CLK_SSS>; + clock-names = "secss"; +}; + &sromc { #address-cells = <2>; #size-cells = <1>; @@ -349,4 +354,10 @@ samsung,pmureg-phandle = <&pmu_system_controller>; }; +&watchdog { + clocks = <&clock CLK_WDT>; + clock-names = "watchdog"; + samsung,syscon-phandle = <&pmu_system_controller>; +}; + #include "exynos5410-pinctrl.dtsi" diff --git a/arch/arm/boot/dts/exynos5420.dtsi b/arch/arm/boot/dts/exynos5420.dtsi index 265747bb19d1..beb6f453039e 100644 --- a/arch/arm/boot/dts/exynos5420.dtsi +++ b/arch/arm/boot/dts/exynos5420.dtsi @@ -694,23 +694,6 @@ #include "exynos4412-tmu-sensor-conf.dtsi" }; - watchdog: watchdog@101D0000 { - compatible = "samsung,exynos5420-wdt"; - reg = <0x101D0000 0x100>; - interrupts = <0 42 0>; - clocks = <&clock CLK_WDT>; - clock-names = "watchdog"; - samsung,syscon-phandle = <&pmu_system_controller>; - }; - - sss: sss@10830000 { - compatible = "samsung,exynos4210-secss"; - reg = <0x10830000 0x300>; - interrupts = <0 112 0>; - clocks = <&clock CLK_SSS>; - clock-names = "secss"; - }; - sysmmu_g2dr: sysmmu@0x10A60000 { compatible = "samsung,exynos-sysmmu"; reg = <0x10A60000 0x1000>; @@ -1030,6 +1013,11 @@ clock-names = "uart", "clk_uart_baud0"; }; +&sss { + clocks = <&clock CLK_SSS>; + clock-names = "secss"; +}; + &usbdrd3_0 { clocks = <&clock CLK_USBD300>; clock-names = "usbdrd30"; @@ -1073,4 +1061,10 @@ samsung,pmureg-phandle = <&pmu_system_controller>; }; +&watchdog { + clocks = <&clock CLK_WDT>; + clock-names = "watchdog"; + samsung,syscon-phandle = <&pmu_system_controller>; +}; + #include "exynos5420-pinctrl.dtsi" diff --git a/arch/arm/boot/dts/exynos54xx.dtsi b/arch/arm/boot/dts/exynos54xx.dtsi index 0eb8aa31b7d9..06a604911e87 100644 --- a/arch/arm/boot/dts/exynos54xx.dtsi +++ b/arch/arm/boot/dts/exynos54xx.dtsi @@ -74,6 +74,18 @@ }; }; + watchdog: watchdog@101d0000 { + compatible = "samsung,exynos5420-wdt"; + reg = <0x101d0000 0x100>; + interrupts = <0 42 0>; + }; + + sss: sss@10830000 { + compatible = "samsung,exynos4210-secss"; + reg = <0x10830000 0x300>; + interrupts = <0 112 0>; + }; + /* i2c_0-3 are defined in exynos5.dtsi */ hsi2c_4: i2c@12ca0000 { compatible = "samsung,exynos5250-hsi2c";
Move watchdog and Security SubSystem nodes from exynos5420.dtsi to file shared with Exynos5410 and configure the clocks on the latter. Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com> --- arch/arm/boot/dts/exynos5410.dtsi | 11 +++++++++++ arch/arm/boot/dts/exynos5420.dtsi | 28 +++++++++++----------------- arch/arm/boot/dts/exynos54xx.dtsi | 12 ++++++++++++ 3 files changed, 34 insertions(+), 17 deletions(-)