This is a note to let you know that I've just added the patch titled arm64: tegra: Fix duplicate regulator on Jetson TX1 to the 6.1-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: arm64-tegra-fix-duplicate-regulator-on-jetson-tx1.patch and it can be found in the queue-6.1 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let <stable@xxxxxxxxxxxxxxx> know about it. commit 3de457136d8cae7695308039d414a0e6af37f512 Author: Thierry Reding <treding@xxxxxxxxxx> Date: Fri Nov 18 07:35:31 2022 +0100 arm64: tegra: Fix duplicate regulator on Jetson TX1 [ Upstream commit 29bcc1eaca315326d1cc883fbe9b451d1f9e3fa5 ] When the top-level regulators were renamed, the 1.2V camera regulator accidentally ended up with the same DT node name as the 1.8V camera regulator. Fixes: 097e01c61015 ("arm64: tegra: Rename top-level regulators") Signed-off-by: Thierry Reding <treding@xxxxxxxxxx> Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx> diff --git a/arch/arm64/boot/dts/nvidia/tegra210-p2597.dtsi b/arch/arm64/boot/dts/nvidia/tegra210-p2597.dtsi index a44c56c1e56e5..634373a423ef6 100644 --- a/arch/arm64/boot/dts/nvidia/tegra210-p2597.dtsi +++ b/arch/arm64/boot/dts/nvidia/tegra210-p2597.dtsi @@ -1666,7 +1666,7 @@ vdd_hdmi: regulator-vdd-hdmi { vin-supply = <&vdd_5v0_sys>; }; - vdd_cam_1v2: regulator-vdd-cam-1v8 { + vdd_cam_1v2: regulator-vdd-cam-1v2 { compatible = "regulator-fixed"; regulator-name = "vdd-cam-1v2"; regulator-min-microvolt = <1200000>;