Unverified Commit 1db56016 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'gemini-dts-v6.1-1' of... 

Merge tag 'gemini-dts-v6.1-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik into arm/dt

Gemini DTS updates for kernel v6.1:

- Enable Gigabit ethernet on SSI1328 and NS2502
- Modify NS2502 us use RedBoot partition parsing

* tag 'gemini-dts-v6.1-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik:
  ARM: dts: Let Gemini NS2502 parse redboot partitions
  ARM: dts: gemini: ssi1328: permit to use gigabit
  ARM: dts: gemini: ns2502: permit to use gigabit

Link: https://lore.kernel.org/r/CACRpkdZt58ExwG+6EicODLhuVc8NSgCGUj4uNQmtnES8Cnf5uQ@mail.gmail.com


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents b90cb105 f485f6d8

arch/arm/boot/dts/gemini-ns2502.dts

+4 −29
Original line number Diff line number Diff line
@@ -39,10 +39,6 @@ mdio0: mdio { 
		phy0: ethernet-phy@1 {

			reg = <1>;

			device_type = "ethernet-phy";

			/* We lack the knowledge of necessary GPIO to achieve

			 * Gigabit

			 */

			max-speed = <100>;

		};

	};

};
@@ -50,7 +46,7 @@ phy0: ethernet-phy@1 { 
&ethernet {

	status = "okay";

	ethernet-port@0 {

		phy-mode = "rgmii";

		phy-mode = "rgmii-id";

		phy-handle = <&phy0>;

	};

};
@@ -65,30 +61,9 @@ &flash { 
	pinctrl-1 = <&pflash_disabled_pins>;



	partitions {

		compatible = "fixed-partitions";

		#address-cells = <1>;

		#size-cells = <1>;



		partition@0 {

			label = "RedBoot";

			reg = <0x00000000 0x00020000>;

		};

		partition@20000 {

			label = "kernel";

			reg = <0x00020000 0x00700000>;

		};

		partition@720000 {

			label = "VCTL";

			reg = <0x00720000 0x00020000>;

		};

		partition@740000 {

			label = "CurConf";

			reg = <0x00740000 0x000a0000>;

		};

		partition@7e0000 {

			label = "FIS";

			reg = <0x007e0000 0x00010000>;

		};

		compatible = "redboot-fis";

		/* Eraseblock at 0x7e0000 */

		fis-index-block = <0x3f>;

	};

};

arch/arm/boot/dts/gemini-ssi1328.dts

+0 −4
Original line number Diff line number Diff line
@@ -40,10 +40,6 @@ mdio0: mdio { 
		phy0: ethernet-phy@1 {

			reg = <1>;

			device_type = "ethernet-phy";

			/* We lack the knowledge of necessary GPIO to achieve

			 * Gigabit

			 */

			max-speed = <100>;

		};

		/* WAN ICPlus IP101A */

		phy1: ethernet-phy@2 {