arm64: dts: juno/vexpress: fix node name unit-address presence warnings

Commit fa38a82096a1 ("scripts/dtc: Update to upstream version 53bf130b1cdd") added warnings on node name unit-address presence/absence mismatch in device trees. This patch fixes those warning on all the juno/vexpress platforms where unit-address is present in node name while the reg/ranges property is not present. It also adds unit-address to all smb bus node. Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>
author: Sudeep Holla <sudeep.holla@arm.com> 2016-03-07 06:26:18 -0500
committer: Sudeep Holla <sudeep.holla@arm.com> 2016-03-08 08:54:27 -0500
commit: 6d6acd140ab3d46348ec3a9dbfd386d9ca42b825 (patch)
tree: c9fa7cb41faa4ed21d74fad34c9b3aa63234a881
parent: 4739f744530a78bbf7e92b5cf93c10bf1ee09f41 (diff)
6 files changed, 36 insertions, 36 deletions
diff --git a/arch/arm64/boot/dts/arm/foundation-v8.dtsi b/arch/arm64/boot/dts/arm/foundation-v8.dtsi
index 5fbdfcb0b112..65f716e11b95 100644
--- a/arch/arm64/boot/dts/arm/foundation-v8.dtsi
+++ b/arch/arm64/boot/dts/arm/foundation-v8.dtsi
@@ -97,7 +97,7 @@
                timeout-sec = <30>;
        };
-        smb {
+        smb@08000000 {
                compatible = "arm,vexpress,v2m-p1", "simple-bus";
                arm,v2m-memory-map = "rs1";
                #address-cells = <2>; /* SMB chipselect number and offset */
diff --git a/arch/arm64/boot/dts/arm/juno-base.dtsi b/arch/arm64/boot/dts/arm/juno-base.dtsi
index 31d5d44db233..9a96bc081cf1 100644
--- a/arch/arm64/boot/dts/arm/juno-base.dtsi
+++ b/arch/arm64/boot/dts/arm/juno-base.dtsi
@@ -105,13 +105,13 @@
                clocks {
                        compatible = "arm,scpi-clocks";
-                        scpi_dvfs: scpi_clocks@0 {
+                        scpi_dvfs: scpi-dvfs {
                                compatible = "arm,scpi-dvfs-clocks";
                                #clock-cells = <1>;
                                clock-indices = <0>, <1>, <2>;
                                clock-output-names = "atlclk", "aplclk","gpuclk";
                        };
-                        scpi_clk: scpi_clocks@3 {
+                        scpi_clk: scpi-clk {
                                compatible = "arm,scpi-variable-clocks";
                                #clock-cells = <1>;
                                clock-indices = <3>;
@@ -153,7 +153,7 @@
                clock-names = "pxlclk";
                port {
-                        hdlcd1_output: endpoint@0 {
+                        hdlcd1_output: hdlcd1-endpoint {
                                remote-endpoint = <&tda998x_1_input>;
                        };
                };
@@ -167,7 +167,7 @@
                clock-names = "pxlclk";
                port {
-                        hdlcd0_output: endpoint@0 {
+                        hdlcd0_output: hdlcd0-endpoint {
                                remote-endpoint = <&tda998x_0_input>;
                        };
                };
@@ -195,7 +195,7 @@
                        compatible = "nxp,tda998x";
                        reg = <0x70>;
                        port {
-                                tda998x_0_input: endpoint@0 {
+                                tda998x_0_input: tda998x-0-endpoint {
                                        remote-endpoint = <&hdlcd0_output>;
                                };
                        };
@@ -205,7 +205,7 @@
                        compatible = "nxp,tda998x";
                        reg = <0x71>;
                        port {
-                                tda998x_1_input: endpoint@0 {
+                                tda998x_1_input: tda998x-1-endpoint {
                                        remote-endpoint = <&hdlcd1_output>;
                                };
                        };
@@ -242,7 +242,7 @@
                      <0x00000008 0x80000000 0x1 0x80000000>;
        };
-        smb {
+        smb@08000000 {
                compatible = "simple-bus";
                #address-cells = <2>;
                #size-cells = <1>;
diff --git a/arch/arm64/boot/dts/arm/juno-motherboard.dtsi b/arch/arm64/boot/dts/arm/juno-motherboard.dtsi
index 413f1b9ebcd4..5aa8bf4cfd53 100644
--- a/arch/arm64/boot/dts/arm/juno-motherboard.dtsi
+++ b/arch/arm64/boot/dts/arm/juno-motherboard.dtsi
@@ -46,7 +46,7 @@
                        arm,vexpress,site = <0>;
                        arm,v2m-memory-map = "rs1";
-                        mb_fixed_3v3: fixedregulator@0 {
+                        mb_fixed_3v3: mcc-sb-3v3 {
                                compatible = "regulator-fixed";
                                regulator-name = "MCC_SB_3V3";
                                regulator-min-microvolt = <3300000>;
@@ -59,42 +59,42 @@
                                #address-cells = <1>;
                                #size-cells = <0>;
-                                button@1 {
+                                power-button {
                                        debounce_interval = <50>;
                                        wakeup-source;
                                        linux,code = <116>;
                                        label = "POWER";
                                        gpios = <&iofpga_gpio0 0 0x4>;
                                };
-                                button@2 {
+                                home-button {
                                        debounce_interval = <50>;
                                        wakeup-source;
                                        linux,code = <102>;
                                        label = "HOME";
                                        gpios = <&iofpga_gpio0 1 0x4>;
                                };
-                                button@3 {
+                                rlock-button {
                                        debounce_interval = <50>;
                                        wakeup-source;
                                        linux,code = <152>;
                                        label = "RLOCK";
                                        gpios = <&iofpga_gpio0 2 0x4>;
                                };
-                                button@4 {
+                                vol-up-button {
                                        debounce_interval = <50>;
                                        wakeup-source;
                                        linux,code = <115>;
                                        label = "VOL+";
                                        gpios = <&iofpga_gpio0 3 0x4>;
                                };
-                                button@5 {
+                                vol-down-button {
                                        debounce_interval = <50>;
                                        wakeup-source;
                                        linux,code = <114>;
                                        label = "VOL-";
                                        gpios = <&iofpga_gpio0 4 0x4>;
                                };
-                                button@6 {
+                                nmi-button {
                                        debounce_interval = <50>;
                                        wakeup-source;
                                        linux,code = <99>;
@@ -159,7 +159,7 @@
                                        compatible = "syscon", "simple-mfd";
                                        reg = <0x010000 0x1000>;
-                                        led@08.0 {
+                                        led0 {
                                                compatible = "register-bit-led";
                                                offset = <0x08>;
                                                mask = <0x01>;
@@ -167,7 +167,7 @@
                                                linux,default-trigger = "heartbeat";
                                                default-state = "on";
                                        };
-                                        led@08.1 {
+                                        led1 {
                                                compatible = "register-bit-led";
                                                offset = <0x08>;
                                                mask = <0x02>;
@@ -175,7 +175,7 @@
                                                linux,default-trigger = "mmc0";
                                                default-state = "off";
                                        };
-                                        led@08.2 {
+                                        led2 {
                                                compatible = "register-bit-led";
                                                offset = <0x08>;
                                                mask = <0x04>;
@@ -183,7 +183,7 @@
                                                linux,default-trigger = "cpu0";
                                                default-state = "off";
                                        };
-                                        led@08.3 {
+                                        led3 {
                                                compatible = "register-bit-led";
                                                offset = <0x08>;
                                                mask = <0x08>;
@@ -191,7 +191,7 @@
                                                linux,default-trigger = "cpu1";
                                                default-state = "off";
                                        };
-                                        led@08.4 {
+                                        led4 {
                                                compatible = "register-bit-led";
                                                offset = <0x08>;
                                                mask = <0x10>;
@@ -199,7 +199,7 @@
                                                linux,default-trigger = "cpu2";
                                                default-state = "off";
                                        };
-                                        led@08.5 {
+                                        led5 {
                                                compatible = "register-bit-led";
                                                offset = <0x08>;
                                                mask = <0x20>;
@@ -207,14 +207,14 @@
                                                linux,default-trigger = "cpu3";
                                                default-state = "off";
                                        };
-                                        led@08.6 {
+                                        led6 {
                                                compatible = "register-bit-led";
                                                offset = <0x08>;
                                                mask = <0x40>;
                                                label = "vexpress:6";
                                                default-state = "off";
                                        };
-                                        led@08.7 {
+                                        led7 {
                                                compatible = "register-bit-led";
                                                offset = <0x08>;
                                                mask = <0x80>;
diff --git a/arch/arm64/boot/dts/arm/rtsm_ve-aemv8a.dts b/arch/arm64/boot/dts/arm/rtsm_ve-aemv8a.dts
index 20addabbd127..a852e28a40e1 100644
--- a/arch/arm64/boot/dts/arm/rtsm_ve-aemv8a.dts
+++ b/arch/arm64/boot/dts/arm/rtsm_ve-aemv8a.dts
@@ -104,7 +104,7 @@
                             <0 63 4>;
        };
-        smb {
+        smb@08000000 {
                compatible = "simple-bus";
                #address-cells = <2>;
diff --git a/arch/arm64/boot/dts/arm/rtsm_ve-motherboard.dtsi b/arch/arm64/boot/dts/arm/rtsm_ve-motherboard.dtsi
index 88a7583ed7a7..321b43b589ae 100644
--- a/arch/arm64/boot/dts/arm/rtsm_ve-motherboard.dtsi
+++ b/arch/arm64/boot/dts/arm/rtsm_ve-motherboard.dtsi
@@ -226,7 +226,7 @@
                        };
                };
-                v2m_fixed_3v3: fixedregulator@0 {
+                v2m_fixed_3v3: v2m-3v3 {
                        compatible = "regulator-fixed";
                        regulator-name = "3V3";
                        regulator-min-microvolt = <3300000>;
@@ -238,7 +238,7 @@
                        compatible = "arm,vexpress,config-bus";
                        arm,vexpress,config-bridge = <&v2m_sysreg>;
-                        v2m_oscclk1: osc@1 {
+                        v2m_oscclk1: oscclk1 {
                                /* CLCD clock */
                                compatible = "arm,vexpress-osc";
                                arm,vexpress-sysreg,func = <1 1>;
@@ -247,27 +247,27 @@
                                clock-output-names = "v2m:oscclk1";
                        };
-                        reset@0 {
+                        reset {
                                compatible = "arm,vexpress-reset";
                                arm,vexpress-sysreg,func = <5 0>;
                        };
-                        muxfpga@0 {
+                        muxfpga {
                                compatible = "arm,vexpress-muxfpga";
                                arm,vexpress-sysreg,func = <7 0>;
                        };
-                        shutdown@0 {
+                        shutdown {
                                compatible = "arm,vexpress-shutdown";
                                arm,vexpress-sysreg,func = <8 0>;
                        };
-                        reboot@0 {
+                        reboot {
                                compatible = "arm,vexpress-reboot";
                                arm,vexpress-sysreg,func = <9 0>;
                        };
-                        dvimode@0 {
+                        dvimode {
                                compatible = "arm,vexpress-dvimode";
                                arm,vexpress-sysreg,func = <11 0>;
                        };
diff --git a/arch/arm64/boot/dts/arm/vexpress-v2f-1xv7-ca53x2.dts b/arch/arm64/boot/dts/arm/vexpress-v2f-1xv7-ca53x2.dts
index bb3c26d1154d..e3a171162bb4 100644
--- a/arch/arm64/boot/dts/arm/vexpress-v2f-1xv7-ca53x2.dts
+++ b/arch/arm64/boot/dts/arm/vexpress-v2f-1xv7-ca53x2.dts
@@ -93,7 +93,7 @@
                compatible = "arm,vexpress,config-bus";
                arm,vexpress,config-bridge = <&v2m_sysreg>;
-                smbclk: osc@4 {
+                smbclk: smclk {
                        /* SMC clock */
                        compatible = "arm,vexpress-osc";
                        arm,vexpress-sysreg,func = <1 4>;
@@ -102,7 +102,7 @@
                        clock-output-names = "smclk";
                };
-                volt@0 {
+                volt-vio {
                        /* VIO to expansion board above */
                        compatible = "arm,vexpress-volt";
                        arm,vexpress-sysreg,func = <2 0>;
@@ -112,7 +112,7 @@
                        regulator-always-on;
                };
-                volt@1 {
+                volt-12v {
                        /* 12V from power connector J6 */
                        compatible = "arm,vexpress-volt";
                        arm,vexpress-sysreg,func = <2 1>;
@@ -120,7 +120,7 @@
                        regulator-always-on;
                };
-                temp@0 {
+                temp-fpga {
                        /* FPGA temperature */
                        compatible = "arm,vexpress-temp";
                        arm,vexpress-sysreg,func = <4 0>;
@@ -128,7 +128,7 @@
                };
        };
-        smb {
+        smb@08000000 {
                compatible = "simple-bus";
                #address-cells = <2>;
author	Sudeep Holla <sudeep.holla@arm.com>	2016-03-07 06:26:18 -0500
committer	Sudeep Holla <sudeep.holla@arm.com>	2016-03-08 08:54:27 -0500
commit	6d6acd140ab3d46348ec3a9dbfd386d9ca42b825 (patch)
tree	c9fa7cb41faa4ed21d74fad34c9b3aa63234a881
parent	4739f744530a78bbf7e92b5cf93c10bf1ee09f41 (diff)

diff --git a/arch/arm64/boot/dts/arm/foundation-v8.dtsi b/arch/arm64/boot/dts/arm/foundation-v8.dtsi index 5fbdfcb0b112..65f716e11b95 100644 --- a/arch/arm64/boot/dts/arm/foundation-v8.dtsi +++ b/arch/arm64/boot/dts/arm/foundation-v8.dtsi
@@ -97,7 +97,7 @@
97	timeout-sec = <30>;	97	timeout-sec = <30>;
98	};	98	};
99		99
100	smb {	100	smb@08000000 {
101	compatible = "arm,vexpress,v2m-p1", "simple-bus";	101	compatible = "arm,vexpress,v2m-p1", "simple-bus";
102	arm,v2m-memory-map = "rs1";	102	arm,v2m-memory-map = "rs1";
103	#address-cells = <2>; /* SMB chipselect number and offset */	103	#address-cells = <2>; /* SMB chipselect number and offset */


diff --git a/arch/arm64/boot/dts/arm/juno-base.dtsi b/arch/arm64/boot/dts/arm/juno-base.dtsi index 31d5d44db233..9a96bc081cf1 100644 --- a/arch/arm64/boot/dts/arm/juno-base.dtsi +++ b/arch/arm64/boot/dts/arm/juno-base.dtsi
@@ -105,13 +105,13 @@
105	clocks {	105	clocks {
106	compatible = "arm,scpi-clocks";	106	compatible = "arm,scpi-clocks";
107		107
108	scpi_dvfs: scpi_clocks@0 {	108	scpi_dvfs: scpi-dvfs {
109	compatible = "arm,scpi-dvfs-clocks";	109	compatible = "arm,scpi-dvfs-clocks";
110	#clock-cells = <1>;	110	#clock-cells = <1>;
111	clock-indices = <0>, <1>, <2>;	111	clock-indices = <0>, <1>, <2>;
112	clock-output-names = "atlclk", "aplclk","gpuclk";	112	clock-output-names = "atlclk", "aplclk","gpuclk";
113	};	113	};
114	scpi_clk: scpi_clocks@3 {	114	scpi_clk: scpi-clk {
115	compatible = "arm,scpi-variable-clocks";	115	compatible = "arm,scpi-variable-clocks";
116	#clock-cells = <1>;	116	#clock-cells = <1>;
117	clock-indices = <3>;	117	clock-indices = <3>;
@@ -153,7 +153,7 @@
153	clock-names = "pxlclk";	153	clock-names = "pxlclk";
154		154
155	port {	155	port {
156	hdlcd1_output: endpoint@0 {	156	hdlcd1_output: hdlcd1-endpoint {
157	remote-endpoint = <&tda998x_1_input>;	157	remote-endpoint = <&tda998x_1_input>;
158	};	158	};
159	};	159	};
@@ -167,7 +167,7 @@
167	clock-names = "pxlclk";	167	clock-names = "pxlclk";
168		168
169	port {	169	port {
170	hdlcd0_output: endpoint@0 {	170	hdlcd0_output: hdlcd0-endpoint {
171	remote-endpoint = <&tda998x_0_input>;	171	remote-endpoint = <&tda998x_0_input>;
172	};	172	};
173	};	173	};
@@ -195,7 +195,7 @@
195	compatible = "nxp,tda998x";	195	compatible = "nxp,tda998x";
196	reg = <0x70>;	196	reg = <0x70>;
197	port {	197	port {
198	tda998x_0_input: endpoint@0 {	198	tda998x_0_input: tda998x-0-endpoint {
199	remote-endpoint = <&hdlcd0_output>;	199	remote-endpoint = <&hdlcd0_output>;
200	};	200	};
201	};	201	};
@@ -205,7 +205,7 @@
205	compatible = "nxp,tda998x";	205	compatible = "nxp,tda998x";
206	reg = <0x71>;	206	reg = <0x71>;
207	port {	207	port {
208	tda998x_1_input: endpoint@0 {	208	tda998x_1_input: tda998x-1-endpoint {
209	remote-endpoint = <&hdlcd1_output>;	209	remote-endpoint = <&hdlcd1_output>;
210	};	210	};
211	};	211	};
@@ -242,7 +242,7 @@
242	<0x00000008 0x80000000 0x1 0x80000000>;	242	<0x00000008 0x80000000 0x1 0x80000000>;
243	};	243	};
244		244
245	smb {	245	smb@08000000 {
246	compatible = "simple-bus";	246	compatible = "simple-bus";
247	#address-cells = <2>;	247	#address-cells = <2>;
248	#size-cells = <1>;	248	#size-cells = <1>;


diff --git a/arch/arm64/boot/dts/arm/juno-motherboard.dtsi b/arch/arm64/boot/dts/arm/juno-motherboard.dtsi index 413f1b9ebcd4..5aa8bf4cfd53 100644 --- a/arch/arm64/boot/dts/arm/juno-motherboard.dtsi +++ b/arch/arm64/boot/dts/arm/juno-motherboard.dtsi
@@ -46,7 +46,7 @@
46	arm,vexpress,site = <0>;	46	arm,vexpress,site = <0>;
47	arm,v2m-memory-map = "rs1";	47	arm,v2m-memory-map = "rs1";
48		48
49	mb_fixed_3v3: fixedregulator@0 {	49	mb_fixed_3v3: mcc-sb-3v3 {
50	compatible = "regulator-fixed";	50	compatible = "regulator-fixed";
51	regulator-name = "MCC_SB_3V3";	51	regulator-name = "MCC_SB_3V3";
52	regulator-min-microvolt = <3300000>;	52	regulator-min-microvolt = <3300000>;
@@ -59,42 +59,42 @@
59	#address-cells = <1>;	59	#address-cells = <1>;
60	#size-cells = <0>;	60	#size-cells = <0>;
61		61
62	button@1 {	62	power-button {
63	debounce_interval = <50>;	63	debounce_interval = <50>;
64	wakeup-source;	64	wakeup-source;
65	linux,code = <116>;	65	linux,code = <116>;
66	label = "POWER";	66	label = "POWER";
67	gpios = <&iofpga_gpio0 0 0x4>;	67	gpios = <&iofpga_gpio0 0 0x4>;
68	};	68	};
69	button@2 {	69	home-button {
70	debounce_interval = <50>;	70	debounce_interval = <50>;
71	wakeup-source;	71	wakeup-source;
72	linux,code = <102>;	72	linux,code = <102>;
73	label = "HOME";	73	label = "HOME";
74	gpios = <&iofpga_gpio0 1 0x4>;	74	gpios = <&iofpga_gpio0 1 0x4>;
75	};	75	};
76	button@3 {	76	rlock-button {
77	debounce_interval = <50>;	77	debounce_interval = <50>;
78	wakeup-source;	78	wakeup-source;
79	linux,code = <152>;	79	linux,code = <152>;
80	label = "RLOCK";	80	label = "RLOCK";
81	gpios = <&iofpga_gpio0 2 0x4>;	81	gpios = <&iofpga_gpio0 2 0x4>;
82	};	82	};
83	button@4 {	83	vol-up-button {
84	debounce_interval = <50>;	84	debounce_interval = <50>;
85	wakeup-source;	85	wakeup-source;
86	linux,code = <115>;	86	linux,code = <115>;
87	label = "VOL+";	87	label = "VOL+";
88	gpios = <&iofpga_gpio0 3 0x4>;	88	gpios = <&iofpga_gpio0 3 0x4>;
89	};	89	};
90	button@5 {	90	vol-down-button {
91	debounce_interval = <50>;	91	debounce_interval = <50>;
92	wakeup-source;	92	wakeup-source;
93	linux,code = <114>;	93	linux,code = <114>;
94	label = "VOL-";	94	label = "VOL-";
95	gpios = <&iofpga_gpio0 4 0x4>;	95	gpios = <&iofpga_gpio0 4 0x4>;
96	};	96	};
97	button@6 {	97	nmi-button {
98	debounce_interval = <50>;	98	debounce_interval = <50>;
99	wakeup-source;	99	wakeup-source;
100	linux,code = <99>;	100	linux,code = <99>;
@@ -159,7 +159,7 @@
159	compatible = "syscon", "simple-mfd";	159	compatible = "syscon", "simple-mfd";
160	reg = <0x010000 0x1000>;	160	reg = <0x010000 0x1000>;
161		161
162	led@08.0 {	162	led0 {
163	compatible = "register-bit-led";	163	compatible = "register-bit-led";
164	offset = <0x08>;	164	offset = <0x08>;
165	mask = <0x01>;	165	mask = <0x01>;
@@ -167,7 +167,7 @@
167	linux,default-trigger = "heartbeat";	167	linux,default-trigger = "heartbeat";
168	default-state = "on";	168	default-state = "on";
169	};	169	};
170	led@08.1 {	170	led1 {
171	compatible = "register-bit-led";	171	compatible = "register-bit-led";
172	offset = <0x08>;	172	offset = <0x08>;
173	mask = <0x02>;	173	mask = <0x02>;
@@ -175,7 +175,7 @@
175	linux,default-trigger = "mmc0";	175	linux,default-trigger = "mmc0";
176	default-state = "off";	176	default-state = "off";
177	};	177	};
178	led@08.2 {	178	led2 {
179	compatible = "register-bit-led";	179	compatible = "register-bit-led";
180	offset = <0x08>;	180	offset = <0x08>;
181	mask = <0x04>;	181	mask = <0x04>;
@@ -183,7 +183,7 @@
183	linux,default-trigger = "cpu0";	183	linux,default-trigger = "cpu0";
184	default-state = "off";	184	default-state = "off";
185	};	185	};
186	led@08.3 {	186	led3 {
187	compatible = "register-bit-led";	187	compatible = "register-bit-led";
188	offset = <0x08>;	188	offset = <0x08>;
189	mask = <0x08>;	189	mask = <0x08>;
@@ -191,7 +191,7 @@
191	linux,default-trigger = "cpu1";	191	linux,default-trigger = "cpu1";
192	default-state = "off";	192	default-state = "off";
193	};	193	};
194	led@08.4 {	194	led4 {
195	compatible = "register-bit-led";	195	compatible = "register-bit-led";
196	offset = <0x08>;	196	offset = <0x08>;
197	mask = <0x10>;	197	mask = <0x10>;
@@ -199,7 +199,7 @@
199	linux,default-trigger = "cpu2";	199	linux,default-trigger = "cpu2";
200	default-state = "off";	200	default-state = "off";
201	};	201	};
202	led@08.5 {	202	led5 {
203	compatible = "register-bit-led";	203	compatible = "register-bit-led";
204	offset = <0x08>;	204	offset = <0x08>;
205	mask = <0x20>;	205	mask = <0x20>;
@@ -207,14 +207,14 @@
207	linux,default-trigger = "cpu3";	207	linux,default-trigger = "cpu3";
208	default-state = "off";	208	default-state = "off";
209	};	209	};
210	led@08.6 {	210	led6 {
211	compatible = "register-bit-led";	211	compatible = "register-bit-led";
212	offset = <0x08>;	212	offset = <0x08>;
213	mask = <0x40>;	213	mask = <0x40>;
214	label = "vexpress:6";	214	label = "vexpress:6";
215	default-state = "off";	215	default-state = "off";
216	};	216	};
217	led@08.7 {	217	led7 {
218	compatible = "register-bit-led";	218	compatible = "register-bit-led";
219	offset = <0x08>;	219	offset = <0x08>;
220	mask = <0x80>;	220	mask = <0x80>;


diff --git a/arch/arm64/boot/dts/arm/rtsm_ve-aemv8a.dts b/arch/arm64/boot/dts/arm/rtsm_ve-aemv8a.dts index 20addabbd127..a852e28a40e1 100644 --- a/arch/arm64/boot/dts/arm/rtsm_ve-aemv8a.dts +++ b/arch/arm64/boot/dts/arm/rtsm_ve-aemv8a.dts
@@ -104,7 +104,7 @@
104	<0 63 4>;	104	<0 63 4>;
105	};	105	};
106		106
107	smb {	107	smb@08000000 {
108	compatible = "simple-bus";	108	compatible = "simple-bus";
109		109
110	#address-cells = <2>;	110	#address-cells = <2>;


diff --git a/arch/arm64/boot/dts/arm/rtsm_ve-motherboard.dtsi b/arch/arm64/boot/dts/arm/rtsm_ve-motherboard.dtsi index 88a7583ed7a7..321b43b589ae 100644 --- a/arch/arm64/boot/dts/arm/rtsm_ve-motherboard.dtsi +++ b/arch/arm64/boot/dts/arm/rtsm_ve-motherboard.dtsi
@@ -226,7 +226,7 @@
226	};	226	};
227	};	227	};
228		228
229	v2m_fixed_3v3: fixedregulator@0 {	229	v2m_fixed_3v3: v2m-3v3 {
230	compatible = "regulator-fixed";	230	compatible = "regulator-fixed";
231	regulator-name = "3V3";	231	regulator-name = "3V3";
232	regulator-min-microvolt = <3300000>;	232	regulator-min-microvolt = <3300000>;
@@ -238,7 +238,7 @@
238	compatible = "arm,vexpress,config-bus";	238	compatible = "arm,vexpress,config-bus";
239	arm,vexpress,config-bridge = <&v2m_sysreg>;	239	arm,vexpress,config-bridge = <&v2m_sysreg>;
240		240
241	v2m_oscclk1: osc@1 {	241	v2m_oscclk1: oscclk1 {
242	/* CLCD clock */	242	/* CLCD clock */
243	compatible = "arm,vexpress-osc";	243	compatible = "arm,vexpress-osc";
244	arm,vexpress-sysreg,func = <1 1>;	244	arm,vexpress-sysreg,func = <1 1>;
@@ -247,27 +247,27 @@
247	clock-output-names = "v2m:oscclk1";	247	clock-output-names = "v2m:oscclk1";
248	};	248	};
249		249
250	reset@0 {	250	reset {
251	compatible = "arm,vexpress-reset";	251	compatible = "arm,vexpress-reset";
252	arm,vexpress-sysreg,func = <5 0>;	252	arm,vexpress-sysreg,func = <5 0>;
253	};	253	};
254		254
255	muxfpga@0 {	255	muxfpga {
256	compatible = "arm,vexpress-muxfpga";	256	compatible = "arm,vexpress-muxfpga";
257	arm,vexpress-sysreg,func = <7 0>;	257	arm,vexpress-sysreg,func = <7 0>;
258	};	258	};
259		259
260	shutdown@0 {	260	shutdown {
261	compatible = "arm,vexpress-shutdown";	261	compatible = "arm,vexpress-shutdown";
262	arm,vexpress-sysreg,func = <8 0>;	262	arm,vexpress-sysreg,func = <8 0>;
263	};	263	};
264		264
265	reboot@0 {	265	reboot {
266	compatible = "arm,vexpress-reboot";	266	compatible = "arm,vexpress-reboot";
267	arm,vexpress-sysreg,func = <9 0>;	267	arm,vexpress-sysreg,func = <9 0>;
268	};	268	};
269		269
270	dvimode@0 {	270	dvimode {
271	compatible = "arm,vexpress-dvimode";	271	compatible = "arm,vexpress-dvimode";
272	arm,vexpress-sysreg,func = <11 0>;	272	arm,vexpress-sysreg,func = <11 0>;
273	};	273	};


diff --git a/arch/arm64/boot/dts/arm/vexpress-v2f-1xv7-ca53x2.dts b/arch/arm64/boot/dts/arm/vexpress-v2f-1xv7-ca53x2.dts index bb3c26d1154d..e3a171162bb4 100644 --- a/arch/arm64/boot/dts/arm/vexpress-v2f-1xv7-ca53x2.dts +++ b/arch/arm64/boot/dts/arm/vexpress-v2f-1xv7-ca53x2.dts
@@ -93,7 +93,7 @@
93	compatible = "arm,vexpress,config-bus";	93	compatible = "arm,vexpress,config-bus";
94	arm,vexpress,config-bridge = <&v2m_sysreg>;	94	arm,vexpress,config-bridge = <&v2m_sysreg>;
95		95
96	smbclk: osc@4 {	96	smbclk: smclk {
97	/* SMC clock */	97	/* SMC clock */
98	compatible = "arm,vexpress-osc";	98	compatible = "arm,vexpress-osc";
99	arm,vexpress-sysreg,func = <1 4>;	99	arm,vexpress-sysreg,func = <1 4>;
@@ -102,7 +102,7 @@
102	clock-output-names = "smclk";	102	clock-output-names = "smclk";
103	};	103	};
104		104
105	volt@0 {	105	volt-vio {
106	/* VIO to expansion board above */	106	/* VIO to expansion board above */
107	compatible = "arm,vexpress-volt";	107	compatible = "arm,vexpress-volt";
108	arm,vexpress-sysreg,func = <2 0>;	108	arm,vexpress-sysreg,func = <2 0>;
@@ -112,7 +112,7 @@
112	regulator-always-on;	112	regulator-always-on;
113	};	113	};
114		114
115	volt@1 {	115	volt-12v {
116	/* 12V from power connector J6 */	116	/* 12V from power connector J6 */
117	compatible = "arm,vexpress-volt";	117	compatible = "arm,vexpress-volt";
118	arm,vexpress-sysreg,func = <2 1>;	118	arm,vexpress-sysreg,func = <2 1>;
@@ -120,7 +120,7 @@
120	regulator-always-on;	120	regulator-always-on;
121	};	121	};
122		122
123	temp@0 {	123	temp-fpga {
124	/* FPGA temperature */	124	/* FPGA temperature */
125	compatible = "arm,vexpress-temp";	125	compatible = "arm,vexpress-temp";
126	arm,vexpress-sysreg,func = <4 0>;	126	arm,vexpress-sysreg,func = <4 0>;
@@ -128,7 +128,7 @@
128	};	128	};
129	};	129	};
130		130
131	smb {	131	smb@08000000 {
132	compatible = "simple-bus";	132	compatible = "simple-bus";
133		133
134	#address-cells = <2>;	134	#address-cells = <2>;