Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 82a68267 authored by Gregory CLEMENT's avatar Gregory CLEMENT Committed by Jason Cooper
Browse files

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: default avatarGregory CLEMENT <gregory.clement@free-electrons.com>
Signed-off-by: default avatarJason Cooper <jason@lakedaemon.net>
parent b18ea4dc

arch/arm/boot/dts/armada-370-db.dts

+8 −8
Original line number Diff line number Diff line
@@ -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 {

arch/arm/boot/dts/armada-370-mirabox.dts

+8 −8
Original line number Diff line number Diff line
@@ -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 {

arch/arm/boot/dts/armada-370-rd.dts

+7 −7
Original line number Diff line number Diff line
@@ -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";

		};

	};

arch/arm/boot/dts/armada-370-xp.dtsi

+50 −49
Original line number Diff line number Diff line
@@ -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 {

		mpic: interrupt-controller@20000 {

				compatible = "marvell,mpic";

				#interrupt-cells = <1>;

				#size-cells = <1>;

				interrupt-controller;

		};



		coherency-fabric@d0020200 {

		coherency-fabric@20200 {

				compatible = "marvell,coherency-fabric";

			reg = <0xd0020200 0xb0>,

			      <0xd0021810 0x1c>;

				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>;

arch/arm/boot/dts/armada-370.dtsi

+33 −32
Original line number Diff line number Diff line
@@ -28,14 +28,15 @@ 
	};



	soc {

		mpic: interrupt-controller@d0020000 {

			reg = <0xd0020a00 0x1d0>,

			      <0xd0021870 0x58>;



		mpic: interrupt-controller@20000 {

			reg = <0x20a00 0x1d0>,

			      <0x21870 0x58>;

		};



		system-controller@d0018200 {

		system-controller@18200 {

				compatible = "marvell,armada-370-xp-system-controller";

				reg = <0xd0018200 0x100>;

				reg = <0x18200 0x100>;

		};



		L2: l2-cache {
@@ -47,7 +48,7 @@ 


		pinctrl {

			compatible = "marvell,mv88f6710-pinctrl";

			reg = <0xd0018000 0x38>;

			reg = <0x18000 0x38>;



			sdio_pins1: sdio-pins1 {

			      marvell,pins = "mpp9",  "mpp11", "mpp12",
@@ -68,9 +69,9 @@ 
			};

	        };



		gpio0: gpio@d0018100 {

		gpio0: gpio@18100 {

			compatible = "marvell,orion-gpio";

			reg = <0xd0018100 0x40>;

			reg = <0x18100 0x40>;

			ngpios = <32>;

			gpio-controller;

			#gpio-cells = <2>;
@@ -79,9 +80,9 @@ 
			interrupts = <82>, <83>, <84>, <85>;

		};



		gpio1: gpio@d0018140 {

		gpio1: gpio@18140 {

			compatible = "marvell,orion-gpio";

			reg = <0xd0018140 0x40>;

			reg = <0x18140 0x40>;

			ngpios = <32>;

			gpio-controller;

			#gpio-cells = <2>;
@@ -90,9 +91,9 @@ 
			interrupts = <87>, <88>, <89>, <90>;

		};



		gpio2: gpio@d0018180 {

		gpio2: gpio@18180 {

			compatible = "marvell,orion-gpio";

			reg = <0xd0018180 0x40>;

			reg = <0x18180 0x40>;

			ngpios = <2>;

			gpio-controller;

			#gpio-cells = <2>;
@@ -101,23 +102,23 @@ 
			interrupts = <91>;

		};



		coreclk: mvebu-sar@d0018230 {

		coreclk: mvebu-sar@18230 {

			compatible = "marvell,armada-370-core-clock";

			reg = <0xd0018230 0x08>;

			reg = <0x18230 0x08>;

			#clock-cells = <1>;

		};



		gateclk: clock-gating-control@d0018220 {

		gateclk: clock-gating-control@18220 {

			compatible = "marvell,armada-370-gating-clock";

			reg = <0xd0018220 0x4>;

			reg = <0x18220 0x4>;

			clocks = <&coreclk 0>;

			#clock-cells = <1>;

		};



		xor@d0060800 {

		xor@60800 {

			compatible = "marvell,orion-xor";

			reg = <0xd0060800 0x100

			       0xd0060A00 0x100>;

			reg = <0x60800 0x100

			       0x60A00 0x100>;

			status = "okay";



			xor00 {
@@ -133,10 +134,10 @@ 
			};

		};



		xor@d0060900 {

		xor@60900 {

			compatible = "marvell,orion-xor";

			reg = <0xd0060900 0x100

			       0xd0060b00 0x100>;

			reg = <0x60900 0x100

			       0x60b00 0x100>;

			status = "okay";



			xor10 {
@@ -152,18 +153,18 @@ 
			};

		};



		usb@d0050000 {

		usb@50000 {

			clocks = <&coreclk 0>;

		};



		usb@d0051000 {

		usb@51000 {

			clocks = <&coreclk 0>;

		};



		thermal@d0018300 {

		thermal@18300 {

			compatible = "marvell,armada370-thermal";

			reg = <0xd0018300 0x4

			       0xd0018304 0x4>;

			reg = <0x18300 0x4

			       0x18304 0x4>;

			status = "okay";

		};
@@ -177,18 +178,18 @@ 


			bus-range = <0x00 0xff>;



			reg = <0xd0040000 0x2000>, <0xd0080000 0x2000>;

			reg = <0x40000 0x2000>, <0x80000 0x2000>;



			reg-names = "pcie0.0", "pcie1.0";



			ranges = <0x82000000 0 0xd0040000 0xd0040000 0 0x00002000   /* Port 0.0 registers */

				  0x82000000 0 0xd0080000 0xd0080000 0 0x00002000   /* Port 1.0 registers */

			ranges = <0x82000000 0 0x40000 0x40000 0 0x00002000   /* Port 0.0 registers */

				  0x82000000 0 0x80000 0x80000 0 0x00002000   /* Port 1.0 registers */

				  0x82000000 0 0xe0000000 0xe0000000 0 0x08000000   /* non-prefetchable memory */

			          0x81000000 0 0          0xe8000000 0 0x00100000>; /* downstream I/O */



			pcie@1,0 {

				device_type = "pci";

				assigned-addresses = <0x82000800 0 0xd0040000 0 0x2000>;

				assigned-addresses = <0x82000800 0 0x40000 0 0x2000>;

				reg = <0x0800 0 0 0 0>;

				#address-cells = <3>;

				#size-cells = <2>;
@@ -204,7 +205,7 @@ 


			pcie@2,0 {

				device_type = "pci";

				assigned-addresses = <0x82002800 0 0xd0080000 0 0x2000>;

				assigned-addresses = <0x82002800 0 0x80000 0 0x2000>;

				reg = <0x1000 0 0 0 0>;

				#address-cells = <3>;

				#size-cells = <2>;