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
Loading
Loading
Loading
Loading
+5 −5
Original line number Diff line number Diff line
@@ -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>;
@@ -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>;
@@ -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>;
+2 −2
Original line number Diff line number Diff line
@@ -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>;
@@ -178,7 +178,7 @@
			clock-output-names = "v2m:refclk32khz";
		};

		iofpga@3,00000000 {
		iofpga@300000000 {
			compatible = "simple-bus";
			#address-cells = <1>;
			#size-cells = <1>;
+3 −3
Original line number Diff line number Diff line
@@ -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>;
@@ -120,7 +120,7 @@
				};
			};

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

			iofpga@3,00000000 {
			iofpga@300000000 {
				compatible = "simple-bus";
				#address-cells = <1>;
				#size-cells = <1>;
+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@
		motherboard {
			arm,v2m-memory-map = "rs2";

			iofpga@3,00000000 {
			iofpga@300000000 {
				virtio-p9@140000 {
					compatible = "virtio,mmio";
					reg = <0x140000 0x200>;
+3 −3
Original line number Diff line number Diff line
@@ -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>;
@@ -51,7 +51,7 @@
				clock-output-names = "v2m:refclk32khz";
			};

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