mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-21 08:19:28 +00:00
Merge branch 'tegra/dt64' into arm/fixes
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. * tegra/dt64: 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/linux-arm-kernel/YILD4yyPXuiYbHW1@orome.fritz.box/ Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
commit
a1768dad77
7 changed files with 13 additions and 5 deletions
|
@ -10,7 +10,7 @@ / {
|
||||||
model = "NVIDIA Jetson TX2 Developer Kit";
|
model = "NVIDIA Jetson TX2 Developer Kit";
|
||||||
compatible = "nvidia,p2771-0000", "nvidia,tegra186";
|
compatible = "nvidia,p2771-0000", "nvidia,tegra186";
|
||||||
|
|
||||||
aconnect {
|
aconnect@2900000 {
|
||||||
status = "okay";
|
status = "okay";
|
||||||
|
|
||||||
dma-controller@2930000 {
|
dma-controller@2930000 {
|
||||||
|
|
|
@ -23,7 +23,7 @@ aliases {
|
||||||
};
|
};
|
||||||
|
|
||||||
chosen {
|
chosen {
|
||||||
bootargs = "earlycon console=ttyS0,115200n8";
|
bootargs = "earlycon console=ttyS0,115200n8 fw_devlink=on";
|
||||||
stdout-path = "serial0:115200n8";
|
stdout-path = "serial0:115200n8";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -73,7 +73,7 @@ ethernet@2490000 {
|
||||||
snps,rxpbl = <8>;
|
snps,rxpbl = <8>;
|
||||||
};
|
};
|
||||||
|
|
||||||
aconnect {
|
aconnect@2900000 {
|
||||||
compatible = "nvidia,tegra186-aconnect",
|
compatible = "nvidia,tegra186-aconnect",
|
||||||
"nvidia,tegra210-aconnect";
|
"nvidia,tegra210-aconnect";
|
||||||
clocks = <&bpmp TEGRA186_CLK_APE>,
|
clocks = <&bpmp TEGRA186_CLK_APE>,
|
||||||
|
|
|
@ -651,6 +651,8 @@ rt5658: audio-codec@1a {
|
||||||
reg = <0x1a>;
|
reg = <0x1a>;
|
||||||
interrupt-parent = <&gpio>;
|
interrupt-parent = <&gpio>;
|
||||||
interrupts = <TEGRA194_MAIN_GPIO(S, 5) GPIO_ACTIVE_HIGH>;
|
interrupts = <TEGRA194_MAIN_GPIO(S, 5) GPIO_ACTIVE_HIGH>;
|
||||||
|
clocks = <&bpmp TEGRA194_CLK_AUD_MCLK>;
|
||||||
|
clock-names = "mclk";
|
||||||
realtek,jd-src = <2>;
|
realtek,jd-src = <2>;
|
||||||
sound-name-prefix = "CVB-RT";
|
sound-name-prefix = "CVB-RT";
|
||||||
|
|
||||||
|
@ -658,7 +660,6 @@ port {
|
||||||
rt5658_ep: endpoint {
|
rt5658_ep: endpoint {
|
||||||
remote-endpoint = <&i2s1_dap_ep>;
|
remote-endpoint = <&i2s1_dap_ep>;
|
||||||
mclk-fs = <256>;
|
mclk-fs = <256>;
|
||||||
clocks = <&bpmp TEGRA194_CLK_AUD_MCLK>;
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
|
@ -5,6 +5,10 @@ / {
|
||||||
model = "NVIDIA Jetson Xavier NX (SD-card)";
|
model = "NVIDIA Jetson Xavier NX (SD-card)";
|
||||||
compatible = "nvidia,p3668-0000", "nvidia,tegra194";
|
compatible = "nvidia,p3668-0000", "nvidia,tegra194";
|
||||||
|
|
||||||
|
aliases {
|
||||||
|
mmc0 = "/bus@0/mmc@3400000";
|
||||||
|
};
|
||||||
|
|
||||||
bus@0 {
|
bus@0 {
|
||||||
/* SDMMC1 (SD/MMC) */
|
/* SDMMC1 (SD/MMC) */
|
||||||
mmc@3400000 {
|
mmc@3400000 {
|
||||||
|
|
|
@ -5,6 +5,10 @@ / {
|
||||||
model = "NVIDIA Jetson Xavier NX (eMMC)";
|
model = "NVIDIA Jetson Xavier NX (eMMC)";
|
||||||
compatible = "nvidia,p3668-0001", "nvidia,tegra194";
|
compatible = "nvidia,p3668-0001", "nvidia,tegra194";
|
||||||
|
|
||||||
|
aliases {
|
||||||
|
mmc0 = "/bus@0/mmc@3460000";
|
||||||
|
};
|
||||||
|
|
||||||
bus@0 {
|
bus@0 {
|
||||||
/* SDMMC4 (eMMC) */
|
/* SDMMC4 (eMMC) */
|
||||||
mmc@3460000 {
|
mmc@3460000 {
|
||||||
|
|
|
@ -14,7 +14,6 @@ aliases {
|
||||||
i2c5 = "/bus@0/i2c@31c0000";
|
i2c5 = "/bus@0/i2c@31c0000";
|
||||||
i2c6 = "/bus@0/i2c@c250000";
|
i2c6 = "/bus@0/i2c@c250000";
|
||||||
i2c7 = "/bus@0/i2c@31e0000";
|
i2c7 = "/bus@0/i2c@31e0000";
|
||||||
mmc0 = "/bus@0/mmc@3460000";
|
|
||||||
rtc0 = "/bpmp/i2c/pmic@3c";
|
rtc0 = "/bpmp/i2c/pmic@3c";
|
||||||
rtc1 = "/bus@0/rtc@c2a0000";
|
rtc1 = "/bus@0/rtc@c2a0000";
|
||||||
serial0 = &tcu;
|
serial0 = &tcu;
|
||||||
|
|
Loading…
Reference in a new issue