Commit 2cb6115d authored Jun 18, 2017 by Olof Johansson

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

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

The i.MX device tree updates for 4.13:
 - New board support: Gateworks Ventana GW5600, Technexion Pico i.MX7D
   Board.
 - A series from Alexandre Belloni to correct the vendor prefix for
   rv4162 compatible.
 - A patch-set from Andrey Smirnov ot enable PCIe support for i.MX7 and
   imx7d-sdb board.
 - Increase the SGTL5000 LRCLK pad strength to fix a random audio
   channel swapping seen on imx6qdl-wandboard and imx6qdl-colibri
   boards.
 - Clean up non-existing property 'enable-active-low' from fixed
   regulator device nodes.
 - Correct GPIO polarity for Ethernet PHY and PCI reset lines, even
   though device drivers do not use the polarity for now.
 - Add Wifi and Bluetooth support for imx7d-sdb board.
 - Adopt the i.MX6Q/DL DT to the new and more flexible GPC binding.
 - Update zii-rdu2 device tree source to use #include "..." for local
   inclusion.
 - A series from Philipp Zabel and Steve Longerbeam to enable video
   capture support for imx6qdl platforms.
 - A number of small random updates on various board support.

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

: (47 commits)
  ARM: dts: imx6q-cm-fx6: add sdio wifi/bt nodes
  ARM: dts: ls1021a: update the clockgen node
  ARM: dts: imx6-sabreauto: add the ADV7180 video decoder
  ARM: dts: imx6-sabreauto: add pinctrl for gpt input capture
  ARM: dts: imx6-sabreauto: add reset-gpios property for max7310_b
  ARM: dts: imx6-sabreauto: create i2cmux for i2c3
  ARM: dts: imx6-sabresd: add OV5642 and OV5640 camera sensors
  ARM: dts: imx6-sabrelite: add OV5642 and OV5640 camera sensors
  ARM: dts: imx6qdl-sabrelite: remove erratum ERR006687 workaround
  ARM: dts: imx6qdl: add capture-subsystem device
  ARM: dts: imx6qdl: Add video multiplexers, mipi_csi, and their connections
  ARM: dts: imx6qdl: Add compatible, clocks, irqs to MIPI CSI-2 node
  ARM: dts: imx6qdl: add multiplexer controls
  ARM: dts: imx6: Fix PCI GPIO reset polarity
  ARM: dts: imx7d-sdb: Add Bluetooth support
  ARM: dts: imx7d-sdb: Add Wifi support
  ARM: dts: imx7d-sdb: Adjust the regulator nodes
  ARM: dts: imx: Fix Ethernet PHY reset polarity
  ARM: dts: imx7: Fix typo in watchdog pin name
  ARM: dts: vf610-zii: Add switch eeprom-length properties
  ...

Signed-off-by: Olof Johansson <olof@lixom.net>

parents ae1d2663 d8710c3f

arch/arm/boot/dts/Makefile

+3 −0

Original line number	Diff line number	Diff line
		@@ -365,6 +365,7 @@ dtb-$(CONFIG_SOC_IMX6Q) += \
		imx6dl-gw551x.dtb \
		imx6dl-gw552x.dtb \
		imx6dl-gw553x.dtb \
		imx6dl-gw560x.dtb \
		imx6dl-gw5903.dtb \
		imx6dl-gw5904.dtb \
		imx6dl-hummingboard.dtb \
		@@ -410,6 +411,7 @@ dtb-$(CONFIG_SOC_IMX6Q) += \
		imx6q-gw551x.dtb \
		imx6q-gw552x.dtb \
		imx6q-gw553x.dtb \
		imx6q-gw560x.dtb \
		imx6q-gw5903.dtb \
		imx6q-gw5904.dtb \
		imx6q-h100.dtb \
		@@ -478,6 +480,7 @@ dtb-$(CONFIG_SOC_IMX7D) += \
		imx7d-cl-som-imx7.dtb \
		imx7d-colibri-eval-v3.dtb \
		imx7d-nitrogen7.dtb \
		imx7d-pico.dtb \
		imx7d-sbc-imx7.dtb \
		imx7d-sdb.dtb \
		imx7d-sdb-sht11.dtb \

arch/arm/boot/dts/imx23-sansa.dts

+3 −4

Original line number	Diff line number	Diff line
		@@ -42,6 +42,7 @@
		*/

		/dts-v1/;
		#include <dt-bindings/gpio/gpio.h>
		#include "imx23.dtsi"

		/ {
		@@ -149,9 +150,8 @@
		regulator-name = "vdd-touchpad0";
		regulator-min-microvolt = <3300000>;
		regulator-max-microvolt = <3300000>;
		gpio = <&gpio0 26 0>;
		gpio = <&gpio0 26 GPIO_ACTIVE_LOW>;
		regulator-always-on;
		enable-active-low;
		};

		reg_vdd_tuner: regulator-vdd-tuner0 {
		@@ -159,9 +159,8 @@
		regulator-name = "vdd-tuner0";
		regulator-min-microvolt = <3300000>;
		regulator-max-microvolt = <3300000>;
		gpio = <&gpio0 29 0>;
		gpio = <&gpio0 29 GPIO_ACTIVE_LOW>;
		regulator-always-on;
		enable-active-low;
		};

		backlight {

arch/arm/boot/dts/imx25-karo-tx25.dts

+1 −1

Original line number	Diff line number	Diff line
		@@ -97,7 +97,7 @@
		&fec {
		pinctrl-names = "default";
		pinctrl-0 = <&pinctrl_fec>;
		phy-reset-gpios = <&gpio3 7 0>;
		phy-reset-gpios = <&gpio3 7 GPIO_ACTIVE_LOW>;
		phy-mode = "rmii";
		phy-supply = <&reg_fec_phy>;
		status = "okay";

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -125,7 +125,7 @@
		pinctrl-names = "default";
		pinctrl-0 = <&pinctrl_fec>;
		phy-supply = <&reg_fec_3v3>;
		phy-reset-gpios = <&gpio4 8 0>;
		phy-reset-gpios = <&gpio4 8 GPIO_ACTIVE_LOW>;
		status = "okay";
		};

arch/arm/boot/dts/imx25.dtsi

+1 −0

Original line number	Diff line number	Diff line
		@@ -9,6 +9,7 @@
		* http://www.gnu.org/copyleft/gpl.html
		*/

		#include <dt-bindings/gpio/gpio.h>
		#include "imx25-pinfunc.h"

		/ {