[PATCH v3 1/3] ARM: dts: exynos: Add assigned clock parent to CMU in Exynos3250

[PATCH v3 1/3] ARM: dts: exynos: Add assigned clock parent to CMU in Exynos3250

[Krzysztof Kozlowski]

Commit 52005dece527 ("ARM: dts: Add assigned clock parents to CMU node
for exynos3250") added assigned clocks under Clock Management Unit to
fix hangs when accessing ISP registers.

However the dtschema expects "clocks" property if "assigned-clocks" are
used.  Add reference to input clock, the parent used in
"assigned-clock-parents" to silence the dtschema warnings:

  arch/arm/boot/dts/exynos3250-artik5-eval.dt.yaml: clock-controller@10030000: 'clocks' is a dependency of 'assigned-clocks'

Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>

---

Changes since v2:
1. Use XUSBXTI as real input clock.

Changes since v1:
1. Add clocks property.

This is a v2 for:
https://lore.kernel.org/linux-samsung-soc/20200901101534.GE23793@kozik-lap/T/#me85ac382b847dadbc3f6ebf30e94e70b5df1ebb6
---
 arch/arm/boot/dts/exynos3250-artik5.dtsi | 4 ++++
 arch/arm/boot/dts/exynos3250-monk.dts    | 4 ++++
 arch/arm/boot/dts/exynos3250-rinato.dts  | 4 ++++
 3 files changed, 12 insertions(+)

diff --git a/arch/arm/boot/dts/exynos3250-artik5.dtsi b/arch/arm/boot/dts/exynos3250-artik5.dtsi
index 6c2f320be2f4..12887b3924af 100644
--- a/arch/arm/boot/dts/exynos3250-artik5.dtsi
+++ b/arch/arm/boot/dts/exynos3250-artik5.dtsi
@@ -55,6 +55,10 @@
 	assigned-clock-rates = <6000000>;
 };
 
+&cmu {
+	clocks = <&xusbxti>;
+};
+
 &cpu0 {
 	cpu0-supply = <&buck2_reg>;
 };
diff --git a/arch/arm/boot/dts/exynos3250-monk.dts b/arch/arm/boot/dts/exynos3250-monk.dts
index 9d77a73bc92b..c1a68e612037 100644
--- a/arch/arm/boot/dts/exynos3250-monk.dts
+++ b/arch/arm/boot/dts/exynos3250-monk.dts
@@ -164,6 +164,10 @@
 	status = "okay";
 };
 
+&cmu {
+	clocks = <&xusbxti>;
+};
+
 &cpu0 {
 	cpu0-supply = <&buck2_reg>;
 };
diff --git a/arch/arm/boot/dts/exynos3250-rinato.dts b/arch/arm/boot/dts/exynos3250-rinato.dts
index 3df003af0d15..b55afaaa691e 100644
--- a/arch/arm/boot/dts/exynos3250-rinato.dts
+++ b/arch/arm/boot/dts/exynos3250-rinato.dts
@@ -205,6 +205,10 @@
 	status = "okay";
 };
 
+&cmu {
+	clocks = <&xusbxti>;
+};
+
 &cpu0 {
 	cpu0-supply = <&buck2_reg>;
 };
-- 
2.17.1

[PATCH v3 2/3] ARM: dts: exynos: Add assigned clock parent to CMU in Exynos4412 Odroid

[Krzysztof Kozlowski]

Commit 68605101460e ("ARM: dts: exynos: Add support for audio over HDMI
for Odroid X/X2/U3") added assigned clocks under Clock Management Unit.

However the dtschema expects "clocks" property if "assigned-clocks" are
used.  Add reference to input clock, the parent used in
"assigned-clock-parents" to silence the dtschema warnings:

  arch/arm/boot/dts/exynos4412-odroidu3.dt.yaml: clock-controller@10030000: 'clocks' is a dependency of 'assigned-clocks'

Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>

---

Changes since v2:
1. Use XUSBXTI as real input clock.
---
 arch/arm/boot/dts/exynos4412-odroid-common.dtsi | 1 +
 1 file changed, 1 insertion(+)

diff --git a/arch/arm/boot/dts/exynos4412-odroid-common.dtsi b/arch/arm/boot/dts/exynos4412-odroid-common.dtsi
index ca3c78e0966c..4a9f9881f10f 100644
--- a/arch/arm/boot/dts/exynos4412-odroid-common.dtsi
+++ b/arch/arm/boot/dts/exynos4412-odroid-common.dtsi
@@ -120,6 +120,7 @@
 };
 
 &clock {
+	clocks = <&clock CLK_XUSBXTI>;
 	assigned-clocks = <&clock CLK_FOUT_EPLL>;
 	assigned-clock-rates = <45158401>;
 };
-- 
2.17.1

Re: [PATCH v3 2/3] ARM: dts: exynos: Add assigned clock parent to CMU in Exynos4412 Odroid

[Krzysztof Kozlowski]

On Sun, Sep 06, 2020 at 04:21:45PM +0200, Krzysztof Kozlowski wrote:
> Commit 68605101460e ("ARM: dts: exynos: Add support for audio over HDMI
> for Odroid X/X2/U3") added assigned clocks under Clock Management Unit.
> 
> However the dtschema expects "clocks" property if "assigned-clocks" are
> used.  Add reference to input clock, the parent used in
> "assigned-clock-parents" to silence the dtschema warnings:
> 
>   arch/arm/boot/dts/exynos4412-odroidu3.dt.yaml: clock-controller@10030000: 'clocks' is a dependency of 'assigned-clocks'
> 

Applied.

Best regards,
Krzysztof

Re: [PATCH v3 2/3] ARM: dts: exynos: Add assigned clock parent to CMU in Exynos4412 Odroid

[Marek Szyprowski]

Hi Krzysztof,

On 11.09.2020 16:54, Krzysztof Kozlowski wrote:
> On Sun, Sep 06, 2020 at 04:21:45PM +0200, Krzysztof Kozlowski wrote:
>> Commit 68605101460e ("ARM: dts: exynos: Add support for audio over HDMI
>> for Odroid X/X2/U3") added assigned clocks under Clock Management Unit.
>>
>> However the dtschema expects "clocks" property if "assigned-clocks" are
>> used.  Add reference to input clock, the parent used in
>> "assigned-clock-parents" to silence the dtschema warnings:
>>
>>    arch/arm/boot/dts/exynos4412-odroidu3.dt.yaml: clock-controller@10030000: 'clocks' is a dependency of 'assigned-clocks'
>>
> Applied.

This patch breaks operation of clocks on Odroid X2/U3:

# dmesg | grep clk
[    0.000000] exynos_clkout_init: failed to register clkout clock
[    0.000000] Exynos4x12 clocks: sclk_apll = 1000000000, sclk_mpll = 
800000000
                 sclk_epll = 45158401, sclk_vpll = 350000000, arm_clk = 
1000000000
[    2.569484] usb3503 0-0008: unable to request refclk (-517)
[    2.848718] s3c-sdhci 12530000.sdhci: clock source 2: mmc_busclk.2 
(50000000 Hz)
[    3.373850] usb3503 0-0008: unable to request refclk (-517)
[    3.542777] usb3503 0-0008: unable to request refclk (-517)
[    3.544005] usb3503 0-0008: unable to request refclk (-517)
[    3.559223] usb3503 0-0008: unable to request refclk (-517)

Please revert or drop if possible.

Best regards
-- 
Marek Szyprowski, PhD
Samsung R&D Institute Poland

Re: [PATCH v3 2/3] ARM: dts: exynos: Add assigned clock parent to CMU in Exynos4412 Odroid

[Krzysztof Kozlowski]

On Mon, 21 Sep 2020 at 11:42, Marek Szyprowski <m.szyprowski@samsung.com> wrote:
>
> Hi Krzysztof,
>
> On 11.09.2020 16:54, Krzysztof Kozlowski wrote:
> > On Sun, Sep 06, 2020 at 04:21:45PM +0200, Krzysztof Kozlowski wrote:
> >> Commit 68605101460e ("ARM: dts: exynos: Add support for audio over HDMI
> >> for Odroid X/X2/U3") added assigned clocks under Clock Management Unit.
> >>
> >> However the dtschema expects "clocks" property if "assigned-clocks" are
> >> used.  Add reference to input clock, the parent used in
> >> "assigned-clock-parents" to silence the dtschema warnings:
> >>
> >>    arch/arm/boot/dts/exynos4412-odroidu3.dt.yaml: clock-controller@10030000: 'clocks' is a dependency of 'assigned-clocks'
> >>
> > Applied.
>
> This patch breaks operation of clocks on Odroid X2/U3:
>
> # dmesg | grep clk
> [    0.000000] exynos_clkout_init: failed to register clkout clock
> [    0.000000] Exynos4x12 clocks: sclk_apll = 1000000000, sclk_mpll =
> 800000000
>                  sclk_epll = 45158401, sclk_vpll = 350000000, arm_clk =
> 1000000000
> [    2.569484] usb3503 0-0008: unable to request refclk (-517)
> [    2.848718] s3c-sdhci 12530000.sdhci: clock source 2: mmc_busclk.2
> (50000000 Hz)
> [    3.373850] usb3503 0-0008: unable to request refclk (-517)
> [    3.542777] usb3503 0-0008: unable to request refclk (-517)
> [    3.544005] usb3503 0-0008: unable to request refclk (-517)
> [    3.559223] usb3503 0-0008: unable to request refclk (-517)
>
> Please revert or drop if possible.

Crap, thanks for noticing. I tested only Odroid X where the usb3503
came up. I'll try to fix it or revert.

Best regards,
Krzysztof

Re: [PATCH v3 2/3] ARM: dts: exynos: Add assigned clock parent to CMU in Exynos4412 Odroid

[Krzysztof Kozlowski]

On Mon, Sep 21, 2020 at 11:42:40AM +0200, Marek Szyprowski wrote:
> Hi Krzysztof,
> 
> On 11.09.2020 16:54, Krzysztof Kozlowski wrote:
> > On Sun, Sep 06, 2020 at 04:21:45PM +0200, Krzysztof Kozlowski wrote:
> >> Commit 68605101460e ("ARM: dts: exynos: Add support for audio over HDMI
> >> for Odroid X/X2/U3") added assigned clocks under Clock Management Unit.
> >>
> >> However the dtschema expects "clocks" property if "assigned-clocks" are
> >> used.  Add reference to input clock, the parent used in
> >> "assigned-clock-parents" to silence the dtschema warnings:
> >>
> >>    arch/arm/boot/dts/exynos4412-odroidu3.dt.yaml: clock-controller@10030000: 'clocks' is a dependency of 'assigned-clocks'
> >>
> > Applied.
> 
> This patch breaks operation of clocks on Odroid X2/U3:
> 
> # dmesg | grep clk
> [    0.000000] exynos_clkout_init: failed to register clkout clock
> [    0.000000] Exynos4x12 clocks: sclk_apll = 1000000000, sclk_mpll = 
> 800000000
>                  sclk_epll = 45158401, sclk_vpll = 350000000, arm_clk = 
> 1000000000
> [    2.569484] usb3503 0-0008: unable to request refclk (-517)
> [    2.848718] s3c-sdhci 12530000.sdhci: clock source 2: mmc_busclk.2 
> (50000000 Hz)
> [    3.373850] usb3503 0-0008: unable to request refclk (-517)
> [    3.542777] usb3503 0-0008: unable to request refclk (-517)
> [    3.544005] usb3503 0-0008: unable to request refclk (-517)
> [    3.559223] usb3503 0-0008: unable to request refclk (-517)
> 
> Please revert or drop if possible.

I re-applied this one (it was once reverted), as clkout was converted to
proper driver. My Odroid U3 boots fine now with this patch.

Best regards,
Krzysztof

[PATCH v3 3/3] ARM: dts: exynos: Add clocks sound node in Exynos5422 Odroid XU4

[Krzysztof Kozlowski]

The dtschema expects "clocks" property if "assigned-clocks" are used.
Add reference to all parent clocks to silence the dtbs_check warnings.

Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>

---

Changes since v2:
1. Move clock properties to i2s, just like Sylwester Nawrocki did for
   Odroid XU3.
---
 arch/arm/boot/dts/exynos5422-odroidxu4.dts | 60 ++++++++++------------
 1 file changed, 27 insertions(+), 33 deletions(-)

diff --git a/arch/arm/boot/dts/exynos5422-odroidxu4.dts b/arch/arm/boot/dts/exynos5422-odroidxu4.dts
index 892d389d6d09..ddd55d3bcadd 100644
--- a/arch/arm/boot/dts/exynos5422-odroidxu4.dts
+++ b/arch/arm/boot/dts/exynos5422-odroidxu4.dts
@@ -35,30 +35,6 @@
 
 		samsung,audio-routing = "I2S Playback", "Mixer DAI TX";
 
-		assigned-clocks = <&clock CLK_MOUT_EPLL>,
-				<&clock CLK_MOUT_MAU_EPLL>,
-				<&clock CLK_MOUT_USER_MAU_EPLL>,
-				<&clock_audss EXYNOS_MOUT_AUDSS>,
-				<&clock_audss EXYNOS_MOUT_I2S>,
-				<&clock_audss EXYNOS_DOUT_SRP>,
-				<&clock_audss EXYNOS_DOUT_AUD_BUS>,
-				<&clock_audss EXYNOS_DOUT_I2S>;
-
-		assigned-clock-parents = <&clock CLK_FOUT_EPLL>,
-				<&clock CLK_MOUT_EPLL>,
-				<&clock CLK_MOUT_MAU_EPLL>,
-				<&clock CLK_MAU_EPLL>,
-				<&clock_audss EXYNOS_MOUT_AUDSS>;
-
-		assigned-clock-rates = <0>,
-				<0>,
-				<0>,
-				<0>,
-				<0>,
-				<196608001>,
-				<(196608002 / 2)>,
-				<196608000>;
-
 		cpu {
 			sound-dai = <&i2s0 0>, <&i2s0 1>;
 		};
@@ -69,17 +45,35 @@
 	};
 };
 
-&clock_audss {
-	assigned-clocks = <&clock_audss EXYNOS_DOUT_SRP>,
-			  <&clock CLK_FOUT_EPLL>;
-	assigned-clock-rates = <(196608000 / 256)>,
-			       <196608000>;
-};
-
 &i2s0 {
 	status = "okay";
-	assigned-clocks = <&i2s0 CLK_I2S_RCLK_SRC>;
-	assigned-clock-parents = <&clock_audss EXYNOS_SCLK_I2S>;
+
+	assigned-clocks = <&clock CLK_MOUT_EPLL>,
+			  <&clock CLK_MOUT_MAU_EPLL>,
+			  <&clock CLK_MOUT_USER_MAU_EPLL>,
+			  <&clock_audss EXYNOS_MOUT_AUDSS>,
+			  <&clock_audss EXYNOS_MOUT_I2S>,
+			  <&i2s0 CLK_I2S_RCLK_SRC>,
+			  <&clock_audss EXYNOS_DOUT_SRP>,
+			  <&clock_audss EXYNOS_DOUT_AUD_BUS>,
+			  <&clock_audss EXYNOS_DOUT_I2S>;
+
+	assigned-clock-parents = <&clock CLK_FOUT_EPLL>,
+				 <&clock CLK_MOUT_EPLL>,
+				 <&clock CLK_MOUT_MAU_EPLL>,
+				 <&clock CLK_MAU_EPLL>,
+				 <&clock_audss EXYNOS_MOUT_AUDSS>,
+				 <&clock_audss EXYNOS_SCLK_I2S>;
+
+	assigned-clock-rates = <0>,
+			       <0>,
+			       <0>,
+			       <0>,
+			       <0>,
+			       <0>,
+			       <196608001>,
+			       <(196608002 / 2)>,
+			       <196608000>;
 };
 
 &pwm {
-- 
2.17.1

Re: [PATCH v3 3/3] ARM: dts: exynos: Add clocks sound node in Exynos5422 Odroid XU4

[Krzysztof Kozlowski]

On Sun, Sep 06, 2020 at 04:21:46PM +0200, Krzysztof Kozlowski wrote:
> The dtschema expects "clocks" property if "assigned-clocks" are used.
> Add reference to all parent clocks to silence the dtbs_check warnings.
> 
> Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>
> 
> ---
> 
> Changes since v2:
> 1. Move clock properties to i2s, just like Sylwester Nawrocki did for
>    Odroid XU3.
> ---
>  arch/arm/boot/dts/exynos5422-odroidxu4.dts | 60 ++++++++++------------

Applied with reworked commit msg.

Best regards,
Krzysztof

Re: [PATCH v3 1/3] ARM: dts: exynos: Add assigned clock parent to CMU in Exynos3250

[Krzysztof Kozlowski]

On Sun, Sep 06, 2020 at 04:21:44PM +0200, Krzysztof Kozlowski wrote:
> Commit 52005dece527 ("ARM: dts: Add assigned clock parents to CMU node
> for exynos3250") added assigned clocks under Clock Management Unit to
> fix hangs when accessing ISP registers.
> 
> However the dtschema expects "clocks" property if "assigned-clocks" are
> used.  Add reference to input clock, the parent used in
> "assigned-clock-parents" to silence the dtschema warnings:
> 
>   arch/arm/boot/dts/exynos3250-artik5-eval.dt.yaml: clock-controller@10030000: 'clocks' is a dependency of 'assigned-clocks'
> 
> Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>
> 
> ---
> 
> Changes since v2:
> 1. Use XUSBXTI as real input clock.
> 
> Changes since v1:
> 1. Add clocks property.
> 
> This is a v2 for:
> https://lore.kernel.org/linux-samsung-soc/20200901101534.GE23793@kozik-lap/T/#me85ac382b847dadbc3f6ebf30e94e70b5df1ebb6
> ---
>  arch/arm/boot/dts/exynos3250-artik5.dtsi | 4 ++++
>  arch/arm/boot/dts/exynos3250-monk.dts    | 4 ++++
>  arch/arm/boot/dts/exynos3250-rinato.dts  | 4 ++++

Applied.

Best regards,
Krzysztof