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

i.MX fixes for 4.20:
 - Add boot-on and always-on for imx6sx-sdb phy regulator to fix enet
   resume problem, which is exposed by commit ("regulator: fixed:
   Convert to use GPIO descriptor only").
 - Fix improperly quoted stdout-path values for imx53-ppd and
   vf610m4-colibri board.
 - Fix the typo of compatible string "fs,imx6sll-i2c" which should be
   "fsl,imx6sll-i2c".

* tag 'imx-fixes-4.20' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
  ARM: dts: imx6sx-sdb: Fix enet phy regulator
  ARM: dts: fsl: Fix improperly quoted stdout-path values
  ARM: dts: imx6sll: fix typo for fsl,imx6sll-i2c node

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

4 files changed, 10 insertions, 5 deletions

diff --git a/arch/arm/boot/dts/imx53-ppd.dts b/arch/arm/boot/dts/imx53-ppd.dts
index b560ff88459b..5ff9a179c83c 100644
--- a/arch/arm/boot/dts/imx53-ppd.dts
+++ b/arch/arm/boot/dts/imx53-ppd.dts
@@ -55,7 +55,7 @@
         };
 
         chosen {
-                stdout-path = "&uart1:115200n8";
+                stdout-path = "serial0:115200n8";
         };
 
         memory@70000000 {
diff --git a/arch/arm/boot/dts/imx6sll.dtsi b/arch/arm/boot/dts/imx6sll.dtsi
index ed9a980bce85..beefa1b2049d 100644
--- a/arch/arm/boot/dts/imx6sll.dtsi
+++ b/arch/arm/boot/dts/imx6sll.dtsi
@@ -740,7 +740,7 @@
                         i2c1: i2c@21a0000 {
                                 #address-cells = <1>;
                                 #size-cells = <0>;
-                                compatible = "fs,imx6sll-i2c", "fsl,imx21-i2c";
+                                compatible = "fsl,imx6sll-i2c", "fsl,imx21-i2c";
                                 reg = <0x021a0000 0x4000>;
                                 interrupts = <GIC_SPI 36 IRQ_TYPE_LEVEL_HIGH>;
                                 clocks = <&clks IMX6SLL_CLK_I2C1>;
diff --git a/arch/arm/boot/dts/imx6sx-sdb.dtsi b/arch/arm/boot/dts/imx6sx-sdb.dtsi
index 53b3408b5fab..7d7d679945d2 100644
--- a/arch/arm/boot/dts/imx6sx-sdb.dtsi
+++ b/arch/arm/boot/dts/imx6sx-sdb.dtsi
@@ -117,7 +117,9 @@
                 regulator-name = "enet_3v3";
                 regulator-min-microvolt = <3300000>;
                 regulator-max-microvolt = <3300000>;
-                gpios = <&gpio2 6 GPIO_ACTIVE_LOW>;
+                gpio = <&gpio2 6 GPIO_ACTIVE_LOW>;
+                regulator-boot-on;
+                regulator-always-on;
         };
 
         reg_pcie_gpio: regulator-pcie-gpio {
@@ -180,6 +182,7 @@
         phy-supply = <&reg_enet_3v3>;
         phy-mode = "rgmii";
         phy-handle = <&ethphy1>;
+        phy-reset-gpios = <&gpio2 7 GPIO_ACTIVE_LOW>;
         status = "okay";
 
         mdio {
@@ -373,6 +376,8 @@
                                 MX6SX_PAD_RGMII1_RD3__ENET1_RX_DATA_3   0x3081
                                 MX6SX_PAD_RGMII1_RX_CTL__ENET1_RX_EN    0x3081
                                 MX6SX_PAD_ENET2_RX_CLK__ENET2_REF_CLK_25M       0x91
+                                /* phy reset */
+                                MX6SX_PAD_ENET2_CRS__GPIO2_IO_7         0x10b0
                         >;
                 };
 
diff --git a/arch/arm/boot/dts/vf610m4-colibri.dts b/arch/arm/boot/dts/vf610m4-colibri.dts
index 41ec66a96990..ca6249558760 100644
--- a/arch/arm/boot/dts/vf610m4-colibri.dts
+++ b/arch/arm/boot/dts/vf610m4-colibri.dts
@@ -50,8 +50,8 @@
         compatible = "fsl,vf610m4";
 
         chosen {
-                bootargs = "console=ttyLP2,115200 clk_ignore_unused init=/linuxrc rw";
-                stdout-path = "&uart2";
+                bootargs = "clk_ignore_unused init=/linuxrc rw";
+                stdout-path = "serial2:115200";
         };
 
         memory@8c000000 {