arm64: dts: altera: socfpga_stratix10: move clocks out of soc node
Subsystems (2)
PATCH 1/1 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.
--- .../boot/dts/altera/socfpga_stratix10.dtsi | 56 +++++++++---------- 1 file changed, 28 insertions(+), 28 deletions(-)
arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi +28 -28
@@ -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>;
Signature · 1 line
2.25.1
Dinh Nguyen
maintainerQuoted 74 lines · 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(-)arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi +28
-21@@ -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"; - }; -
arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi clkmgr: clock-controller@ffd10000 { · line 152
Quoted 10 lines
arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi +0
-7- 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
Dinh Nguyen
maintainerHi
Quoted 79 lines · Dinh Nguyen
Quoted 76 lines · 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(-)arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi +28
-25@@ -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>;
Quoted 9 lines
arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi clkmgr: clock-controller@ffd10000 { · line 151
Quoted 6 lines
arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi +0
-3- }; - }; - 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
arch/arm64/boot/dts/altera/socfpga_stratix10_socdk.dts +4 -6
@@ -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
Quoted 21 lines
Take that back. Your changes are fine, but you need to update the board files as well. i.e
socfpga_stratix10_socdk.dtsarch/arm64/boot/dts/altera/socfpga_stratix10_socdk.dts +0
-0@@ -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",
arch/arm64/boot/dts/altera/socfpga_stratix10_socdk.dts &mmc { · line 113
Quoted 7 lines
arch/arm64/boot/dts/altera/socfpga_stratix10_socdk.dts +4
-0@@ -113,6 +107,10 @@ &mmc { bus-width = <4>; }; +&osc1 { + clock-frequency = <25000000>; +}; +
Sorry I missed this change, will update in v2 patch.
Thanks,
Nirav
PATCH 1/1 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.
--- .../boot/dts/altera/socfpga_stratix10.dtsi | 56 +++++++++---------- .../dts/altera/socfpga_stratix10_socdk.dts | 10 ++-- 2 files changed, 32 insertions(+), 34 deletions(-)
arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi +28 -28
@@ -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>;
arch/arm64/boot/dts/altera/socfpga_stratix10_socdk.dts +4 -6
@@ -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"; };
Signature · 1 line
2.25.1
Dinh Nguyen
maintainerQuoted 103 lines · 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(-)arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi +28
-28@@ -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>;arch/arm64/boot/dts/altera/socfpga_stratix10_socdk.dts +0
-6@@ -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",
arch/arm64/boot/dts/altera/socfpga_stratix10_socdk.dts &mmc { · line 116
Quoted 10 lines
arch/arm64/boot/dts/altera/socfpga_stratix10_socdk.dts +4
-0@@ -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#".
PATCH v3 1/1 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.
--- .../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(-)
arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi +28 -28
@@ -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>;
arch/arm64/boot/dts/altera/socfpga_stratix10_socdk.dts +4 -6
@@ -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"; };
arch/arm64/boot/dts/altera/socfpga_stratix10_socdk_nand.dts +4 -6
@@ -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"; };
Signature · 1 line
2.25.1
Quoted 132 lines · 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(-)arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi +28
-28@@ -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>;arch/arm64/boot/dts/altera/socfpga_stratix10_socdk.dts +4
-6@@ -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"; };arch/arm64/boot/dts/altera/socfpga_stratix10_socdk_nand.dts +0
-6@@ -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",
arch/arm64/boot/dts/altera/socfpga_stratix10_socdk_nand.dts partition@200000 { · line 129
Quoted 10 lines
arch/arm64/boot/dts/altera/socfpga_stratix10_socdk_nand.dts +4
-0@@ -126,6 +120,10 @@ partition@200000 { }; }; +&osc1 { + clock-frequency = <25000000>; +}; + &uart0 { status = "okay"; };
Applied!
Thanks,
Dinh