Commit db39ad7d authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'dt-3.10-4' of git://git.infradead.org/users/jcooper/linux into next/dt2 

From Jason Cooper:
mvebu dt for v3.10 round 4

 - mvebu LPAE 64bit dts file changes

* tag 'dt-3.10-4' of git://git.infradead.org/users/jcooper/linux

: (52 commits)
  ARM: dts: mvebu: Convert mvebu device tree files to 64 bits
  ARM: dts: mvebu: introduce internal-regs node
  ARM: dts: mvebu: Convert all the mvebu files to use the range property
  ARM: dts: mvebu: move all peripherals inside soc
  ARM: dts: mvebu: fix cpus section indentation
  arm: mvebu: PCIe Device Tree informations for Armada XP GP
  arm: mvebu: PCIe Device Tree informations for Armada 370 DB
  arm: mvebu: PCIe Device Tree informations for Armada 370 Mirabox
  arm: mvebu: PCIe Device Tree informations for Armada XP DB
  arm: mvebu: PCIe Device Tree informations for OpenBlocks AX3-4
  arm: mvebu: add PCIe Device Tree informations for Armada XP
  arm: mvebu: add PCIe Device Tree informations for Armada 370
  ARM: mvebu: Align the internal registers virtual base to support LPAE
  ARM: mvebu: Limit the DMA zone when LPAE is selected
  arm: plat-orion: remove addr-map code
  arm: mach-mv78xx0: convert to use the mvebu-mbus driver
  arm: mach-orion5x: convert to use mvebu-mbus driver
  arm: mach-dove: convert to use mvebu-mbus driver
  arm: mach-kirkwood: convert to use mvebu-mbus driver
  arm: mach-mvebu: convert to use mvebu-mbus driver
  ...

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents bf049ded 74898364

arch/arm/Kconfig

+4 −0
Original line number Diff line number Diff line
@@ -564,6 +564,7 @@ config ARCH_DOVE 
	select PINCTRL_DOVE

	select PLAT_ORION_LEGACY

	select USB_ARCH_HAS_EHCI

	select MVEBU_MBUS

	help

	  Support for the Marvell Dove SoC 88AP510
@@ -577,6 +578,7 @@ config ARCH_KIRKWOOD 
	select PINCTRL

	select PINCTRL_KIRKWOOD

	select PLAT_ORION_LEGACY

	select MVEBU_MBUS

	help

	  Support for the following Marvell Kirkwood series SoCs:

	  88F6180, 88F6192 and 88F6281.
@@ -588,6 +590,7 @@ config ARCH_MV78XX0 
	select GENERIC_CLOCKEVENTS

	select PCI

	select PLAT_ORION_LEGACY

	select MVEBU_MBUS

	help

	  Support for the following Marvell MV78xx0 series SoCs:

	  MV781x0, MV782x0.
@@ -600,6 +603,7 @@ config ARCH_ORION5X 
	select GENERIC_CLOCKEVENTS

	select PCI

	select PLAT_ORION_LEGACY

	select MVEBU_MBUS

	help

	  Support for the following Marvell Orion 5x series SoCs:

	  Orion-1 (5181), Orion-VoIP (5181L), Orion-NAS (5182),

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

+71 −52
Original line number Diff line number Diff line
@@ -30,11 +30,12 @@ 
	};



	soc {

		serial@d0012000 {

		internal-regs {

			serial@12000 {

				clock-frequency = <200000000>;

				status = "okay";

			};

		sata@d00a0000 {

			sata@a0000 {

				nr-ports = <2>;

				status = "okay";

			};
@@ -49,18 +50,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 +76,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 {
@@ -94,5 +95,23 @@ 
					spi-max-frequency = <50000000>;

				};

			};



			pcie-controller {

				status = "okay";

				/*

				 * The two PCIe units are accessible through

				 * both standard PCIe slots and mini-PCIe

				 * slots on the board.

				 */

				pcie@1,0 {

					/* Port 0, Lane 0 */

					status = "okay";

				};

				pcie@2,0 {

					/* Port 1, Lane 0 */

					status = "okay";

				};

			};

		};

	};

};

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

+104 −38
Original line number Diff line number Diff line
@@ -25,14 +25,52 @@ 
	};



	soc {

		serial@d0012000 {

		internal-regs {

			serial@12000 {

				clock-frequency = <200000000>;

				status = "okay";

			};

		timer@d0020300 {

			timer@20300 {

				clock-frequency = <600000000>;

				status = "okay";

			};



			pinctrl {

				pwr_led_pin: pwr-led-pin {

					marvell,pins = "mpp63";

					marvell,function = "gpo";

				};



				stat_led_pins: stat-led-pins {

					marvell,pins = "mpp64", "mpp65";

					marvell,function = "gpio";

				};

			};



			gpio_leds {

				compatible = "gpio-leds";

				pinctrl-names = "default";

				pinctrl-0 = <&pwr_led_pin &stat_led_pins>;



				green_pwr_led {

					label = "mirabox:green:pwr";

					gpios = <&gpio1 31 1>;

					linux,default-trigger = "heartbeat";

				};



				blue_stat_led {

					label = "mirabox:blue:stat";

					gpios = <&gpio2 0 1>;

					linux,default-trigger = "cpu0";

				};



				green_stat_led {

					label = "mirabox:green:stat";

					gpios = <&gpio2 1 1>;

					default-state = "off";

				};

			};



			mdio {

				phy0: ethernet-phy@0 {

					reg = <0>;
@@ -42,19 +80,19 @@ 
					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 {

			pinctrl-0 = <&sdio_pins2>;

			mvsdio@d4000 {

				pinctrl-0 = <&sdio_pins3>;

				pinctrl-names = "default";

				status = "okay";

				/*
@@ -63,12 +101,40 @@ 
				 */

			};



		usb@d0050000 {

			usb@50000 {

				status = "okay";

			};



		usb@d0051000 {

			usb@51000 {

				status = "okay";

			};



			i2c@11000 {

				status = "okay";

				clock-frequency = <100000>;

				pca9505: pca9505@25 {

					compatible = "nxp,pca9505";

					gpio-controller;

					#gpio-cells = <2>;

					reg = <0x25>;

				};

			};



			pcie-controller {

				status = "okay";



				/* Internal mini-PCIe connector */

				pcie@1,0 {

					/* Port 0, Lane 0 */

					status = "okay";

				};



				/* Connected on the PCB to a USB 3.0 XHCI controller */

				pcie@2,0 {

					/* Port 1, Lane 0 */

					status = "okay";

				};

			};

		};

	};

};

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

+49 −36
Original line number Diff line number Diff line
@@ -28,11 +28,12 @@ 
	};



	soc {

		serial@d0012000 {

		internal-regs {

			serial@12000 {

				clock-frequency = <200000000>;

				status = "okay";

			};

		sata@d00a0000 {

			sata@a0000 {

				nr-ports = <2>;

				status = "okay";

			};
@@ -47,30 +48,42 @@ 
				};

			};



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

			};



			gpio-keys {

				compatible = "gpio-keys";

				#address-cells = <1>;

				#size-cells = <0>;

				button@1 {

					label = "Software Button";

					linux,code = <116>;

					gpios = <&gpio0 6 1>;

				};

			};

		};

	};

 };

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

+170 −126
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 
 * 370 and Armada XP SoC.

 */



/include/ "skeleton.dtsi"

/include/ "skeleton64.dtsi"



/ {

	model = "Marvell Armada 370 and XP SoC";
@@ -28,59 +28,58 @@ 
		};

	};



	mpic: interrupt-controller@d0020000 {

	soc {

		#address-cells = <1>;

		#size-cells = <1>;

		compatible = "simple-bus";

		interrupt-parent = <&mpic>;

		ranges = <0 0 0xd0000000 0x100000>;



		internal-regs {

			compatible = "simple-bus";

			#address-cells = <1>;

			#size-cells = <1>;

			ranges;



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

			};



	soc {

		#address-cells = <1>;

		#size-cells = <1>;

		compatible = "simple-bus";

		interrupt-parent = <&mpic>;

		ranges;



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

			};



		addr-decoding@d0020000 {

			compatible = "marvell,armada-addr-decoding-controller";

			reg = <0xd0020000 0x258>;

		};



		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";
@@ -91,28 +90,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>;
@@ -121,9 +120,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>;
@@ -134,35 +133,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>;
@@ -171,9 +170,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>;
@@ -181,6 +180,51 @@ 
				clocks = <&coreclk 0>;

				status = "disabled";

			};



			devbus-bootcs@10400 {

				compatible = "marvell,mvebu-devbus";

				reg = <0x10400 0x8>;

				#address-cells = <1>;

				#size-cells = <1>;

				clocks = <&coreclk 0>;

				status = "disabled";

			};



			devbus-cs0@10408 {

				compatible = "marvell,mvebu-devbus";

				reg = <0x10408 0x8>;

				#address-cells = <1>;

				#size-cells = <1>;

				clocks = <&coreclk 0>;

				status = "disabled";

			};



			devbus-cs1@10410 {

				compatible = "marvell,mvebu-devbus";

				reg = <0x10410 0x8>;

				#address-cells = <1>;

				#size-cells = <1>;

				clocks = <&coreclk 0>;

				status = "disabled";

			};



			devbus-cs2@10418 {

				compatible = "marvell,mvebu-devbus";

				reg = <0x10418 0x8>;

				#address-cells = <1>;

				#size-cells = <1>;

				clocks = <&coreclk 0>;

				status = "disabled";

			};



			devbus-cs3@10420 {

				compatible = "marvell,mvebu-devbus";

				reg = <0x10420 0x8>;

				#address-cells = <1>;

				#size-cells = <1>;

				clocks = <&coreclk 0>;

				status = "disabled";

			};

		};

	};

 };

CRA Git | Maintained and supported by SUSTech CRA and CCSE