Skip to content

Commit 75c82a2

Browse files
jonhunterthierryreding
authored andcommitted
arm64: tegra: Set fw_devlink=on for Jetson TX2
Commit 5d25c47 ("Revert "arm64: tegra: Disable the ACONNECT for Jetson TX2"") re-enabled the Tegra ADMA and ACONNECT drivers to support audio on Jetson TX2. However, this revert was dependent upon commit e590474 ("driver core: Set fw_devlink=on by default") and without this commit, enabling the ACONNECT is causing resume from system suspend to fail on Jetson TX2. Resume fails because the ACONNECT driver is being resumed before the BPMP driver, and the ACONNECT driver is attempting to power on a power-domain that is provided by the BPMP. Commit e590474 ("driver core: Set fw_devlink=on by default") has since been temporarily reverted while some issues are being investigated. This is causing resume from system suspend on Jetson TX2 to fail again. Rather than disable the ACONNECT driver again, fix this by setting fw_devlink is set to 'on' for Jetson TX2 in the bootargs specified in device-tree. Fixes: 5d25c47 ("Revert arm64: tegra: Disable the ACONNECT for Jetson TX2") Signed-off-by: Jon Hunter <jonathanh@nvidia.com> Signed-off-by: Thierry Reding <treding@nvidia.com>
1 parent 4b154b9 commit 75c82a2

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

arch/arm64/boot/dts/nvidia/tegra186-p3310.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
};
2424

2525
chosen {
26-
bootargs = "earlycon console=ttyS0,115200n8";
26+
bootargs = "earlycon console=ttyS0,115200n8 fw_devlink=on";
2727
stdout-path = "serial0:115200n8";
2828
};
2929

0 commit comments

Comments
 (0)