Skip to content

Commit

Permalink
arm64: dts: fvp/juno: Fix node address fields
Browse files Browse the repository at this point in the history
The Arm Ltd. boards were using an outdated address convention in the DT
node names, by separating the high from the low 32-bits of an address by
a comma.

Remove the comma from the node name suffix to be DT spec compliant.

Link: https://lore.kernel.org/r/20200513103016.130417-3-andre.przywara@arm.com
Signed-off-by: Andre Przywara <andre.przywara@arm.com>
Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>
  • Loading branch information
Andre Przywara authored and Sudeep Holla committed May 17, 2020
1 parent 8f3d9f3 commit bb5cce1
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 14 deletions.
10 changes: 5 additions & 5 deletions arch/arm/boot/dts/vexpress-v2m-rs1.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
#interrupt-cells = <1>;
ranges;

nor_flash: flash@0,00000000 {
nor_flash: flash@0 {
compatible = "arm,vexpress-flash", "cfi-flash";
reg = <0 0x00000000 0x04000000>,
<4 0x00000000 0x04000000>;
Expand All @@ -41,13 +41,13 @@
};
};

psram@1,00000000 {
psram@100000000 {
compatible = "arm,vexpress-psram", "mtd-ram";
reg = <1 0x00000000 0x02000000>;
bank-width = <4>;
};

ethernet@2,02000000 {
ethernet@202000000 {
compatible = "smsc,lan9118", "smsc,lan9115";
reg = <2 0x02000000 0x10000>;
interrupts = <15>;
Expand All @@ -59,14 +59,14 @@
vddvario-supply = <&v2m_fixed_3v3>;
};

usb@2,03000000 {
usb@203000000 {
compatible = "nxp,usb-isp1761";
reg = <2 0x03000000 0x20000>;
interrupts = <16>;
port1-otg;
};

iofpga@3,00000000 {
iofpga@300000000 {
compatible = "simple-bus";
#address-cells = <1>;
#size-cells = <1>;
Expand Down
4 changes: 2 additions & 2 deletions arch/arm64/boot/dts/arm/foundation-v8.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@
<0 0 41 &gic 0 0 GIC_SPI 41 IRQ_TYPE_LEVEL_HIGH>,
<0 0 42 &gic 0 0 GIC_SPI 42 IRQ_TYPE_LEVEL_HIGH>;

ethernet@2,02000000 {
ethernet@202000000 {
compatible = "smsc,lan91c111";
reg = <2 0x02000000 0x10000>;
interrupts = <15>;
Expand All @@ -178,7 +178,7 @@
clock-output-names = "v2m:refclk32khz";
};

iofpga@3,00000000 {
iofpga@300000000 {
compatible = "simple-bus";
#address-cells = <1>;
#size-cells = <1>;
Expand Down
6 changes: 3 additions & 3 deletions arch/arm64/boot/dts/arm/juno-motherboard.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@
};
};

flash@0,00000000 {
flash@0 {
/* 2 * 32MiB NOR Flash memory mounted on CS0 */
compatible = "arm,vexpress-flash", "cfi-flash";
reg = <0 0x00000000 0x04000000>;
Expand All @@ -120,7 +120,7 @@
};
};

ethernet@2,00000000 {
ethernet@200000000 {
compatible = "smsc,lan9118", "smsc,lan9115";
reg = <2 0x00000000 0x10000>;
interrupts = <3>;
Expand All @@ -133,7 +133,7 @@
vddvario-supply = <&mb_fixed_3v3>;
};

iofpga@3,00000000 {
iofpga@300000000 {
compatible = "simple-bus";
#address-cells = <1>;
#size-cells = <1>;
Expand Down
2 changes: 1 addition & 1 deletion arch/arm64/boot/dts/arm/rtsm_ve-motherboard-rs2.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
motherboard {
arm,v2m-memory-map = "rs2";

iofpga@3,00000000 {
iofpga@300000000 {
virtio-p9@140000 {
compatible = "virtio,mmio";
reg = <0x140000 0x200>;
Expand Down
6 changes: 3 additions & 3 deletions arch/arm64/boot/dts/arm/rtsm_ve-motherboard.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,14 @@
#interrupt-cells = <1>;
ranges;

flash@0,00000000 {
flash@0 {
compatible = "arm,vexpress-flash", "cfi-flash";
reg = <0 0x00000000 0x04000000>,
<4 0x00000000 0x04000000>;
bank-width = <4>;
};

ethernet@2,02000000 {
ethernet@202000000 {
compatible = "smsc,lan91c111";
reg = <2 0x02000000 0x10000>;
interrupts = <15>;
Expand All @@ -51,7 +51,7 @@
clock-output-names = "v2m:refclk32khz";
};

iofpga@3,00000000 {
iofpga@300000000 {
compatible = "simple-bus";
#address-cells = <1>;
#size-cells = <1>;
Expand Down

0 comments on commit bb5cce1

Please sign in to comment.