Commit 7f1f5ac4 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'mvebu-dt64-5.6-1' of git://git.infradead.org/linux-mvebu into arm/dt 

mvebu dt64 for 5.6 (part 1)

 micro-DPU (uDPU) board changes (Armada 3270 based board):
 - Fix broken ethernet
 - Remove i2c-fast-mode property
 - Indicate that SFP cages support 3W modules
 SolidRun Clearfog GT 8K (Armada 8040 base board):
 - Fix switch cpu port node

* tag 'mvebu-dt64-5.6-1' of git://git.infradead.org/linux-mvebu:
  arm64: dts: marvell: clearfog-gt-8k: fix switch cpu port node
  arm64: dts: uDPU: SFP cages support 3W modules
  arm64: dts: uDPU: remove i2c-fast-mode
  arm64: dts: uDPU: fix broken ethernet

Link: https://lore.kernel.org/r/871rs53nu5.fsf@FE-laptop


Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents d104b3be 62bba54d

arch/arm64/boot/dts/marvell/armada-3720-uDPU.dts

+8 −0
Original line number Diff line number Diff line
@@ -69,6 +69,7 @@ sfp_eth0: sfp-eth0 { 
		mod-def0-gpio = <&gpiosb 3 GPIO_ACTIVE_LOW>;

		tx-disable-gpio = <&gpiosb 4 GPIO_ACTIVE_HIGH>;

		tx-fault-gpio = <&gpiosb 5 GPIO_ACTIVE_HIGH>;

		maximum-power-milliwatt = <3000>;

	};



	sfp_eth1: sfp-eth1 {
@@ -78,6 +79,7 @@ sfp_eth1: sfp-eth1 { 
		mod-def0-gpio = <&gpiosb 8 GPIO_ACTIVE_LOW>;

		tx-disable-gpio = <&gpiosb 9 GPIO_ACTIVE_HIGH>;

		tx-fault-gpio = <&gpiosb 10 GPIO_ACTIVE_HIGH>;

		maximum-power-milliwatt = <3000>;

	};

};
@@ -119,12 +121,14 @@ &i2c0 { 
	status = "okay";

	pinctrl-names = "default";

	pinctrl-0 = <&i2c1_pins>;

	/delete-property/mrvl,i2c-fast-mode;

};



&i2c1 {

	status = "okay";

	pinctrl-names = "default";

	pinctrl-0 = <&i2c2_pins>;

	/delete-property/mrvl,i2c-fast-mode;



	lm75@48 {

		status = "okay";
@@ -143,6 +147,7 @@ &eth0 { 
	phy-mode = "sgmii";

	status = "okay";

	managed = "in-band-status";

	phys = <&comphy1 0>;

	sfp = <&sfp_eth0>;

};
@@ -150,11 +155,14 @@ &eth1 { 
	phy-mode = "sgmii";

	status = "okay";

	managed = "in-band-status";

	phys = <&comphy0 1>;

	sfp = <&sfp_eth1>;

};



&usb3 {

	status = "okay";

	phys = <&usb2_utmi_otg_phy>;

	phy-names = "usb2-utmi-otg-phy";

};



&uart0 {

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

+2 −0
Original line number Diff line number Diff line
@@ -408,6 +408,8 @@ port@5 { 
				reg = <5>;

				label = "cpu";

				ethernet = <&cp1_eth2>;

				phy-mode = "2500base-x";

				managed = "in-band-status";

			};

		};