diff options
author | Arnd Bergmann <arnd@arndb.de> | 2016-09-13 17:42:20 +0200 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2016-09-13 17:42:20 +0200 |
commit | 4dbacf2cdea7f372fddd576ff582634c8c2dc1f0 (patch) | |
tree | a4629c183aadab5e1ed86413687a50e2814ad257 /Documentation/devicetree/bindings | |
parent | 971b4c6e1a827e2b01738772a2a7cfd8b0842286 (diff) | |
parent | bb728d662bed0fe91b152550e640cb3f6caa972c (diff) | |
download | op-kernel-dev-4dbacf2cdea7f372fddd576ff582634c8c2dc1f0.zip op-kernel-dev-4dbacf2cdea7f372fddd576ff582634c8c2dc1f0.tar.gz |
Merge tag 'imx-dt-4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into next/dt
Pull "i.MX device tree changes for 4.9" from Shawn Guo:
- Add SoC support for i.MX7 Solo which is a reduced version of i.MX7
Dual.
- New board support: Gateworks Ventana i.MX6Q/DL GW553x, Inverse Path
i.MX53 USB armory, i.MX6Q/DL TS-4900 from Technologic Systems,
i.MX6UL GEA M6UL modules from Engicam, i.MX7 Solo Warp7 board.
- Add DMA and IPU CSI devices for i.MX53 SoC support.
- Refine i.MX7 Dual SoC DTS as a preparation of i.MX7 Solo support.
- Use of_graph dt nodes to describe the panel for vf610-colibri and
ls1021a-twr boards.
- Add gpio-ranges property to i.MX6 GPIO controllers, which will be
useful when GPIO driver is changed to request pad configuration as
GPIO function.
- Random device additions or small changes for various board support.
* tag 'imx-dt-4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: (41 commits)
ARM: dts: add gpio-ranges property to iMX GPIO controllers
ARM: dts: imx35: add iim module to imx35.dtsi
ARM: dts: vf610-colibri: use of_graph dt nodes to describe the panel
ARM: dts: ls1021a: Add of_graph dt nodes to describe the panel
ARM: dts: imx53: add support for USB armory board
devicetree: Add vendor prefix for Inverse Path
ARM: dts: imx7s-warp: Add Bluetooth support
ARM: dts: imx7s-warp: Add User Button support
ARM: dts: imx7s-warp: Enable I2C2 device support
ARM: dts: imx6ul-geam: Add Engicam IMX6UL GEA M6UL initial support
ARM: dts: imx6ul iomuxc syscon is compatible to imx6q
ARM: dts: imx7-colibri: add Audio support
ARM: dts: imx7-colibri: add basic supply regulators
ARM: dts: imx7-colibri: move SD-card to module level
ARM: dts: imx6sx: Add GPU bindings
ARM: dts: imx7s-warp: Let the codec control MCLK pinctrl
ARM: dts: imx6ul-pico-hobbit: Use WDOG_B pin reset
ARM: dts: imx6q-bx50v3: configure unused pca953x pins
ARM: dts: imx6sx: document SION necessity of ENET1_REF_CLK1
ARM: dts: imx7s-warp: Use WDOG_B pin reset
...
Diffstat (limited to 'Documentation/devicetree/bindings')
-rw-r--r-- | Documentation/devicetree/bindings/arm/technologic.txt | 6 | ||||
-rw-r--r-- | Documentation/devicetree/bindings/vendor-prefixes.txt | 1 |
2 files changed, 7 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/arm/technologic.txt b/Documentation/devicetree/bindings/arm/technologic.txt index 8422988..33797ac 100644 --- a/Documentation/devicetree/bindings/arm/technologic.txt +++ b/Documentation/devicetree/bindings/arm/technologic.txt @@ -4,3 +4,9 @@ Technologic Systems Platforms Device Tree Bindings TS-4800 board Required root node properties: - compatible = "technologic,imx51-ts4800", "fsl,imx51"; + +TS-4900 is a System-on-Module based on the Freescale i.MX6 System-on-Chip. +It can be mounted on a carrier board providing additional peripheral connectors. +Required root node properties: + - compatible = "technologic,imx6dl-ts4900", "fsl,imx6dl" + - compatible = "technologic,imx6q-ts4900", "fsl,imx6q" diff --git a/Documentation/devicetree/bindings/vendor-prefixes.txt b/Documentation/devicetree/bindings/vendor-prefixes.txt index 7b6bda3..cc15e99 100644 --- a/Documentation/devicetree/bindings/vendor-prefixes.txt +++ b/Documentation/devicetree/bindings/vendor-prefixes.txt @@ -136,6 +136,7 @@ innolux Innolux Corporation intel Intel Corporation intercontrol Inter Control Group invensense InvenSense Inc. +inversepath Inverse Path isee ISEE 2007 S.L. isil Intersil issi Integrated Silicon Solutions Inc. |