LinuxLists.cc - [PATCH] arm64: dts: altera: socfpga_stratix10: move clocks out of soc node

2022-06-23 02:52:20

Subject: [PATCH] arm64: dts: altera: socfpga_stratix10: move clocks out of soc node

2022-06-23 16:31:00

Subject: Re: [PATCH] arm64: dts: altera: socfpga_stratix10: move clocks out of soc node

On 6/22/22 21:42, [email protected] wrote:
> From: Niravkumar L Rabara <[email protected]>
>
> The clocks are not part of the SoC but provided on the board
> (external oscillators). Moving them out of soc node.
>
> Signed-off-by: Niravkumar L Rabara <[email protected]>
> ---
> .../boot/dts/altera/socfpga_stratix10.dtsi | 56 +++++++++----------
> 1 file changed, 28 insertions(+), 28 deletions(-)
>
> diff --git a/arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi b/arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi
> index aa2bba75265f..5c7d926d18f7 100644
> --- a/arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi
> +++ b/arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi
> @@ -97,6 +97,34 @@ intc: interrupt-controller@fffc1000 {
> <0x0 0xfffc6000 0x0 0x2000>;
> };
>
> + clocks {
> + cb_intosc_hs_div2_clk: cb-intosc-hs-div2-clk {
> + #clock-cells = <0>;
> + compatible = "fixed-clock";
> + };
> +
> + cb_intosc_ls_clk: cb-intosc-ls-clk {
> + #clock-cells = <0>;
> + compatible = "fixed-clock";
> + };
> +
> + f2s_free_clk: f2s-free-clk {
> + #clock-cells = <0>;
> + compatible = "fixed-clock";
> + };
> +
> + osc1: osc1 {
> + #clock-cells = <0>;
> + compatible = "fixed-clock";
> + };
> +
> + qspi_clk: qspi-clk {
> + #clock-cells = <0>;
> + compatible = "fixed-clock";
> + clock-frequency = <200000000>;
> + };
> + };
> +
> soc {
> #address-cells = <1>;
> #size-cells = <1>;
> @@ -119,34 +147,6 @@ clkmgr: clock-controller@ffd10000 {
> #clock-cells = <1>;
> };
>
> - clocks {
> - cb_intosc_hs_div2_clk: cb-intosc-hs-div2-clk {
> - #clock-cells = <0>;
> - compatible = "fixed-clock";
> - };
> -
> - cb_intosc_ls_clk: cb-intosc-ls-clk {
> - #clock-cells = <0>;
> - compatible = "fixed-clock";
> - };
> -
> - f2s_free_clk: f2s-free-clk {
> - #clock-cells = <0>;
> - compatible = "fixed-clock";
> - };
> -
> - osc1: osc1 {
> - #clock-cells = <0>;
> - compatible = "fixed-clock";
> - };
> -
> - qspi_clk: qspi-clk {
> - #clock-cells = <0>;
> - compatible = "fixed-clock";
> - clock-frequency = <200000000>;
> - };
> - };
> -
> gmac0: ethernet@ff800000 {
> compatible = "altr,socfpga-stmmac-a10-s10", "snps,dwmac-3.74a", "snps,dwmac";
> reg = <0xff800000 0x2000>;

NAK! This patch breaks the Stratix10 boot. Also these clocks are part of
the SoC!

Dinh

2022-06-23 19:41:59

by Dinh Nguyen

[permalink] [raw]

Subject: Re: [PATCH] arm64: dts: altera: socfpga_stratix10: move clocks out of soc node

Hi

On 6/23/22 11:16, Dinh Nguyen wrote:
>
>
> On 6/22/22 21:42, [email protected] wrote:
>> From: Niravkumar L Rabara <[email protected]>
>>
>> The clocks are not part of the SoC but provided on the board
>> (external oscillators). Moving them out of soc node.
>>
>> Signed-off-by: Niravkumar L Rabara <[email protected]>
>> ---
>> .../boot/dts/altera/socfpga_stratix10.dtsi    | 56 +++++++++----------
>> 1 file changed, 28 insertions(+), 28 deletions(-)
>>
>> diff --git a/arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi
>> b/arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi
>> index aa2bba75265f..5c7d926d18f7 100644
>> --- a/arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi
>> +++ b/arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi
>> @@ -97,6 +97,34 @@ intc: interrupt-controller@fffc1000 {
>>                 <0x0 0xfffc6000 0x0 0x2000>;
>>       };
>> +    clocks {
>> +        cb_intosc_hs_div2_clk: cb-intosc-hs-div2-clk {
>> +            #clock-cells = <0>;
>> +            compatible = "fixed-clock";
>> +        };
>> +
>> +        cb_intosc_ls_clk: cb-intosc-ls-clk {
>> +            #clock-cells = <0>;
>> +            compatible = "fixed-clock";
>> +        };
>> +
>> +        f2s_free_clk: f2s-free-clk {
>> +            #clock-cells = <0>;
>> +            compatible = "fixed-clock";
>> +        };
>> +
>> +        osc1: osc1 {
>> +            #clock-cells = <0>;
>> +            compatible = "fixed-clock";
>> +        };
>> +
>> +        qspi_clk: qspi-clk {
>> +            #clock-cells = <0>;
>> +            compatible = "fixed-clock";
>> +            clock-frequency = <200000000>;
>> +        };
>> +    };
>> +
>>       soc {
>>           #address-cells = <1>;
>>           #size-cells = <1>;
>> @@ -119,34 +147,6 @@ clkmgr: clock-controller@ffd10000 {
>>               #clock-cells = <1>;
>>           };
>> -        clocks {
>> -            cb_intosc_hs_div2_clk: cb-intosc-hs-div2-clk {
>> -                #clock-cells = <0>;
>> -                compatible = "fixed-clock";
>> -            };
>> -
>> -            cb_intosc_ls_clk: cb-intosc-ls-clk {
>> -                #clock-cells = <0>;
>> -                compatible = "fixed-clock";
>> -            };
>> -
>> -            f2s_free_clk: f2s-free-clk {
>> -                #clock-cells = <0>;
>> -                compatible = "fixed-clock";
>> -            };
>> -
>> -            osc1: osc1 {
>> -                #clock-cells = <0>;
>> -                compatible = "fixed-clock";
>> -            };
>> -
>> -            qspi_clk: qspi-clk {
>> -                #clock-cells = <0>;
>> -                compatible = "fixed-clock";
>> -                clock-frequency = <200000000>;
>> -            };
>> -        };
>> -
>>           gmac0: ethernet@ff800000 {
>>               compatible = "altr,socfpga-stmmac-a10-s10",
>> "snps,dwmac-3.74a", "snps,dwmac";
>>               reg = <0xff800000 0x2000>;
>
> NAK! This patch breaks the Stratix10 boot. Also these clocks are part of
> the SoC!
>

Take that back. Your changes are fine, but you need to update the board
files as well. i.e socfpga_stratix10_socdk.dts

--- a/arch/arm64/boot/dts/altera/socfpga_stratix10_socdk.dts
+++ b/arch/arm64/boot/dts/altera/socfpga_stratix10_socdk.dts
@@ -52,12 +52,6 @@ ref_033v: regulator-v-ref {
};

soc {
- clocks {
- osc1 {
- clock-frequency = <25000000>;
- };
- };
-
eccmgr {
sdmmca-ecc@ff8c8c00 {
compatible = "altr,socfpga-s10-sdmmc-ecc",
@@ -113,6 +107,10 @@ &mmc {
bus-width = <4>;
};

+&osc1 {
+ clock-frequency = <25000000>;
+};
+

Dinh

2022-06-24 03:38:26

by Rabara, Niravkumar L

[permalink] [raw]

Subject: Re: [PATCH] arm64: dts: altera: socfpga_stratix10: move clocks out of soc node

>
>Take that back. Your changes are fine, but you need to update the board
>files as well. i.e socfpga_stratix10_socdk.dts
>
>
>--- a/arch/arm64/boot/dts/altera/socfpga_stratix10_socdk.dts
>+++ b/arch/arm64/boot/dts/altera/socfpga_stratix10_socdk.dts
>@@ -52,12 +52,6 @@ ref_033v: regulator-v-ref {
> };
>
> soc {
> clocks {
> osc1 {
> clock-frequency = <25000000>;
> };
> };
>
> eccmgr {
> sdmmca-ecc@ff8c8c00 {
> compatible = "altr,socfpga-s10-sdmmc-ecc",
>@@ -113,6 +107,10 @@ &mmc {
> bus-width = <4>;
> };
>
>+&osc1 {
>+ clock-frequency = <25000000>;
>+};
>+

Sorry I missed this change, will update in v2 patch.

Thanks,
Nirav

2022-06-24 12:04:29

by Rabara, Niravkumar L

[permalink] [raw]

Subject: [PATCH] arm64: dts: altera: socfpga_stratix10: move clocks out of soc node

From: Niravkumar L Rabara <[email protected]>

The clocks are not part of the SoC but provided on the board
(external oscillators). Moving them out of soc node.

Signed-off-by: Niravkumar L Rabara <[email protected]>
---
.../boot/dts/altera/socfpga_stratix10.dtsi | 56 +++++++++----------
.../dts/altera/socfpga_stratix10_socdk.dts | 10 ++--
2 files changed, 32 insertions(+), 34 deletions(-)

diff --git a/arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi b/arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi
index aa2bba75265f..5c7d926d18f7 100644
--- a/arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi
+++ b/arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi
@@ -97,6 +97,34 @@ intc: interrupt-controller@fffc1000 {
<0x0 0xfffc6000 0x0 0x2000>;
};

+ clocks {
+ cb_intosc_hs_div2_clk: cb-intosc-hs-div2-clk {
+ #clock-cells = <0>;
+ compatible = "fixed-clock";
+ };
+
+ cb_intosc_ls_clk: cb-intosc-ls-clk {
+ #clock-cells = <0>;
+ compatible = "fixed-clock";
+ };
+
+ f2s_free_clk: f2s-free-clk {
+ #clock-cells = <0>;
+ compatible = "fixed-clock";
+ };
+
+ osc1: osc1 {
+ #clock-cells = <0>;
+ compatible = "fixed-clock";
+ };
+
+ qspi_clk: qspi-clk {
+ #clock-cells = <0>;
+ compatible = "fixed-clock";
+ clock-frequency = <200000000>;
+ };
+ };
+
soc {
#address-cells = <1>;
#size-cells = <1>;
@@ -119,34 +147,6 @@ clkmgr: clock-controller@ffd10000 {
#clock-cells = <1>;
};

- clocks {
- cb_intosc_hs_div2_clk: cb-intosc-hs-div2-clk {
- #clock-cells = <0>;
- compatible = "fixed-clock";
- };
-
- cb_intosc_ls_clk: cb-intosc-ls-clk {
- #clock-cells = <0>;
- compatible = "fixed-clock";
- };
-
- f2s_free_clk: f2s-free-clk {
- #clock-cells = <0>;
- compatible = "fixed-clock";
- };
-
- osc1: osc1 {
- #clock-cells = <0>;
- compatible = "fixed-clock";
- };
-
- qspi_clk: qspi-clk {
- #clock-cells = <0>;
- compatible = "fixed-clock";
- clock-frequency = <200000000>;
- };
- };
-
gmac0: ethernet@ff800000 {
compatible = "altr,socfpga-stmmac-a10-s10", "snps,dwmac-3.74a", "snps,dwmac";
reg = <0xff800000 0x2000>;
diff --git a/arch/arm64/boot/dts/altera/socfpga_stratix10_socdk.dts b/arch/arm64/boot/dts/altera/socfpga_stratix10_socdk.dts
index 5159cd5771dc..48424e459f12 100644
--- a/arch/arm64/boot/dts/altera/socfpga_stratix10_socdk.dts
+++ b/arch/arm64/boot/dts/altera/socfpga_stratix10_socdk.dts
@@ -52,12 +52,6 @@ ref_033v: regulator-v-ref {
};

soc {
- clocks {
- osc1 {
- clock-frequency = <25000000>;
- };
- };
-
eccmgr {
sdmmca-ecc@ff8c8c00 {
compatible = "altr,socfpga-s10-sdmmc-ecc",
@@ -113,6 +107,10 @@ &mmc {
bus-width = <4>;
};

+&osc1 {
+ clock-frequency = <25000000>;
+};
+
&uart0 {
status = "okay";
};
--
2.25.1

2022-06-24 15:44:35

by Dinh Nguyen

[permalink] [raw]

Subject: Re: [PATCH] arm64: dts: altera: socfpga_stratix10: move clocks out of soc node

On 6/24/22 06:59, [email protected] wrote:
> From: Niravkumar L Rabara <[email protected]>
>
> The clocks are not part of the SoC but provided on the board
> (external oscillators). Moving them out of soc node.
>
> Signed-off-by: Niravkumar L Rabara <[email protected]>
> ---
> .../boot/dts/altera/socfpga_stratix10.dtsi | 56 +++++++++----------
> .../dts/altera/socfpga_stratix10_socdk.dts | 10 ++--
> 2 files changed, 32 insertions(+), 34 deletions(-)
>
> diff --git a/arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi b/arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi
> index aa2bba75265f..5c7d926d18f7 100644
> --- a/arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi
> +++ b/arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi
> @@ -97,6 +97,34 @@ intc: interrupt-controller@fffc1000 {
> <0x0 0xfffc6000 0x0 0x2000>;
> };
>
> + clocks {
> + cb_intosc_hs_div2_clk: cb-intosc-hs-div2-clk {
> + #clock-cells = <0>;
> + compatible = "fixed-clock";
> + };
> +
> + cb_intosc_ls_clk: cb-intosc-ls-clk {
> + #clock-cells = <0>;
> + compatible = "fixed-clock";
> + };
> +
> + f2s_free_clk: f2s-free-clk {
> + #clock-cells = <0>;
> + compatible = "fixed-clock";
> + };
> +
> + osc1: osc1 {
> + #clock-cells = <0>;
> + compatible = "fixed-clock";
> + };
> +
> + qspi_clk: qspi-clk {
> + #clock-cells = <0>;
> + compatible = "fixed-clock";
> + clock-frequency = <200000000>;
> + };
> + };
> +
> soc {
> #address-cells = <1>;
> #size-cells = <1>;
> @@ -119,34 +147,6 @@ clkmgr: clock-controller@ffd10000 {
> #clock-cells = <1>;
> };
>
> - clocks {
> - cb_intosc_hs_div2_clk: cb-intosc-hs-div2-clk {
> - #clock-cells = <0>;
> - compatible = "fixed-clock";
> - };
> -
> - cb_intosc_ls_clk: cb-intosc-ls-clk {
> - #clock-cells = <0>;
> - compatible = "fixed-clock";
> - };
> -
> - f2s_free_clk: f2s-free-clk {
> - #clock-cells = <0>;
> - compatible = "fixed-clock";
> - };
> -
> - osc1: osc1 {
> - #clock-cells = <0>;
> - compatible = "fixed-clock";
> - };
> -
> - qspi_clk: qspi-clk {
> - #clock-cells = <0>;
> - compatible = "fixed-clock";
> - clock-frequency = <200000000>;
> - };
> - };
> -
> gmac0: ethernet@ff800000 {
> compatible = "altr,socfpga-stmmac-a10-s10", "snps,dwmac-3.74a", "snps,dwmac";
> reg = <0xff800000 0x2000>;
> diff --git a/arch/arm64/boot/dts/altera/socfpga_stratix10_socdk.dts b/arch/arm64/boot/dts/altera/socfpga_stratix10_socdk.dts
> index 5159cd5771dc..48424e459f12 100644
> --- a/arch/arm64/boot/dts/altera/socfpga_stratix10_socdk.dts
> +++ b/arch/arm64/boot/dts/altera/socfpga_stratix10_socdk.dts
> @@ -52,12 +52,6 @@ ref_033v: regulator-v-ref {
> };
>
> soc {
> - clocks {
> - osc1 {
> - clock-frequency = <25000000>;
> - };
> - };
> -
> eccmgr {
> sdmmca-ecc@ff8c8c00 {
> compatible = "altr,socfpga-s10-sdmmc-ecc",
> @@ -113,6 +107,10 @@ &mmc {
> bus-width = <4>;
> };
>
> +&osc1 {
> + clock-frequency = <25000000>;
> +};
> +
> &uart0 {
> status = "okay";
> };

What about arch/arm64/boot/dts/altera/socfpga_stratix10_socdk_nand.dts?

Also for future versions, please use a 'PATCHv#".

2022-06-24 16:46:57

by Rabara, Niravkumar L

[permalink] [raw]

Subject: [PATCHv3] arm64: dts: altera: socfpga_stratix10: move clocks out of soc node

From: Niravkumar L Rabara <[email protected]>

The clocks are not part of the SoC but provided on the board
(external oscillators). Moving them out of soc node.

Signed-off-by: Niravkumar L Rabara <[email protected]>
---
.../boot/dts/altera/socfpga_stratix10.dtsi | 56 +++++++++----------
.../dts/altera/socfpga_stratix10_socdk.dts | 10 ++--
.../altera/socfpga_stratix10_socdk_nand.dts | 10 ++--
3 files changed, 36 insertions(+), 40 deletions(-)

diff --git a/arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi b/arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi
index aa2bba75265f..5c7d926d18f7 100644
--- a/arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi
+++ b/arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi
@@ -97,6 +97,34 @@ intc: interrupt-controller@fffc1000 {
<0x0 0xfffc6000 0x0 0x2000>;
};

+ clocks {
+ cb_intosc_hs_div2_clk: cb-intosc-hs-div2-clk {
+ #clock-cells = <0>;
+ compatible = "fixed-clock";
+ };
+
+ cb_intosc_ls_clk: cb-intosc-ls-clk {
+ #clock-cells = <0>;
+ compatible = "fixed-clock";
+ };
+
+ f2s_free_clk: f2s-free-clk {
+ #clock-cells = <0>;
+ compatible = "fixed-clock";
+ };
+
+ osc1: osc1 {
+ #clock-cells = <0>;
+ compatible = "fixed-clock";
+ };
+
+ qspi_clk: qspi-clk {
+ #clock-cells = <0>;
+ compatible = "fixed-clock";
+ clock-frequency = <200000000>;
+ };
+ };
+
soc {
#address-cells = <1>;
#size-cells = <1>;
@@ -119,34 +147,6 @@ clkmgr: clock-controller@ffd10000 {
#clock-cells = <1>;
};

- clocks {
- cb_intosc_hs_div2_clk: cb-intosc-hs-div2-clk {
- #clock-cells = <0>;
- compatible = "fixed-clock";
- };
-
- cb_intosc_ls_clk: cb-intosc-ls-clk {
- #clock-cells = <0>;
- compatible = "fixed-clock";
- };
-
- f2s_free_clk: f2s-free-clk {
- #clock-cells = <0>;
- compatible = "fixed-clock";
- };
-
- osc1: osc1 {
- #clock-cells = <0>;
- compatible = "fixed-clock";
- };
-
- qspi_clk: qspi-clk {
- #clock-cells = <0>;
- compatible = "fixed-clock";
- clock-frequency = <200000000>;
- };
- };
-
gmac0: ethernet@ff800000 {
compatible = "altr,socfpga-stmmac-a10-s10", "snps,dwmac-3.74a", "snps,dwmac";
reg = <0xff800000 0x2000>;
diff --git a/arch/arm64/boot/dts/altera/socfpga_stratix10_socdk.dts b/arch/arm64/boot/dts/altera/socfpga_stratix10_socdk.dts
index 5159cd5771dc..48424e459f12 100644
--- a/arch/arm64/boot/dts/altera/socfpga_stratix10_socdk.dts
+++ b/arch/arm64/boot/dts/altera/socfpga_stratix10_socdk.dts
@@ -52,12 +52,6 @@ ref_033v: regulator-v-ref {
};

soc {
- clocks {
- osc1 {
- clock-frequency = <25000000>;
- };
- };
-
eccmgr {
sdmmca-ecc@ff8c8c00 {
compatible = "altr,socfpga-s10-sdmmc-ecc",
@@ -113,6 +107,10 @@ &mmc {
bus-width = <4>;
};

+&osc1 {
+ clock-frequency = <25000000>;
+};
+
&uart0 {
status = "okay";
};
diff --git a/arch/arm64/boot/dts/altera/socfpga_stratix10_socdk_nand.dts b/arch/arm64/boot/dts/altera/socfpga_stratix10_socdk_nand.dts
index 0ab676c639a1..847a7c01f5af 100644
--- a/arch/arm64/boot/dts/altera/socfpga_stratix10_socdk_nand.dts
+++ b/arch/arm64/boot/dts/altera/socfpga_stratix10_socdk_nand.dts
@@ -52,12 +52,6 @@ ref_033v: regulator-v-ref {
};

soc {
- clocks {
- osc1 {
- clock-frequency = <25000000>;
- };
- };
-
eccmgr {
sdmmca-ecc@ff8c8c00 {
compatible = "altr,socfpga-s10-sdmmc-ecc",
@@ -126,6 +120,10 @@ partition@200000 {
};
};

+&osc1 {
+ clock-frequency = <25000000>;
+};
+
&uart0 {
status = "okay";
};
--
2.25.1

2022-06-24 23:14:11

by Dinh Nguyen

[permalink] [raw]

Subject: Re: [PATCHv3] arm64: dts: altera: socfpga_stratix10: move clocks out of soc node

On 6/24/22 11:21, [email protected] wrote:
> From: Niravkumar L Rabara <[email protected]>
>
> The clocks are not part of the SoC but provided on the board
> (external oscillators). Moving them out of soc node.
>
> Signed-off-by: Niravkumar L Rabara <[email protected]>
> ---
> .../boot/dts/altera/socfpga_stratix10.dtsi | 56 +++++++++----------
> .../dts/altera/socfpga_stratix10_socdk.dts | 10 ++--
> .../altera/socfpga_stratix10_socdk_nand.dts | 10 ++--
> 3 files changed, 36 insertions(+), 40 deletions(-)
>
> diff --git a/arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi b/arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi
> index aa2bba75265f..5c7d926d18f7 100644
> --- a/arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi
> +++ b/arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi
> @@ -97,6 +97,34 @@ intc: interrupt-controller@fffc1000 {
> <0x0 0xfffc6000 0x0 0x2000>;
> };
>
> + clocks {
> + cb_intosc_hs_div2_clk: cb-intosc-hs-div2-clk {
> + #clock-cells = <0>;
> + compatible = "fixed-clock";
> + };
> +
> + cb_intosc_ls_clk: cb-intosc-ls-clk {
> + #clock-cells = <0>;
> + compatible = "fixed-clock";
> + };
> +
> + f2s_free_clk: f2s-free-clk {
> + #clock-cells = <0>;
> + compatible = "fixed-clock";
> + };
> +
> + osc1: osc1 {
> + #clock-cells = <0>;
> + compatible = "fixed-clock";
> + };
> +
> + qspi_clk: qspi-clk {
> + #clock-cells = <0>;
> + compatible = "fixed-clock";
> + clock-frequency = <200000000>;
> + };
> + };
> +
> soc {
> #address-cells = <1>;
> #size-cells = <1>;
> @@ -119,34 +147,6 @@ clkmgr: clock-controller@ffd10000 {
> #clock-cells = <1>;
> };
>
> - clocks {
> - cb_intosc_hs_div2_clk: cb-intosc-hs-div2-clk {
> - #clock-cells = <0>;
> - compatible = "fixed-clock";
> - };
> -
> - cb_intosc_ls_clk: cb-intosc-ls-clk {
> - #clock-cells = <0>;
> - compatible = "fixed-clock";
> - };
> -
> - f2s_free_clk: f2s-free-clk {
> - #clock-cells = <0>;
> - compatible = "fixed-clock";
> - };
> -
> - osc1: osc1 {
> - #clock-cells = <0>;
> - compatible = "fixed-clock";
> - };
> -
> - qspi_clk: qspi-clk {
> - #clock-cells = <0>;
> - compatible = "fixed-clock";
> - clock-frequency = <200000000>;
> - };
> - };
> -
> gmac0: ethernet@ff800000 {
> compatible = "altr,socfpga-stmmac-a10-s10", "snps,dwmac-3.74a", "snps,dwmac";
> reg = <0xff800000 0x2000>;
> diff --git a/arch/arm64/boot/dts/altera/socfpga_stratix10_socdk.dts b/arch/arm64/boot/dts/altera/socfpga_stratix10_socdk.dts
> index 5159cd5771dc..48424e459f12 100644
> --- a/arch/arm64/boot/dts/altera/socfpga_stratix10_socdk.dts
> +++ b/arch/arm64/boot/dts/altera/socfpga_stratix10_socdk.dts
> @@ -52,12 +52,6 @@ ref_033v: regulator-v-ref {
> };
>
> soc {
> - clocks {
> - osc1 {
> - clock-frequency = <25000000>;
> - };
> - };
> -
> eccmgr {
> sdmmca-ecc@ff8c8c00 {
> compatible = "altr,socfpga-s10-sdmmc-ecc",
> @@ -113,6 +107,10 @@ &mmc {
> bus-width = <4>;
> };
>
> +&osc1 {
> + clock-frequency = <25000000>;
> +};
> +
> &uart0 {
> status = "okay";
> };
> diff --git a/arch/arm64/boot/dts/altera/socfpga_stratix10_socdk_nand.dts b/arch/arm64/boot/dts/altera/socfpga_stratix10_socdk_nand.dts
> index 0ab676c639a1..847a7c01f5af 100644
> --- a/arch/arm64/boot/dts/altera/socfpga_stratix10_socdk_nand.dts
> +++ b/arch/arm64/boot/dts/altera/socfpga_stratix10_socdk_nand.dts
> @@ -52,12 +52,6 @@ ref_033v: regulator-v-ref {
> };
>
> soc {
> - clocks {
> - osc1 {
> - clock-frequency = <25000000>;
> - };
> - };
> -
> eccmgr {
> sdmmca-ecc@ff8c8c00 {
> compatible = "altr,socfpga-s10-sdmmc-ecc",
> @@ -126,6 +120,10 @@ partition@200000 {
> };
> };
>
> +&osc1 {
> + clock-frequency = <25000000>;
> +};
> +
> &uart0 {
> status = "okay";
> };

Applied!

Thanks,
Dinh