]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
arm/arm64: dts: arm: Use generic clock and regulator nodenames
authorRob Herring (Arm) <robh@kernel.org>
Sat, 29 Jun 2024 22:15:35 +0000 (00:15 +0200)
committerArnd Bergmann <arnd@arndb.de>
Mon, 1 Jul 2024 13:50:39 +0000 (15:50 +0200)
With the recent defining of preferred naming for fixed clock and
regulator nodes, convert the Arm Ltd. boards to use the preferred
names. In the cases which had a unit-address, warnings about missing
"reg" property are fixed.

Signed-off-by: Rob Herring (Arm) <robh@kernel.org>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Reviewed-by: Sudeep Holla <sudeep.holla@arm.com>
Link: https://lore.kernel.org/20240528191536.1444649-2-robh@kernel.org
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Link: https://lore.kernel.org/r/20240630-arm-dts-fixes-2-v1-1-a32ba57e5b1d@linaro.org
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
23 files changed:
arch/arm/boot/dts/arm/arm-realview-eb-bbrevd.dtsi
arch/arm/boot/dts/arm/arm-realview-eb.dtsi
arch/arm/boot/dts/arm/arm-realview-pb1176.dts
arch/arm/boot/dts/arm/arm-realview-pb11mp.dts
arch/arm/boot/dts/arm/arm-realview-pbx.dtsi
arch/arm/boot/dts/arm/integratorap-im-pd1.dts
arch/arm/boot/dts/arm/integratorap.dts
arch/arm/boot/dts/arm/integratorcp.dts
arch/arm/boot/dts/arm/mps2.dtsi
arch/arm/boot/dts/arm/versatile-ab.dts
arch/arm/boot/dts/arm/vexpress-v2m-rs1.dtsi
arch/arm/boot/dts/arm/vexpress-v2m.dtsi
arch/arm/boot/dts/arm/vexpress-v2p-ca15-tc1.dts
arch/arm/boot/dts/arm/vexpress-v2p-ca15_a7.dts
arch/arm/boot/dts/arm/vexpress-v2p-ca5s.dts
arch/arm/boot/dts/arm/vexpress-v2p-ca9.dts
arch/arm64/boot/dts/arm/corstone1000-fvp.dts
arch/arm64/boot/dts/arm/corstone1000.dtsi
arch/arm64/boot/dts/arm/foundation-v8.dtsi
arch/arm64/boot/dts/arm/juno-clocks.dtsi
arch/arm64/boot/dts/arm/juno-motherboard.dtsi
arch/arm64/boot/dts/arm/rtsm_ve-motherboard.dtsi
arch/arm64/boot/dts/arm/vexpress-v2f-1xv7-ca53x2.dts

index a79e1d1d30a7b781efc72b096a0f02bf07a6b4c6..7f62aef9ca8a41d8e664fe0c6737a4e2be111e3f 100644 (file)
@@ -22,7 +22,7 @@
 
 / {
        /* Introduce a fixed regulator for the new ethernet controller */
-       veth: fixedregulator@0 {
+       veth: regulator-veth {
                compatible = "regulator-fixed";
                regulator-name = "veth";
                regulator-min-microvolt = <3300000>;
index ed3ed5a4f0f78d96ae89c389cc5cf3858a97ced9..16f784da5a556da0a9ba76066dc013638a1841c3 100644 (file)
@@ -45,7 +45,7 @@
        };
 
        /* The voltage to the MMC card is hardwired at 3.3V */
-       vmmc: fixedregulator@0 {
+       vmmc: regulator-vmmc {
                compatible = "regulator-fixed";
                regulator-name = "vmmc";
                regulator-min-microvolt = <3300000>;
@@ -59,7 +59,7 @@
                clock-frequency = <24000000>;
        };
 
-       timclk: timclk@1M {
+       timclk: clock-1000000 {
                #clock-cells = <0>;
                compatible = "fixed-factor-clock";
                clock-div = <24>;
@@ -68,7 +68,7 @@
        };
 
        /* FIXME: this actually hangs off the PLL clocks */
-       pclk: pclk@0 {
+       pclk: clock-pclk {
                #clock-cells = <0>;
                compatible = "fixed-clock";
                clock-frequency = <0>;
index ab2c9b71da69ee83e8a47527488a604f0b79101e..b9b10cbd65aa81d00eb4af742cb10bc5c366d636 100644 (file)
@@ -69,7 +69,7 @@
                clock-frequency = <24000000>;
        };
 
-       timclk: timclk@1M {
+       timclk: clock-1000000 {
                #clock-cells = <0>;
                compatible = "fixed-factor-clock";
                clock-div = <24>;
@@ -78,7 +78,7 @@
        };
 
        /* FIXME: this actually hangs off the PLL clocks */
-       pclk: pclk@0 {
+       pclk: clock-pclk {
                #clock-cells = <0>;
                compatible = "fixed-clock";
                clock-frequency = <0>;
index a4c2d96aa5c8127062868f9035896af2fca9fbbe..ce35748f3d25d09f0cfaaced3f0ba7bdb7e8801d 100644 (file)
                clock-frequency = <24000000>;
        };
 
-       refclk32khz: refclk32khz {
+       refclk32khz: clock-32768 {
                compatible = "fixed-clock";
                #clock-cells = <0>;
                clock-frequency = <32768>;
        };
 
-       timclk: timclk@1M {
+       timclk: clock-1000000 {
                #clock-cells = <0>;
                compatible = "fixed-factor-clock";
                clock-div = <24>;
        };
 
        /* FIXME: this actually hangs off the PLL clocks */
-       pclk: pclk@0 {
+       pclk: clock-pclk {
                #clock-cells = <0>;
                compatible = "fixed-clock";
                clock-frequency = <0>;
index 61dbe041c69b33322297398276e0f070673afd69..e625403a9456f452fcc2af3b8bf3b2daf10084d6 100644 (file)
                clock-frequency = <24000000>;
        };
 
-       refclk32khz: refclk32khz {
+       refclk32khz: clock-32768 {
                #clock-cells = <0>;
                compatible = "fixed-clock";
                clock-frequency = <32768>;
        };
 
-       timclk: timclk@1M {
+       timclk: clock-1000000 {
                #clock-cells = <0>;
                compatible = "fixed-factor-clock";
                clock-div = <24>;
@@ -83,7 +83,7 @@
        };
 
        /* FIXME: this actually hangs off the PLL clocks */
-       pclk: pclk@0 {
+       pclk: clock-pclk {
                #clock-cells = <0>;
                compatible = "fixed-clock";
                clock-frequency = <0>;
index 367850ea091287c9a166d5d7e53816d1d296f892..db13e09f2fabb003394008b43582e887c7961686 100644 (file)
@@ -54,7 +54,7 @@
        };
 
        /* Also used for the Smart Card Interface SCI */
-       impd1_uartclk: clock@1_4 {
+       impd1_uartclk: clock-uart {
                compatible = "fixed-factor-clock";
                #clock-cells = <0>;
                clock-div = <4>;
@@ -64,7 +64,7 @@
        };
 
        /* For the SSP the clock is divided by 64 */
-       impd1_sspclk: clock@1_64 {
+       impd1_sspclk: clock-ssp {
                compatible = "fixed-factor-clock";
                #clock-cells = <0>;
                clock-div = <64>;
index 27498e0f93f688d5d7931749b98655ccdb029619..9b6a1dbaf265f648891c8a125c4f53ba61bf8aed 100644 (file)
@@ -64,7 +64,7 @@
        };
 
        /* The UART clock is 14.74 MHz divided by an ICS525 */
-       uartclk: uartclk@14.74M {
+       uartclk: clock-14745600 {
                #clock-cells = <0>;
                compatible = "fixed-clock";
                clock-frequency = <14745600>;
@@ -73,7 +73,7 @@
 
        core-module@10000000 {
                /* 24 MHz chrystal on the core module */
-               cm24mhz: cm24mhz@24M {
+               cm24mhz: clock-24000000 {
                        #clock-cells = <0>;
                        compatible = "fixed-clock";
                        clock-frequency = <24000000>;
index c011333eb165d769a2c0eca61470b1427469f936..8ad1a8957ace33f3b12b429301b118c896e3caf5 100644 (file)
         */
 
        /* The codec chrystal operates at 24.576 MHz */
-       xtal_codec: xtal24.576@24.576M {
+       xtal_codec: clock-24576000 {
                #clock-cells = <0>;
                compatible = "fixed-clock";
                clock-frequency = <24576000>;
        };
 
        /* The chrystal is divided by 2 by the codec for the AACI bit clock */
-       aaci_bitclk: aaci_bitclk@12.288M {
+       aaci_bitclk: clock-12288000 {
                #clock-cells = <0>;
                compatible = "fixed-factor-clock";
                clock-div = <2>;
        };
 
        /* This is a 25MHz chrystal on the base board */
-       xtal25mhz: xtal25mhz@25M {
+       xtal25mhz: clock-25000000 {
                #clock-cells = <0>;
                compatible = "fixed-clock";
                clock-frequency = <25000000>;
        };
 
        /* The UART clock is 14.74 MHz divided from 25MHz by an ICS525 */
-       uartclk: uartclk@14.74M {
+       uartclk: clock-14745600 {
                #clock-cells = <0>;
                compatible = "fixed-clock";
                clock-frequency = <14745600>;
        };
 
        /* Actually sysclk I think */
-       pclk: pclk@0 {
+       pclk: clock-pclk {
                #clock-cells = <0>;
                compatible = "fixed-clock";
                clock-frequency = <0>;
@@ -85,7 +85,7 @@
 
        core-module@10000000 {
                /* 24 MHz chrystal on the core module */
-               cm24mhz: cm24mhz@24M {
+               cm24mhz: clock-24000000 {
                        #clock-cells = <0>;
                        compatible = "fixed-clock";
                        clock-frequency = <24000000>;
                };
 
                /* The timer clock is the 24 MHz oscillator divided to 1MHz */
-               timclk: timclk@1M {
+               timclk: clock-1000000 {
                        #clock-cells = <0>;
                        compatible = "fixed-factor-clock";
                        clock-div = <24>;
index d930168fbd918c1b3c2337b3fc833fdfb44fc700..e240bc8aa605529c2484edc7d2dd2cef1e389871 100644 (file)
        #address-cells = <1>;
        #size-cells = <1>;
 
-       oscclk0: clk-osc0 {
+       oscclk0: clock-50000000 {
                compatible = "fixed-clock";
                #clock-cells = <0>;
                clock-frequency = <50000000>;
        };
 
-       oscclk1: clk-osc1 {
+       oscclk1: clock-24576000 {
                compatible = "fixed-clock";
                #clock-cells = <0>;
                clock-frequency = <24576000>;
        };
 
-       oscclk2: clk-osc2 {
+       oscclk2: clock-25000000 {
                compatible = "fixed-clock";
                #clock-cells = <0>;
                clock-frequency = <25000000>;
        };
 
-       cfgclk: clk-cfg {
+       cfgclk: clock-5000000 {
                compatible = "fixed-clock";
                #clock-cells = <0>;
                clock-frequency = <5000000>;
        };
 
-       spicfgclk: clk-spicfg {
+       spicfgclk: clock-75000000 {
                compatible = "fixed-clock";
                #clock-cells = <0>;
                clock-frequency = <75000000>;
@@ -86,7 +86,7 @@
                clock-mult = <1>;
        };
 
-       audmclk: clk-audm {
+       audmclk: clk-12388000 {
                compatible = "fixed-factor-clock";
                clocks = <&oscclk1>;
                #clock-cells = <0>;
@@ -94,7 +94,7 @@
                clock-mult = <1>;
        };
 
-       audsclk: clk-auds {
+       audsclk: clk-3072000 {
                compatible = "fixed-factor-clock";
                clocks = <&oscclk1>;
                #clock-cells = <0>;
index de45aa99e2608911a8fbd6347b950d0cebf9f802..6fe6b49f5d8ecfe1266a36130864697c909f5c81 100644 (file)
@@ -24,7 +24,7 @@
                reg = <0x0 0x08000000>;
        };
 
-       xtal24mhz: xtal24mhz@24M {
+       xtal24mhz: clock-24000000 {
                #clock-cells = <0>;
                compatible = "fixed-clock";
                clock-frequency = <24000000>;
                };
 
                /* OSC1 on AB, OSC4 on PB */
-               osc1: cm_aux_osc@24M {
+               osc1: clock-osc {
                        #clock-cells = <0>;
                        compatible = "arm,versatile-cm-auxosc";
                        clocks = <&xtal24mhz>;
                };
 
                /* The timer clock is the 24 MHz oscillator divided to 1MHz */
-               timclk: timclk@1M {
+               timclk: clock-1000000 {
                        #clock-cells = <0>;
                        compatible = "fixed-factor-clock";
                        clock-div = <24>;
                        clocks = <&xtal24mhz>;
                };
 
-               pclk: pclk@24M {
+               pclk: clock-24000000 {
                        #clock-cells = <0>;
                        compatible = "fixed-factor-clock";
                        clock-div = <1>;
index 8af4b77fe655db89a1f929fab8be20bb8c6709e1..158b3923eae3ab3c3baa13c2fff1116e6804bcf9 100644 (file)
@@ -20,7 +20,7 @@
 #include <dt-bindings/interrupt-controller/arm-gic.h>
 
 / {
-       v2m_fixed_3v3: fixed-regulator-0 {
+       v2m_fixed_3v3: regulator-3v3 {
                compatible = "regulator-fixed";
                regulator-name = "3V3";
                regulator-min-microvolt = <3300000>;
                regulator-always-on;
        };
 
-       v2m_clk24mhz: clk24mhz {
+       v2m_clk24mhz: clock-24000000 {
                compatible = "fixed-clock";
                #clock-cells = <0>;
                clock-frequency = <24000000>;
                clock-output-names = "v2m:clk24mhz";
        };
 
-       v2m_refclk1mhz: refclk1mhz {
+       v2m_refclk1mhz: clock-1000000 {
                compatible = "fixed-clock";
                #clock-cells = <0>;
                clock-frequency = <1000000>;
                clock-output-names = "v2m:refclk1mhz";
        };
 
-       v2m_refclk32khz: refclk32khz {
+       v2m_refclk32khz: clock-32768 {
                compatible = "fixed-clock";
                #clock-cells = <0>;
                clock-frequency = <32768>;
index c5e92f6d2fcd8a6ff0d05dcfd5f7b4ff2b140ec7..be03f2a8a57a4b6bfad711182960ad47457068f2 100644 (file)
                                };
                        };
 
-                       v2m_fixed_3v3: fixed-regulator-0 {
+                       v2m_fixed_3v3: regulator-3v3 {
                                compatible = "regulator-fixed";
                                regulator-name = "3V3";
                                regulator-min-microvolt = <3300000>;
                                regulator-always-on;
                        };
 
-                       v2m_clk24mhz: clk24mhz {
+                       v2m_clk24mhz: clock-24000000 {
                                compatible = "fixed-clock";
                                #clock-cells = <0>;
                                clock-frequency = <24000000>;
                                clock-output-names = "v2m:clk24mhz";
                        };
 
-                       v2m_refclk1mhz: refclk1mhz {
+                       v2m_refclk1mhz: clock-1000000 {
                                compatible = "fixed-clock";
                                #clock-cells = <0>;
                                clock-frequency = <1000000>;
                                clock-output-names = "v2m:refclk1mhz";
                        };
 
-                       v2m_refclk32khz: refclk32khz {
+                       v2m_refclk32khz: clock-32768 {
                                compatible = "fixed-clock";
                                #clock-cells = <0>;
                                clock-frequency = <32768>;
                                compatible = "arm,vexpress,config-bus";
                                arm,vexpress,config-bridge = <&v2m_sysreg>;
 
-                               oscclk0 {
+                               clock-controller-0 {
                                        /* MCC static memory clock */
                                        compatible = "arm,vexpress-osc";
                                        arm,vexpress-sysreg,func = <1 0>;
                                        clock-output-names = "v2m:oscclk0";
                                };
 
-                               v2m_oscclk1: oscclk1 {
+                               v2m_oscclk1: clock-controller-1 {
                                        /* CLCD clock */
                                        compatible = "arm,vexpress-osc";
                                        arm,vexpress-sysreg,func = <1 1>;
                                        clock-output-names = "v2m:oscclk1";
                                };
 
-                               v2m_oscclk2: oscclk2 {
+                               v2m_oscclk2: clock-controller-2 {
                                        /* IO FPGA peripheral clock */
                                        compatible = "arm,vexpress-osc";
                                        arm,vexpress-sysreg,func = <1 2>;
                                        clock-output-names = "v2m:oscclk2";
                                };
 
-                               volt-vio {
+                               regulator-vio {
                                        /* Logic level voltage */
                                        compatible = "arm,vexpress-volt";
                                        arm,vexpress-sysreg,func = <2 0>;
index 679537e17ff5c7119ffb62ad158e2400090685c7..5a91e936edefc67589c8a6131b9a7be71304212e 100644 (file)
                compatible = "arm,vexpress,config-bus";
                arm,vexpress,config-bridge = <&v2m_sysreg>;
 
-               oscclk0 {
+               clock-controller-0 {
                        /* CPU PLL reference clock */
                        compatible = "arm,vexpress-osc";
                        arm,vexpress-sysreg,func = <1 0>;
                        clock-output-names = "oscclk0";
                };
 
-               oscclk4 {
+               clock-controller-4 {
                        /* Multiplexed AXI master clock */
                        compatible = "arm,vexpress-osc";
                        arm,vexpress-sysreg,func = <1 4>;
                        clock-output-names = "oscclk4";
                };
 
-               hdlcd_clk: oscclk5 {
+               hdlcd_clk: clock-controller-5 {
                        /* HDLCD PLL reference clock */
                        compatible = "arm,vexpress-osc";
                        arm,vexpress-sysreg,func = <1 5>;
                        clock-output-names = "oscclk5";
                };
 
-               smbclk: oscclk6 {
+               smbclk: clock-controller-6 {
                        /* SMB clock */
                        compatible = "arm,vexpress-osc";
                        arm,vexpress-sysreg,func = <1 6>;
                        clock-output-names = "oscclk6";
                };
 
-               sys_pll: oscclk7 {
+               sys_pll: clock-controller-7 {
                        /* SYS PLL reference clock */
                        compatible = "arm,vexpress-osc";
                        arm,vexpress-sysreg,func = <1 7>;
                        clock-output-names = "oscclk7";
                };
 
-               oscclk8 {
+               clock-controller-8 {
                        /* DDR2 PLL reference clock */
                        compatible = "arm,vexpress-osc";
                        arm,vexpress-sysreg,func = <1 8>;
                        clock-output-names = "oscclk8";
                };
 
-               volt-cores {
+               regulator-cores {
                        /* CPU core voltage */
                        compatible = "arm,vexpress-volt";
                        arm,vexpress-sysreg,func = <2 0>;
index 511e87cc2bc5e0aa3b8bb9b566e56c997ffc816c..6ef23c53d2d863c777ef265d8dd2c347278b762c 100644 (file)
                compatible = "arm,vexpress,config-bus";
                arm,vexpress,config-bridge = <&v2m_sysreg>;
 
-               oscclk0 {
+               clock-controller-0 {
                        /* A15 PLL 0 reference clock */
                        compatible = "arm,vexpress-osc";
                        arm,vexpress-sysreg,func = <1 0>;
                        clock-output-names = "oscclk0";
                };
 
-               oscclk1 {
+               clock-controller-1 {
                        /* A15 PLL 1 reference clock */
                        compatible = "arm,vexpress-osc";
                        arm,vexpress-sysreg,func = <1 1>;
                        clock-output-names = "oscclk1";
                };
 
-               oscclk2 {
+               clock-controller-2 {
                        /* A7 PLL 0 reference clock */
                        compatible = "arm,vexpress-osc";
                        arm,vexpress-sysreg,func = <1 2>;
                        clock-output-names = "oscclk2";
                };
 
-               oscclk3 {
+               clock-controller-3 {
                        /* A7 PLL 1 reference clock */
                        compatible = "arm,vexpress-osc";
                        arm,vexpress-sysreg,func = <1 3>;
                        clock-output-names = "oscclk3";
                };
 
-               oscclk4 {
+               clock-controller-4 {
                        /* External AXI master clock */
                        compatible = "arm,vexpress-osc";
                        arm,vexpress-sysreg,func = <1 4>;
                        clock-output-names = "oscclk4";
                };
 
-               hdlcd_clk: oscclk5 {
+               hdlcd_clk: clock-controller-5 {
                        /* HDLCD PLL reference clock */
                        compatible = "arm,vexpress-osc";
                        arm,vexpress-sysreg,func = <1 5>;
                        clock-output-names = "oscclk5";
                };
 
-               smbclk: oscclk6 {
+               smbclk: clock-controller-6 {
                        /* Static memory controller clock */
                        compatible = "arm,vexpress-osc";
                        arm,vexpress-sysreg,func = <1 6>;
                        clock-output-names = "oscclk6";
                };
 
-               oscclk7 {
+               clock-controller-7 {
                        /* SYS PLL reference clock */
                        compatible = "arm,vexpress-osc";
                        arm,vexpress-sysreg,func = <1 7>;
                        clock-output-names = "oscclk7";
                };
 
-               oscclk8 {
+               clock-controller-8 {
                        /* DDR2 PLL reference clock */
                        compatible = "arm,vexpress-osc";
                        arm,vexpress-sysreg,func = <1 8>;
                        clock-output-names = "oscclk8";
                };
 
-               volt-a15 {
+               regulator-a15 {
                        /* A15 CPU core voltage */
                        compatible = "arm,vexpress-volt";
                        arm,vexpress-sysreg,func = <2 0>;
                        label = "A15 Vcore";
                };
 
-               volt-a7 {
+               regulator-a7 {
                        /* A7 CPU core voltage */
                        compatible = "arm,vexpress-volt";
                        arm,vexpress-sysreg,func = <2 1>;
index ff1f9a1bcfcfc3bdffe1234ae103d876dfb891e9..e3896253f33e3e5360197095c44f37e83b015682 100644 (file)
                compatible = "arm,vexpress,config-bus";
                arm,vexpress,config-bridge = <&v2m_sysreg>;
 
-               cpu_clk: oscclk0 {
+               cpu_clk: clock-controller-0 {
                        /* CPU and internal AXI reference clock */
                        compatible = "arm,vexpress-osc";
                        arm,vexpress-sysreg,func = <1 0>;
                        clock-output-names = "oscclk0";
                };
 
-               axi_clk: oscclk1 {
+               axi_clk: clock-controller-1 {
                        /* Multiplexed AXI master clock */
                        compatible = "arm,vexpress-osc";
                        arm,vexpress-sysreg,func = <1 1>;
                        clock-output-names = "oscclk1";
                };
 
-               oscclk2 {
+               clock-controller-2 {
                        /* DDR2 */
                        compatible = "arm,vexpress-osc";
                        arm,vexpress-sysreg,func = <1 2>;
                        clock-output-names = "oscclk2";
                };
 
-               hdlcd_clk: oscclk3 {
+               hdlcd_clk: clock-controller-3 {
                        /* HDLCD */
                        compatible = "arm,vexpress-osc";
                        arm,vexpress-sysreg,func = <1 3>;
                        clock-output-names = "oscclk3";
                };
 
-               oscclk4 {
+               clock-controller-4 {
                        /* Test chip gate configuration */
                        compatible = "arm,vexpress-osc";
                        arm,vexpress-sysreg,func = <1 4>;
                        clock-output-names = "oscclk4";
                };
 
-               smbclk: oscclk5 {
+               smbclk: clock-controller-5 {
                        /* SMB clock */
                        compatible = "arm,vexpress-osc";
                        arm,vexpress-sysreg,func = <1 5>;
index 8bf35666412b1086a420ac3becacd348b8e7c8d8..43a5a4ab6ff0418f1875bcb609b84c8af52b6021 100644 (file)
                compatible = "arm,vexpress,config-bus";
                arm,vexpress,config-bridge = <&v2m_sysreg>;
 
-               oscclk0: extsaxiclk {
+               oscclk0: clock-controller-0 {
                        /* ACLK clock to the AXI master port on the test chip */
                        compatible = "arm,vexpress-osc";
                        arm,vexpress-sysreg,func = <1 0>;
                        clock-output-names = "extsaxiclk";
                };
 
-               oscclk1: clcdclk {
+               oscclk1: clock-controller-1 {
                        /* Reference clock for the CLCD */
                        compatible = "arm,vexpress-osc";
                        arm,vexpress-sysreg,func = <1 1>;
                        clock-output-names = "clcdclk";
                };
 
-               smbclk: oscclk2: tcrefclk {
+               smbclk: oscclk2: clock-controller-2 {
                        /* Reference clock for the test chip internal PLLs */
                        compatible = "arm,vexpress-osc";
                        arm,vexpress-sysreg,func = <1 2>;
                        clock-output-names = "tcrefclk";
                };
 
-               volt-vd10 {
+               regulator-vd10 {
                        /* Test Chip internal logic voltage */
                        compatible = "arm,vexpress-volt";
                        arm,vexpress-sysreg,func = <2 0>;
                        label = "VD10";
                };
 
-               volt-vd10-s2 {
+               regulator-vd10-s2 {
                        /* PL310, L2 cache, RAM cell supply (not PL310 logic) */
                        compatible = "arm,vexpress-volt";
                        arm,vexpress-sysreg,func = <2 1>;
                        label = "VD10_S2";
                };
 
-               volt-vd10-s3 {
+               regulator-vd10-s3 {
                        /* Cortex-A9 system supply, Cores, MPEs, SCU and PL310 logic */
                        compatible = "arm,vexpress-volt";
                        arm,vexpress-sysreg,func = <2 2>;
                        label = "VD10_S3";
                };
 
-               volt-vcc1v8 {
+               regulator-vcc1v8 {
                        /* DDR2 SDRAM and Test Chip DDR2 I/O supply */
                        compatible = "arm,vexpress-volt";
                        arm,vexpress-sysreg,func = <2 3>;
                        label = "VCC1V8";
                };
 
-               volt-ddr2vtt {
+               regulator-ddr2vtt {
                        /* DDR2 SDRAM VTT termination voltage */
                        compatible = "arm,vexpress-volt";
                        arm,vexpress-sysreg,func = <2 4>;
                        label = "DDR2VTT";
                };
 
-               volt-vcc3v3 {
+               regulator-vcc3v3 {
                        /* Local board supply for miscellaneous logic external to the Test Chip */
                        arm,vexpress-sysreg,func = <2 5>;
                        compatible = "arm,vexpress-volt";
index 901a7fc83307ae123056beb1dbf14ff288cf9922..abd01356299581e7bc8fb939856deb6a186479bc 100644 (file)
@@ -21,7 +21,7 @@
                reg-io-width = <2>;
        };
 
-       vmmc_v3_3d: fixed_v3_3d {
+       vmmc_v3_3d: regulator-vmmc {
                compatible = "regulator-fixed";
                regulator-name = "vmmc_supply";
                regulator-min-microvolt = <3300000>;
index 6ad7829f9e28509f534a87a972aa3b1b369e2cb8..bb9b96fb531440c08258c268df39b491eed5a448 100644 (file)
                cache-sets = <1024>;
        };
 
-       refclk100mhz: refclk100mhz {
+       refclk100mhz: clock-100000000 {
                compatible = "fixed-clock";
                #clock-cells = <0>;
                clock-frequency = <100000000>;
                clock-output-names = "apb_pclk";
        };
 
-       smbclk: refclk24mhzx2 {
+       smbclk: clock-48000000 {
                /* Reference 24MHz clock x 2 */
                compatible = "fixed-clock";
                #clock-cells = <0>;
@@ -83,7 +83,7 @@
                             <GIC_PPI 10 (GIC_CPU_MASK_SIMPLE(1) | IRQ_TYPE_LEVEL_LOW)>;
        };
 
-       uartclk: uartclk {
+       uartclk: clock-50000000 {
                /* UART clock - 50MHz */
                compatible = "fixed-clock";
                #clock-cells = <0>;
index 7b41537731a6aec17fee92655a52ab132aaefd36..93f1e7c026b8c3e6a4c221c11f5f20ea8b882dbf 100644 (file)
                timeout-sec = <30>;
        };
 
-       v2m_clk24mhz: clk24mhz {
+       v2m_clk24mhz: clock-24000000 {
                compatible = "fixed-clock";
                #clock-cells = <0>;
                clock-frequency = <24000000>;
                clock-output-names = "v2m:clk24mhz";
        };
 
-       v2m_refclk1mhz: refclk1mhz {
+       v2m_refclk1mhz: clock-1000000 {
                compatible = "fixed-clock";
                #clock-cells = <0>;
                clock-frequency = <1000000>;
                clock-output-names = "v2m:refclk1mhz";
        };
 
-       v2m_refclk32khz: refclk32khz {
+       v2m_refclk32khz: clock-32768 {
                compatible = "fixed-clock";
                #clock-cells = <0>;
                clock-frequency = <32768>;
index 2870b5eeb198430aca0ee9301411a56e5aafaa2d..6d7d88e9591ad5f129cbafcb89a38661152214c4 100644 (file)
@@ -8,35 +8,35 @@
  */
 / {
        /* SoC fixed clocks */
-       soc_uartclk: refclk7372800hz {
+       soc_uartclk: clock-7372800 {
                compatible = "fixed-clock";
                #clock-cells = <0>;
                clock-frequency = <7372800>;
                clock-output-names = "juno:uartclk";
        };
 
-       soc_usb48mhz: clk48mhz {
+       soc_usb48mhz: clock-48000000 {
                compatible = "fixed-clock";
                #clock-cells = <0>;
                clock-frequency = <48000000>;
                clock-output-names = "clk48mhz";
        };
 
-       soc_smc50mhz: clk50mhz {
+       soc_smc50mhz: clock-50000000 {
                compatible = "fixed-clock";
                #clock-cells = <0>;
                clock-frequency = <50000000>;
                clock-output-names = "smc_clk";
        };
 
-       soc_refclk100mhz: refclk100mhz {
+       soc_refclk100mhz: clock-100000000 {
                compatible = "fixed-clock";
                #clock-cells = <0>;
                clock-frequency = <100000000>;
                clock-output-names = "apb_pclk";
        };
 
-       soc_faxiclk: refclk400mhz {
+       soc_faxiclk: clock-400000000 {
                compatible = "fixed-clock";
                #clock-cells = <0>;
                clock-frequency = <400000000>;
index 6ca73f41408d4df4f13710e0dde0566fa71748ec..ffa4ba4f1fbcd524c37ee06f348ca87f9b29fbaa 100644 (file)
@@ -8,35 +8,35 @@
  */
 
 / {
-       mb_clk24mhz: clk24mhz {
+       mb_clk24mhz: clock-24000000 {
                compatible = "fixed-clock";
                #clock-cells = <0>;
                clock-frequency = <24000000>;
                clock-output-names = "juno_mb:clk24mhz";
        };
 
-       mb_clk25mhz: clk25mhz {
+       mb_clk25mhz: clock-25000000 {
                compatible = "fixed-clock";
                #clock-cells = <0>;
                clock-frequency = <25000000>;
                clock-output-names = "juno_mb:clk25mhz";
        };
 
-       v2m_refclk1mhz: refclk1mhz {
+       v2m_refclk1mhz: clock-1000000 {
                compatible = "fixed-clock";
                #clock-cells = <0>;
                clock-frequency = <1000000>;
                clock-output-names = "juno_mb:refclk1mhz";
        };
 
-       v2m_refclk32khz: refclk32khz {
+       v2m_refclk32khz: clock-32768 {
                compatible = "fixed-clock";
                #clock-cells = <0>;
                clock-frequency = <32768>;
                clock-output-names = "juno_mb:refclk32khz";
        };
 
-       mb_fixed_3v3: mcc-sb-3v3 {
+       mb_fixed_3v3: regulator-3v3 {
                compatible = "regulator-fixed";
                regulator-name = "MCC_SB_3V3";
                regulator-min-microvolt = <3300000>;
index ba8beef3fe99e55bbd6d43da6adaba74243fa27e..66b1b74d27dc1e82a0cd119f513c999023563d18 100644 (file)
@@ -8,28 +8,28 @@
  * VEMotherBoard.lisa
  */
 / {
-       v2m_clk24mhz: clk24mhz {
+       v2m_clk24mhz: clock-24000000 {
                compatible = "fixed-clock";
                #clock-cells = <0>;
                clock-frequency = <24000000>;
                clock-output-names = "v2m:clk24mhz";
        };
 
-       v2m_refclk1mhz: refclk1mhz {
+       v2m_refclk1mhz: clock-1000000 {
                compatible = "fixed-clock";
                #clock-cells = <0>;
                clock-frequency = <1000000>;
                clock-output-names = "v2m:refclk1mhz";
        };
 
-       v2m_refclk32khz: refclk32khz {
+       v2m_refclk32khz: clock-32768 {
                compatible = "fixed-clock";
                #clock-cells = <0>;
                clock-frequency = <32768>;
                clock-output-names = "v2m:refclk32khz";
        };
 
-       v2m_fixed_3v3: v2m-3v3 {
+       v2m_fixed_3v3: regulator-3v3 {
                compatible = "regulator-fixed";
                regulator-name = "3V3";
                regulator-min-microvolt = <3300000>;
@@ -41,7 +41,7 @@
                compatible = "arm,vexpress,config-bus";
                arm,vexpress,config-bridge = <&v2m_sysreg>;
 
-               v2m_oscclk1: oscclk1 {
+               v2m_oscclk1: clock-controller {
                        /* CLCD clock */
                        compatible = "arm,vexpress-osc";
                        arm,vexpress-sysreg,func = <1 1>;
index 9115c99d0dc02c8d47eb0f3ac2e0cdfcfa3bfc78..a0e1fa83eafa704ec8b45cd7a10f76baf233a982 100644 (file)
                compatible = "arm,vexpress,config-bus";
                arm,vexpress,config-bridge = <&v2m_sysreg>;
 
-               smbclk: smclk {
+               smbclk: clock-controller {
                        /* SMC clock */
                        compatible = "arm,vexpress-osc";
                        arm,vexpress-sysreg,func = <1 4>;
                        clock-output-names = "smclk";
                };
 
-               volt-vio {
+               regulator-vio {
                        /* VIO to expansion board above */
                        compatible = "arm,vexpress-volt";
                        arm,vexpress-sysreg,func = <2 0>;
                        regulator-always-on;
                };
 
-               volt-12v {
+               regulator-12v {
                        /* 12V from power connector J6 */
                        compatible = "arm,vexpress-volt";
                        arm,vexpress-sysreg,func = <2 1>;