Skip to content

Commit 9d0a36d

Browse files
Andre-ARMsudeep-holla
authored andcommitted
arm64: dts: fvp/juno: Fix bus node names
Most Arm Ltd. boards are employing a layered bus structure, to map the hardware design (SoC, motherboard, IOFPGA) and structure the DTs. The "simple-bus" nodes only allow a limited set of node names. Switch to use *-bus to be binding compliant. This relies on a pending dt-schema.git fix for now: devicetree-org/dt-schema#38 Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Andre Przywara <[email protected]> Signed-off-by: Sudeep Holla <[email protected]>
1 parent 906e6dd commit 9d0a36d

File tree

6 files changed

+10
-10
lines changed

6 files changed

+10
-10
lines changed

arch/arm/boot/dts/vexpress-v2m-rs1.dtsi

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@
174174
};
175175

176176
bus@8000000 {
177-
motherboard {
177+
motherboard-bus {
178178
model = "V2M-P1";
179179
arm,hbi = <0x190>;
180180
arm,vexpress,site = <0>;
@@ -220,7 +220,7 @@
220220
port1-otg;
221221
};
222222

223-
iofpga@300000000 {
223+
iofpga-bus@300000000 {
224224
compatible = "simple-bus";
225225
#address-cells = <1>;
226226
#size-cells = <1>;

arch/arm64/boot/dts/arm/foundation-v8.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@
178178
interrupts = <15>;
179179
};
180180

181-
iofpga@300000000 {
181+
iofpga-bus@300000000 {
182182
compatible = "simple-bus";
183183
#address-cells = <1>;
184184
#size-cells = <1>;

arch/arm64/boot/dts/arm/juno-base.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -828,7 +828,7 @@
828828
<0 0 12 &gic 0 GIC_SPI 169 IRQ_TYPE_LEVEL_HIGH>;
829829
};
830830

831-
site2: tlx@60000000 {
831+
site2: tlx-bus@60000000 {
832832
compatible = "simple-bus";
833833
#address-cells = <1>;
834834
#size-cells = <1>;

arch/arm64/boot/dts/arm/juno-motherboard.dtsi

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@
9292
};
9393

9494
bus@8000000 {
95-
motherboard {
95+
motherboard-bus {
9696
compatible = "arm,vexpress,v2p-p1", "simple-bus";
9797
#address-cells = <2>; /* SMB chipselect number and offset */
9898
#size-cells = <1>;
@@ -133,7 +133,7 @@
133133
vddvario-supply = <&mb_fixed_3v3>;
134134
};
135135

136-
iofpga@300000000 {
136+
iofpga-bus@300000000 {
137137
compatible = "simple-bus";
138138
#address-cells = <1>;
139139
#size-cells = <1>;

arch/arm64/boot/dts/arm/rtsm_ve-motherboard-rs2.dtsi

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66
*/
77
/ {
88
bus@8000000 {
9-
motherboard {
9+
motherboard-bus {
1010
arm,v2m-memory-map = "rs2";
1111

12-
iofpga@300000000 {
12+
iofpga-bus@300000000 {
1313
virtio-p9@140000 {
1414
compatible = "virtio,mmio";
1515
reg = <0x140000 0x200>;

arch/arm64/boot/dts/arm/rtsm_ve-motherboard.dtsi

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@
7777
};
7878

7979
bus@8000000 {
80-
motherboard {
80+
motherboard-bus {
8181
arm,v2m-memory-map = "rs1";
8282
compatible = "arm,vexpress,v2m-p1", "simple-bus";
8383
#address-cells = <2>; /* SMB chipselect number and offset */
@@ -98,7 +98,7 @@
9898
interrupts = <15>;
9999
};
100100

101-
iofpga@300000000 {
101+
iofpga-bus@300000000 {
102102
compatible = "simple-bus";
103103
#address-cells = <1>;
104104
#size-cells = <1>;

0 commit comments

Comments
 (0)