diff options
author | Linus Torvalds | 2021-04-23 13:01:05 -0700 |
---|---|---|
committer | Linus Torvalds | 2021-04-23 13:01:05 -0700 |
commit | 6d1d45cb98347dbd101b378d11b5f0deb87b345d (patch) | |
tree | 85ff7719e73e5747874d7ed527ccaad30ecf0da0 /arch/arm64/boot/dts/nvidia/tegra194-p3668-0000.dtsi | |
parent | 5bfc75d92efd494db37f5c4c173d3639d4772966 (diff) | |
parent | a1768dad775b5ceb25d17bc7a13318f43adf3069 (diff) |
Merge tag 'arm-fixes-5.12-4' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
Pull ARM SoC fixes from Arnd Bergmann:
"These should be the final fixes for v5.12.
There is one fix for SD card detection on one Allwinner board, and a
few fixes for the Tegra platform that I had already queued up for
v5.13 due to a communication problem. This addresses MMC device
ordering on multiple machines, audio support on Jetson AGX Xavier and
suspend/resume on Jetson TX2"
* tag 'arm-fixes-5.12-4' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc:
arm64: dts: allwinner: Revert SD card CD GPIO for Pine64-LTS
arm64: tegra: Move clocks from RT5658 endpoint to device node
arm64: tegra: Fix mmc0 alias for Jetson Xavier NX
arm64: tegra: Set fw_devlink=on for Jetson TX2
arm64: tegra: Add unit-address for ACONNECT on Tegra186
Diffstat (limited to 'arch/arm64/boot/dts/nvidia/tegra194-p3668-0000.dtsi')
-rw-r--r-- | arch/arm64/boot/dts/nvidia/tegra194-p3668-0000.dtsi | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm64/boot/dts/nvidia/tegra194-p3668-0000.dtsi b/arch/arm64/boot/dts/nvidia/tegra194-p3668-0000.dtsi index 7da3d48cb410..14da4206ea66 100644 --- a/arch/arm64/boot/dts/nvidia/tegra194-p3668-0000.dtsi +++ b/arch/arm64/boot/dts/nvidia/tegra194-p3668-0000.dtsi @@ -5,6 +5,10 @@ model = "NVIDIA Jetson Xavier NX (SD-card)"; compatible = "nvidia,p3668-0000", "nvidia,tegra194"; + aliases { + mmc0 = "/bus@0/mmc@3400000"; + }; + bus@0 { /* SDMMC1 (SD/MMC) */ mmc@3400000 { |