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

Commit 7c179f9d authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

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

Pull "i.MX device tree changes for 4.16" from Shawn Guo:

 - A few random updates for vf610-zii board: correct switch EEPROM size,
   enable edma1, correct GPIO expander interrupt, add PHYs for switch2
   device.
 - LS1021A device tree updates: add reboot and QSPI device nodes, label
   USB controllers, specify interrupt-affinity for PMU, fix TMR_FIPER1
   setting, enable esdhc device, add Moxa UC-8410A board support.
 - A bunch of patches from Fabio: fix reg - unit address mismatches,
   remove leading zero in unit address, move regulators out of
   simple-bus, move nodes with no reg property out of bus, remove extra
   clock cell, add missing phy-cells to usb-nop-xceiv, etc.
 - A couple series from Hummingboard developers: re-organise device tree
   files for better handling various board versions, and then add the
   new hummingboard2 board support on top of that.
 - Disable AC'97 input pins pad and add support for powering off for
   imx6qdl-udoo board.
 - Convert from fbdev to drm bindings for imx6sx-sdb and imx6sl-evk
   board.
 - Add device tree for Variscite DART-MX6 SoM and Carrier-board support.
 - Add new board support of TS-4600 and TS-7970 from Technologic
   Systems.
 - A series from Stefan to update imx7-colibri device tree and then add
   new version of Toradex Colibri iMX7D board with eMMC support.
 - Other random updates on various board support.

* tag 'imx-dt-4.16' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: (126 commits)
  ARM: dts: imx7s: Avoid using label in unit address and reg
  ARM: dts: imx51-zii-rdu1: Add missing #phy-cells to usb-nop-xceiv
  ARM: dts: imx6qdl-hummingboard2: Remove leading zero in unit address
  ARM: dts: ls1021a: add support for Moxa UC-8410A open platform
  ARM: dts: imx51-babbage: Fix the 26MHz clock modelling
  ARM: dts: vf610-zii-dev-rev-b: add PHYs for switch2
  ARM: dts: vf610-zii-dev-rev-b: fix interrupt for GPIO expander
  ARM: dts: vf610-zii-dev: enable edma1
  ARM: dts: ls1021a-twr: Remove extra clock cell
  ARM: dts: ls1021a-qds: Remove extra clock cell
  ARM: dts: imx53: add srtc node
  dt-bindings: imx-gpcv2: Fix the unit address
  ARM: imx: dts: Use lower case for bindings notation
  ARM: dts: imx6q-h100: use usdhc2 VSELECT
  ARM: dts: imx6sx: Add support for PCI power domain
  ARM: dts: imx6sx: Fix PCI non-prefetchable memory range
  ARM: dts: imx6qdl-hummingboard2: rename regulators to match schematic
  ARM: dts: imx6qdl-hummingboard2: add v1.5 som with eMMC
  ARM: dts: imx6qdl-hummingboard2: add v1.5 som without eMMC
  ARM: dts: imx6qdl-hummingboard2: add PWM3 support
  ...
parents b55eb1ae 84a82ef7

Documentation/devicetree/bindings/arm/technologic.txt

+11 −0
Original line number Diff line number Diff line 
Technologic Systems Platforms Device Tree Bindings

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



TS-4600 is a System-on-Module based on the Freescale i.MX28 System-on-Chip.

It can be mounted on a carrier board providing additional peripheral connectors.

Required root node properties:

	- compatible = "technologic,imx28-ts4600", "fsl,imx28"



TS-4800 board

Required root node properties:

	- compatible = "technologic,imx51-ts4800", "fsl,imx51";
@@ -10,3 +15,9 @@ 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"



TS-7970 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-ts7970", "fsl,imx6dl"

	- compatible = "technologic,imx6q-ts7970", "fsl,imx6q"

Documentation/devicetree/bindings/display/panel/sgd,gktw70sdae4se.txt

0 → 100644
+41 −0
Original line number Diff line number Diff line 
Solomon Goldentek Display GKTW70SDAE4SE LVDS Display Panel

==========================================================



The GKTW70SDAE4SE is a 7" WVGA TFT-LCD display panel.



These DT bindings follow the LVDS panel bindings defined in panel-lvds.txt

with the following device-specific properties.



Required properties:



- compatible: Shall contain "sgd,gktw70sdae4se" and "panel-lvds", in that order.



Example

-------



panel {

	compatible = "sgd,gktw70sdae4se", "panel-lvds";



	width-mm = <153>;

	height-mm = <86>;



	data-mapping = "jeida-18";



	panel-timing {

		clock-frequency = <32000000>;

		hactive = <800>;

		vactive = <480>;

		hback-porch = <39>;

		hfront-porch = <39>;

		vback-porch = <29>;

		vfront-porch = <13>;

		hsync-len = <47>;

		vsync-len = <2>;

	};



	port {

		panel_in: endpoint {

			remote-endpoint = <&lvds_encoder>;

		};

	};

};

Documentation/devicetree/bindings/power/fsl,imx-gpcv2.txt

+2 −2
Original line number Diff line number Diff line
@@ -44,10 +44,10 @@ Example: 
			#address-cells = <1>;

			#size-cells = <0>;



			pgc_pcie_phy: power-domain@3 {

			pgc_pcie_phy: power-domain@1 {

				#power-domain-cells = <0>;



				reg = <IMX7_POWER_DOMAIN_PCIE_PHY>;

				reg = <1>;

				power-supply = <&reg_1p0d>;

			};

		};

Documentation/devicetree/bindings/vendor-prefixes.txt

+1 −0
Original line number Diff line number Diff line
@@ -306,6 +306,7 @@ seagate Seagate Technology PLC 
semtech	Semtech Corporation

sensirion	Sensirion AG

sff	Small Form Factor Committee

sgd	Solomon Goldentek Display Corporation

sgx	SGX Sensortech

sharp	Sharp Corporation

shimafuji	Shimafuji Electric, Inc.

arch/arm/boot/dts/Makefile

+21 −1
Original line number Diff line number Diff line
@@ -373,6 +373,8 @@ dtb-$(CONFIG_SOC_IMX6Q) += \ 
	imx6dl-aristainetos2_7.dtb \

	imx6dl-colibri-eval-v3.dtb \

	imx6dl-cubox-i.dtb \

	imx6dl-cubox-i-emmc-som-v15.dtb \

	imx6dl-cubox-i-som-v15.dtb \

	imx6dl-dfi-fs700-m60.dtb \

	imx6dl-gw51xx.dtb \

	imx6dl-gw52xx.dtb \
@@ -385,6 +387,11 @@ dtb-$(CONFIG_SOC_IMX6Q) += \ 
	imx6dl-gw5903.dtb \

	imx6dl-gw5904.dtb \

	imx6dl-hummingboard.dtb \

	imx6dl-hummingboard-emmc-som-v15.dtb \

	imx6dl-hummingboard-som-v15.dtb \

	imx6dl-hummingboard2.dtb \

	imx6dl-hummingboard2-emmc-som-v15.dtb \

	imx6dl-hummingboard2-som-v15.dtb \

	imx6dl-icore.dtb \

	imx6dl-icore-rqs.dtb \

	imx6dl-nit6xlite.dtb \
@@ -397,6 +404,7 @@ dtb-$(CONFIG_SOC_IMX6Q) += \ 
	imx6dl-sabresd.dtb \

	imx6dl-savageboard.dtb \

	imx6dl-ts4900.dtb \

	imx6dl-ts7970.dtb \

	imx6dl-tx6dl-comtft.dtb \

	imx6dl-tx6s-8034.dtb \

	imx6dl-tx6s-8034-mb7.dtb \
@@ -422,6 +430,8 @@ dtb-$(CONFIG_SOC_IMX6Q) += \ 
	imx6q-b850v3.dtb \

	imx6q-cm-fx6.dtb \

	imx6q-cubox-i.dtb \

	imx6q-cubox-i-emmc-som-v15.dtb \

	imx6q-cubox-i-som-v15.dtb \

	imx6q-dfi-fs700-m60.dtb \

	imx6q-display5-tianma-tm070-1280x768.dtb \

	imx6q-dmo-edmqmx6.dtb \
@@ -440,6 +450,11 @@ dtb-$(CONFIG_SOC_IMX6Q) += \ 
	imx6q-gw5904.dtb \

	imx6q-h100.dtb \

	imx6q-hummingboard.dtb \

	imx6q-hummingboard-emmc-som-v15.dtb \

	imx6q-hummingboard-som-v15.dtb \

	imx6q-hummingboard2.dtb \

	imx6q-hummingboard2-emmc-som-v15.dtb \

	imx6q-hummingboard2-som-v15.dtb \

	imx6q-icore.dtb \

	imx6q-icore-ofcap10.dtb \

	imx6q-icore-ofcap12.dtb \
@@ -460,6 +475,7 @@ dtb-$(CONFIG_SOC_IMX6Q) += \ 
	imx6q-sbc6x.dtb \

	imx6q-tbs2910.dtb \

	imx6q-ts4900.dtb \

	imx6q-ts7970.dtb \

	imx6q-tx6q-1010.dtb \

	imx6q-tx6q-1010-comtft.dtb \

	imx6q-tx6q-1020.dtb \
@@ -471,6 +487,7 @@ dtb-$(CONFIG_SOC_IMX6Q) += \ 
	imx6q-tx6q-11x0-mb7.dtb \

	imx6q-udoo.dtb \

	imx6q-utilite-pro.dtb \

	imx6q-var-dt6customboard.dtb \

	imx6q-wandboard.dtb \

	imx6q-wandboard-revb1.dtb \

	imx6q-wandboard-revd1.dtb \
@@ -512,15 +529,17 @@ dtb-$(CONFIG_SOC_IMX6UL) += \ 
	imx6ull-14x14-evk.dtb

dtb-$(CONFIG_SOC_IMX7D) += \

	imx7d-cl-som-imx7.dtb \

	imx7d-colibri-emmc-eval-v3.dtb \

	imx7d-colibri-eval-v3.dtb \

	imx7d-nitrogen7.dtb \

	imx7d-pico.dtb \

	imx7d-pico-pi.dtb \

	imx7d-sbc-imx7.dtb \

	imx7d-sdb.dtb \

	imx7d-sdb-sht11.dtb \

	imx7s-colibri-eval-v3.dtb \

	imx7s-warp.dtb

dtb-$(CONFIG_SOC_LS1021A) += \

	ls1021a-moxa-uc-8410a.dtb \

	ls1021a-qds.dtb \

	ls1021a-twr.dtb

dtb-$(CONFIG_SOC_VF610) += \
@@ -559,6 +578,7 @@ dtb-$(CONFIG_ARCH_MXS) += \ 
	imx28-m28cu3.dtb \

	imx28-m28evk.dtb \

	imx28-sps1.dtb \

	imx28-ts4600.dtb \

	imx28-tx28.dtb

dtb-$(CONFIG_ARCH_NOMADIK) += \

	ste-nomadik-s8815.dtb \