arm64: dts: amd/seattle: Move and simplify fixed clocks

The fixed clocks are not part of "simple-bus", so move them out of the
bus to the top-level. In the process, use the preferred node names of
"clock-<freq>". There's also little reason to have multiple fixed
clocks at the same frequencies, so remove them keeping the labels
to minimize the change.

Signed-off-by: Rob Herring (Arm) <robh@kernel.org>
Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Link: https://lore.kernel.org/r/20250306-dt-amd-fixes-v1-2-011c423ba99a@kernel.org
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

diff --git a/arch/arm64/boot/dts/amd/amd-seattle-clks.dtsi b/arch/arm64/boot/dts/amd/amd-seattle-clks.dtsi
index 2dd2c28171ee32398b0161891650f34e72d19564..73f687773ce6598b4726585f1aa513141633838b 100644 (file)
--- a/arch/arm64/boot/dts/amd/amd-seattle-clks.dtsi
+++ b/arch/arm64/boot/dts/amd/amd-seattle-clks.dtsi
@@ -5,51 +5,39 @@
  * Copyright (C) 2014 Advanced Micro Devices, Inc.
  */
 
-       adl3clk_100mhz: clk100mhz_0 {
+       adl3clk_100mhz: uartspiclk_100mhz: clock-100000000 {
                compatible = "fixed-clock";
                #clock-cells = <0>;
                clock-frequency = <100000000>;
                clock-output-names = "adl3clk_100mhz";
        };
 
-       ccpclk_375mhz: clk375mhz {
+       ccpclk_375mhz: clock-375000000 {
                compatible = "fixed-clock";
                #clock-cells = <0>;
                clock-frequency = <375000000>;
                clock-output-names = "ccpclk_375mhz";
        };
 
-       sataclk_333mhz: clk333mhz {
+       sataclk_333mhz: clock-333000000 {
                compatible = "fixed-clock";
                #clock-cells = <0>;
                clock-frequency = <333000000>;
                clock-output-names = "sataclk_333mhz";
        };
 
-       pcieclk_500mhz: clk500mhz_0 {
+       dmaclk_500mhz: pcieclk_500mhz: clock-500000000 {
                compatible = "fixed-clock";
                #clock-cells = <0>;
                clock-frequency = <500000000>;
                clock-output-names = "pcieclk_500mhz";
        };
 
-       dmaclk_500mhz: clk500mhz_1 {
-               compatible = "fixed-clock";
-               #clock-cells = <0>;
-               clock-frequency = <500000000>;
-               clock-output-names = "dmaclk_500mhz";
-       };
-
-       miscclk_250mhz: clk250mhz_4 {
+       xgmacclk0_dma_250mhz: xgmacclk0_ptp_250mhz: xgmacclk1_dma_250mhz: xgmacclk1_ptp_250mhz:
+       miscclk_250mhz: clock-250000000 {
                compatible = "fixed-clock";
                #clock-cells = <0>;
                clock-frequency = <250000000>;
                clock-output-names = "miscclk_250mhz";
        };
 
-       uartspiclk_100mhz: clk100mhz_1 {
-               compatible = "fixed-clock";
-               #clock-cells = <0>;
-               clock-frequency = <100000000>;
-               clock-output-names = "uartspiclk_100mhz";
-       };

diff --git a/arch/arm64/boot/dts/amd/amd-seattle-soc.dtsi b/arch/arm64/boot/dts/amd/amd-seattle-soc.dtsi
index d3d931eb7677796fe46d09d946d7e7b6b8b9b231..6a073d13478d5fce16dbe14d3d3f18d2f84f28ee 100644 (file)
--- a/arch/arm64/boot/dts/amd/amd-seattle-soc.dtsi
+++ b/arch/arm64/boot/dts/amd/amd-seattle-soc.dtsi
@@ -11,6 +11,8 @@
        #address-cells = <2>;
        #size-cells = <2>;
 
+       /include/ "amd-seattle-clks.dtsi"
+
        gic0: interrupt-controller@e1101000 {
                compatible = "arm,gic-400", "arm,cortex-a15-gic";
                interrupt-controller;
@@ -51,8 +53,6 @@
                 */
                dma-ranges = <0x0 0x0 0x0 0x0 0x100 0x0>;
 
-               /include/ "amd-seattle-clks.dtsi"
-
                sata0: sata@e0300000 {
                        compatible = "snps,dwc-ahci";
                        reg = <0 0xe0300000 0 0xf0000>;

diff --git a/arch/arm64/boot/dts/amd/amd-seattle-xgbe-b.dtsi b/arch/arm64/boot/dts/amd/amd-seattle-xgbe-b.dtsi
index 9259e547e2e814d957b46804ea1d56078401d139..056dd3e350426111db86dc0fe1d1a601ed7fee4d 100644 (file)
--- a/arch/arm64/boot/dts/amd/amd-seattle-xgbe-b.dtsi
+++ b/arch/arm64/boot/dts/amd/amd-seattle-xgbe-b.dtsi
@@ -5,34 +5,6 @@
  * Copyright (C) 2015 Advanced Micro Devices, Inc.
  */
 
-       xgmacclk0_dma_250mhz: clk250mhz_0 {
-               compatible = "fixed-clock";
-               #clock-cells = <0>;
-               clock-frequency = <250000000>;
-               clock-output-names = "xgmacclk0_dma_250mhz";
-       };
-
-       xgmacclk0_ptp_250mhz: clk250mhz_1 {
-               compatible = "fixed-clock";
-               #clock-cells = <0>;
-               clock-frequency = <250000000>;
-               clock-output-names = "xgmacclk0_ptp_250mhz";
-       };
-
-       xgmacclk1_dma_250mhz: clk250mhz_2 {
-               compatible = "fixed-clock";
-               #clock-cells = <0>;
-               clock-frequency = <250000000>;
-               clock-output-names = "xgmacclk1_dma_250mhz";
-       };
-
-       xgmacclk1_ptp_250mhz: clk250mhz_3 {
-               compatible = "fixed-clock";
-               #clock-cells = <0>;
-               clock-frequency = <250000000>;
-               clock-output-names = "xgmacclk1_ptp_250mhz";
-       };
-
        xgmac0: xgmac@e0700000 {
                compatible = "amd,xgbe-seattle-v1a";
                reg = <0 0xe0700000 0 0x80000>,