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

i.MX arm device tree update for 5.2:
 - New board support: imx50-kobo-aura, imx53-m53menlo, imx6dl-eckelmann,
   imx7d-mba7, imx7d-zii-rpu2, and vf610-zii-spb4.
 - Add i2c, mmc and spi aliases for SoC i.MX35, i.MX50 and i.MX6SL.
 - Use new 'reset-gpios' property describing CODEC reset pin for board
   mx6qdl-zii-rdu2, imx6qdl-gw5903 and imx6qdl-var-dart.
 - Specify viewport count for PCIE block on SoC imx7d and imx6qdl.
 - Correct 'ipg' clock of SDMA device for i.MX5, i.MX6 and i.MX7 SoCs.
 - Rename MMDC memory controller device to be generic and add MMDC
   device for imx7ulp SoC.
 - Add OCOTP device support for imx7ulp SoC.
 - Improve ZII board DTS by switching to SPDX identifier and using generic
   device node name.
 - A series from Rui Miguel Silva to add various media related devices
   for i.MX7 SoC, and enable ov2680 sensor support for imx7s-warp board.
 - Random small updates on various board support.

* tag 'imx-dt-5.2' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: (59 commits)
  ARM: dts: imx7s: Specify #io-channel-cells in ADC nodes
  ARM: dts: vf610-zii-dev-rev-b: Specify CS as GPIO_ACTIVE_LOW in spi0
  ARM: dts: vf610-zii-dev: Mark i2c0 SCL as GPIO_OPEN_DRAIN
  ARM: dts: Add support for ZII i.MX7 RPU2 board
  ARM: dts: bugfix tqma7 soft reset issue
  ARM: dts: imx53: Add Menlosystems M53 board
  ARM: dts: imx53: Rename M53 SoM touchscreen node
  ARM: dts: imx6dl-sabreauto: update opp table for auto part
  ARM: dts: imx: Use generic node names for Zii dts
  ARM: dts: imx: Switch Zii dts to SPDX identifier
  ARM: dts: imx6q-logicpd: Shutdown LCD regulator during suspend
  ARM: dts: imx6q-logicpd: Enable Analog audio capture
  ARM: dts: imx6sll: add cooling-cells for cpu-freq cooling device
  ARM: dts: imx50: Add Kobo Aura DTS
  ARM: dts: imx6qdl-var-dart: Use new CODEC reset pin name
  ARM: dts: imx6qdl-gw5903: Use new CODEC reset pin name
  ARM: dts: mx6qdl-zii-rdu2: Use new CODEC reset pin name
  ARM: dts: imx50: Specify IMX5_CLK_IPG as "ahb" clock to SDMA
  ARM: dts: imx51: Specify IMX5_CLK_IPG as "ahb" clock to SDMA
  ARM: dts: imx53: Specify IMX5_CLK_IPG as "ahb" clock to SDMA
  ...

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

1 files changed, 3 insertions, 3 deletions

diff --git a/arch/arm/boot/dts/vf610-zii-dev.dtsi b/arch/arm/boot/dts/vf610-zii-dev.dtsi
index 19eb4a849efb..0507e6dcbb21 100644
--- a/arch/arm/boot/dts/vf610-zii-dev.dtsi
+++ b/arch/arm/boot/dts/vf610-zii-dev.dtsi
@@ -138,7 +138,7 @@
 	pinctrl-names = "default", "gpio";
 	pinctrl-0 = <&pinctrl_i2c0>;
 	pinctrl-1 = <&pinctrl_i2c0_gpio>;
-	scl-gpios = <&gpio1 4 GPIO_ACTIVE_HIGH>;
+	scl-gpios = <&gpio1 4 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
 	sda-gpios = <&gpio1 5 GPIO_ACTIVE_HIGH>;
 	status = "okay";
 
@@ -147,12 +147,12 @@
 		reg = <0x48>;
 	};
 
-	at24c04@50 {
+	eeprom@50 {
 		compatible = "atmel,24c04";
 		reg = <0x50>;
 	};
 
-	at24c04@52 {
+	eeprom@52 {
 		compatible = "atmel,24c04";
 		reg = <0x52>;
 	};