Commit c58181eb authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

Merge "mvebu dt changes for v3.15 (incremental round #2)" from Jason Cooper:

 - mvebu
    - add audio for Armada 370 DB
    - enable Armada 370/XP watchdog

 - kirkwood
    - convert board rd88f6281
    - add board rd88f6192

 - dove
    enable watchdog

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

:
  ARM: dove: Enable Dove watchdog in the devicetree
  ARM: kirkwood: Add RSTOUT 'reg' entry to devicetree
  ARM: mvebu: Enable Armada 370/XP watchdog in the devicetree
  ARM: Kirkwood: convert rd88f6281-setup.c to DT.
  ARM: Kirkwood: Add DT description of rd88f6192.
  ARM: mvebu: enable S/PDIF audio in Armada 370 DB Device Tree
  ARM: mvebu: add audio support to Armada 370 DB
  ARM: mvebu: add I2C0 muxing option for Armada 370 SoC
  ARM: mvebu: add audio I2S controller to Armada 370 Device Tree

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 9df69906 7a5b293f

arch/arm/boot/dts/Makefile

+3 −0
Original line number Diff line number Diff line
@@ -113,6 +113,9 @@ dtb-$(CONFIG_ARCH_KIRKWOOD) += kirkwood-b3.dtb \ 
	kirkwood-nsa310a.dtb \

	kirkwood-openblocks_a6.dtb \

	kirkwood-openblocks_a7.dtb \

	kirkwood-rd88f6192.dtb \

	kirkwood-rd88f6281-a0.dtb \

	kirkwood-rd88f6281-a1.dtb \

	kirkwood-sheevaplug.dtb \

	kirkwood-sheevaplug-esata.dtb \

	kirkwood-topkick.dtb \

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

+56 −0
Original line number Diff line number Diff line
@@ -64,6 +64,22 @@ 
				phy-mode = "rgmii-id";

			};



			i2c@11000 {

				pinctrl-0 = <&i2c0_pins>;

				pinctrl-names = "default";

				status = "okay";

				audio_codec: audio-codec@4a {

					compatible = "cirrus,cs42l51";

					reg = <0x4a>;

				};

			};



			audio-controller@30000 {

				pinctrl-0 = <&i2s_pins2>;

				pinctrl-names = "default";

				status = "okay";

			};



			mvsdio@d4000 {

				pinctrl-0 = <&sdio_pins1>;

				pinctrl-names = "default";
@@ -80,6 +96,30 @@ 
				broken-cd;

			};



			pinctrl {

				/*

				 * These pins might be muxed as I2S by

				 * the bootloader, but it conflicts

				 * with the real I2S pins that are

				 * muxed using i2s_pins. We must mux

				 * those pins to a function other than

				 * I2S.

				 */

				pinctrl-0 = <&hog_pins1 &hog_pins2>;

				pinctrl-names = "default";



				hog_pins1: hog-pins1 {

					marvell,pins = "mpp6",  "mpp8", "mpp10",

						       "mpp12", "mpp13";

					marvell,function = "gpio";

				};



				hog_pins2: hog-pins2 {

					marvell,pins = "mpp5", "mpp7", "mpp9";

					marvell,function = "gpo";

				};

			};



			usb@50000 {

				status = "okay";

			};
@@ -112,10 +152,26 @@ 
				/* Port 0, Lane 0 */

				status = "okay";

			};



			pcie@2,0 {

				/* Port 1, Lane 0 */

				status = "okay";

			};

		};

	};



	sound {

	      compatible = "marvell,a370db-audio";

	      marvell,audio-controller = <&audio_controller>;

	      marvell,audio-codec = <&audio_codec &spdif_out &spdif_in>;

	      status = "okay";

	};



	spdif_out: spdif-out {

	      compatible = "linux,spdif-dit";

	};



	spdif_in: spdif-in {

	      compatible = "linux,spdif-dir";

	};

};

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

+4 −0
Original line number Diff line number Diff line
@@ -199,6 +199,10 @@ 
				interrupts = <37>, <38>, <39>, <40>, <5>, <6>;

			};



			watchdog@20300 {

				reg = <0x20300 0x34>, <0x20704 0x4>;

			};



			usb@50000 {

				compatible = "marvell,orion-ehci";

				reg = <0x50000 0x500>;

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

+33 −0
Original line number Diff line number Diff line
@@ -132,6 +132,25 @@ 
							"mpp51", "mpp52", "mpp53";

					marvell,function = "sd0";

				};



				i2c0_pins: i2c0-pins {

					marvell,pins = "mpp2", "mpp3";

					marvell,function = "i2c0";

				};



				i2s_pins1: i2s-pins1 {

					marvell,pins = "mpp5", "mpp6", "mpp7",

						       "mpp8", "mpp9", "mpp10",

						       "mpp12", "mpp13";

					marvell,function = "audio";

				};



				i2s_pins2: i2s-pins2 {

					marvell,pins = "mpp49", "mpp47", "mpp50",

						       "mpp59", "mpp57", "mpp61",

						       "mpp62", "mpp60", "mpp58";

					marvell,function = "audio";

				};

			};



			gpio0: gpio@18100 {
@@ -196,6 +215,20 @@ 
				clocks = <&coreclk 2>;

			};



			watchdog@20300 {

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

				clocks = <&coreclk 2>;

			};



			audio_controller: audio-controller@30000 {

				compatible = "marvell,armada370-audio";

				reg = <0x30000 0x4000>;

				interrupts = <93>;

				clocks = <&gateclk 0>;

				clock-names = "internal";

				status = "disabled";

			};



			usb@50000 {

				clocks = <&coreclk 0>;

			};

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

+6 −0
Original line number Diff line number Diff line
@@ -111,6 +111,12 @@ 
				clock-names = "nbclk", "fixed";

			};



			watchdog@20300 {

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

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

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

			};



			armada-370-xp-pmsu@22000 {

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

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

CRA Git | Maintained and supported by SUSTech CRA and CCSE