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

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

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

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

i.MX device tree updates for 4.12:
 - New board support: I2SE's i.MX28 Duckbill-2 boards, Gateworks Ventana
   i.MX6 GW5903/GW5904, Zodiac Inflight Innovations RDU2 board, Engicam
   i.CoreM6 Quad/Dual OpenFrame modules, Boundary Device i.MX6 Quad Plus
   SOM.
 - Improve compatible string for i.MX50 eSDHC, i.MX7S SRC devices and
   i.MX6SX UART device.
 - Add interrupts for switch and PHY devices on VF610 ZII Devel C board.
 - Add LVDS, LCD backlight, touchscreen and SAI2 support for i.MX6
   icore, geam, and isiot boards.
 - A series from Lucas Stach to improve i.MX6Q Plus device tree and add
   PRE/PRG devices.
 - A series from Stefan Agner to update imx7-colibri device tree
   regarding to display, PMIC/regulator support.
 - Fix PCI bus DTC warnings seen with the latest compiler.
 - Set default phy_type and dr_mode for i.MX25 USBOTG port.
 - A couple of small improvements on i.MX25 pin function DT header.
 - Add audio support for imx6q-cm-fx6 board using Wolfson wm8731 codec
   which is muxed to SSI2 device.
 - Other random updates, small fixes and trivial cleanups.

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

: (56 commits)
  ARM: dts: imx6q-utilite-pro: add hpd gpio
  ARM: dts: imx6qp-sabresd: Set reg_arm regulator supply
  ARM: dts: imx6qdl-sabresd: Set LDO regulator supply
  ARM: dts: imx: add Gateworks Ventana GW5903 support
  ARM: dts: i.MX25: add AIPS control registers
  ARM: dts: imx7-colibri: add Carrier Board 3.3V/5V regulators
  ARM: dts: imx7-colibri: remove 1.8V fixed regulator
  ARM: dts: imx7-colibri: allow to disable Ethernet rail
  ARM: dts: imx7-colibri: fix PMIC voltages
  ARM: dts: imx7-colibri: use OF graph to describe the display
  ARM: dts: imx6qp-nitrogen6_som2: add Quad Plus variant of the SOM
  ARM: dts: imx6q-icore: Add touchscreen node
  ARM: dts: vf610-zii-dev-rev-b: change switch2 label
  ARM: dts: imx6ul-[geam|isiot]: Add sai2 node
  ARM: dts: imx6ul-isiot-common: Add touchscreen node
  ARM: dts: imx6ul-isiot: Add i2c nodes
  ARM: dts: imx6ul-isiot: Add imx6ul-isiot-common.dtsi
  ARM: dts: imx6ul-isiot: Add backlight support for lcdif
  ARM: dts: imx6ul-geam: Add backlight support for lcdif
  ARM: dts: imx6: add ZII RDU2 boards
  ...

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

Documentation/devicetree/bindings/arm/i2se.txt

0 → 100644
+22 −0
Original line number Diff line number Diff line 
I2SE Device Tree Bindings

-------------------------



Duckbill Board

Required root node properties:

    - compatible = "i2se,duckbill", "fsl,imx28";



Duckbill 2 Board

Required root node properties:

    - compatible = "i2se,duckbill-2", "fsl,imx28";



Duckbill 2 485 Board

Required root node properties:

    - compatible = "i2se,duckbill-2-485", "i2se,duckbill-2", "fsl,imx28";



Duckbill 2 EnOcean Board

Required root node properties:

    - compatible = "i2se,duckbill-2-enocean", "i2se,duckbill-2", "fsl,imx28";



Duckbill 2 SPI Board

Required root node properties:

    - compatible = "i2se,duckbill-2-spi", "i2se,duckbill-2", "fsl,imx28";

arch/arm/boot/dts/Makefile

+15 −1
Original line number Diff line number Diff line
@@ -363,6 +363,8 @@ dtb-$(CONFIG_SOC_IMX6Q) += \ 
	imx6dl-gw551x.dtb \

	imx6dl-gw552x.dtb \

	imx6dl-gw553x.dtb \

	imx6dl-gw5903.dtb \

	imx6dl-gw5904.dtb \

	imx6dl-hummingboard.dtb \

	imx6dl-icore.dtb \

	imx6dl-icore-rqs.dtb \
@@ -406,9 +408,13 @@ dtb-$(CONFIG_SOC_IMX6Q) += \ 
	imx6q-gw551x.dtb \

	imx6q-gw552x.dtb \

	imx6q-gw553x.dtb \

	imx6q-gw5903.dtb \

	imx6q-gw5904.dtb \

	imx6q-h100.dtb \

	imx6q-hummingboard.dtb \

	imx6q-icore.dtb \

	imx6q-icore-ofcap10.dtb \

	imx6q-icore-ofcap12.dtb \

	imx6q-icore-rqs.dtb \

	imx6q-marsboard.dtb \

	imx6q-mccmon6.dtb \
@@ -436,9 +442,12 @@ dtb-$(CONFIG_SOC_IMX6Q) += \ 
	imx6q-utilite-pro.dtb \

	imx6q-wandboard.dtb \

	imx6q-wandboard-revb1.dtb \

	imx6q-zii-rdu2.dtb \

	imx6qp-nitrogen6_max.dtb \

	imx6qp-nitrogen6_som2.dtb \

	imx6qp-sabreauto.dtb \

	imx6qp-sabresd.dtb

	imx6qp-sabresd.dtb \

	imx6qp-zii-rdu2.dtb

dtb-$(CONFIG_SOC_IMX6SL) += \

	imx6sl-evk.dtb \

	imx6sl-warp.dtb
@@ -469,6 +478,7 @@ dtb-$(CONFIG_SOC_IMX7D) += \ 
	imx7d-nitrogen7.dtb \

	imx7d-sbc-imx7.dtb \

	imx7d-sdb.dtb \

	imx7d-sdb-sht11.dtb \

	imx7s-colibri-eval-v3.dtb \

	imx7s-warp.dtb

dtb-$(CONFIG_SOC_LS1021A) += \
@@ -499,6 +509,10 @@ dtb-$(CONFIG_ARCH_MXS) += \ 
	imx28-cfa10056.dtb \

	imx28-cfa10057.dtb \

	imx28-cfa10058.dtb \

	imx28-duckbill-2-485.dtb \

	imx28-duckbill-2.dtb \

	imx28-duckbill-2-enocean.dtb \

	imx28-duckbill-2-spi.dtb \

	imx28-duckbill.dtb \

	imx28-eukrea-mbmx283lc.dtb \

	imx28-eukrea-mbmx287lc.dtb \

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

+0 −2
Original line number Diff line number Diff line
@@ -179,8 +179,6 @@ 
};



&usbotg {

	phy_type = "utmi";

	dr_mode = "otg";

	external-vbus-divider;

	status = "okay";

};

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

+0 −2
Original line number Diff line number Diff line
@@ -309,8 +309,6 @@ 
};



&usbotg {

	phy_type = "utmi";

	dr_mode = "otg";

	external-vbus-divider;

	status = "okay";

};

arch/arm/boot/dts/imx25-pinfunc.h

+2 −3
Original line number Diff line number Diff line
@@ -17,8 +17,6 @@ 
 * <mux_reg conf_reg input_reg mux_mode input_val>

 */



#define MX25_PAD_TDO__TDO			0x000 0x3e8 0x000 0x00 0x000



#define MX25_PAD_A10__A10			0x008 0x000 0x000 0x00 0x000

#define MX25_PAD_A10__GPIO_4_0			0x008 0x000 0x000 0x05 0x000
@@ -68,7 +66,6 @@ 


#define MX25_PAD_A22__A22			0x030 0x000 0x000 0x00 0x000

#define MX25_PAD_A22__GPIO_2_8			0x030 0x000 0x000 0x05 0x000

#define MX25_PAD_A22__FEC_TDATA2		0x030 0x000 0x000 0x07 0x000

#define MX25_PAD_A22__SIM2_VEN1			0x030 0x000 0x000 0x06 0x000

#define MX25_PAD_A22__FEC_TDATA2		0x030 0x000 0x000 0x07 0x000
@@ -542,6 +539,8 @@ 
#define MX25_PAD_RTCK__OWIRE			0x1ec 0x3e4 0x000 0x01 0x000

#define MX25_PAD_RTCK__GPIO_3_14		0x1ec 0x3e4 0x000 0x05 0x000



#define MX25_PAD_TDO__TDO			0x000 0x3e8 0x000 0x00 0x000



#define MX25_PAD_DE_B__DE_B			0x1f0 0x3ec 0x000 0x00 0x000

#define MX25_PAD_DE_B__GPIO_2_20		0x1f0 0x3ec 0x000 0x05 0x000