Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 072a4fd2 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'imx-dt-3.16' of... 

Merge tag 'imx-dt-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into next/dt

Merge "ARM: imx: device tree changes for 3.16" from Shawn Guo:

i.MX device tree changes for 3.16:
 - New board support: imx35-pdk, imx51-digi-connectcore, imx6dl-phytec,
   imx6dl-riotboard, and vf610-colibri.
 - Improve device tree support for imx51-babbage and eukrea-cpuimx51 to
   get the same level support as board files, so that we can kill the
   board files.
 - Quite some updates on imx27-phytec-phycore board support from
   Alexander Shiyan
 - Enable USB, sound and touchscreen on the eukrea imx25/35/51 boards,
   from Denis Carikli
 - Quite a lot of patches from Fabio Estevam, updating Freescale
   imx25-pdk and imx27-pdk board support
 - Correct USB device configuration for imx25/35
 - Fixes i2c4 device node in imx6dl.dtsi regarding to compatible string
   and clock data
 - Enable HDMI, TVE, LVDS display support on a bunch of imx5/6 boards
 - Update PCIe to the new binding and enable PCIe support on
   imx6qdl-sabresd board
 - A couple of imx6q-dmo-edmqmx6 updates from Lucas Stach, adding pfuze
   irq gpio and SPI flash
 - Enable CODA7541 VPU for i.MX53
 - A series of updates on imx6qdl-phytec boards from Philipp Zabel
 - Small cleanups and fixes on board imx28-duckbill - Michael Heimpold
 - Add stdout-path property to i.MX boards
 - Karo TX25 board updates from Sascha Hauer
 - Enable pwm and sdhc devices for board vf610-twr

* tag 'imx-dt-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux

: (105 commits)
  ARM: dts: imx35-pdk: Fix memory region description
  ARM: dts: imx51-eukrea-mbimxsd51-baseboard: Add CAN support
  ARM: dts: imx6: add new board RIoTboard
  ARM: dts: imx6: i2c4 cleanup
  ARM: dts: imx6: edmqmx6: add vcc and vio power supplies to stmpe
  ARM: dts: Karo TX25: use hardware ecc
  ARM: dts: Karo TX25: Add phy reset gpio and supply for FEC
  ARM: dts: Karo TX25: Add pinctrl nodes
  ARM: dts: i.MX25: Add IRAM node
  ARM: dts: i.MX25: Add mmc aliases
  ARM: dts: i.MX51 babbage: Fix FEC pad ctrl settings
  ARM: dts: imx6qdl-sabresd: Add USDHC4 support
  ARM: imx: add HDMI support for SolidRun HummingBoard and Cubox-i
  ARM: dts: imx6: edmqmx6: add SPI bus and flash
  ARM: dts: imx6: edmqmx6: add pinctrl for pfuze irq gpio
  ARM: dts: imx6q-udoo: Add HDMI support
  ARM: dts: Add stdout-path property to i.MX boards
  ARM: dts: imx: Fix LVDS mapping for Ventana GW52xx
  ARM: dts: imx: add LVDS backlight for Ventana
  ARM: dts: imx6qdl-sabresd: remove power-on gpio from pcie
  ...

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

Documentation/devicetree/bindings/vendor-prefixes.txt

+1 −0
Original line number Diff line number Diff line
@@ -125,6 +125,7 @@ stericsson ST-Ericsson 
synology	Synology, Inc.

ti	Texas Instruments

tlm	Trusted Logic Mobility

toradex	Toradex AG

toshiba	Toshiba Corporation

toumaz	Toumaz

usi	Universal Scientifc Industrial Co., Ltd.

arch/arm/boot/dts/Makefile

+5 −0
Original line number Diff line number Diff line
@@ -157,10 +157,12 @@ dtb-$(CONFIG_ARCH_MXC) += \ 
	imx27-phytec-phycard-s-rdk.dtb \

	imx31-bug.dtb \

	imx35-eukrea-mbimxsd35-baseboard.dtb \

	imx35-pdk.dtb \

	imx50-evk.dtb \

	imx51-apf51.dtb \

	imx51-apf51dev.dtb \

	imx51-babbage.dtb \

	imx51-digi-connectcore-jsk.dtb \

	imx51-eukrea-mbimxsd51-baseboard.dtb \

	imx53-ard.dtb \

	imx53-m53evk.dtb \
@@ -179,6 +181,8 @@ dtb-$(CONFIG_ARCH_MXC) += \ 
	imx6dl-gw54xx.dtb \

	imx6dl-hummingboard.dtb \

	imx6dl-nitrogen6x.dtb \

	imx6dl-phytec-pbab01.dtb \

	imx6dl-riotboard.dtb \

	imx6dl-sabreauto.dtb \

	imx6dl-sabrelite.dtb \

	imx6dl-sabresd.dtb \
@@ -203,6 +207,7 @@ dtb-$(CONFIG_ARCH_MXC) += \ 
	imx6q-udoo.dtb \

	imx6q-wandboard.dtb \

	imx6sl-evk.dtb \

	vf610-colibri.dtb \

	vf610-cosmic.dtb \

	vf610-twr.dtb

dtb-$(CONFIG_ARCH_MXS) += imx23-evk.dtb \

arch/arm/boot/dts/imx25-eukrea-mbimxsd25-baseboard.dts

+13 −0
Original line number Diff line number Diff line
@@ -172,3 +172,16 @@ 
	fsl,uart-has-rtscts;

	status = "okay";

};



&usbhost1 {

	phy_type = "serial";

	dr_mode = "host";

	status = "okay";

};



&usbotg {

	phy_type = "utmi";

	dr_mode = "otg";

	external-vbus-divider;

	status = "okay";

};

arch/arm/boot/dts/imx25-karo-tx25.dts

+77 −0
Original line number Diff line number Diff line
@@ -16,21 +16,98 @@ 
	model = "Ka-Ro TX25";

	compatible = "karo,imx25-tx25", "fsl,imx25";



	chosen {

		stdout-path = &uart1;

	};



	regulators {

		compatible = "simple-bus";

		#address-cells = <1>;

		#size-cells = <0>;



		reg_fec_phy: regulator@0 {

			compatible = "regulator-fixed";

			reg = <0>;

			regulator-name = "fec-phy";

			regulator-min-microvolt = <3300000>;

			regulator-max-microvolt = <3300000>;

			gpio = <&gpio4 9 0>;

			enable-active-high;

		};

	};



	memory {

		reg = <0x80000000 0x02000000 0x90000000 0x02000000>;

	};

};



&iomuxc {

	pinctrl_uart1: uart1grp {

		fsl,pins = <

			MX25_PAD_UART1_TXD__UART1_TXD 0x80000000

			MX25_PAD_UART1_RXD__UART1_RXD 0x80000000

			MX25_PAD_UART1_CTS__UART1_CTS 0x80000000

			MX25_PAD_UART1_RTS__UART1_RTS 0x80000000

		>;

	};



	pinctrl_fec: fecgrp {

		fsl,pins = <

			MX25_PAD_D11__GPIO_4_9		0x80000000 /* FEC PHY power on pin */

			MX25_PAD_D13__GPIO_4_7		0x80000000 /* FEC reset */

			MX25_PAD_FEC_MDC__FEC_MDC	0x80000000

			MX25_PAD_FEC_MDIO__FEC_MDIO	0x80000000

			MX25_PAD_FEC_TDATA0__FEC_TDATA0	0x80000000

			MX25_PAD_FEC_TDATA1__FEC_TDATA1	0x80000000

			MX25_PAD_FEC_TX_EN__FEC_TX_EN	0x80000000

			MX25_PAD_FEC_RDATA0__FEC_RDATA0	0x80000000

			MX25_PAD_FEC_RDATA1__FEC_RDATA1	0x80000000

			MX25_PAD_FEC_RX_DV__FEC_RX_DV	0x80000000

			MX25_PAD_FEC_TX_CLK__FEC_TX_CLK	0x80000000

		>;

	};



	pinctrl_nfc: nfcgrp {

		fsl,pins = <

			MX25_PAD_NF_CE0__NF_CE0		0x80000000

			MX25_PAD_NFWE_B__NFWE_B		0x80000000

			MX25_PAD_NFRE_B__NFRE_B		0x80000000

			MX25_PAD_NFALE__NFALE		0x80000000

			MX25_PAD_NFCLE__NFCLE		0x80000000

			MX25_PAD_NFWP_B__NFWP_B		0x80000000

			MX25_PAD_NFRB__NFRB		0x80000000

			MX25_PAD_D7__D7			0x80000000

			MX25_PAD_D6__D6			0x80000000

			MX25_PAD_D5__D5			0x80000000

			MX25_PAD_D4__D4			0x80000000

			MX25_PAD_D3__D3			0x80000000

			MX25_PAD_D2__D2			0x80000000

			MX25_PAD_D1__D1			0x80000000

			MX25_PAD_D0__D0			0x80000000

		>;

	};

};



&uart1 {

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_uart1>;

	status = "okay";

};



&fec {

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_fec>;

	phy-reset-gpios = <&gpio3 7 0>;

	phy-mode = "rmii";

	phy-supply = <&reg_fec_phy>;

	status = "okay";

};



&nfc {

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_nfc>;

	nand-on-flash-bbt;

	nand-ecc-mode = "hw";

	nand-bus-width = <8>;

	status = "okay";

};

arch/arm/boot/dts/imx25-pdk.dts

+216 −1
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ 
 */



/dts-v1/;

#include <dt-bindings/input/input.h>

#include "imx25.dtsi"



/ {
@@ -19,18 +20,232 @@ 
	memory {

		reg = <0x80000000 0x4000000>;

	};



	regulators {

		compatible = "simple-bus";

		#address-cells = <1>;

		#size-cells = <0>;



		reg_fec_3v3: regulator@0 {

			compatible = "regulator-fixed";

			reg = <0>;

			regulator-name = "fec-3v3";

			regulator-min-microvolt = <3300000>;

			regulator-max-microvolt = <3300000>;

			gpio = <&gpio2 3 0>;

			enable-active-high;

		};



&uart1 {

		reg_2p5v: regulator@1 {

			compatible = "regulator-fixed";

			reg = <1>;

			regulator-name = "2P5V";

			regulator-min-microvolt = <2500000>;

			regulator-max-microvolt = <2500000>;

		};



		reg_3p3v: regulator@2 {

			compatible = "regulator-fixed";

			reg = <2>;

			regulator-name = "3P3V";

			regulator-min-microvolt = <3300000>;

			regulator-max-microvolt = <3300000>;

		};



		reg_can_3v3: regulator@3 {

			compatible = "regulator-fixed";

			reg = <3>;

			regulator-name = "can-3v3";

			regulator-min-microvolt = <3300000>;

			regulator-max-microvolt = <3300000>;

			gpio = <&gpio4 6 0>;

		};

	};



	sound {

		compatible = "fsl,imx25-pdk-sgtl5000",

			     "fsl,imx-audio-sgtl5000";

		model = "imx25-pdk-sgtl5000";

		ssi-controller = <&ssi1>;

		audio-codec = <&codec>;

		audio-routing =

			"MIC_IN", "Mic Jack",

			"Mic Jack", "Mic Bias",

			"Headphone Jack", "HP_OUT";

		mux-int-port = <1>;

		mux-ext-port = <4>;

	};

};



&audmux {

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_audmux>;

	status = "okay";

};



&can1 {

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_can1>;

	xceiver-supply = <&reg_can_3v3>;

	status = "okay";

};



&esdhc1 {

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_esdhc1>;

	cd-gpios = <&gpio2 1 0>;

	wp-gpios = <&gpio2 0 0>;

	status = "okay";

};



&fec {

	phy-mode = "rmii";

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_fec>;

	phy-supply = <&reg_fec_3v3>;

	phy-reset-gpios = <&gpio4 8 0>;

	status = "okay";

};



&i2c1 {

	clock-frequency = <100000>;

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_i2c1>;

	status = "okay";



	codec: sgtl5000@0a {

		compatible = "fsl,sgtl5000";

		reg = <0x0a>;

		clocks = <&clks 129>;

		VDDA-supply = <&reg_2p5v>;

		VDDIO-supply = <&reg_3p3v>;

	};

};



&iomuxc {

	imx25-pdk {

		pinctrl_audmux: audmuxgrp {

			fsl,pins = <

				MX25_PAD_RW__AUD4_TXFS			0xe0

				MX25_PAD_OE__AUD4_TXC			0xe0

				MX25_PAD_EB0__AUD4_TXD			0xe0

				MX25_PAD_EB1__AUD4_RXD			0xe0

			>;

		};



		pinctrl_can1: can1grp {

			fsl,pins = <

				MX25_PAD_GPIO_A__CAN1_TX		0x0

				MX25_PAD_GPIO_B__CAN1_RX		0x0

				MX25_PAD_D14__GPIO_4_6 			0x80000000

			>;

		};



		pinctrl_esdhc1: esdhc1grp {

			fsl,pins = <

				MX25_PAD_SD1_CMD__SD1_CMD		0x80000000

				MX25_PAD_SD1_CLK__SD1_CLK		0x80000000

				MX25_PAD_SD1_DATA0__SD1_DATA0		0x80000000

				MX25_PAD_SD1_DATA1__SD1_DATA1		0x80000000

				MX25_PAD_SD1_DATA2__SD1_DATA2		0x80000000

				MX25_PAD_SD1_DATA3__SD1_DATA3		0x80000000

				MX25_PAD_A14__GPIO_2_0			0x80000000

				MX25_PAD_A15__GPIO_2_1			0x80000000

			>;

		};



		pinctrl_fec: fecgrp {

			fsl,pins = <

				MX25_PAD_FEC_MDC__FEC_MDC		0x80000000

				MX25_PAD_FEC_MDIO__FEC_MDIO		0x400001e0

				MX25_PAD_FEC_TDATA0__FEC_TDATA0		0x80000000

				MX25_PAD_FEC_TDATA1__FEC_TDATA1		0x80000000

				MX25_PAD_FEC_TX_EN__FEC_TX_EN		0x80000000

				MX25_PAD_FEC_RDATA0__FEC_RDATA0		0x80000000

				MX25_PAD_FEC_RDATA1__FEC_RDATA1		0x80000000

				MX25_PAD_FEC_RX_DV__FEC_RX_DV		0x80000000

				MX25_PAD_FEC_TX_CLK__FEC_TX_CLK		0x1c0

				MX25_PAD_A17__GPIO_2_3			0x80000000

				MX25_PAD_D12__GPIO_4_8			0x80000000

			>;

		};



		pinctrl_i2c1: i2c1grp {

			fsl,pins = <

				MX25_PAD_I2C1_CLK__I2C1_CLK		0x80000000

				MX25_PAD_I2C1_DAT__I2C1_DAT		0x80000000

			>;

		};



		pinctrl_kpp: kppgrp {

			fsl,pins = <

				MX25_PAD_KPP_ROW0__KPP_ROW0	0x80000000

				MX25_PAD_KPP_ROW1__KPP_ROW1	0x80000000

				MX25_PAD_KPP_ROW2__KPP_ROW2	0x80000000

				MX25_PAD_KPP_ROW3__KPP_ROW3	0x80000000

				MX25_PAD_KPP_COL0__KPP_COL0	0x80000000

				MX25_PAD_KPP_COL1__KPP_COL1	0x80000000

				MX25_PAD_KPP_COL2__KPP_COL2	0x80000000

				MX25_PAD_KPP_COL3__KPP_COL3	0x80000000

			>;

		};





		pinctrl_uart1: uart1grp {

			fsl,pins = <

				MX25_PAD_UART1_RTS__UART1_RTS		0xe0

				MX25_PAD_UART1_CTS__UART1_CTS		0xe0

				MX25_PAD_UART1_TXD__UART1_TXD		0x80000000

				MX25_PAD_UART1_RXD__UART1_RXD		0xc0

			>;

		};

	};

};



&nfc {

	nand-on-flash-bbt;

	status = "okay";

};



&kpp {

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_kpp>;

	linux,keymap = <

			MATRIX_KEY(0x0, 0x0, KEY_UP)

			MATRIX_KEY(0x0, 0x1, KEY_DOWN)

			MATRIX_KEY(0x0, 0x2, KEY_VOLUMEDOWN)

			MATRIX_KEY(0x0, 0x3, KEY_HOME)

			MATRIX_KEY(0x1, 0x0, KEY_RIGHT)

			MATRIX_KEY(0x1, 0x1, KEY_LEFT)

			MATRIX_KEY(0x1, 0x2, KEY_ENTER)

			MATRIX_KEY(0x1, 0x3, KEY_VOLUMEUP)

			MATRIX_KEY(0x2, 0x0, KEY_F6)

			MATRIX_KEY(0x2, 0x1, KEY_F8)

			MATRIX_KEY(0x2, 0x2, KEY_F9)

			MATRIX_KEY(0x2, 0x3, KEY_F10)

			MATRIX_KEY(0x3, 0x0, KEY_F1)

			MATRIX_KEY(0x3, 0x1, KEY_F2)

			MATRIX_KEY(0x3, 0x2, KEY_F3)

			MATRIX_KEY(0x3, 0x2, KEY_POWER)

	>;

	status = "okay";

};



&ssi1 {

	codec-handle = <&codec>;

	fsl,mode = "i2s-slave";

	status = "okay";

};



&uart1 {

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_uart1>;

	fsl,uart-has-rtscts;

	status = "okay";

};



&usbhost1 {

	phy_type = "serial";

	dr_mode = "host";

	status = "okay";

};