Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9053d2db authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 2cc63b39 2f8b1ce1

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -729,7 +729,7 @@ 




&cpsw_emac0 {

&cpsw_emac0 {

	phy-handle = <&ethphy0>;

	phy-handle = <&ethphy0>;

	phy-mode = "rgmii-txid";

	phy-mode = "rgmii-id";

};

};





&tscadc {

&tscadc {

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

+2 −2
Original line number Original line Diff line number Diff line
@@ -651,13 +651,13 @@ 




&cpsw_emac0 {

&cpsw_emac0 {

	phy-handle = <&ethphy0>;

	phy-handle = <&ethphy0>;

	phy-mode = "rgmii-txid";

	phy-mode = "rgmii-id";

	dual_emac_res_vlan = <1>;

	dual_emac_res_vlan = <1>;

};

};





&cpsw_emac1 {

&cpsw_emac1 {

	phy-handle = <&ethphy1>;

	phy-handle = <&ethphy1>;

	phy-mode = "rgmii-txid";

	phy-mode = "rgmii-id";

	dual_emac_res_vlan = <2>;

	dual_emac_res_vlan = <2>;

};

};

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

+24 −22
Original line number Original line Diff line number Diff line
@@ -144,11 +144,13 @@ 
				status = "okay";

				status = "okay";

			};

			};





			nand@d0000 {

			nand-controller@d0000 {

				status = "okay";

				status = "okay";



				nand@0 {

					reg = <0>;

					label = "pxa3xx_nand-0";

					label = "pxa3xx_nand-0";

				num-cs = <1>;

					nand-rb = <0>;

				marvell,nand-keep-config;

					nand-on-flash-bbt;

					nand-on-flash-bbt;





					partitions {

					partitions {
@@ -167,7 +169,7 @@ 
						partition@1000000 {

						partition@1000000 {

							label = "Filesystem";

							label = "Filesystem";

							reg = <0x1000000 0x3f000000>;

							reg = <0x1000000 0x3f000000>;



						};

					};

					};

				};

				};

			};

			};

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

+8 −5
Original line number Original line Diff line number Diff line
@@ -160,14 +160,17 @@ 
				status = "okay";

				status = "okay";

			};

			};





			nand@d0000 {

			nand-controller@d0000 {

				status = "okay";

				status = "okay";



				nand@0 {

					reg = <0>;

					label = "pxa3xx_nand-0";

					label = "pxa3xx_nand-0";

				num-cs = <1>;

					nand-rb = <0>;

				marvell,nand-keep-config;

					nand-on-flash-bbt;

					nand-on-flash-bbt;

				};

				};

			};

			};

		};





		bm-bppi {

		bm-bppi {

			status = "okay";

			status = "okay";

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

+44 −41
Original line number Original line Diff line number Diff line
@@ -81,11 +81,13 @@ 




			};

			};





			nand@d0000 {

			nand-controller@d0000 {

				status = "okay";

				status = "okay";



				nand@0 {

					reg = <0>;

					label = "pxa3xx_nand-0";

					label = "pxa3xx_nand-0";

				num-cs = <1>;

					nand-rb = <0>;

				marvell,nand-keep-config;

					nand-on-flash-bbt;

					nand-on-flash-bbt;





					partitions {

					partitions {
@@ -129,6 +131,7 @@ 
				};

				};

			};

			};

		};

		};

	};





	gpio-keys {

	gpio-keys {

		compatible = "gpio-keys";

		compatible = "gpio-keys";