Commit 3197e4a1 authored by Kevin Hilman's avatar Kevin Hilman
Browse files

Merge tag 'dt-3.13' of git://git.infradead.org/linux-mvebu into next/dt 

From Jason Cooper:
mvebu dt changes for v3.13

 - mvebu
    - add MSI
    - new compatible string for mv64xxx-i2c

 - dove
    - use the pre-processor
    - define the MBus nodes
    - add PCIe controllers
    - add Globalscale D3Plug
    - relocate internal registers nodes

* tag 'dt-3.13' of git://git.infradead.org/linux-mvebu

:
  ARM: dove: add initial DT file for Globalscale D3Plug
  ARM: dove: add PCIe controllers to SoC DT
  ARM: dove: relocate internal registers device nodes
  ARM: dove: add MBus DT node
  ARM: dove: add MBUS_ID macro to Dove DT
  ARM: dove: use preprocessor on device tree files
  ARM: mvebu: link PCIe controllers to the MSI controller
  ARM: mvebu: the MPIC now provides MSI controller features
  ARM: dts: mvebu: Update with the new compatible string for mv64xxx-i2c

Signed-off-by: default avatarKevin Hilman <khilman@linaro.org>
parents 32d7962d 37078732

arch/arm/boot/dts/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ dtb-$(CONFIG_ARCH_DAVINCI) += da850-enbw-cmc.dtb \ 
dtb-$(CONFIG_ARCH_DOVE) += dove-cm-a510.dtb \

	dove-cubox.dtb \

	dove-d2plug.dtb \

	dove-d3plug.dtb \

	dove-dove-db.dtb

dtb-$(CONFIG_ARCH_EXYNOS) += exynos4210-origen.dtb \

	exynos4210-smdkv310.dtb \

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

+1 −2
Original line number Diff line number Diff line
@@ -113,6 +113,7 @@ 
				#interrupt-cells = <1>;

				#size-cells = <1>;

				interrupt-controller;

				msi-controller;

			};



			coherency-fabric@20200 {
@@ -176,7 +177,6 @@ 


			i2c0: i2c@11000 {

				compatible = "marvell,mv64xxx-i2c";

				reg = <0x11000 0x20>;

				#address-cells = <1>;

				#size-cells = <0>;

				interrupts = <31>;
@@ -187,7 +187,6 @@ 


			i2c1: i2c@11100 {

				compatible = "marvell,mv64xxx-i2c";

				reg = <0x11100 0x20>;

				#address-cells = <1>;

				#size-cells = <0>;

				interrupts = <32>;

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

+9 −0
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ 
			#address-cells = <3>;

			#size-cells = <2>;



			msi-parent = <&mpic>;

			bus-range = <0x00 0xff>;



			ranges =
@@ -218,6 +219,14 @@ 
				};

			};



			i2c0: i2c@11000 {

				reg = <0x11000 0x20>;

			};



			i2c1: i2c@11100 {

				reg = <0x11100 0x20>;

			};



			usb@50000 {

				clocks = <&coreclk 0>;

			};

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

+1 −0
Original line number Diff line number Diff line
@@ -57,6 +57,7 @@ 
			#address-cells = <3>;

			#size-cells = <2>;



			msi-parent = <&mpic>;

			bus-range = <0x00 0xff>;



			ranges =

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

+1 −0
Original line number Diff line number Diff line
@@ -58,6 +58,7 @@ 
			#address-cells = <3>;

			#size-cells = <2>;



			msi-parent = <&mpic>;

			bus-range = <0x00 0xff>;



			ranges =

CRA Git | Maintained and supported by SUSTech CRA and CCSE