openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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:
https://github.com/devicetree-org/dt-schema/pull/38

Link: https://lore.kernel.org/r/20200513103016.130417-16-andre.przywara@arm.com
Signed-off-by: Andre Przywara <andre.przywara@arm.com>
Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>
This commit is contained in:
Andre Przywara 2020-05-13 11:30:11 +01:00 committed by Sudeep Holla
parent 906e6dd481
commit 9d0a36ddcc
6 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/arm/boot/dts/vexpress-v2m-rs1.dtsi
View File

@ -174,7 +174,7 @@ dvimode {
}; };
bus@8000000 { bus@8000000 {
motherboard { motherboard-bus {
model = "V2M-P1"; model = "V2M-P1";
arm,hbi = <0x190>; arm,hbi = <0x190>;
arm,vexpress,site = <0>; arm,vexpress,site = <0>;
@ -220,7 +220,7 @@ usb@203000000 {
port1-otg; port1-otg;
}; };
iofpga@300000000 { iofpga-bus@300000000 {
compatible = "simple-bus"; compatible = "simple-bus";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;

2
arch/arm64/boot/dts/arm/foundation-v8.dtsi
View File

@ -178,7 +178,7 @@ ethernet@202000000 {
interrupts = <15>; interrupts = <15>;
}; };
iofpga@300000000 { iofpga-bus@300000000 {
compatible = "simple-bus"; compatible = "simple-bus";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;

2
arch/arm64/boot/dts/arm/juno-base.dtsi
View File

@ -828,7 +828,7 @@ bus@8000000 {
<0 0 12 &gic 0 GIC_SPI 169 IRQ_TYPE_LEVEL_HIGH>; <0 0 12 &gic 0 GIC_SPI 169 IRQ_TYPE_LEVEL_HIGH>;
}; };
site2: tlx@60000000 { site2: tlx-bus@60000000 {
compatible = "simple-bus"; compatible = "simple-bus";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;

4
arch/arm64/boot/dts/arm/juno-motherboard.dtsi
View File

@ -92,7 +92,7 @@ nmi-button {
}; };
bus@8000000 { bus@8000000 {
motherboard { motherboard-bus {
compatible = "arm,vexpress,v2p-p1", "simple-bus"; compatible = "arm,vexpress,v2p-p1", "simple-bus";
#address-cells = <2>; /* SMB chipselect number and offset */ #address-cells = <2>; /* SMB chipselect number and offset */
#size-cells = <1>; #size-cells = <1>;
@ -133,7 +133,7 @@ ethernet@200000000 {
vddvario-supply = <&mb_fixed_3v3>; vddvario-supply = <&mb_fixed_3v3>;
}; };
iofpga@300000000 { iofpga-bus@300000000 {
compatible = "simple-bus"; compatible = "simple-bus";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;

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

@ -6,10 +6,10 @@
*/ */
/ { / {
bus@8000000 { bus@8000000 {
motherboard { motherboard-bus {
arm,v2m-memory-map = "rs2"; arm,v2m-memory-map = "rs2";
iofpga@300000000 { iofpga-bus@300000000 {
virtio-p9@140000 { virtio-p9@140000 {
compatible = "virtio,mmio"; compatible = "virtio,mmio";
reg = <0x140000 0x200>; reg = <0x140000 0x200>;

4
arch/arm64/boot/dts/arm/rtsm_ve-motherboard.dtsi
View File

@ -77,7 +77,7 @@ dvimode {
}; };
bus@8000000 { bus@8000000 {
motherboard { motherboard-bus {
arm,v2m-memory-map = "rs1"; arm,v2m-memory-map = "rs1";
compatible = "arm,vexpress,v2m-p1", "simple-bus"; compatible = "arm,vexpress,v2m-p1", "simple-bus";
#address-cells = <2>; /* SMB chipselect number and offset */ #address-cells = <2>; /* SMB chipselect number and offset */
@ -98,7 +98,7 @@ ethernet@202000000 {
interrupts = <15>; interrupts = <15>;
}; };
iofpga@300000000 { iofpga-bus@300000000 {
compatible = "simple-bus"; compatible = "simple-bus";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;