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

Merge tag 'imx-dt-3.15-2' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/dt 

i.MX device tree changes for 3.15, take 2 from Shawn Guo:
 - Cleanup and device additions for imx27-phytec-phycard boards
 - eDMA and audio support for vf610-twr board
 - Minor updates and fixes for a couple of imx28 and imx5 boards

* tag 'imx-dt-3.15-2' of git://git.linaro.org/people/shawnguo/linux-2.6

:
  ARM: dts: vf610: i2c: Add eDMA support
  ARM: dts: imx27-phytec-phycore-som: Add USBOTG node
  ARM: dts: imx27-phytec-phycore-rdk: Add USBH2 node
  ARM: dts: i.MX27: Add USB nodes
  ARM: dts: vf610-twr: Add ADC support
  ARM: dts: mxs: Fix the RTC compatible prop on M28EVK
  ARM: dts: vf610-twr: Add simple-card support.
  ARM: dts: vf610-twr: Enable SGTL5000 codec.
  ARM: dts: vf610-twr: Enable SAI ALSA SoC DAI device
  ARM: dts: vf610: Add edma mux Tx and Rx support for SAI node.
  ARM: dts: vf610: lpuart: Add eDMA support
  ARM: dts: vf610: Add eDMA node
  ARM: dts: imx27-phytec-phycore: Add diagnostic PMIC LEDs
  ARM: dts: imx27-phytec-phycard-s-som: Rename file to .dtsi
  ARM: dts: i.MX51 babbage: Support diagnostic LED
  ARM: dts: imx28-tx28: Remove 'enable-active-low' property
  ARM: dts: mx53: Remove 'enable-active-low' property
  ARM: dts: imx27-phytec-phycard-s-rdk: Add pinctrl definitions for SDHC2
  ARM: dts: imx27-phytec-phycard-s-som: Add NFC node
  ARM: dts: imx27-phytec-phycard-s-som: Sort entries

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 09be3f5e b4e5e84d

arch/arm/boot/dts/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -144,7 +144,6 @@ dtb-$(CONFIG_ARCH_MXC) += \ 
	imx27-apf27dev.dtb \

	imx27-pdk.dtb \

	imx27-phytec-phycore-rdk.dtb \

	imx27-phytec-phycard-s-som.dtb \

	imx27-phytec-phycard-s-rdk.dtb \

	imx31-bug.dtb \

	imx35-eukrea-mbimxsd35-baseboard.dtb \

arch/arm/boot/dts/imx27-phytec-phycard-s-rdk.dts

+15 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ 
 * http://www.gnu.org/copyleft/gpl.html

 */



#include "imx27-phytec-phycard-s-som.dts"

#include "imx27-phytec-phycard-s-som.dtsi"



/ {

	model = "Phytec pca100 rapid development kit";
@@ -88,6 +88,18 @@ 
			>;

		};



		pinctrl_sdhc2: sdhc2grp {

			fsl,pins = <

				MX27_PAD_SD2_CLK__SD2_CLK 0x0

				MX27_PAD_SD2_CMD__SD2_CMD 0x0

				MX27_PAD_SD2_D0__SD2_D0 0x0

				MX27_PAD_SD2_D1__SD2_D1 0x0

				MX27_PAD_SD2_D2__SD2_D2 0x0

				MX27_PAD_SD2_D3__SD2_D3 0x0

				MX27_PAD_SSI3_RXDAT__GPIO3_29 0x0 /* CD */

			>;

		};



		pinctrl_uart1: uart1grp {

			fsl,pins = <

				MX27_PAD_UART1_TXD__UART1_TXD 0x0
@@ -124,6 +136,8 @@ 
};



&sdhci2 {

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_sdhc2>;

	cd-gpios = <&gpio3 29 GPIO_ACTIVE_HIGH>;

	status = "okay";

};

arch/arm/boot/dts/imx27-phytec-phycard-s-som.dts→arch/arm/boot/dts/imx27-phytec-phycard-s-som.dtsi

+35 −14
Original line number Diff line number Diff line
@@ -29,6 +29,24 @@ 
	status = "okay";

};



&fec {

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_fec1>;

	status = "okay";

};



&i2c2 {

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_i2c2>;

	status = "okay";



	at24@52 {

		compatible = "at,24c32";

		pagesize = <32>;

		reg = <0x52>;

	};

};



&iomuxc {

	imx27-phycard-s-som {

		pinctrl_fec1: fec1grp {
@@ -60,23 +78,26 @@ 
				MX27_PAD_I2C2_SCL__I2C2_SCL 0x0

			>;

		};



		pinctrl_nfc: nfcgrp {

			fsl,pins = <

				MX27_PAD_NFRB__NFRB 0x0

				MX27_PAD_NFCLE__NFCLE 0x0

				MX27_PAD_NFWP_B__NFWP_B 0x0

				MX27_PAD_NFCE_B__NFCE_B 0x0

				MX27_PAD_NFALE__NFALE 0x0

				MX27_PAD_NFRE_B__NFRE_B 0x0

				MX27_PAD_NFWE_B__NFWE_B 0x0

			>;

		};

	};



&fec {

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_fec1>;

	status = "okay";

};



&i2c2 {

&nfc {

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_i2c2>;

	pinctrl-0 = <&pinctrl_nfc>;

	nand-bus-width = <8>;

	nand-ecc-mode = "hw";

	nand-on-flash-bbt;

	status = "okay";



	at24@52 {

		compatible = "at,24c32";

		pagesize = <32>;

		reg = <0x52>;

	};

};

arch/arm/boot/dts/imx27-phytec-phycore-rdk.dts

+81 −0
Original line number Diff line number Diff line
@@ -81,6 +81,23 @@ 
			>;

		};



		pinctrl_usbh2: usbh2grp {

			fsl,pins = <

				MX27_PAD_USBH2_CLK__USBH2_CLK 0x0

				MX27_PAD_USBH2_DIR__USBH2_DIR 0x0

				MX27_PAD_USBH2_NXT__USBH2_NXT 0x0

				MX27_PAD_USBH2_STP__USBH2_STP 0x0

				MX27_PAD_CSPI2_SCLK__USBH2_DATA0 0x0

				MX27_PAD_CSPI2_MOSI__USBH2_DATA1 0x0

				MX27_PAD_CSPI2_MISO__USBH2_DATA2 0x0

				MX27_PAD_CSPI2_SS1__USBH2_DATA3 0x0

				MX27_PAD_CSPI2_SS2__USBH2_DATA4 0x0

				MX27_PAD_CSPI1_SS2__USBH2_DATA5 0x0

				MX27_PAD_CSPI2_SS0__USBH2_DATA6 0x0

				MX27_PAD_USBH2_DATA7__USBH2_DATA7 0x0

			>;

		};



		pinctrl_weim: weimgrp {

			fsl,pins = <

				MX27_PAD_CS4_B__CS4_B		0x0 /* CS4 */
@@ -96,6 +113,56 @@ 
	status = "okay";

};



&pmicleds {

	ledr1: led@3 {

		reg = <3>;

		label = "system:red1:user";

	};



	ledg1: led@4 {

		reg = <4>;

		label = "system:green1:user";

	};



	ledb1: led@5 {

		reg = <5>;

		label = "system:blue1:user";

	};



	ledr2: led@6 {

		reg = <6>;

		label = "system:red2:user";

	};



	ledg2: led@7 {

		reg = <7>;

		label = "system:green2:user";

	};



	ledb2: led@8 {

		reg = <8>;

		label = "system:blue2:user";

	};



	ledr3: led@9 {

		reg = <9>;

		label = "system:red3:nand";

		linux,default-trigger = "nand-disk";

	};



	ledg3: led@10 {

		reg = <10>;

		label = "system:green3:live";

		linux,default-trigger = "heartbeat";

	};



	ledb3: led@11 {

		reg = <11>;

		label = "system:blue3:cpu";

		linux,default-trigger = "cpu0";

	};

};



&sdhci2 {

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_sdhc2>;
@@ -120,6 +187,20 @@ 
	status = "okay";

};



&usbh2 {

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_usbh2>;

	dr_mode = "host";

	phy_type = "ulpi";

	vbus-supply = <&reg_5v0>;

	disable-over-current;

	status = "okay";

};



&usbphy2 {

	vcc-supply = <&reg_5v0>;

};



&weim {

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_weim>;

arch/arm/boot/dts/imx27-phytec-phycore-som.dtsi

+44 −0
Original line number Diff line number Diff line
@@ -32,6 +32,14 @@ 
			regulator-min-microvolt = <3300000>;

			regulator-max-microvolt = <3300000>;

		};



		reg_5v0: regulator@1 {

			compatible = "regulator-fixed";

			reg = <1>;

			regulator-name = "5V0";

			regulator-min-microvolt = <5000000>;

			regulator-max-microvolt = <5000000>;

		};

	};

};
@@ -69,6 +77,12 @@ 
		fsl,mc13xxx-uses-adc;

		fsl,mc13xxx-uses-rtc;



		pmicleds: leds {

			#address-cells = <1>;

			#size-cells = <0>;

			led-control = <0x001 0x000 0x000 0x000 0x000 0x000>;

		};



		regulators {

			/* SW1A and SW1B joined operation */

			sw1_reg: sw1a {
@@ -236,6 +250,23 @@ 
				MX27_PAD_NFWE_B__NFWE_B 0x0

			>;

		};



		pinctrl_usbotg: usbotggrp {

			fsl,pins = <

				MX27_PAD_USBOTG_CLK__USBOTG_CLK 0x0

				MX27_PAD_USBOTG_DIR__USBOTG_DIR 0x0

				MX27_PAD_USBOTG_NXT__USBOTG_NXT 0x0

				MX27_PAD_USBOTG_STP__USBOTG_STP 0x0

				MX27_PAD_USBOTG_DATA0__USBOTG_DATA0 0x0

				MX27_PAD_USBOTG_DATA1__USBOTG_DATA1 0x0

				MX27_PAD_USBOTG_DATA2__USBOTG_DATA2 0x0

				MX27_PAD_USBOTG_DATA3__USBOTG_DATA3 0x0

				MX27_PAD_USBOTG_DATA4__USBOTG_DATA4 0x0

				MX27_PAD_USBOTG_DATA5__USBOTG_DATA5 0x0

				MX27_PAD_USBOTG_DATA6__USBOTG_DATA6 0x0

				MX27_PAD_USBOTG_DATA7__USBOTG_DATA7 0x0

			>;

		};

	};

};
@@ -248,6 +279,19 @@ 
	status = "okay";

};



&usbotg {

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_usbotg>;

	dr_mode = "otg";

	phy_type = "ulpi";

	vbus-supply = <&sw3_reg>;

	status = "okay";

};



&usbphy0 {

	vcc-supply = <&sw3_reg>;

};



&weim {

	status = "okay";

CRA Git | Maintained and supported by SUSTech CRA and CCSE