github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-03 03:53:37 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

arm64: tegra: Device tree fixes for v5.12-rc6

Browse Source 
This contains a couple of device tree fixes for the v5.12 release cycle.
 These are needed for proper audio support on Jetson AGX Xavier, to boot
 the Jetson Xavier NX from an SD card and to be able to suspend/resume
 the Jetson TX2.
 -----BEGIN PGP SIGNATURE-----
 
 iQJHBAABCAAxFiEEiOrDCAFJzPfAjcif3SOs138+s6EFAmBl/4YTHHRyZWRpbmdA
 bnZpZGlhLmNvbQAKCRDdI6zXfz6zoXoiD/9ZqkJo8NreyLLUXP4qLvdEMbM2mMYx
 5+tevdKqGtlX3Tr9j/t50ti1JhDXf+9TsnIj8CKQaFXOvvdDQCUvybW5bEUmdxeW
 AOVOXZP8R4utI/pucOU6kWX8s9uFOdm3DE4HPPQQm66jUMkTVs9ZWCHUAaCFFIZj
 ZIW/U/Nwph5PNnBAztAoxzWLs3SqTiTG5isk6Zf5OFpQsSuNzZt7ovSrylZPHvYt
 6la6f1QNLAdqU6OnNIoAPUitgBNOMZdAj4EIIHZ/7ALtkZaUSxgLJBcxLJUuav2w
 Y2ZQUCe3NCZIu08TcQQYCe5IYzJ6kXNGwKm80XO9poGFZAxRbFOpwNdpHAuq5Cjz
 HcUHcfxTrvBU9KxnYLOAee5UWqoR1OgBPmBbzZ6ZIIgboeWyI1pQRn1vjkyWJ+8g
 J6GbOBa5vv94Rc4cLBwrU0Wkawoy0G4VrT3t6UjVeJ7BIEEDWwipcDuIEGFxtvTE
 e5MoMb5nODjGssiGxIlD5WdRUakSGYOYK2CVhTa9PNKt1wyu3mX+czSfLUlIeY5r
 bYUGk4+ujvDXjxNneD5dUOU++laL5I/9AytLopBtD5u47FCKNeXJLYHGI2Jg5EZD
 MVgPd99B3gkSI7johWeBniGv6jPRV0l5yx4RLFuk+ucpNC6VCmDtOVdT6SKh95t5
 BJmIdqK8MJoo6A==
 =4Hys
 -----END PGP SIGNATURE-----

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

arm64: tegra: Device tree fixes for v5.12-rc6

This contains a couple of device tree fixes for the v5.12 release cycle.
These are needed for proper audio support on Jetson AGX Xavier, to boot
the Jetson Xavier NX from an SD card and to be able to suspend/resume
the Jetson TX2.

* tag 'tegra-for-5.13-arm64-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux:
  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

Link: https://lore.kernel.org/r/20210401172622.3352990-5-thierry.reding@gmail.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann 2021-04-01 22:02:59 +02:00
commit 520f30feb8
7 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm64/boot/dts/nvidia/tegra186-p2771-0000.dts
View File

@ -10,7 +10,7 @@ / {
model = "NVIDIA Jetson TX2 Developer Kit";
compatible = "nvidia,p2771-0000", "nvidia,tegra186";
aconnect {
aconnect@2900000 {
status = "okay";
dma-controller@2930000 {

2
arch/arm64/boot/dts/nvidia/tegra186-p3310.dtsi
View File

@ -23,7 +23,7 @@ aliases {
};
chosen {
bootargs = "earlycon console=ttyS0,115200n8";
bootargs = "earlycon console=ttyS0,115200n8 fw_devlink=on";
stdout-path = "serial0:115200n8";
};

2
arch/arm64/boot/dts/nvidia/tegra186.dtsi
View File

@ -73,7 +73,7 @@ ethernet@2490000 {
snps,rxpbl = <8>;
};
aconnect {
aconnect@2900000 {
compatible = "nvidia,tegra186-aconnect",
"nvidia,tegra210-aconnect";
clocks = <&bpmp TEGRA186_CLK_APE>,

3
arch/arm64/boot/dts/nvidia/tegra194-p2972-0000.dts
View File

@ -651,6 +651,8 @@ rt5658: audio-codec@1a {
reg = <0x1a>;
interrupt-parent = <&gpio>;
interrupts = <TEGRA194_MAIN_GPIO(S, 5) GPIO_ACTIVE_HIGH>;
clocks = <&bpmp TEGRA194_CLK_AUD_MCLK>;
clock-names = "mclk";
realtek,jd-src = <2>;
sound-name-prefix = "CVB-RT";
@ -658,7 +660,6 @@ port {
rt5658_ep: endpoint {
remote-endpoint = <&i2s1_dap_ep>;
mclk-fs = <256>;
clocks = <&bpmp TEGRA194_CLK_AUD_MCLK>;
};
};
};

4
arch/arm64/boot/dts/nvidia/tegra194-p3668-0000.dtsi
View File

@ -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 {

4
arch/arm64/boot/dts/nvidia/tegra194-p3668-0001.dtsi
View File

@ -5,6 +5,10 @@ / {
model = "NVIDIA Jetson Xavier NX (eMMC)";
compatible = "nvidia,p3668-0001", "nvidia,tegra194";
aliases {
mmc0 = "/bus@0/mmc@3460000";
};
bus@0 {
/* SDMMC4 (eMMC) */
mmc@3460000 {

1
arch/arm64/boot/dts/nvidia/tegra194-p3668.dtsi
View File

@ -14,7 +14,6 @@ aliases {
i2c5 = "/bus@0/i2c@31c0000";
i2c6 = "/bus@0/i2c@c250000";
i2c7 = "/bus@0/i2c@31e0000";
mmc0 = "/bus@0/mmc@3460000";
rtc0 = "/bpmp/i2c/pmic@3c";
rtc1 = "/bus@0/rtc@c2a0000";
serial0 = &tcu;