[PATCH 1/3] dt-bindings: clock: Add watchdog and SSS clock IDs to Exynos5410

[PATCH 1/3] dt-bindings: clock: Add watchdog and SSS clock IDs to Exynos5410

[Krzysztof Kozlowski]

Add IDs for watchdog and Security SubSystem to Exynos5410.  Use the same
number as for Exynos5420 just in case in future these drivers were
merged.

Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
---
 include/dt-bindings/clock/exynos5410.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/include/dt-bindings/clock/exynos5410.h b/include/dt-bindings/clock/exynos5410.h
index 705b2aa84317..85b467b3a207 100644
--- a/include/dt-bindings/clock/exynos5410.h
+++ b/include/dt-bindings/clock/exynos5410.h
@@ -49,6 +49,7 @@
 #define CLK_UART3		260
 #define CLK_PWM			279
 #define CLK_MCT			315
+#define CLK_WDT			316
 #define CLK_RTC			317
 #define CLK_TMU			318
 #define CLK_MMC0		351
@@ -57,6 +58,7 @@
 #define CLK_USBH20		365
 #define CLK_USBD300		366
 #define CLK_USBD301		367
+#define CLK_SSS			471
 
 #define CLK_NR_CLKS		512
 
-- 
1.9.1

[PATCH 2/3] clk: samsung: exynos5410: Add WDT, ACLK266 and SSS clocks

[Krzysztof Kozlowski]

Add clock hierarchy for Security SubSystem clock and watchdog.

Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
---
 drivers/clk/samsung/clk-exynos5410.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/drivers/clk/samsung/clk-exynos5410.c b/drivers/clk/samsung/clk-exynos5410.c
index db9978dc6e83..7e3ffa70d364 100644
--- a/drivers/clk/samsung/clk-exynos5410.c
+++ b/drivers/clk/samsung/clk-exynos5410.c
@@ -31,6 +31,7 @@
 #define SRC_CPU			0x200
 #define DIV_CPU0		0x500
 #define SRC_CPERI1		0x4204
+#define GATE_IP_G2D		0x8800
 #define DIV_TOP0		0x10510
 #define DIV_TOP1		0x10514
 #define DIV_FSYS0		0x10548
@@ -154,11 +155,15 @@ static struct samsung_div_clock exynos5410_div_clks[] __initdata = {
 	DIV(0, "dout_pwm", "mout_pwm", DIV_PERIC3, 0, 4),
 
 	DIV(0, "aclk200", "mout_aclk200", DIV_TOP0, 12, 3),
+	DIV(0, "aclk266", "mpll_user_p", DIV_TOP0, 16, 3),
 	DIV(0, "aclk400", "mout_aclk400", DIV_TOP0, 24, 3),
 };
 
 static struct samsung_gate_clock exynos5410_gate_clks[] __initdata = {
+	GATE(CLK_SSS, "sss", "aclk266", GATE_IP_G2D, 2, 0, 0),
+
 	GATE(CLK_MCT, "mct", "aclk66", GATE_IP_PERIS, 18, 0, 0),
+	GATE(CLK_WDT, "wdt", "aclk66", GATE_IP_PERIS, 19, 0, 0),
 	GATE(CLK_RTC, "rtc", "aclk66", GATE_IP_PERIS, 20, 0, 0),
 	GATE(CLK_TMU, "tmu", "aclk66", GATE_IP_PERIS, 21, 0, 0),
 
-- 
1.9.1

Re: [PATCH 2/3] clk: samsung: exynos5410: Add WDT, ACLK266 and SSS clocks

[Javier Martinez Canillas]

Hello Krzysztof,

On 06/01/2016 05:45 AM, Krzysztof Kozlowski wrote:
> Add clock hierarchy for Security SubSystem clock and watchdog.
> 
> Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
> ---

Reviewed-by: Javier Martinez Canillas <javier@osg.samsung.com>

Best regards,
-- 
Javier Martinez Canillas
Open Source Group
Samsung Research America

Re: [PATCH 2/3] clk: samsung: exynos5410: Add WDT, ACLK266 and SSS clocks

[Sylwester Nawrocki]

On 06/01/2016 04:55 PM, Javier Martinez Canillas wrote:
> On 06/01/2016 05:45 AM, Krzysztof Kozlowski wrote:
>> > Add clock hierarchy for Security SubSystem clock and watchdog.
>> > 
>> > Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
>> > ---
> Reviewed-by: Javier Martinez Canillas <javier@osg.samsung.com>

Patches 1/3, 2/3 applied, thanks.

Re: [PATCH 2/3] clk: samsung: exynos5410: Add WDT, ACLK266 and SSS clocks

[Sylwester Nawrocki]

On 06/01/2016 11:45 AM, Krzysztof Kozlowski wrote:
> Add clock hierarchy for Security SubSystem clock and watchdog.
> 
> Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>

A applied patches: 

[PATCH 1/3] dt-bindings: clock: Add watchdog and SSS clock IDs to Exynos5410
[PATCH 2/3] clk: samsung: exynos5410: Add WDT, ACLK266 and SSS clocks

[PATCH 1/6] dt-bindings: clock: Add TMU clock ID to Exynos5410
[PATCH 2/6] clk: samsung: exynos5410: Add TMU clock

And here is a subsequent tag from a stable branch including all 
the dependency "dt-bindings" patches:

------8<------
The following changes since commit 1a695a905c18548062509178b98bc91e67510864:

  Linux 4.7-rc1 (2016-05-29 09:29:24 -0700)

are available in the git repository at:

  git://linuxtv.org/snawrocki/samsung.git tags/clk-v4.8-exynos5410-dt-2

for you to fetch changes up to 4528dd8ed477bf202bd33ee48d38d656672d37f8:

  dt-bindings: clock: Add watchdog and SSS clock IDs to Exynos5410 (2016-06-02 11:17:55 +0200)

----------------------------------------------------------------
Adition of missing clock index definitions for exynos5410 SoC:
PWM, USB, I2C, RTC, PMU, watchdog and the security device related
clocks.

----------------------------------------------------------------
Krzysztof Kozlowski (5):
      dt-bindings: clock: Add license and reformat Exynos5410 clock IDs
      dt-bindings: clock: Add PWM and USB clock IDs to Exynos5410
      dt-bindings: clock: Add I2C, HSI2C and RTC clock IDs to Exynos5410
      dt-bindings: clock: Add TMU clock ID to Exynos5410
      dt-bindings: clock: Add watchdog and SSS clock IDs to Exynos5410

 include/dt-bindings/clock/exynos5410.h | 76 +++++++++++++++++++++++++++------------
 1 file changed, 54 insertions(+), 22 deletions(-)
------8<------

--
Thanks, 
Sylwester

Re: [PATCH 2/3] clk: samsung: exynos5410: Add WDT, ACLK266 and SSS clocks

[Krzysztof Kozlowski]

On 06/06/2016 01:02 PM, Sylwester Nawrocki wrote:
> On 06/01/2016 11:45 AM, Krzysztof Kozlowski wrote:
>> Add clock hierarchy for Security SubSystem clock and watchdog.
>>
>> Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
> 
> A applied patches: 
> 
> [PATCH 1/3] dt-bindings: clock: Add watchdog and SSS clock IDs to Exynos5410
> [PATCH 2/3] clk: samsung: exynos5410: Add WDT, ACLK266 and SSS clocks
> 
> [PATCH 1/6] dt-bindings: clock: Add TMU clock ID to Exynos5410
> [PATCH 2/6] clk: samsung: exynos5410: Add TMU clock
> 
> And here is a subsequent tag from a stable branch including all 
> the dependency "dt-bindings" patches:
> 
> ------8<------
> The following changes since commit 1a695a905c18548062509178b98bc91e67510864:
> 
>   Linux 4.7-rc1 (2016-05-29 09:29:24 -0700)
> 
> are available in the git repository at:
> 
>   git://linuxtv.org/snawrocki/samsung.git tags/clk-v4.8-exynos5410-dt-2
> 
> for you to fetch changes up to 4528dd8ed477bf202bd33ee48d38d656672d37f8:
> 
>   dt-bindings: clock: Add watchdog and SSS clock IDs to Exynos5410 (2016-06-02 11:17:55 +0200)

Thanks, pulled!

BR,
Krzysztof

[PATCH 3/3] ARM: dts: exynos: Add watchdog amd Security SubSystem to Exynos5410

[Krzysztof Kozlowski]

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

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";
-- 
1.9.1

Re: [PATCH 3/3] ARM: dts: exynos: Add watchdog amd Security SubSystem to Exynos5410

[Javier Martinez Canillas]

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,
-- 
Javier Martinez Canillas
Open Source Group
Samsung Research America

Re: [PATCH 3/3] ARM: dts: exynos: Add watchdog amd Security SubSystem to Exynos5410

[Krzysztof Kozlowski]

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

Re: [PATCH 3/3] ARM: dts: exynos: Add watchdog amd Security SubSystem to Exynos5410

[Javier Martinez Canillas]

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,
-- 
Javier Martinez Canillas
Open Source Group
Samsung Research America

Re: [PATCH 1/3] dt-bindings: clock: Add watchdog and SSS clock IDs to Exynos5410

[Javier Martinez Canillas]

Hello Krzysztof,

On 06/01/2016 05:45 AM, Krzysztof Kozlowski wrote:
> Add IDs for watchdog and Security SubSystem to Exynos5410.  Use the same
> number as for Exynos5420 just in case in future these drivers were
> merged.
> 
> Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
> ---

Reviewed-by: Javier Martinez Canillas <javier@osg.samsung.com>

Best regards,
-- 
Javier Martinez Canillas
Open Source Group
Samsung Research America