Commit bb5cce12 authored by Andre Przywara's avatar Andre Przywara Committed by Sudeep Holla
Browse files

arm64: dts: fvp/juno: Fix node address fields

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: default avatarAndre Przywara <andre.przywara@arm.com>
Signed-off-by: default avatarSudeep Holla <sudeep.holla@arm.com>
parent 8f3d9f35
...@@ -31,7 +31,7 @@ motherboard { ...@@ -31,7 +31,7 @@ motherboard {
#interrupt-cells = <1>; #interrupt-cells = <1>;
ranges; ranges;
nor_flash: flash@0,00000000 { nor_flash: flash@0 {
compatible = "arm,vexpress-flash", "cfi-flash"; compatible = "arm,vexpress-flash", "cfi-flash";
reg = <0 0x00000000 0x04000000>, reg = <0 0x00000000 0x04000000>,
<4 0x00000000 0x04000000>; <4 0x00000000 0x04000000>;
...@@ -41,13 +41,13 @@ partitions { ...@@ -41,13 +41,13 @@ partitions {
}; };
}; };
psram@1,00000000 { psram@100000000 {
compatible = "arm,vexpress-psram", "mtd-ram"; compatible = "arm,vexpress-psram", "mtd-ram";
reg = <1 0x00000000 0x02000000>; reg = <1 0x00000000 0x02000000>;
bank-width = <4>; bank-width = <4>;
}; };
ethernet@2,02000000 { ethernet@202000000 {
compatible = "smsc,lan9118", "smsc,lan9115"; compatible = "smsc,lan9118", "smsc,lan9115";
reg = <2 0x02000000 0x10000>; reg = <2 0x02000000 0x10000>;
interrupts = <15>; interrupts = <15>;
...@@ -59,14 +59,14 @@ ethernet@2,02000000 { ...@@ -59,14 +59,14 @@ ethernet@2,02000000 {
vddvario-supply = <&v2m_fixed_3v3>; vddvario-supply = <&v2m_fixed_3v3>;
}; };
usb@2,03000000 { usb@203000000 {
compatible = "nxp,usb-isp1761"; compatible = "nxp,usb-isp1761";
reg = <2 0x03000000 0x20000>; reg = <2 0x03000000 0x20000>;
interrupts = <16>; interrupts = <16>;
port1-otg; port1-otg;
}; };
iofpga@3,00000000 { iofpga@300000000 {
compatible = "simple-bus"; compatible = "simple-bus";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
......
...@@ -151,7 +151,7 @@ bus@8000000 { ...@@ -151,7 +151,7 @@ bus@8000000 {
<0 0 41 &gic 0 0 GIC_SPI 41 IRQ_TYPE_LEVEL_HIGH>, <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>; <0 0 42 &gic 0 0 GIC_SPI 42 IRQ_TYPE_LEVEL_HIGH>;
ethernet@2,02000000 { ethernet@202000000 {
compatible = "smsc,lan91c111"; compatible = "smsc,lan91c111";
reg = <2 0x02000000 0x10000>; reg = <2 0x02000000 0x10000>;
interrupts = <15>; interrupts = <15>;
...@@ -178,7 +178,7 @@ v2m_refclk32khz: refclk32khz { ...@@ -178,7 +178,7 @@ v2m_refclk32khz: refclk32khz {
clock-output-names = "v2m:refclk32khz"; clock-output-names = "v2m:refclk32khz";
}; };
iofpga@3,00000000 { iofpga@300000000 {
compatible = "simple-bus"; compatible = "simple-bus";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
......
...@@ -103,7 +103,7 @@ nmi-button { ...@@ -103,7 +103,7 @@ nmi-button {
}; };
}; };
flash@0,00000000 { flash@0 {
/* 2 * 32MiB NOR Flash memory mounted on CS0 */ /* 2 * 32MiB NOR Flash memory mounted on CS0 */
compatible = "arm,vexpress-flash", "cfi-flash"; compatible = "arm,vexpress-flash", "cfi-flash";
reg = <0 0x00000000 0x04000000>; reg = <0 0x00000000 0x04000000>;
...@@ -120,7 +120,7 @@ partitions { ...@@ -120,7 +120,7 @@ partitions {
}; };
}; };
ethernet@2,00000000 { ethernet@200000000 {
compatible = "smsc,lan9118", "smsc,lan9115"; compatible = "smsc,lan9118", "smsc,lan9115";
reg = <2 0x00000000 0x10000>; reg = <2 0x00000000 0x10000>;
interrupts = <3>; interrupts = <3>;
...@@ -133,7 +133,7 @@ ethernet@2,00000000 { ...@@ -133,7 +133,7 @@ ethernet@2,00000000 {
vddvario-supply = <&mb_fixed_3v3>; vddvario-supply = <&mb_fixed_3v3>;
}; };
iofpga@3,00000000 { iofpga@300000000 {
compatible = "simple-bus"; compatible = "simple-bus";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
......
...@@ -9,7 +9,7 @@ bus@8000000 { ...@@ -9,7 +9,7 @@ bus@8000000 {
motherboard { motherboard {
arm,v2m-memory-map = "rs2"; arm,v2m-memory-map = "rs2";
iofpga@3,00000000 { iofpga@300000000 {
virtio-p9@140000 { virtio-p9@140000 {
compatible = "virtio,mmio"; compatible = "virtio,mmio";
reg = <0x140000 0x200>; reg = <0x140000 0x200>;
......
...@@ -17,14 +17,14 @@ motherboard { ...@@ -17,14 +17,14 @@ motherboard {
#interrupt-cells = <1>; #interrupt-cells = <1>;
ranges; ranges;
flash@0,00000000 { flash@0 {
compatible = "arm,vexpress-flash", "cfi-flash"; compatible = "arm,vexpress-flash", "cfi-flash";
reg = <0 0x00000000 0x04000000>, reg = <0 0x00000000 0x04000000>,
<4 0x00000000 0x04000000>; <4 0x00000000 0x04000000>;
bank-width = <4>; bank-width = <4>;
}; };
ethernet@2,02000000 { ethernet@202000000 {
compatible = "smsc,lan91c111"; compatible = "smsc,lan91c111";
reg = <2 0x02000000 0x10000>; reg = <2 0x02000000 0x10000>;
interrupts = <15>; interrupts = <15>;
...@@ -51,7 +51,7 @@ v2m_refclk32khz: refclk32khz { ...@@ -51,7 +51,7 @@ v2m_refclk32khz: refclk32khz {
clock-output-names = "v2m:refclk32khz"; clock-output-names = "v2m:refclk32khz";
}; };
iofpga@3,00000000 { iofpga@300000000 {
compatible = "simple-bus"; compatible = "simple-bus";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment