Merge tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc

Pull ARM SoC fixes from Arnd Bergmann:
 "Only a handful of device tree fixes, all simple enough:

  NVIDIA Tegra:
   - Fix a regression for booting on chromebooks

  TI OMAP:
   - Two fixes PHY mode on am335x reference boards

  Marvell mvebu:
   - A regression fix for Armada XP NAND flash controllers
   - An incorrect reset signal on the clearfog board"

* tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc:
  ARM: tegra: Restore DT ABI on Tegra124 Chromebooks
  ARM: dts: am335x-evm: Fix PHY mode for ethernet
  ARM: dts: am335x-evmsk: Fix PHY mode for ethernet
  arm64: dts: clearfog-gt-8k: fix SGMII PHY reset signal
  ARM: dts: armada-xp: fix Armada XP boards NAND description

arch/arm/boot/dts/am335x-evm.dts

@@ -729,7 +729,7 @@ ethphy0: ethernet-phy@0 {
 
 &cpsw_emac0 {
 	phy-handle = <&ethphy0>;
-	phy-mode = "rgmii-txid";
+	phy-mode = "rgmii-id";
 };
 
 &tscadc {

arch/arm/boot/dts/am335x-evmsk.dts

@@ -651,13 +651,13 @@ ethphy1: ethernet-phy@1 {
 
 &cpsw_emac0 {
 	phy-handle = <&ethphy0>;
-	phy-mode = "rgmii-txid";
+	phy-mode = "rgmii-id";
 	dual_emac_res_vlan = <1>;
 };
 
 &cpsw_emac1 {
 	phy-handle = <&ethphy1>;
-	phy-mode = "rgmii-txid";
+	phy-mode = "rgmii-id";
 	dual_emac_res_vlan = <2>;
 };
 

arch/arm/boot/dts/armada-xp-db.dts

@@ -144,11 +144,13 @@ usb@52000 {
 				status = "okay";
 			};
 
-			nand@d0000 {
+			nand-controller@d0000 {
 				status = "okay";
+
+				nand@0 {
+					reg = <0>;
 					label = "pxa3xx_nand-0";
-				num-cs = <1>;
-				marvell,nand-keep-config;
+					nand-rb = <0>;
 					nand-on-flash-bbt;
 
 					partitions {
@@ -167,7 +169,7 @@ partition@800000 {
 						partition@1000000 {
 							label = "Filesystem";
 							reg = <0x1000000 0x3f000000>;
-
+						};
 					};
 				};
 			};

arch/arm/boot/dts/armada-xp-gp.dts

@@ -160,14 +160,17 @@ bm@c0000 {
 				status = "okay";
 			};
 
-			nand@d0000 {
+			nand-controller@d0000 {
 				status = "okay";
+
+				nand@0 {
+					reg = <0>;
 					label = "pxa3xx_nand-0";
-				num-cs = <1>;
-				marvell,nand-keep-config;
+					nand-rb = <0>;
 					nand-on-flash-bbt;
 				};
 			};
+		};
 
 		bm-bppi {
 			status = "okay";

arch/arm/boot/dts/armada-xp-lenovo-ix4-300d.dts

@@ -81,11 +81,13 @@ pcf8563@51 {
 
 			};
 
-			nand@d0000 {
+			nand-controller@d0000 {
 				status = "okay";
+
+				nand@0 {
+					reg = <0>;
 					label = "pxa3xx_nand-0";
-				num-cs = <1>;
-				marvell,nand-keep-config;
+					nand-rb = <0>;
 					nand-on-flash-bbt;
 
 					partitions {
@@ -129,6 +131,7 @@ partition@e00000 {
 				};
 			};
 		};
+	};
 
 	gpio-keys {
 		compatible = "gpio-keys";

arch/arm/boot/dts/tegra124-nyan.dtsi

@@ -13,10 +13,25 @@ chosen {
 		stdout-path = "serial0:115200n8";
 	};
 
-	memory@80000000 {
+	/*
+	 * Note that recent version of the device tree compiler (starting with
+	 * version 1.4.2) warn about this node containing a reg property, but
+	 * missing a unit-address. However, the bootloader on these Chromebook
+	 * devices relies on the full name of this node to be exactly /memory.
+	 * Adding the unit-address causes the bootloader to create a /memory
+	 * node and write the memory bank configuration to that node, which in
+	 * turn leads the kernel to believe that the device has 2 GiB of
+	 * memory instead of the amount detected by the bootloader.
+	 *
+	 * The name of this node is effectively ABI and must not be changed.
+	 */
+	memory {
+		device_type = "memory";
 		reg = <0x0 0x80000000 0x0 0x80000000>;
 	};
 
+	/delete-node/ memory@80000000;
+
 	host1x@50000000 {
 		hdmi@54280000 {
 			status = "okay";

arch/arm64/boot/dts/marvell/armada-8040-clearfog-gt-8k.dts

@@ -351,7 +351,7 @@ ge_phy: ethernet-phy@0 {
 		reg = <0>;
 		pinctrl-names = "default";
 		pinctrl-0 = <&cp0_copper_eth_phy_reset>;
-		reset-gpios = <&cp1_gpio1 11 GPIO_ACTIVE_LOW>;
+		reset-gpios = <&cp0_gpio2 11 GPIO_ACTIVE_LOW>;
 		reset-assert-us = <10000>;
 	};