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

Commit 939ac3cd authored by Kevin Hilman's avatar Kevin Hilman
Browse files

Merge branch 'mvebu/dt-4' into next/dt 



* mvebu/dt-4:
  ARM: mvebu: sort DT nodes by address
  ARM: orion5x: sort DT nodes by address
  ARM: dove: sort DT nodes by address
  ARM: kirkwood: sort dt nodes by address

Signed-off-by: default avatarKevin Hilman <khilman@linaro.org>

Conflicts:
	arch/arm/boot/dts/armada-370-xp.dtsi
parents 718133a6 a095b1c7

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

+88 −88
Original line number Diff line number Diff line
@@ -103,22 +103,52 @@ 
			#size-cells = <1>;

			ranges = <0 MBUS_ID(0xf0, 0x01) 0 0x100000>;



			mbusc: mbus-controller@20000 {

				compatible = "marvell,mbus-controller";

				reg = <0x20000 0x100>, <0x20180 0x20>;

			rtc@10300 {

				compatible = "marvell,orion-rtc";

				reg = <0x10300 0x20>;

				interrupts = <50>;

			};



			mpic: interrupt-controller@20000 {

				compatible = "marvell,mpic";

				#interrupt-cells = <1>;

				#size-cells = <1>;

				interrupt-controller;

				msi-controller;

			spi0: spi@10600 {

				compatible = "marvell,orion-spi";

				reg = <0x10600 0x28>;

				#address-cells = <1>;

				#size-cells = <0>;

				cell-index = <0>;

				interrupts = <30>;

				clocks = <&coreclk 0>;

				status = "disabled";

			};



			coherency-fabric@20200 {

				compatible = "marvell,coherency-fabric";

				reg = <0x20200 0xb0>, <0x21010 0x1c>;

			spi1: spi@10680 {

				compatible = "marvell,orion-spi";

				reg = <0x10680 0x28>;

				#address-cells = <1>;

				#size-cells = <0>;

				cell-index = <1>;

				interrupts = <92>;

				clocks = <&coreclk 0>;

				status = "disabled";

			};



			i2c0: i2c@11000 {

				compatible = "marvell,mv64xxx-i2c";

				#address-cells = <1>;

				#size-cells = <0>;

				interrupts = <31>;

				timeout-ms = <1000>;

				clocks = <&coreclk 0>;

				status = "disabled";

			};



			i2c1: i2c@11100 {

				compatible = "marvell,mv64xxx-i2c";

				#address-cells = <1>;

				#size-cells = <0>;

				interrupts = <32>;

				timeout-ms = <1000>;

				clocks = <&coreclk 0>;

				status = "disabled";

			};



			serial@12000 {
@@ -146,25 +176,41 @@ 
				clock-output-names = "nand";

			};



			mbusc: mbus-controller@20000 {

				compatible = "marvell,mbus-controller";

				reg = <0x20000 0x100>, <0x20180 0x20>;

			};



			mpic: interrupt-controller@20000 {

				compatible = "marvell,mpic";

				#interrupt-cells = <1>;

				#size-cells = <1>;

				interrupt-controller;

				msi-controller;

			};



			coherency-fabric@20200 {

				compatible = "marvell,coherency-fabric";

				reg = <0x20200 0xb0>, <0x21010 0x1c>;

			};



			timer@20300 {

				reg = <0x20300 0x30>, <0x21040 0x30>;

				interrupts = <37>, <38>, <39>, <40>, <5>, <6>;

			};



			sata@a0000 {

				compatible = "marvell,orion-sata";

				reg = <0xa0000 0x5000>;

				interrupts = <55>;

				clocks = <&gateclk 15>, <&gateclk 30>;

				clock-names = "0", "1";

			usb@50000 {

				compatible = "marvell,orion-ehci";

				reg = <0x50000 0x500>;

				interrupts = <45>;

				status = "disabled";

			};



			mdio {

				#address-cells = <1>;

				#size-cells = <0>;

				compatible = "marvell,orion-mdio";

				reg = <0x72004 0x4>;

			usb@51000 {

				compatible = "marvell,orion-ehci";

				reg = <0x51000 0x500>;

				interrupts = <46>;

				status = "disabled";

			};



			eth0: ethernet@70000 {
@@ -175,6 +221,13 @@ 
				status = "disabled";

			};



			mdio {

				#address-cells = <1>;

				#size-cells = <0>;

				compatible = "marvell,orion-mdio";

				reg = <0x72004 0x4>;

			};



			eth1: ethernet@74000 {

				compatible = "marvell,armada-370-neta";

				reg = <0x74000 0x4000>;
@@ -183,32 +236,25 @@ 
				status = "disabled";

			};



			i2c0: i2c@11000 {

				compatible = "marvell,mv64xxx-i2c";

				#address-cells = <1>;

				#size-cells = <0>;

				interrupts = <31>;

				timeout-ms = <1000>;

				clocks = <&coreclk 0>;

			sata@a0000 {

				compatible = "marvell,orion-sata";

				reg = <0xa0000 0x5000>;

				interrupts = <55>;

				clocks = <&gateclk 15>, <&gateclk 30>;

				clock-names = "0", "1";

				status = "disabled";

			};



			i2c1: i2c@11100 {

				compatible = "marvell,mv64xxx-i2c";

			nand@d0000 {

				compatible = "marvell,armada370-nand";

				reg = <0xd0000 0x54>;

				#address-cells = <1>;

				#size-cells = <0>;

				interrupts = <32>;

				timeout-ms = <1000>;

				clocks = <&coreclk 0>;

				#size-cells = <1>;

				interrupts = <113>;

				clocks = <&coredivclk 0>;

				status = "disabled";

			};



			rtc@10300 {

				compatible = "marvell,orion-rtc";

				reg = <0x10300 0x20>;

				interrupts = <50>;

			};



			mvsdio@d4000 {

				compatible = "marvell,orion-sdio";

				reg = <0xd4000 0x200>;
@@ -220,52 +266,6 @@ 
				cap-mmc-highspeed;

				status = "disabled";

			};



			usb@50000 {

				compatible = "marvell,orion-ehci";

				reg = <0x50000 0x500>;

				interrupts = <45>;

				status = "disabled";

			};



			usb@51000 {

				compatible = "marvell,orion-ehci";

				reg = <0x51000 0x500>;

				interrupts = <46>;

				status = "disabled";

			};



			spi0: spi@10600 {

				compatible = "marvell,orion-spi";

				reg = <0x10600 0x28>;

				#address-cells = <1>;

				#size-cells = <0>;

				cell-index = <0>;

				interrupts = <30>;

				clocks = <&coreclk 0>;

				status = "disabled";

			};



			spi1: spi@10680 {

				compatible = "marvell,orion-spi";

				reg = <0x10680 0x28>;

				#address-cells = <1>;

				#size-cells = <0>;

				cell-index = <1>;

				interrupts = <92>;

				clocks = <&coreclk 0>;

				status = "disabled";

			};



			nand@d0000 {

				compatible = "marvell,armada370-nand";

				reg = <0xd0000 0x54>;

				#address-cells = <1>;

				#size-cells = <1>;

				interrupts = <113>;

				clocks = <&coredivclk 0>;

				status = "disabled";

			};

		};

	};

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

+37 −37
Original line number Diff line number Diff line
@@ -91,11 +91,6 @@ 
		};



		internal-regs {

			system-controller@18200 {

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

				reg = <0x18200 0x100>;

			};



			L2: l2-cache {

				compatible = "marvell,aurora-outer-cache";

				reg = <0x08000 0x1000>;
@@ -103,8 +98,17 @@ 
				wt-override;

			};



			interrupt-controller@20000 {

				reg = <0x20a00 0x1d0>, <0x21870 0x58>;

			i2c0: i2c@11000 {

				reg = <0x11000 0x20>;

			};



			i2c1: i2c@11100 {

				reg = <0x11100 0x20>;

			};



			system-controller@18200 {

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

				reg = <0x18200 0x100>;

			};



			pinctrl {
@@ -163,9 +167,11 @@ 
				interrupts = <91>;

			};



			timer@20300 {

				compatible = "marvell,armada-370-timer";

				clocks = <&coreclk 2>;

			gateclk: clock-gating-control@18220 {

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

				reg = <0x18220 0x4>;

				clocks = <&coreclk 0>;

				#clock-cells = <1>;

			};



			coreclk: mvebu-sar@18230 {
@@ -174,11 +180,28 @@ 
				#clock-cells = <1>;

			};



			gateclk: clock-gating-control@18220 {

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

				reg = <0x18220 0x4>;

			thermal@18300 {

				compatible = "marvell,armada370-thermal";

				reg = <0x18300 0x4

					0x18304 0x4>;

				status = "okay";

			};



			interrupt-controller@20000 {

				reg = <0x20a00 0x1d0>, <0x21870 0x58>;

			};



			timer@20300 {

				compatible = "marvell,armada-370-timer";

				clocks = <&coreclk 2>;

			};



			usb@50000 {

				clocks = <&coreclk 0>;

			};



			usb@51000 {

				clocks = <&coreclk 0>;

				#clock-cells = <1>;

			};



			xor@60800 {
@@ -218,29 +241,6 @@ 
					dmacap,memset;

				};

			};



			i2c0: i2c@11000 {

				reg = <0x11000 0x20>;

			};



			i2c1: i2c@11100 {

				reg = <0x11100 0x20>;

			};



			usb@50000 {

				clocks = <&coreclk 0>;

			};



			usb@51000 {

				clocks = <&coreclk 0>;

			};



			thermal@18300 {

				compatible = "marvell,armada370-thermal";

				reg = <0x18300 0x4

					0x18304 0x4>;

				status = "okay";

			};

		};

	};

};

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

+50 −50
Original line number Diff line number Diff line
@@ -42,13 +42,14 @@ 
				wt-override;

			};



			interrupt-controller@20000 {

			      reg = <0x20a00 0x2d0>, <0x21070 0x58>;

			i2c0: i2c@11000 {

				compatible = "marvell,mv78230-i2c", "marvell,mv64xxx-i2c";

				reg = <0x11000 0x100>;

			};



			armada-370-xp-pmsu@22000 {

				compatible = "marvell,armada-370-xp-pmsu";

				reg = <0x22100 0x430>, <0x20800 0x20>;

			i2c1: i2c@11100 {

				compatible = "marvell,mv78230-i2c", "marvell,mv64xxx-i2c";

				reg = <0x11100 0x100>;

			};



			serial@12200 {
@@ -68,10 +69,16 @@ 
				status = "disabled";

			};



			timer@20300 {

				compatible = "marvell,armada-xp-timer";

				clocks = <&coreclk 2>, <&refclk>;

				clock-names = "nbclk", "fixed";

			system-controller@18200 {

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

				reg = <0x18200 0x500>;

			};



			gateclk: clock-gating-control@18220 {

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

				reg = <0x18220 0x4>;

				clocks = <&coreclk 0>;

				#clock-cells = <1>;

			};



			coreclk: mvebu-sar@18230 {
@@ -80,6 +87,13 @@ 
				#clock-cells = <1>;

			};



			thermal@182b0 {

				compatible = "marvell,armadaxp-thermal";

				reg = <0x182b0 0x4

					0x184d0 0x4>;

				status = "okay";

			};



			cpuclk: clock-complex@18700 {

				#clock-cells = <1>;

				compatible = "marvell,armada-xp-cpu-clock";
@@ -87,16 +101,19 @@ 
				clocks = <&coreclk 1>;

			};



			gateclk: clock-gating-control@18220 {

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

				reg = <0x18220 0x4>;

				clocks = <&coreclk 0>;

				#clock-cells = <1>;

			interrupt-controller@20000 {

			      reg = <0x20a00 0x2d0>, <0x21070 0x58>;

			};



			system-controller@18200 {

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

				reg = <0x18200 0x500>;

			timer@20300 {

				compatible = "marvell,armada-xp-timer";

				clocks = <&coreclk 2>, <&refclk>;

				clock-names = "nbclk", "fixed";

			};



			armada-370-xp-pmsu@22000 {

				compatible = "marvell,armada-370-xp-pmsu";

				reg = <0x22100 0x430>, <0x20800 0x20>;

			};



			eth2: ethernet@30000 {
@@ -107,6 +124,22 @@ 
				status = "disabled";

			};



			usb@50000 {

				clocks = <&gateclk 18>;

			};



			usb@51000 {

				clocks = <&gateclk 19>;

			};



			usb@52000 {

				compatible = "marvell,orion-ehci";

				reg = <0x52000 0x500>;

				interrupts = <47>;

				clocks = <&gateclk 20>;

				status = "disabled";

			};



			xor@60900 {

				compatible = "marvell,orion-xor";

				reg = <0x60900 0x100
@@ -146,39 +179,6 @@ 
					dmacap,memset;

				};

			};



			i2c0: i2c@11000 {

				compatible = "marvell,mv78230-i2c", "marvell,mv64xxx-i2c";

				reg = <0x11000 0x100>;

			};



			i2c1: i2c@11100 {

				compatible = "marvell,mv78230-i2c", "marvell,mv64xxx-i2c";

				reg = <0x11100 0x100>;

			};



			usb@50000 {

				clocks = <&gateclk 18>;

			};



			usb@51000 {

				clocks = <&gateclk 19>;

			};



			usb@52000 {

				compatible = "marvell,orion-ehci";

				reg = <0x52000 0x500>;

				interrupts = <47>;

				clocks = <&gateclk 20>;

				status = "disabled";

			};



			thermal@182b0 {

				compatible = "marvell,armadaxp-thermal";

				reg = <0x182b0 0x4

					0x184d0 0x4>;

				status = "okay";

			};

		};

	};

arch/arm/boot/dts/dove.dtsi

+248 −248
Original line number Diff line number Diff line
@@ -107,60 +107,29 @@ 
				  0xffffe000 MBUS_ID(0x03, 0x01) 0 0x0000800   /* CESA SRAM  2k */

				  0xfffff000 MBUS_ID(0x0d, 0x00) 0 0x0000800>; /* PMU  SRAM  2k */



			mbusc: mbus-ctrl@20000 {

				compatible = "marvell,mbus-controller";

				reg = <0x20000 0x80>, <0x800100 0x8>;

			};



			timer: timer@20300 {

				compatible = "marvell,orion-timer";

				reg = <0x20300 0x20>;

				interrupt-parent = <&bridge_intc>;

				interrupts = <1>, <2>;

			spi0: spi-ctrl@10600 {

				compatible = "marvell,orion-spi";

				#address-cells = <1>;

				#size-cells = <0>;

				cell-index = <0>;

				interrupts = <6>;

				reg = <0x10600 0x28>;

				clocks = <&core_clk 0>;

				pinctrl-0 = <&pmx_spi0>;

				pinctrl-names = "default";

				status = "disabled";

			};



			intc: main-interrupt-ctrl@20200 {

				compatible = "marvell,orion-intc";

				interrupt-controller;

				#interrupt-cells = <1>;

				reg = <0x20200 0x10>, <0x20210 0x10>;

			};



			bridge_intc: bridge-interrupt-ctrl@20110 {

				compatible = "marvell,orion-bridge-intc";

				interrupt-controller;

				#interrupt-cells = <1>;

				reg = <0x20110 0x8>;

				interrupts = <0>;

				marvell,#interrupts = <5>;

			};



			pmu_intc: pmu-interrupt-ctrl@d0050 {

				compatible = "marvell,dove-pmu-intc";

				interrupt-controller;

				#interrupt-cells = <1>;

				reg = <0xd0050 0x8>;

				interrupts = <33>;

				marvell,#interrupts = <7>;

			};



			core_clk: core-clocks@d0214 {

				compatible = "marvell,dove-core-clock";

				reg = <0xd0214 0x4>;

				#clock-cells = <1>;

			};



			gate_clk: clock-gating-ctrl@d0038 {

				compatible = "marvell,dove-gating-clock";

				reg = <0xd0038 0x4>;

			i2c0: i2c-ctrl@11000 {

				compatible = "marvell,mv64xxx-i2c";

				reg = <0x11000 0x20>;

				#address-cells = <1>;

				#size-cells = <0>;

				interrupts = <11>;

				clock-frequency = <400000>;

				timeout-ms = <1000>;

				clocks = <&core_clk 0>;

				#clock-cells = <1>;

			};



			thermal: thermal-diode@d001c {

				compatible = "marvell,dove-thermal";

				reg = <0xd001c 0x0c>, <0xd005c 0x08>;

				status = "disabled";

			};



			uart0: serial@12000 {
@@ -201,34 +170,213 @@ 
				status = "disabled";

			};



			gpio0: gpio-ctrl@d0400 {

				compatible = "marvell,orion-gpio";

				#gpio-cells = <2>;

				gpio-controller;

				reg = <0xd0400 0x20>;

				ngpios = <32>;

			spi1: spi-ctrl@14600 {

				compatible = "marvell,orion-spi";

				#address-cells = <1>;

				#size-cells = <0>;

				cell-index = <1>;

				interrupts = <5>;

				reg = <0x14600 0x28>;

				clocks = <&core_clk 0>;

				status = "disabled";

			};



			mbusc: mbus-ctrl@20000 {

				compatible = "marvell,mbus-controller";

				reg = <0x20000 0x80>, <0x800100 0x8>;

			};



			bridge_intc: bridge-interrupt-ctrl@20110 {

				compatible = "marvell,orion-bridge-intc";

				interrupt-controller;

				#interrupt-cells = <2>;

				interrupts = <12>, <13>, <14>, <60>;

				#interrupt-cells = <1>;

				reg = <0x20110 0x8>;

				interrupts = <0>;

				marvell,#interrupts = <5>;

			};



			gpio1: gpio-ctrl@d0420 {

				compatible = "marvell,orion-gpio";

				#gpio-cells = <2>;

				gpio-controller;

				reg = <0xd0420 0x20>;

				ngpios = <32>;

			intc: main-interrupt-ctrl@20200 {

				compatible = "marvell,orion-intc";

				interrupt-controller;

				#interrupt-cells = <2>;

				interrupts = <61>;

				#interrupt-cells = <1>;

				reg = <0x20200 0x10>, <0x20210 0x10>;

			};



			gpio2: gpio-ctrl@e8400 {

				compatible = "marvell,orion-gpio";

				#gpio-cells = <2>;

				gpio-controller;

				reg = <0xe8400 0x0c>;

				ngpios = <8>;

			timer: timer@20300 {

				compatible = "marvell,orion-timer";

				reg = <0x20300 0x20>;

				interrupt-parent = <&bridge_intc>;

				interrupts = <1>, <2>;

				clocks = <&core_clk 0>;

			};



			crypto: crypto-engine@30000 {

				compatible = "marvell,orion-crypto";

				reg = <0x30000 0x10000>,

				      <0xffffe000 0x800>;

				reg-names = "regs", "sram";

				interrupts = <31>;

				clocks = <&gate_clk 15>;

				status = "okay";

			};



			ehci0: usb-host@50000 {

				compatible = "marvell,orion-ehci";

				reg = <0x50000 0x1000>;

				interrupts = <24>;

				clocks = <&gate_clk 0>;

				status = "okay";

			};



			ehci1: usb-host@51000 {

				compatible = "marvell,orion-ehci";

				reg = <0x51000 0x1000>;

				interrupts = <25>;

				clocks = <&gate_clk 1>;

				status = "okay";

			};



			xor0: dma-engine@60800 {

				compatible = "marvell,orion-xor";

				reg = <0x60800 0x100

				       0x60a00 0x100>;

				clocks = <&gate_clk 23>;

				status = "okay";



				channel0 {

					interrupts = <39>;

					dmacap,memcpy;

					dmacap,xor;

				};



				channel1 {

					interrupts = <40>;

					dmacap,memcpy;

					dmacap,xor;

				};

			};



			xor1: dma-engine@60900 {

				compatible = "marvell,orion-xor";

				reg = <0x60900 0x100

				       0x60b00 0x100>;

				clocks = <&gate_clk 24>;

				status = "okay";



				channel0 {

					interrupts = <42>;

					dmacap,memcpy;

					dmacap,xor;

				};



				channel1 {

					interrupts = <43>;

					dmacap,memcpy;

					dmacap,xor;

				};

			};



			sdio1: sdio-host@90000 {

				compatible = "marvell,dove-sdhci";

				reg = <0x90000 0x100>;

				interrupts = <36>, <38>;

				clocks = <&gate_clk 9>;

				pinctrl-0 = <&pmx_sdio1>;

				pinctrl-names = "default";

				status = "disabled";

			};



			eth: ethernet-ctrl@72000 {

				compatible = "marvell,orion-eth";

				#address-cells = <1>;

				#size-cells = <0>;

				reg = <0x72000 0x4000>;

				clocks = <&gate_clk 2>;

				marvell,tx-checksum-limit = <1600>;

				status = "disabled";



				ethernet-port@0 {

					device_type = "network";

					compatible = "marvell,orion-eth-port";

					reg = <0>;

					interrupts = <29>;

					/* overwrite MAC address in bootloader */

					local-mac-address = [00 00 00 00 00 00];

					phy-handle = <&ethphy>;

				};

			};



			mdio: mdio-bus@72004 {

				compatible = "marvell,orion-mdio";

				#address-cells = <1>;

				#size-cells = <0>;

				reg = <0x72004 0x84>;

				interrupts = <30>;

				clocks = <&gate_clk 2>;

				status = "disabled";



				ethphy: ethernet-phy {

					device_type = "ethernet-phy";

					/* set phy address in board file */

				};

			};



			sdio0: sdio-host@92000 {

				compatible = "marvell,dove-sdhci";

				reg = <0x92000 0x100>;

				interrupts = <35>, <37>;

				clocks = <&gate_clk 8>;

				pinctrl-0 = <&pmx_sdio0>;

				pinctrl-names = "default";

				status = "disabled";

			};



			sata0: sata-host@a0000 {

				compatible = "marvell,orion-sata";

				reg = <0xa0000 0x2400>;

				interrupts = <62>;

				clocks = <&gate_clk 3>;

				nr-ports = <1>;

				status = "disabled";

			};



			audio0: audio-controller@b0000 {

				compatible = "marvell,dove-audio";

				reg = <0xb0000 0x2210>;

				interrupts = <19>, <20>;

				clocks = <&gate_clk 12>;

				clock-names = "internal";

				status = "disabled";

			};



			audio1: audio-controller@b4000 {

				compatible = "marvell,dove-audio";

				reg = <0xb4000 0x2210>;

				interrupts = <21>, <22>;

				clocks = <&gate_clk 13>;

				clock-names = "internal";

				status = "disabled";

			};



			thermal: thermal-diode@d001c {

				compatible = "marvell,dove-thermal";

				reg = <0xd001c 0x0c>, <0xd005c 0x08>;

			};



			gate_clk: clock-gating-ctrl@d0038 {

				compatible = "marvell,dove-gating-clock";

				reg = <0xd0038 0x4>;

				clocks = <&core_clk 0>;

				#clock-cells = <1>;

			};



			pmu_intc: pmu-interrupt-ctrl@d0050 {

				compatible = "marvell,dove-pmu-intc";

				interrupt-controller;

				#interrupt-cells = <1>;

				reg = <0xd0050 0x8>;

				interrupts = <33>;

				marvell,#interrupts = <7>;

			};



			pinctrl: pin-ctrl@d0200 {
@@ -422,85 +570,32 @@ 
				};

			};



			spi0: spi-ctrl@10600 {

				compatible = "marvell,orion-spi";

				#address-cells = <1>;

				#size-cells = <0>;

				cell-index = <0>;

				interrupts = <6>;

				reg = <0x10600 0x28>;

				clocks = <&core_clk 0>;

				pinctrl-0 = <&pmx_spi0>;

				pinctrl-names = "default";

				status = "disabled";

			};



			spi1: spi-ctrl@14600 {

				compatible = "marvell,orion-spi";

				#address-cells = <1>;

				#size-cells = <0>;

				cell-index = <1>;

				interrupts = <5>;

				reg = <0x14600 0x28>;

				clocks = <&core_clk 0>;

				status = "disabled";

			};



			i2c0: i2c-ctrl@11000 {

				compatible = "marvell,mv64xxx-i2c";

				reg = <0x11000 0x20>;

				#address-cells = <1>;

				#size-cells = <0>;

				interrupts = <11>;

				clock-frequency = <400000>;

				timeout-ms = <1000>;

				clocks = <&core_clk 0>;

				status = "disabled";

			};



			ehci0: usb-host@50000 {

				compatible = "marvell,orion-ehci";

				reg = <0x50000 0x1000>;

				interrupts = <24>;

				clocks = <&gate_clk 0>;

				status = "okay";

			};



			ehci1: usb-host@51000 {

				compatible = "marvell,orion-ehci";

				reg = <0x51000 0x1000>;

				interrupts = <25>;

				clocks = <&gate_clk 1>;

				status = "okay";

			};



			sdio0: sdio-host@92000 {

				compatible = "marvell,dove-sdhci";

				reg = <0x92000 0x100>;

				interrupts = <35>, <37>;

				clocks = <&gate_clk 8>;

				pinctrl-0 = <&pmx_sdio0>;

				pinctrl-names = "default";

				status = "disabled";

			core_clk: core-clocks@d0214 {

				compatible = "marvell,dove-core-clock";

				reg = <0xd0214 0x4>;

				#clock-cells = <1>;

			};



			sdio1: sdio-host@90000 {

				compatible = "marvell,dove-sdhci";

				reg = <0x90000 0x100>;

				interrupts = <36>, <38>;

				clocks = <&gate_clk 9>;

				pinctrl-0 = <&pmx_sdio1>;

				pinctrl-names = "default";

				status = "disabled";

			gpio0: gpio-ctrl@d0400 {

				compatible = "marvell,orion-gpio";

				#gpio-cells = <2>;

				gpio-controller;

				reg = <0xd0400 0x20>;

				ngpios = <32>;

				interrupt-controller;

				#interrupt-cells = <2>;

				interrupts = <12>, <13>, <14>, <60>;

			};



			sata0: sata-host@a0000 {

				compatible = "marvell,orion-sata";

				reg = <0xa0000 0x2400>;

				interrupts = <62>;

				clocks = <&gate_clk 3>;

				nr-ports = <1>;

				status = "disabled";

			gpio1: gpio-ctrl@d0420 {

				compatible = "marvell,orion-gpio";

				#gpio-cells = <2>;

				gpio-controller;

				reg = <0xd0420 0x20>;

				ngpios = <32>;

				interrupt-controller;

				#interrupt-cells = <2>;

				interrupts = <61>;

			};



			rtc: real-time-clock@d8500 {
@@ -510,107 +605,12 @@ 
				interrupts = <5>;

			};



			crypto: crypto-engine@30000 {

				compatible = "marvell,orion-crypto";

				reg = <0x30000 0x10000>,

				      <0xffffe000 0x800>;

				reg-names = "regs", "sram";

				interrupts = <31>;

				clocks = <&gate_clk 15>;

				status = "okay";

			};



			xor0: dma-engine@60800 {

				compatible = "marvell,orion-xor";

				reg = <0x60800 0x100

				       0x60a00 0x100>;

				clocks = <&gate_clk 23>;

				status = "okay";



				channel0 {

					interrupts = <39>;

					dmacap,memcpy;

					dmacap,xor;

				};



				channel1 {

					interrupts = <40>;

					dmacap,memcpy;

					dmacap,xor;

				};

			};



			xor1: dma-engine@60900 {

				compatible = "marvell,orion-xor";

				reg = <0x60900 0x100

				       0x60b00 0x100>;

				clocks = <&gate_clk 24>;

				status = "okay";



				channel0 {

					interrupts = <42>;

					dmacap,memcpy;

					dmacap,xor;

				};



				channel1 {

					interrupts = <43>;

					dmacap,memcpy;

					dmacap,xor;

				};

			};



			mdio: mdio-bus@72004 {

				compatible = "marvell,orion-mdio";

				#address-cells = <1>;

				#size-cells = <0>;

				reg = <0x72004 0x84>;

				interrupts = <30>;

				clocks = <&gate_clk 2>;

				status = "disabled";



				ethphy: ethernet-phy {

					device_type = "ethernet-phy";

					/* set phy address in board file */

				};

			};



			eth: ethernet-ctrl@72000 {

				compatible = "marvell,orion-eth";

				#address-cells = <1>;

				#size-cells = <0>;

				reg = <0x72000 0x4000>;

				clocks = <&gate_clk 2>;

				marvell,tx-checksum-limit = <1600>;

				status = "disabled";



				ethernet-port@0 {

					device_type = "network";

					compatible = "marvell,orion-eth-port";

					reg = <0>;

					interrupts = <29>;

					/* overwrite MAC address in bootloader */

					local-mac-address = [00 00 00 00 00 00];

					phy-handle = <&ethphy>;

				};

			};



			audio0: audio-controller@b0000 {

				compatible = "marvell,dove-audio";

				reg = <0xb0000 0x2210>;

				interrupts = <19>, <20>;

				clocks = <&gate_clk 12>;

				clock-names = "internal";

				status = "disabled";

			};



			audio1: audio-controller@b4000 {

				compatible = "marvell,dove-audio";

				reg = <0xb4000 0x2210>;

				interrupts = <21>, <22>;

				clocks = <&gate_clk 13>;

				clock-names = "internal";

				status = "disabled";

			gpio2: gpio-ctrl@e8400 {

				compatible = "marvell,orion-gpio";

				#gpio-cells = <2>;

				gpio-controller;

				reg = <0xe8400 0x0c>;

				ngpios = <8>;

			};

		};

	};

arch/arm/boot/dts/kirkwood.dtsi

+70 −70

File changed.

Preview size limit exceeded, changes collapsed.