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

i.MX device tree update for 4.20:
 - New board support: Engicam's i.Core MX6 CPU module v1.5; ConnectCore
   6UL Single Board Computer (SBC) Pro; i.MX6 ULZ based EVK board.
 - Add Add SFF interface support for vf610-zii board.
 - Disable unneeded devices like VPU and internal watchdog for imx51-zii
   boards.
 - Add 'no-sdio' and 'no-sd' property for vf610-zii-cfu1 board.
 - Improve i.MX6 SLL GPIO support by adding gpio-ranges property and
   clocks information.
 - Update iomux header for i.MX7 Solo and i.MX6 ULL.
 - Enable GPIO buttons as wakeup source for imx7d-sdb and imx6sx-sdb.
 - Add GPIO keys and egalax touch screen support for imx6qdl-sabreauto.
 - Switch to use SPDX-License-Identifier for more boards - vf610-twr,
   imx7s-warp, Engicam boards.
 - Add device tree bindings of 'fsl,pmic-stby-poweroff' property and add
   the support for i.MX6 RIoTboard.
 - DTC has new checks for SPI buses which will be landed on 4.20.
   A patch from Rob to fix those 100+ warnings on i.MX boards. (Thanks!)
 - Switch i.MX7 device tree to use updated coresight binding for
   hardware ports.
 - Misc small or random update and cleanup.

* tag 'imx-dt-4.20' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: (50 commits)
  ARM: dts: imx: add i.mx6ulz and i.mx6ulz 14x14 evk support
  dt-bindings: arm: add compatible for i.MX6ULZ 14x14 EVK board
  ARM: dts: imx53-ppd: Remove 'num-chipselects' property
  ARM: dts: vf610-twr: Switch to SPDX identifier
  ARM: dts: vf: Switch to SPDX identifier
  ARM: dts: imx6qdl-zii-rdu2: Disable the internal RTC
  ARM: dts: imx51-zii-rdu1: Fix the rtc compatible string
  ARM: dts: imx6ul: use nvmem-cells for cpu speed grading
  ARM: dts: imx: Fix SPI bus warnings
  ARM: dts: imx7: Update coresight binding for hardware ports
  ARM: dts: vf610-zii-cfu1: Pass the 'no-sd' property
  ARM: dts: vf610-zii-cfu1: Pass the 'no-sdio' property
  ARM: dts: imx51-zii-scu2-mezz: Disable the internal watchdog
  ARM: dts: imx51-zii-scu2-mezz: Disable VPU
  ARM: dts: imx51-zii-scu3-esb: Disable VPU
  ARM: dts: imx51: Add label for VPU node
  ARM: dts: imx6ull: update vdd_soc voltage for 900MHz operating point
  ARM: dts: imx6ul: Add DTS for ConnectCore 6UL SBC Pro
  ARM: dts: imx6: RIoTboard provide standby on power off option
  dt-bindings: imx6q-clock: add new fsl,pmic-stby-poweroff property
  ...

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

1 files changed, 25 insertions, 19 deletions

diff --git a/arch/arm/boot/dts/vf610-zii-dev-rev-c.dts b/arch/arm/boot/dts/vf610-zii-dev-rev-c.dts
index 0b1e94c6f25b..6f4a5602cefd 100644
--- a/arch/arm/boot/dts/vf610-zii-dev-rev-c.dts
+++ b/arch/arm/boot/dts/vf610-zii-dev-rev-c.dts
@@ -200,6 +200,13 @@
 						phy-handle = <&switch1phy4>;
 					};
 
+					port@9 {
+						reg = <9>;
+						label = "sff2";
+						phy-mode = "sgmii";
+						managed = "in-band-status";
+						sfp = <&sff2>;
+					};
 
 					switch1port10: port@10 {
 						reg = <10>;
@@ -245,6 +252,22 @@
 			#size-cells = <0>;
 		};
 	};
+
+	sff2: sff2 {
+		/* lower */
+		compatible = "sff,sff";
+		i2c-bus = <&sff2_i2c>;
+		los-gpios = <&gpio6 12 GPIO_ACTIVE_HIGH>;
+		tx-disable-gpios = <&gpio6 14 GPIO_ACTIVE_HIGH>;
+	};
+
+	sff3: sff3 {
+		/* upper */
+		compatible = "sff,sff";
+		i2c-bus = <&sff3_i2c>;
+		los-gpios = <&gpio6 13 GPIO_ACTIVE_HIGH>;
+		tx-disable-gpios = <&gpio6 15 GPIO_ACTIVE_HIGH>;
+	};
 };
 
 &dspi0 {
@@ -329,13 +352,6 @@
 		interrupts = <23 IRQ_TYPE_EDGE_FALLING>;
 		gpio-controller;
 		interrupt-controller;
-
-		enet_swr_en {
-			gpio-hog;
-			gpios = <0 GPIO_ACTIVE_HIGH>;
-			output-high;
-			line-name = "enet-swr-en";
-		};
 	};
 
 	/*
@@ -378,26 +394,16 @@
 			reg = <0>;
 		};
 
-		i2c@1 {
+		sff2_i2c: i2c@1 {
 			#address-cells = <1>;
 			#size-cells = <0>;
 			reg = <1>;
-
-			sfp2: at24c04@50 {
-				compatible = "atmel,24c02";
-				reg = <0x50>;
-			};
 		};
 
-		i2c@2 {
+		sff3_i2c: i2c@2 {
 			#address-cells = <1>;
 			#size-cells = <0>;
 			reg = <2>;
-
-			sfp3: at24c04@50 {
-				compatible = "atmel,24c02";
-				reg = <0x50>;
-			};
 		};
 
 		i2c@3 {