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

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

The i.MX device tree updates for 4.5:
- New boards support: imx51-ts4800, imx6q-novena, CompuLab imx7d SoM/SBC,
  vf610m4-cosmic
- Add ADC device support for imx6ul and imx7d
- Remove config space from PCIe controller ranges property for i.MX6
- Add Vivante GPU nodes for i.MX6
- Add DCU, LCD, and SATA devices for LS1021A
- A series to update Ventana gw5xxx boards getting HDMI and LVDS to work
  simultaneously and devices like PWM and SPI added
- Quite a few random cleanups and minor updates

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

: (50 commits)
  ARM: dts: imx7d: sbc-imx7: add basic board support
  ARM: dts: imx7d: cl-som-imx7: add basic module support
  ARM: dts: TS-4800: add touchscreen support
  ARM: dts: ts-4800: Add LCD support
  ARM: dts: imx6q: add Novena board
  devicetree: bindings: Add vendor prefix for Kosagi
  ARM: dts: TS-4800: use weim IP to map the FPGA
  ARM: dts: TS-4800: drop uart rts/cts pin reservations
  ARM: dts: imx6: add Vivante GPU nodes
  ARM: dts: imx28: add alternate auart4 pinmux
  ARM: dts: ls1021a: add sata node to dts
  ARM: dts: TS-4800: add basic device tree
  of: documentation: add bindings documentation for TS-4800
  of: add vendor prefix for Technologic Systems
  ARM: dts: imx7d-sdb: add ADC support
  ARM: dts: imx7d.dtsi: add ADC support
  ARM: dts: vf-colibri: add CAN support
  ARM: mxs: dt: cfa10057: fix backlight PWM
  ARM: dts: imx6qdl: move GIC to right location in DT
  ARM: dts: imx6qdl: add IPU aliases
  ...

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents a6dcb262 67fea0f4

Documentation/devicetree/bindings/arm/technologic.txt

0 → 100644
+6 −0
Original line number Diff line number Diff line 
Technologic Systems Platforms Device Tree Bindings

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



TS-4800 board

Required root node properties:

	- compatible = "technologic,imx51-ts4800", "fsl,imx51";

Documentation/devicetree/bindings/vendor-prefixes.txt

+2 −0
Original line number Diff line number Diff line
@@ -123,6 +123,7 @@ jedec JEDEC Solid State Technology Association 
karo	Ka-Ro electronics GmbH

keymile	Keymile GmbH

kinetic Kinetic Technologies

kosagi	Sutajio Ko-Usagi PTE Ltd.

lacie	LaCie

lantiq	Lantiq Semiconductor

lenovo	Lenovo Group Ltd.
@@ -224,6 +225,7 @@ stericsson ST-Ericsson 
synology	Synology, Inc.

tbs	TBS Technologies

tcl	Toby Churchill Ltd.

technologic	Technologic Systems

thine	THine Electronics, Inc.

ti	Texas Instruments

tlm	Trusted Logic Mobility

arch/arm/boot/dts/Makefile

+6 −1
Original line number Diff line number Diff line
@@ -274,7 +274,8 @@ dtb-$(CONFIG_SOC_IMX51) += \ 
	imx51-apf51dev.dtb \

	imx51-babbage.dtb \

	imx51-digi-connectcore-jsk.dtb \

	imx51-eukrea-mbimxsd51-baseboard.dtb

	imx51-eukrea-mbimxsd51-baseboard.dtb \

	imx51-ts4800.dtb

dtb-$(CONFIG_SOC_IMX53) += \

	imx53-ard.dtb \

	imx53-m53evk.dtb \
@@ -331,6 +332,7 @@ dtb-$(CONFIG_SOC_IMX6Q) += \ 
	imx6q-hummingboard.dtb \

	imx6q-nitrogen6x.dtb \

	imx6q-nitrogen6_max.dtb \

	imx6q-novena.dtb \

	imx6q-phytec-pbab01.dtb \

	imx6q-rex-pro.dtb \

	imx6q-sabreauto.dtb \
@@ -356,6 +358,8 @@ dtb-$(CONFIG_SOC_IMX6SX) += \ 
dtb-$(CONFIG_SOC_IMX6UL) += \

	imx6ul-14x14-evk.dtb

dtb-$(CONFIG_SOC_IMX7D) += \

	imx7d-cl-som-imx7.dtb \

	imx7d-sbc-imx7.dtb \

	imx7d-sdb.dtb

dtb-$(CONFIG_SOC_LS1021A) += \

	ls1021a-qds.dtb \
@@ -365,6 +369,7 @@ dtb-$(CONFIG_SOC_VF610) += \ 
	vf610-colibri-eval-v3.dtb \

	vf610m4-colibri.dtb \

	vf610-cosmic.dtb \

	vf610m4-cosmic.dtb \

	vf610-twr.dtb

dtb-$(CONFIG_ARCH_MXS) += \

	imx23-evk.dtb \

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

+3 −0
Original line number Diff line number Diff line
@@ -284,6 +284,7 @@ 
#define MX25_PAD_CONTRAST__CC4			0x118 0x310 0x000 0x11 0x000

#define MX25_PAD_CONTRAST__PWM4_PWMO		0x118 0x310 0x000 0x14 0x000

#define MX25_PAD_CONTRAST__FEC_CRS		0x118 0x310 0x508 0x15 0x001

#define MX25_PAD_CONTRAST__USBH2_PWR		0x118 0x310 0x000 0x16 0x000



#define MX25_PAD_PWM__PWM			0x11c 0x314 0x000 0x10 0x000

#define MX25_PAD_PWM__GPIO_1_26			0x11c 0x314 0x000 0x15 0x000
@@ -439,6 +440,7 @@ 
#define MX25_PAD_SD1_DATA3__GPIO_2_28		0x1a4 0x39c 0x000 0x15 0x000



#define MX25_PAD_KPP_ROW0__KPP_ROW0		0x1a8 0x3a0 0x000 0x10 0x000

#define MX25_PAD_KPP_ROW0__UART1_DTR		0x1a8 0x3a0 0x000 0x14 0x000

#define MX25_PAD_KPP_ROW0__GPIO_2_29		0x1a8 0x3a0 0x000 0x15 0x000



#define MX25_PAD_KPP_ROW1__KPP_ROW1		0x1ac 0x3a4 0x000 0x10 0x000
@@ -446,6 +448,7 @@ 


#define MX25_PAD_KPP_ROW2__KPP_ROW2		0x1b0 0x3a8 0x000 0x10 0x000

#define MX25_PAD_KPP_ROW2__CSI_D0		0x1b0 0x3a8 0x488 0x13 0x002

#define MX25_PAD_KPP_ROW2__UART1_DCD		0x1b0 0x3a8 0x000 0x14 0x000

#define MX25_PAD_KPP_ROW2__GPIO_2_31		0x1b0 0x3a8 0x000 0x15 0x000



#define MX25_PAD_KPP_ROW3__KPP_ROW3		0x1b4 0x3ac 0x000 0x10 0x000

arch/arm/boot/dts/imx25.dtsi

+4 −0
Original line number Diff line number Diff line
@@ -24,6 +24,10 @@ 
		i2c2 = &i2c3;

		mmc0 = &esdhc1;

		mmc1 = &esdhc2;

		pwm0 = &pwm1;

		pwm1 = &pwm2;

		pwm2 = &pwm3;

		pwm3 = &pwm4;

		serial0 = &uart1;

		serial1 = &uart2;

		serial2 = &uart3;

CRA Git | Maintained and supported by SUSTech CRA and CCSE