Commit 3a69e4e6 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'mvebu-fixes-5.9-1' of... 

Merge tag 'mvebu-fixes-5.9-1' of git://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu into arm/fixes

mvebu fixes for 5.9 (part 1)

- Allow to use correct MAC address for particular DSA slaves /
  ethernet ports on Espressobin (Armada 3720)

- Remove incorrect check in ll_get_coherency_base() used for Armada
  370/XP SoCs.

* tag 'mvebu-fixes-5.9-1' of git://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu:
  ARM: mvebu: drop pointless check for coherency_base
  arm64: dts: marvell: espressobin: Add ethernet switch aliases

Link: https://lore.kernel.org/r/87y2kkesj5.fsf@BL-laptop


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 666674cc 0b58725f

arch/arm/mach-mvebu/coherency_ll.S

+1 −6
Original line number Diff line number Diff line
@@ -35,13 +35,8 @@ ENTRY(ll_get_coherency_base) 


	/*

	 * MMU is disabled, use the physical address of the coherency

	 * base address. However, if the coherency fabric isn't mapped

	 * (i.e its virtual address is zero), it means coherency is

	 * not enabled, so we return 0.

	 * base address, (or 0x0 if the coherency fabric is not mapped)

	 */

	ldr	r1, =coherency_base

	cmp	r1, #0

	beq	2f

	adr	r1, 3f

	ldr	r3, [r1]

	ldr	r1, [r1, r3]

arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7-emmc.dts

+8 −2
Original line number Diff line number Diff line
@@ -20,17 +20,23 @@ 
	compatible = "globalscale,espressobin-v7-emmc", "globalscale,espressobin-v7",

		     "globalscale,espressobin", "marvell,armada3720",

		     "marvell,armada3710";



	aliases {

		/* ethernet1 is wan port */

		ethernet1 = &switch0port3;

		ethernet3 = &switch0port1;

	};

};



&switch0 {

	ports {

		port@1 {

		switch0port1: port@1 {

			reg = <1>;

			label = "lan1";

			phy-handle = <&switch0phy0>;

		};



		port@3 {

		switch0port3: port@3 {

			reg = <3>;

			label = "wan";

			phy-handle = <&switch0phy2>;

arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7.dts

+8 −2
Original line number Diff line number Diff line
@@ -19,17 +19,23 @@ 
	model = "Globalscale Marvell ESPRESSOBin Board V7";

	compatible = "globalscale,espressobin-v7", "globalscale,espressobin",

		     "marvell,armada3720", "marvell,armada3710";



	aliases {

		/* ethernet1 is wan port */

		ethernet1 = &switch0port3;

		ethernet3 = &switch0port1;

	};

};



&switch0 {

	ports {

		port@1 {

		switch0port1: port@1 {

			reg = <1>;

			label = "lan1";

			phy-handle = <&switch0phy0>;

		};



		port@3 {

		switch0port3: port@3 {

			reg = <3>;

			label = "wan";

			phy-handle = <&switch0phy2>;

arch/arm64/boot/dts/marvell/armada-3720-espressobin.dtsi

+8 −4
Original line number Diff line number Diff line
@@ -13,6 +13,10 @@ 
/ {

	aliases {

		ethernet0 = &eth0;

		/* for dsa slave device */

		ethernet1 = &switch0port1;

		ethernet2 = &switch0port2;

		ethernet3 = &switch0port3;

		serial0 = &uart0;

		serial1 = &uart1;

	};
@@ -120,7 +124,7 @@ 
			#address-cells = <1>;

			#size-cells = <0>;



			port@0 {

			switch0port0: port@0 {

				reg = <0>;

				label = "cpu";

				ethernet = <&eth0>;
@@ -131,19 +135,19 @@ 
				};

			};



			port@1 {

			switch0port1: port@1 {

				reg = <1>;

				label = "wan";

				phy-handle = <&switch0phy0>;

			};



			port@2 {

			switch0port2: port@2 {

				reg = <2>;

				label = "lan0";

				phy-handle = <&switch0phy1>;

			};



			port@3 {

			switch0port3: port@3 {

				reg = <3>;

				label = "lan1";

				phy-handle = <&switch0phy2>;

CRA Git | Maintained and supported by SUSTech CRA and CCSE