Commit 6ecbdabe authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

Pull "mvebu DT changes for v3.19 (round 2)" from Jason Cooper:

 - mvebu
    - Use simple-card audio on Armada 370 DB
    - Add DSA node for Armada 370 DB
    - Add SDHCI to Armada 38x
    - Armada 370/XP rework to support new Synology boards
    - Add Synology DS213j and DS414
    - Various pinctrl and uart and alias fixes to help bootloaders

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

:
  arm: mvebu: normalize pinctrl entries for Armada SoCs
  arm: mvebu: fix wrongly named DS414 pinctrl entries
  arm: mvebu: add .dts file for Synology DS414
  arm: mvebu: add .dts file for Synology DS213j
  arm: mvebu: define and use common Armada XP SPI pinctrl setting
  arm: mvebu: define and use common Armada XP UART2/3 pinctrl settings
  arm: mvebu: define and use common Armada 370 UART pinctrl settings
  arm: mvebu: define and use common Armada 370 SPI pinctrl settings
  arm: mvebu: move Armada 370/XP pinctrl node definition armada-370-xp.dtsi
  arm: mvebu: use recently introduced uart label for stdout-path
  arm: mvebu: add uartX labels for Armada SoC serial nodes
  arm: mvebu: fix vendor prefix typo in kirkwood-synology.dtsi
  ARM: mvebu: fix ordering in Armada 370 .dtsi
  ARM: mvebu: adjust ethernet aliases according to U-Boot requirements for A38x
  ARM: mvebu: remove clock-frequency from Armada 38x SDHCI Device Tree node
  ARM: mvebu: enable no-1-8-v flag for Armada 385 DB SDHCI interface
  mvebu: 370 RD: Add support for the switch
  ARM: mvebu: use simple-card DT binding for audio on Armada 370 DB
  ARM: mvebu: remove conflicting muxing on Armada 370 DB

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents ca763758 70ee4e9d

arch/arm/boot/dts/Makefile

+4 −2
Original line number Diff line number Diff line
@@ -521,7 +521,8 @@ dtb-$(CONFIG_MACH_ARMADA_370) += \ 
	armada-370-mirabox.dtb \

	armada-370-netgear-rn102.dtb \

	armada-370-netgear-rn104.dtb \

	armada-370-rd.dtb

	armada-370-rd.dtb \

	armada-370-synology-ds213j.dtb

dtb-$(CONFIG_MACH_ARMADA_375) += \

	armada-375-db.dtb

dtb-$(CONFIG_MACH_ARMADA_38X) += \
@@ -534,7 +535,8 @@ dtb-$(CONFIG_MACH_ARMADA_XP) += \ 
	armada-xp-lenovo-ix4-300d.dtb \

	armada-xp-matrix.dtb \

	armada-xp-netgear-rn2120.dtb \

	armada-xp-openblocks-ax3-4.dtb

	armada-xp-openblocks-ax3-4.dtb \

	armada-xp-synology-ds414.dtb

dtb-$(CONFIG_MACH_DOVE) += dove-cm-a510.dtb \

	dove-cubox.dtb \

	dove-cubox-es.dtb \

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

+76 −30
Original line number Diff line number Diff line
@@ -75,6 +75,7 @@ 
				clock-frequency = <100000>;

				status = "okay";

				audio_codec: audio-codec@4a {

					#sound-dai-cells = <0>;

					compatible = "cirrus,cs42l51";

					reg = <0x4a>;

				};
@@ -102,30 +103,6 @@ 
				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";

			};
@@ -135,6 +112,8 @@ 
			};



			spi0: spi@10600 {

				pinctrl-0 = <&spi0_pins2>;

				pinctrl-names = "default";

				status = "okay";



				spi-flash@0 {
@@ -167,17 +146,84 @@ 
	};



	sound {

	      compatible = "marvell,a370db-audio";

	      marvell,audio-controller = <&audio_controller>;

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

		compatible = "simple-audio-card";

		simple-audio-card,name = "Armada 370 DB Audio";

		simple-audio-card,mclk-fs = <256>;

		simple-audio-card,widgets =

			"Headphone", "Out Jack",

			"Line", "In Jack";

		simple-audio-card,routing =

			"Out Jack", "HPL",

			"Out Jack", "HPR",

			"AIN1L", "In Jack",

			"AIN1L", "In Jack";

		status = "okay";



		simple-audio-card,dai-link@0 {

			format = "i2s";

			cpu {

				sound-dai = <&audio_controller 0>;

			};



			codec {

				sound-dai = <&audio_codec>;

			};

		};



		simple-audio-card,dai-link@1 {

			format = "i2s";

			cpu {

				sound-dai = <&audio_controller 1>;

			};



			codec {

				sound-dai = <&spdif_out>;

			};

		};



		simple-audio-card,dai-link@2 {

			format = "i2s";

			cpu {

				sound-dai = <&audio_controller 1>;

			};



			codec {

				sound-dai = <&spdif_in>;

			};

		};

	};



	spdif_out: spdif-out {

		#sound-dai-cells = <0>;

		compatible = "linux,spdif-dit";

	};



	spdif_in: spdif-in {

		#sound-dai-cells = <0>;

		compatible = "linux,spdif-dir";

	};

};



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

	};

};

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

+13 −12
Original line number Diff line number Diff line
@@ -54,18 +54,6 @@ 
				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";
@@ -169,3 +157,16 @@ 
		};

	};

};



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

	};

};

arch/arm/boot/dts/armada-370-netgear-rn102.dts

+42 −42
Original line number Diff line number Diff line
@@ -59,48 +59,6 @@ 
				status = "okay";

			};



			pinctrl {

				power_led_pin: power-led-pin {

					marvell,pins = "mpp57";

					marvell,function = "gpio";

				};



				sata1_led_pin: sata1-led-pin {

					marvell,pins = "mpp15";

					marvell,function = "gpio";

				};



				sata2_led_pin: sata2-led-pin {

					marvell,pins = "mpp14";

					marvell,function = "gpio";

				};



				backup_led_pin: backup-led-pin {

					marvell,pins = "mpp56";

					marvell,function = "gpio";

				};



				backup_button_pin: backup-button-pin {

					marvell,pins = "mpp58";

					marvell,function = "gpio";

				};



				power_button_pin: power-button-pin {

					marvell,pins = "mpp62";

					marvell,function = "gpio";

				};



				reset_button_pin: reset-button-pin {

					marvell,pins = "mpp6";

					marvell,function = "gpio";

				};



				poweroff: poweroff {

					marvell,pins = "mpp8";

					marvell,function = "gpio";

				};

			};



			mdio {

				pinctrl-0 = <&mdio_pins>;

				pinctrl-names = "default";
@@ -257,3 +215,45 @@ 
		gpios = <&gpio0 8 GPIO_ACTIVE_LOW>;

	};

};



&pinctrl {

	power_led_pin: power-led-pin {

		marvell,pins = "mpp57";

		marvell,function = "gpio";

	};



	sata1_led_pin: sata1-led-pin {

		marvell,pins = "mpp15";

		marvell,function = "gpio";

	};



	sata2_led_pin: sata2-led-pin {

		marvell,pins = "mpp14";

		marvell,function = "gpio";

	};



	backup_led_pin: backup-led-pin {

		marvell,pins = "mpp56";

		marvell,function = "gpio";

	};



	backup_button_pin: backup-button-pin {

		marvell,pins = "mpp58";

		marvell,function = "gpio";

	};



	power_button_pin: power-button-pin {

		marvell,pins = "mpp62";

		marvell,function = "gpio";

	};



	reset_button_pin: reset-button-pin {

		marvell,pins = "mpp6";

		marvell,function = "gpio";

	};



	poweroff: poweroff {

		marvell,pins = "mpp8";

		marvell,function = "gpio";

	};

};

arch/arm/boot/dts/armada-370-netgear-rn104.dts

+32 −32
Original line number Diff line number Diff line
@@ -53,38 +53,6 @@ 
				status = "okay";

			};



			pinctrl {

				poweroff: poweroff {

					marvell,pins = "mpp60";

					marvell,function = "gpio";

				};



				backup_button_pin: backup-button-pin {

					marvell,pins = "mpp52";

					marvell,function = "gpio";

				};



				power_button_pin: power-button-pin {

					marvell,pins = "mpp62";

					marvell,function = "gpio";

				};



				backup_led_pin: backup-led-pin {

					marvell,pins = "mpp63";

					marvell,function = "gpo";

				};



				power_led_pin: power-led-pin {

					marvell,pins = "mpp64";

					marvell,function = "gpio";

				};



				reset_button_pin: reset-button-pin {

					marvell,pins = "mpp65";

					marvell,function = "gpio";

				};

			};



			mdio {

				pinctrl-0 = <&mdio_pins>;

				pinctrl-names = "default";
@@ -269,3 +237,35 @@ 
		gpios = <&gpio1 28 GPIO_ACTIVE_LOW>;

	};

};



&pinctrl {

	poweroff: poweroff {

		marvell,pins = "mpp60";

		marvell,function = "gpio";

	};



	backup_button_pin: backup-button-pin {

		marvell,pins = "mpp52";

		marvell,function = "gpio";

	};



	power_button_pin: power-button-pin {

		marvell,pins = "mpp62";

		marvell,function = "gpio";

	};



	backup_led_pin: backup-led-pin {

		marvell,pins = "mpp63";

		marvell,function = "gpo";

	};



	power_led_pin: power-led-pin {

		marvell,pins = "mpp64";

		marvell,function = "gpio";

	};



	reset_button_pin: reset-button-pin {

		marvell,pins = "mpp65";

		marvell,function = "gpio";

	};

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE