ARM: dts: mvebu: Convert all the mvebu files to use the range property

This conversion will allow to keep 32 bits addresses for the internal registers whereas the memory of the system will be 64 bits. Later it will also ease the move of the mvebu-mbus driver to the device tree support. Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com> Signed-off-by: Jason Cooper <jason@lakedaemon.net>
mariux64 · Apr 15, 2013 · 82a6826 · 82a6826
1 parent b18ea4d
commit 82a6826
Show file tree

Hide file tree

Showing 12 changed files with 245 additions and 242 deletions.
diff --git a/arch/arm/boot/dts/armada-370-db.dts b/arch/arm/boot/dts/armada-370-db.dts
@@ -30,11 +30,11 @@
 	};
 
 	soc {
-		serial@d0012000 {
+		serial@12000 {
 			clock-frequency = <200000000>;
 			status = "okay";
 		};
-		sata@d00a0000 {
+		sata@a0000 {
 			nr-ports = <2>;
 			status = "okay";
 		};
@@ -49,18 +49,18 @@
 			};
 		};
 
-		ethernet@d0070000 {
+		ethernet@70000 {
 			status = "okay";
 			phy = <&phy0>;
 			phy-mode = "rgmii-id";
 		};
-		ethernet@d0074000 {
+		ethernet@74000 {
 			status = "okay";
 			phy = <&phy1>;
 			phy-mode = "rgmii-id";
 		};
 
-		mvsdio@d00d4000 {
+		mvsdio@d4000 {
 			pinctrl-0 = <&sdio_pins1>;
 			pinctrl-names = "default";
 			/*
@@ -75,15 +75,15 @@
 			/* No CD or WP GPIOs */
 		};
 
-		usb@d0050000 {
+		usb@50000 {
 			status = "okay";
 		};
 
-		usb@d0051000 {
+		usb@51000 {
 			status = "okay";
 		};
 
-		spi0: spi@d0010600 {
+		spi0: spi@10600 {
 			status = "okay";
 
 			spi-flash@0 {

diff --git a/arch/arm/boot/dts/armada-370-mirabox.dts b/arch/arm/boot/dts/armada-370-mirabox.dts
@@ -25,11 +25,11 @@
 	};
 
 	soc {
-		serial@d0012000 {
+		serial@12000 {
 			clock-frequency = <200000000>;
 			status = "okay";
 		};
-		timer@d0020300 {
+		timer@20300 {
 			clock-frequency = <600000000>;
 			status = "okay";
 		};
@@ -79,18 +79,18 @@
 				reg = <1>;
 			};
 		};
-		ethernet@d0070000 {
+		ethernet@70000 {
 			status = "okay";
 			phy = <&phy0>;
 			phy-mode = "rgmii-id";
 		};
-		ethernet@d0074000 {
+		ethernet@74000 {
 			status = "okay";
 			phy = <&phy1>;
 			phy-mode = "rgmii-id";
 		};
 
-		mvsdio@d00d4000 {
+		mvsdio@d4000 {
 			pinctrl-0 = <&sdio_pins3>;
 			pinctrl-names = "default";
 			status = "okay";
@@ -100,15 +100,15 @@
 			 */
 		};
 
-		usb@d0050000 {
+		usb@50000 {
 			status = "okay";
 		};
 
-		usb@d0051000 {
+		usb@51000 {
 			status = "okay";
 		};
 
-		i2c@d0011000 {
+		i2c@11000 {
 			status = "okay";
 			clock-frequency = <100000>;
 			pca9505: pca9505@25 {

diff --git a/arch/arm/boot/dts/armada-370-rd.dts b/arch/arm/boot/dts/armada-370-rd.dts
@@ -28,11 +28,11 @@
 	};
 
 	soc {
-		serial@d0012000 {
+		serial@12000 {
 			clock-frequency = <200000000>;
 			status = "okay";
 		};
-		sata@d00a0000 {
+		sata@a0000 {
 			nr-ports = <2>;
 			status = "okay";
 		};
@@ -47,29 +47,29 @@
 			};
 		};
 
-		ethernet@d0070000 {
+		ethernet@70000 {
 			status = "okay";
 			phy = <&phy0>;
 			phy-mode = "sgmii";
 		};
-		ethernet@d0074000 {
+		ethernet@74000 {
 			status = "okay";
 			phy = <&phy1>;
 			phy-mode = "rgmii-id";
 		};
 
-		mvsdio@d00d4000 {
+		mvsdio@d4000 {
 			pinctrl-0 = <&sdio_pins1>;
 			pinctrl-names = "default";
 			status = "okay";
 			/* No CD or WP GPIOs */
 		};
 
-		usb@d0050000 {
+		usb@50000 {
 			status = "okay";
 		};
 
-		usb@d0051000 {
+		usb@51000 {
 			status = "okay";
 		};
 	};

diff --git a/arch/arm/boot/dts/armada-370-xp.dtsi b/arch/arm/boot/dts/armada-370-xp.dtsi
@@ -28,54 +28,55 @@
 		};
 	};
 
+
 	soc {
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "simple-bus";
 		interrupt-parent = <&mpic>;
-		ranges;
+		ranges = <0 0xd0000000 0x100000>;
 
-		mpic: interrupt-controller@d0020000 {
-			compatible = "marvell,mpic";
-			#interrupt-cells = <1>;
-			#size-cells = <1>;
-			interrupt-controller;
+		mpic: interrupt-controller@20000 {
+				compatible = "marvell,mpic";
+				#interrupt-cells = <1>;
+				#size-cells = <1>;
+				interrupt-controller;
 		};
 
-		coherency-fabric@d0020200 {
-			compatible = "marvell,coherency-fabric";
-			reg = <0xd0020200 0xb0>,
-			      <0xd0021810 0x1c>;
+		coherency-fabric@20200 {
+				compatible = "marvell,coherency-fabric";
+				reg = <0x20200 0xb0>,
+				      <0x21810 0x1c>;
 		};
 
-		serial@d0012000 {
+		serial@12000 {
 				compatible = "snps,dw-apb-uart";
-				reg = <0xd0012000 0x100>;
+				reg = <0x12000 0x100>;
 				reg-shift = <2>;
 				interrupts = <41>;
 				reg-io-width = <1>;
 				status = "disabled";
 		};
-		serial@d0012100 {
+		serial@12100 {
 				compatible = "snps,dw-apb-uart";
-				reg = <0xd0012100 0x100>;
+				reg = <0x12100 0x100>;
 				reg-shift = <2>;
 				interrupts = <42>;
 				reg-io-width = <1>;
 				status = "disabled";
 		};
 
-		timer@d0020300 {
+		timer@20300 {
 			       compatible = "marvell,armada-370-xp-timer";
-			       reg = <0xd0020300 0x30>,
-			       <0xd0021040 0x30>;
+			       reg = <0x20300 0x30>,
+			       <0x21040 0x30>;
 			       interrupts = <37>, <38>, <39>, <40>, <5>, <6>;
 			       clocks = <&coreclk 2>;
 		};
 
-		sata@d00a0000 {
+		sata@a0000 {
 			compatible = "marvell,orion-sata";
-			reg = <0xd00a0000 0x2400>;
+			reg = <0xa0000 0x2400>;
 			interrupts = <55>;
 			clocks = <&gateclk 15>, <&gateclk 30>;
 			clock-names = "0", "1";
@@ -86,28 +87,28 @@
 			#address-cells = <1>;
 			#size-cells = <0>;
 			compatible = "marvell,orion-mdio";
-			reg = <0xd0072004 0x4>;
+			reg = <0x72004 0x4>;
 		};
 
-		ethernet@d0070000 {
+		ethernet@70000 {
 				compatible = "marvell,armada-370-neta";
-				reg = <0xd0070000 0x2500>;
+				reg = <0x70000 0x2500>;
 				interrupts = <8>;
 				clocks = <&gateclk 4>;
 				status = "disabled";
 		};
 
-		ethernet@d0074000 {
+		ethernet@74000 {
 				compatible = "marvell,armada-370-neta";
-				reg = <0xd0074000 0x2500>;
+				reg = <0x74000 0x2500>;
 				interrupts = <10>;
 				clocks = <&gateclk 3>;
 				status = "disabled";
 		};
 
-		i2c0: i2c@d0011000 {
+		i2c0: i2c@11000 {
 			compatible = "marvell,mv64xxx-i2c";
-			reg = <0xd0011000 0x20>;
+			reg = <0x11000 0x20>;
 			#address-cells = <1>;
 			#size-cells = <0>;
 			interrupts = <31>;
@@ -116,9 +117,9 @@
 			status = "disabled";
 		};
 
-		i2c1: i2c@d0011100 {
+		i2c1: i2c@11100 {
 			compatible = "marvell,mv64xxx-i2c";
-			reg = <0xd0011100 0x20>;
+			reg = <0x11100 0x20>;
 			#address-cells = <1>;
 			#size-cells = <0>;
 			interrupts = <32>;
@@ -129,35 +130,35 @@
 
 		rtc@10300 {
 			compatible = "marvell,orion-rtc";
-			reg = <0xd0010300 0x20>;
+			reg = <0x10300 0x20>;
 			interrupts = <50>;
 		};
 
-		mvsdio@d00d4000 {
+		mvsdio@d4000 {
 			compatible = "marvell,orion-sdio";
-			reg = <0xd00d4000 0x200>;
+			reg = <0xd4000 0x200>;
 			interrupts = <54>;
 			clocks = <&gateclk 17>;
 			status = "disabled";
 		};
 
-		usb@d0050000 {
+		usb@50000 {
 			compatible = "marvell,orion-ehci";
-			reg = <0xd0050000 0x500>;
+			reg = <0x50000 0x500>;
 			interrupts = <45>;
 			status = "disabled";
 		};
 
-		usb@d0051000 {
+		usb@51000 {
 			compatible = "marvell,orion-ehci";
-			reg = <0xd0051000 0x500>;
+			reg = <0x51000 0x500>;
 			interrupts = <46>;
 			status = "disabled";
 		};
 
-		spi0: spi@d0010600 {
+		spi0: spi@10600 {
 			compatible = "marvell,orion-spi";
-			reg = <0xd0010600 0x28>;
+			reg = <0x10600 0x28>;
 			#address-cells = <1>;
 			#size-cells = <0>;
 			cell-index = <0>;
@@ -166,9 +167,9 @@
 			status = "disabled";
 		};
 
-		spi1: spi@d0010680 {
+		spi1: spi@10680 {
 			compatible = "marvell,orion-spi";
-			reg = <0xd0010680 0x28>;
+			reg = <0x10680 0x28>;
 			#address-cells = <1>;
 			#size-cells = <0>;
 			cell-index = <1>;
@@ -177,45 +178,45 @@
 			status = "disabled";
 		};
 
-		devbus-bootcs@d0010400 {
+		devbus-bootcs@10400 {
 			compatible = "marvell,mvebu-devbus";
-			reg = <0xd0010400 0x8>;
+			reg = <0x10400 0x8>;
 			#address-cells = <1>;
 			#size-cells = <1>;
 			clocks = <&coreclk 0>;
 			status = "disabled";
 		};
 
-		devbus-cs0@d0010408 {
+		devbus-cs0@10408 {
 			compatible = "marvell,mvebu-devbus";
-			reg = <0xd0010408 0x8>;
+			reg = <0x10408 0x8>;
 			#address-cells = <1>;
 			#size-cells = <1>;
 			clocks = <&coreclk 0>;
 			status = "disabled";
 		};
 
-		devbus-cs1@d0010410 {
+		devbus-cs1@10410 {
 			compatible = "marvell,mvebu-devbus";
-			reg = <0xd0010410 0x8>;
+			reg = <0x10410 0x8>;
 			#address-cells = <1>;
 			#size-cells = <1>;
 			clocks = <&coreclk 0>;
 			status = "disabled";
 		};
 
-		devbus-cs2@d0010418 {
+		devbus-cs2@10418 {
 			compatible = "marvell,mvebu-devbus";
-			reg = <0xd0010418 0x8>;
+			reg = <0x10418 0x8>;
 			#address-cells = <1>;
 			#size-cells = <1>;
 			clocks = <&coreclk 0>;
 			status = "disabled";
 		};
 
-		devbus-cs3@d0010420 {
+		devbus-cs3@10420 {
 			compatible = "marvell,mvebu-devbus";
-			reg = <0xd0010420 0x8>;
+			reg = <0x10420 0x8>;
 			#address-cells = <1>;
 			#size-cells = <1>;
 			clocks = <&coreclk 0>;