Message ID | 20210210171823.333802-3-krzk@kernel.org (mailing list archive) |
---|---|
State | RFC |
Headers | show |
Series | [01/11] arm64: defconfig: enable Intel's eASIC N5X SoCFPGA and Keem Bay SoC | expand |
On 10/02/2021 18:18, Krzysztof Kozlowski wrote: > Using full paths to extend or override a device tree node is error > prone. If there was a typo error, a new node will be created instead of > extending the existing node. This will lead to run-time errors that > could be hard to detect. > > A mistyped label on the other hand, will cause a dtc compile error > (during build time). > > Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org> > --- > arch/arm64/boot/dts/intel/socfpga_agilex_socdk.dts | 12 ++++-------- > .../boot/dts/intel/socfpga_agilex_socdk_nand.dts | 12 ++++-------- > arch/arm64/boot/dts/intel/socfpga_n5x_socdk.dts | 12 ++++-------- > 3 files changed, 12 insertions(+), 24 deletions(-) Hi Arnd and Olof, There was no response from Intel SoCFPGA maintainers for the DTS patches, so maybe you could take it directly? I can provide you pull request with these, if that's preferred. They apply cleanly. You could also take the dt-bindings 2/11 or it could go via Rob. About the defconfig patch (1/11) I will work on it more and resend it with your comments (you gave me review). Best regards, Krzysztof
diff --git a/arch/arm64/boot/dts/intel/socfpga_agilex_socdk.dts b/arch/arm64/boot/dts/intel/socfpga_agilex_socdk.dts index a7a83f29f00b..f14a89ca8784 100644 --- a/arch/arm64/boot/dts/intel/socfpga_agilex_socdk.dts +++ b/arch/arm64/boot/dts/intel/socfpga_agilex_socdk.dts @@ -41,14 +41,6 @@ memory { /* We expect the bootloader to fill in the reg */ reg = <0 0 0 0>; }; - - soc { - clocks { - osc1 { - clock-frequency = <25000000>; - }; - }; - }; }; &gpio1 { @@ -92,6 +84,10 @@ &mmc { bus-width = <4>; }; +&osc1 { + clock-frequency = <25000000>; +}; + &uart0 { status = "okay"; }; diff --git a/arch/arm64/boot/dts/intel/socfpga_agilex_socdk_nand.dts b/arch/arm64/boot/dts/intel/socfpga_agilex_socdk_nand.dts index 979aa59a6bd0..58a827a5e83f 100644 --- a/arch/arm64/boot/dts/intel/socfpga_agilex_socdk_nand.dts +++ b/arch/arm64/boot/dts/intel/socfpga_agilex_socdk_nand.dts @@ -41,14 +41,6 @@ memory { /* We expect the bootloader to fill in the reg */ reg = <0 0 0 0>; }; - - soc { - clocks { - osc1 { - clock-frequency = <25000000>; - }; - }; - }; }; &gpio1 { @@ -121,6 +113,10 @@ partition@4280000 { }; }; +&osc1 { + clock-frequency = <25000000>; +}; + &uart0 { status = "okay"; }; diff --git a/arch/arm64/boot/dts/intel/socfpga_n5x_socdk.dts b/arch/arm64/boot/dts/intel/socfpga_n5x_socdk.dts index 5f56e2697fee..01f1307ce4ac 100644 --- a/arch/arm64/boot/dts/intel/socfpga_n5x_socdk.dts +++ b/arch/arm64/boot/dts/intel/socfpga_n5x_socdk.dts @@ -23,14 +23,6 @@ memory { /* We expect the bootloader to fill in the reg */ reg = <0 0 0 0>; }; - - soc { - clocks { - osc1 { - clock-frequency = <25000000>; - }; - }; - }; }; &clkmgr { @@ -44,6 +36,10 @@ &mmc { bus-width = <4>; }; +&osc1 { + clock-frequency = <25000000>; +}; + &uart0 { status = "okay"; };
Using full paths to extend or override a device tree node is error prone. If there was a typo error, a new node will be created instead of extending the existing node. This will lead to run-time errors that could be hard to detect. A mistyped label on the other hand, will cause a dtc compile error (during build time). Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org> --- arch/arm64/boot/dts/intel/socfpga_agilex_socdk.dts | 12 ++++-------- .../boot/dts/intel/socfpga_agilex_socdk_nand.dts | 12 ++++-------- arch/arm64/boot/dts/intel/socfpga_n5x_socdk.dts | 12 ++++-------- 3 files changed, 12 insertions(+), 24 deletions(-)