diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2019-08-05 07:26:12 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2019-08-05 07:26:12 +0200 |
commit | bf6b0545058a074f8de1d681e1e0b4c517cd6bfa (patch) | |
tree | 59bd49e8962116509a9023c086a77106074ee1ca | |
parent | b9c5b548204a25f9369a9126e94db7c42b3794cd (diff) | |
parent | 977bfe032ed6c47dd4c83456746add50f10565a2 (diff) | |
download | kernel-bf6b0545058a074f8de1d681e1e0b4c517cd6bfa.tar.gz kernel-bf6b0545058a074f8de1d681e1e0b4c517cd6bfa.tar.xz kernel-bf6b0545058a074f8de1d681e1e0b4c517cd6bfa.zip |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedora
-rw-r--r-- | arm64-tegra-Jetson-TX2-Allow-bootloader-to-configure.patch | 29 | ||||
-rw-r--r-- | kernel.spec | 2 |
2 files changed, 31 insertions, 0 deletions
diff --git a/arm64-tegra-Jetson-TX2-Allow-bootloader-to-configure.patch b/arm64-tegra-Jetson-TX2-Allow-bootloader-to-configure.patch new file mode 100644 index 000000000..3628a7e6b --- /dev/null +++ b/arm64-tegra-Jetson-TX2-Allow-bootloader-to-configure.patch @@ -0,0 +1,29 @@ +From 59780095ba35a49946e726c88caff6f65f3e433a Mon Sep 17 00:00:00 2001 +From: Peter Robinson <pbrobinson@gmail.com> +Date: Tue, 30 Jul 2019 14:22:36 +0100 +Subject: [PATCH] arm64: tegra: Jetson TX2: Allow bootloader to configure + Ethernet MAC + +Add an ethernet alias so that a stable MAC address is added to the +device tree for the wired ethernet interface. + +Signed-off-by: Peter Robinson <pbrobinson@gmail.com> +--- + arch/arm64/boot/dts/nvidia/tegra186-p3310.dtsi | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/arch/arm64/boot/dts/nvidia/tegra186-p3310.dtsi b/arch/arm64/boot/dts/nvidia/tegra186-p3310.dtsi +index 5e18acf5cfad..947744d0f04c 100644 +--- a/arch/arm64/boot/dts/nvidia/tegra186-p3310.dtsi ++++ b/arch/arm64/boot/dts/nvidia/tegra186-p3310.dtsi +@@ -8,6 +8,7 @@ + compatible = "nvidia,p3310", "nvidia,tegra186"; + + aliases { ++ ethernet0 = "/ethernet@2490000"; + sdhci0 = "/sdhci@3460000"; + sdhci1 = "/sdhci@3400000"; + serial0 = &uarta; +-- +2.21.0 + diff --git a/kernel.spec b/kernel.spec index dce258b2f..a76dc84ee 100644 --- a/kernel.spec +++ b/kernel.spec @@ -579,6 +579,8 @@ Patch307: arm-make-highpte-not-expert.patch # Tegra bits Patch340: arm64-tegra-jetson-tx1-fixes.patch +# https://www.spinics.net/lists/linux-tegra/msg43110.html +Patch341: arm64-tegra-Jetson-TX2-Allow-bootloader-to-configure.patch # QCom ACPI device support pieces |