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

Commit 4dbacf2c authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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
  ...
parents 971b4c6e bb728d66

Documentation/devicetree/bindings/arm/technologic.txt

+6 −0
Original line number Diff line number Diff line
@@ -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"

Documentation/devicetree/bindings/vendor-prefixes.txt

+1 −0
Original line number Diff line number Diff line
@@ -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.

arch/arm/boot/dts/Makefile

+8 −1
Original line number Diff line number Diff line
@@ -315,6 +315,7 @@ dtb-$(CONFIG_SOC_IMX53) += \ 
	imx53-smd.dtb \

	imx53-tx53-x03x.dtb \

	imx53-tx53-x13x.dtb \

	imx53-usbarmory.dtb \

	imx53-voipac-bsb.dtb

dtb-$(CONFIG_SOC_IMX6Q) += \

	imx6dl-apf6dev.dtb \
@@ -330,6 +331,7 @@ dtb-$(CONFIG_SOC_IMX6Q) += \ 
	imx6dl-gw54xx.dtb \

	imx6dl-gw551x.dtb \

	imx6dl-gw552x.dtb \

	imx6dl-gw553x.dtb \

	imx6dl-hummingboard.dtb \

	imx6dl-nit6xlite.dtb \

	imx6dl-nitrogen6x.dtb \
@@ -339,6 +341,7 @@ dtb-$(CONFIG_SOC_IMX6Q) += \ 
	imx6dl-sabreauto.dtb \

	imx6dl-sabrelite.dtb \

	imx6dl-sabresd.dtb \

	imx6dl-ts4900.dtb \

	imx6dl-tx6dl-comtft.dtb \

	imx6dl-tx6s-8034.dtb \

	imx6dl-tx6s-8035.dtb \
@@ -368,6 +371,7 @@ dtb-$(CONFIG_SOC_IMX6Q) += \ 
	imx6q-gw54xx.dtb \

	imx6q-gw551x.dtb \

	imx6q-gw552x.dtb \

	imx6q-gw553x.dtb \

	imx6q-h100.dtb \

	imx6q-hummingboard.dtb \

	imx6q-icore-rqs.dtb \
@@ -382,6 +386,7 @@ dtb-$(CONFIG_SOC_IMX6Q) += \ 
	imx6q-sabresd.dtb \

	imx6q-sbc6x.dtb \

	imx6q-tbs2910.dtb \

	imx6q-ts4900.dtb \

	imx6q-tx6q-1010.dtb \

	imx6q-tx6q-1010-comtft.dtb \

	imx6q-tx6q-1020.dtb \
@@ -407,6 +412,7 @@ dtb-$(CONFIG_SOC_IMX6SX) += \ 
	imx6sx-sdb.dtb

dtb-$(CONFIG_SOC_IMX6UL) += \

	imx6ul-14x14-evk.dtb \

	imx6ul-geam-kit.dtb \

	imx6ul-pico-hobbit.dtb \

	imx6ul-tx6ul-0010.dtb \

	imx6ul-tx6ul-0011.dtb \
@@ -417,7 +423,8 @@ dtb-$(CONFIG_SOC_IMX7D) += \ 
	imx7d-nitrogen7.dtb \

	imx7d-sbc-imx7.dtb \

	imx7d-sdb.dtb \

	imx7s-colibri-eval-v3.dtb

	imx7s-colibri-eval-v3.dtb \

	imx7s-warp.dtb

dtb-$(CONFIG_SOC_LS1021A) += \

	ls1021a-qds.dtb \

	ls1021a-twr.dtb

arch/arm/boot/dts/imx35.dtsi

+7 −0
Original line number Diff line number Diff line
@@ -309,6 +309,13 @@ 
				status = "disabled";

			};



			iim@53ff0000 {

				compatible = "fsl,imx35-iim";

				reg = <0x53ff0000 0x4000>;

				interrupts = <19>;

				clocks = <&clks 80>;

			};



			usbotg: usb@53ff4000 {

				compatible = "fsl,imx35-usb", "fsl,imx27-usb";

				reg = <0x53ff4000 0x0200>;

arch/arm/boot/dts/imx50.dtsi

+10 −0
Original line number Diff line number Diff line
@@ -227,6 +227,7 @@ 
				#gpio-cells = <2>;

				interrupt-controller;

				#interrupt-cells = <2>;

				gpio-ranges = <&iomuxc 0 151 28>;

			};



			gpio2: gpio@53f88000 {
@@ -237,6 +238,10 @@ 
				#gpio-cells = <2>;

				interrupt-controller;

				#interrupt-cells = <2>;

				gpio-ranges = <&iomuxc  0 75 8>, <&iomuxc 8 100 8>,

					      <&iomuxc 16 83 1>, <&iomuxc 17 85 1>,

					      <&iomuxc 18 87 1>, <&iomuxc 19 84 1>,

					      <&iomuxc 20 88 1>, <&iomuxc 21 86 1>;

			};



			gpio3: gpio@53f8c000 {
@@ -247,6 +252,7 @@ 
				#gpio-cells = <2>;

				interrupt-controller;

				#interrupt-cells = <2>;

				gpio-ranges = <&iomuxc 0 108 32>;

			};



			gpio4: gpio@53f90000 {
@@ -257,6 +263,8 @@ 
				#gpio-cells = <2>;

				interrupt-controller;

				#interrupt-cells = <2>;

				gpio-ranges = <&iomuxc  0   8  8>, <&iomuxc 8 45 12>,

					      <&iomuxc 20 140 11>;

			};



			wdog1: wdog@53f98000 {
@@ -346,6 +354,7 @@ 
				#gpio-cells = <2>;

				interrupt-controller;

				#interrupt-cells = <2>;

				gpio-ranges = <&iomuxc 0 57 18>, <&iomuxc 18 89 11>;

			};



			gpio6: gpio@53fe0000 {
@@ -356,6 +365,7 @@ 
				#gpio-cells = <2>;

				interrupt-controller;

				#interrupt-cells = <2>;

				gpio-ranges = <&iomuxc 0 27 18>, <&iomuxc 18 16 11>;

			};



			i2c3: i2c@53fec000 {