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

Commit 7b36efd0 authored by Sebastian Hesselbarth's avatar Sebastian Hesselbarth Committed by Jason Cooper
Browse files

ARM: dts: kirkwood: add node labels 



This adds missing node labels to Kirkwood common and SoC specific nodes
to allow to reference them more easily.

Signed-off-by: default avatarSebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Acked-by: default avatarAndrew Lunn <andrew@lunn.ch>
Link: https://lkml.kernel.org/r/1398862602-29595-3-git-send-email-sebastian.hesselbarth@gmail.com


Signed-off-by: default avatarJason Cooper <jason@lakedaemon.net>
parent c630829a

arch/arm/boot/dts/kirkwood-6192.dtsi

+5 −5
Original line number Diff line number Diff line 
/ {

	mbus {

		pcie-controller {

		pciec: pcie-controller {

			compatible = "marvell,kirkwood-pcie";

			status = "disabled";

			device_type = "pci";
@@ -15,7 +15,7 @@ 
				0x82000000 0x1 0     MBUS_ID(0x04, 0xe8) 0       1 0 /* Port 0.0 MEM */

				0x81000000 0x1 0     MBUS_ID(0x04, 0xe0) 0       1 0 /* Port 0.0 IO  */>;



			pcie@1,0 {

			pcie0: pcie@1,0 {

				device_type = "pci";

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

				reg = <0x0800 0 0 0 0>;
@@ -76,14 +76,14 @@ 
			};

		};



		rtc@10300 {

		rtc: rtc@10300 {

			compatible = "marvell,kirkwood-rtc", "marvell,orion-rtc";

			reg = <0x10300 0x20>;

			interrupts = <53>;

			clocks = <&gate_clk 7>;

		};



		sata@80000 {

		sata: sata@80000 {

			compatible = "marvell,orion-sata";

			reg = <0x80000 0x5000>;

			interrupts = <21>;
@@ -92,7 +92,7 @@ 
			status = "disabled";

		};



		mvsdio@90000 {

		sdio: mvsdio@90000 {

			compatible = "marvell,orion-sdio";

			reg = <0x90000 0x200>;

			interrupts = <28>;

arch/arm/boot/dts/kirkwood-6281.dtsi

+5 −5
Original line number Diff line number Diff line 
/ {

	mbus {

		pcie-controller {

		pciec: pcie-controller {

			compatible = "marvell,kirkwood-pcie";

			status = "disabled";

			device_type = "pci";
@@ -15,7 +15,7 @@ 
				0x82000000 0x1 0     MBUS_ID(0x04, 0xe8) 0       1 0 /* Port 0.0 MEM */

				0x81000000 0x1 0     MBUS_ID(0x04, 0xe0) 0       1 0 /* Port 0.0 IO  */>;



			pcie@1,0 {

			pcie0: pcie@1,0 {

				device_type = "pci";

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

				reg = <0x0800 0 0 0 0>;
@@ -76,14 +76,14 @@ 
			};

		};



		rtc@10300 {

		rtc: rtc@10300 {

			compatible = "marvell,kirkwood-rtc", "marvell,orion-rtc";

			reg = <0x10300 0x20>;

			interrupts = <53>;

			clocks = <&gate_clk 7>;

		};



		sata@80000 {

		sata: sata@80000 {

			compatible = "marvell,orion-sata";

			reg = <0x80000 0x5000>;

			interrupts = <21>;
@@ -94,7 +94,7 @@ 
			status = "disabled";

		};



		mvsdio@90000 {

		sdio: mvsdio@90000 {

			compatible = "marvell,orion-sdio";

			reg = <0x90000 0x200>;

			interrupts = <28>;

arch/arm/boot/dts/kirkwood-6282.dtsi

+8 −8
Original line number Diff line number Diff line 
/ {

	mbus {

		pcie-controller {

		pciec: pcie-controller {

			compatible = "marvell,kirkwood-pcie";

			status = "disabled";

			device_type = "pci";
@@ -19,7 +19,7 @@ 
				0x82000000 0x2 0     MBUS_ID(0x04, 0xd8) 0       1 0 /* Port 1.0 MEM */

				0x81000000 0x2 0     MBUS_ID(0x04, 0xd0) 0       1 0 /* Port 1.0 IO  */>;



			pcie@1,0 {

			pcie0: pcie@1,0 {

				device_type = "pci";

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

				reg = <0x0800 0 0 0 0>;
@@ -36,7 +36,7 @@ 
				status = "disabled";

			};



			pcie@2,0 {

			pcie1: pcie@2,0 {

				device_type = "pci";

				assigned-addresses = <0x82001000 0 0x00044000 0 0x2000>;

				reg = <0x1000 0 0 0 0>;
@@ -104,20 +104,20 @@ 
			};

		};



		thermal@10078 {

		thermal: thermal@10078 {

			compatible = "marvell,kirkwood-thermal";

			reg = <0x10078 0x4>;

			status = "okay";

		};



		rtc@10300 {

		rtc: rtc@10300 {

			compatible = "marvell,kirkwood-rtc", "marvell,orion-rtc";

			reg = <0x10300 0x20>;

			interrupts = <53>;

			clocks = <&gate_clk 7>;

		};



		i2c@11100 {

		i2c1: i2c@11100 {

			compatible = "marvell,mv64xxx-i2c";

			reg = <0x11100 0x20>;

			#address-cells = <1>;
@@ -128,7 +128,7 @@ 
			status = "disabled";

		};



		sata@80000 {

		sata: sata@80000 {

			compatible = "marvell,orion-sata";

			reg = <0x80000 0x5000>;

			interrupts = <21>;
@@ -139,7 +139,7 @@ 
			status = "disabled";

		};



		mvsdio@90000 {

		sdio: mvsdio@90000 {

			compatible = "marvell,orion-sdio";

			reg = <0x90000 0x200>;

			interrupts = <28>;

arch/arm/boot/dts/kirkwood.dtsi

+8 −8
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ 
		pcie-mem-aperture = <0xe0000000 0x10000000>; /* 256 MiB memory space */

		pcie-io-aperture  = <0xf2000000 0x100000>;   /*   1 MiB    I/O space */



		crypto@0301 {

		cesa: crypto@0301 {

			compatible = "marvell,orion-crypto";

			reg = <MBUS_ID(0xf0, 0x01) 0x30000 0x10000>,

			      <MBUS_ID(0x03, 0x01) 0 0x800>;
@@ -77,7 +77,7 @@ 
			#clock-cells = <1>;

		};



		spi@10600 {

		spi0: spi@10600 {

			compatible = "marvell,orion-spi";

			#address-cells = <1>;

			#size-cells = <0>;
@@ -123,7 +123,7 @@ 
			status = "disabled";

		};



		serial@12000 {

		uart0: serial@12000 {

			compatible = "ns16550a";

			reg = <0x12000 0x100>;

			reg-shift = <2>;
@@ -132,7 +132,7 @@ 
			status = "disabled";

		};



		serial@12100 {

		uart1: serial@12100 {

			compatible = "ns16550a";

			reg = <0x12100 0x100>;

			reg-shift = <2>;
@@ -146,7 +146,7 @@ 
			reg = <0x20000 0x80>, <0x1500 0x20>;

		};



		system-controller@20000 {

		sysc: system-controller@20000 {

			compatible = "marvell,orion-system-controller";

			reg = <0x20000 0x120>;

		};
@@ -196,7 +196,7 @@ 
			status = "okay";

		};



		ehci@50000 {

		usb0: ehci@50000 {

			compatible = "marvell,orion-ehci";

			reg = <0x50000 0x1000>;

			interrupts = <19>;
@@ -204,7 +204,7 @@ 
			status = "okay";

		};



		xor@60800 {

		dma0: xor@60800 {

			compatible = "marvell,orion-xor";

			reg = <0x60800 0x100

			       0x60A00 0x100>;
@@ -224,7 +224,7 @@ 
			};

		};



		xor@60900 {

		dma1: xor@60900 {

			compatible = "marvell,orion-xor";

			reg = <0x60900 0x100

			       0x60B00 0x100>;