Unverified Commit 35edcf68 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'tegra-for-6.8-arm64-dt' of... 

Merge tag 'tegra-for-6.8-arm64-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into arm/fixes

arm64: tegra: Device tree fixes for v6.8

This contains two fixes to make the MGBE Ethernet devices found on
Tegra234 work properly.

* tag 'tegra-for-6.8-arm64-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux:
  arm64: tegra: Fix Tegra234 MGBE power-domains
  arm64: tegra: Set the correct PHY mode for MGBE

Link: https://lore.kernel.org/r/20240226144536.1525704-1-thierry.reding@gmail.com


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

arch/arm64/boot/dts/nvidia/tegra234-p3737-0000+p3701-0000.dts

+1 −1
Original line number Diff line number Diff line
@@ -175,7 +175,7 @@ ethernet@6800000 { 
			status = "okay";



			phy-handle = <&mgbe0_phy>;

			phy-mode = "usxgmii";

			phy-mode = "10gbase-r";



			mdio {

				#address-cells = <1>;

arch/arm64/boot/dts/nvidia/tegra234.dtsi

+3 −3
Original line number Diff line number Diff line
@@ -1459,7 +1459,7 @@ ethernet@6800000 { 
					<&mc TEGRA234_MEMORY_CLIENT_MGBEAWR &emc>;

			interconnect-names = "dma-mem", "write";

			iommus = <&smmu_niso0 TEGRA234_SID_MGBE>;

			power-domains = <&bpmp TEGRA234_POWER_DOMAIN_MGBEA>;

			power-domains = <&bpmp TEGRA234_POWER_DOMAIN_MGBEB>;

			status = "disabled";

		};
@@ -1493,7 +1493,7 @@ ethernet@6900000 { 
					<&mc TEGRA234_MEMORY_CLIENT_MGBEBWR &emc>;

			interconnect-names = "dma-mem", "write";

			iommus = <&smmu_niso0 TEGRA234_SID_MGBE_VF1>;

			power-domains = <&bpmp TEGRA234_POWER_DOMAIN_MGBEB>;

			power-domains = <&bpmp TEGRA234_POWER_DOMAIN_MGBEC>;

			status = "disabled";

		};
@@ -1527,7 +1527,7 @@ ethernet@6a00000 { 
					<&mc TEGRA234_MEMORY_CLIENT_MGBECWR &emc>;

			interconnect-names = "dma-mem", "write";

			iommus = <&smmu_niso0 TEGRA234_SID_MGBE_VF2>;

			power-domains = <&bpmp TEGRA234_POWER_DOMAIN_MGBEC>;

			power-domains = <&bpmp TEGRA234_POWER_DOMAIN_MGBED>;

			status = "disabled";

		};