提交 7c67b427 编写于 作者: D Dmitry Osipenko 提交者: Zheng Zengkai

ARM: tegra: acer-a500: Remove bogus USB VBUS regulators

stable inclusion
from stable-5.10.67
commit 035e8d5a6dd8a7b4632925fb24647ae7385c9057
bugzilla: 182619 https://gitee.com/openeuler/kernel/issues/I4EWO7

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=035e8d5a6dd8a7b4632925fb24647ae7385c9057

--------------------------------

[ Upstream commit 70e740ad ]

The configuration of USB VBUS regulators was borrowed from downstream
kernel, which is incorrect because the corresponding GPIOs are connected
to PROX_EN (A501 3G model) and LED_EN pins in accordance to the board
schematics. USB works fine with both GPIOs being disabled, so remove the
bogus USB VBUS regulators. The USB VBUS of USB3 is supplied from the fixed
5v system regulator and device-mode USB1 doesn't have VBUS switches.
Signed-off-by: NDmitry Osipenko <digetx@gmail.com>
Signed-off-by: NThierry Reding <treding@nvidia.com>
Signed-off-by: NSasha Levin <sashal@kernel.org>
Signed-off-by: NChen Jun <chenjun102@huawei.com>
Acked-by: NWeilong Chen <chenweilong@huawei.com>
Signed-off-by: NChen Jun <chenjun102@huawei.com>
Signed-off-by: NZheng Zengkai <zhengzengkai@huawei.com>
上级 a5d8eea4
...@@ -704,7 +704,6 @@ ...@@ -704,7 +704,6 @@
nvidia,xcvr-setup-use-fuses; nvidia,xcvr-setup-use-fuses;
nvidia,xcvr-lsfslew = <2>; nvidia,xcvr-lsfslew = <2>;
nvidia,xcvr-lsrslew = <2>; nvidia,xcvr-lsrslew = <2>;
vbus-supply = <&vdd_vbus1>;
}; };
usb@c5008000 { usb@c5008000 {
...@@ -716,7 +715,7 @@ ...@@ -716,7 +715,7 @@
nvidia,xcvr-setup-use-fuses; nvidia,xcvr-setup-use-fuses;
nvidia,xcvr-lsfslew = <2>; nvidia,xcvr-lsfslew = <2>;
nvidia,xcvr-lsrslew = <2>; nvidia,xcvr-lsrslew = <2>;
vbus-supply = <&vdd_vbus3>; vbus-supply = <&vdd_5v0_sys>;
}; };
brcm_wifi_pwrseq: wifi-pwrseq { brcm_wifi_pwrseq: wifi-pwrseq {
...@@ -967,28 +966,6 @@ ...@@ -967,28 +966,6 @@
vin-supply = <&vdd_5v0_sys>; vin-supply = <&vdd_5v0_sys>;
}; };
vdd_vbus1: regulator@4 {
compatible = "regulator-fixed";
regulator-name = "vdd_usb1_vbus";
regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>;
regulator-always-on;
gpio = <&gpio TEGRA_GPIO(D, 0) GPIO_ACTIVE_HIGH>;
enable-active-high;
vin-supply = <&vdd_5v0_sys>;
};
vdd_vbus3: regulator@5 {
compatible = "regulator-fixed";
regulator-name = "vdd_usb3_vbus";
regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>;
regulator-always-on;
gpio = <&gpio TEGRA_GPIO(D, 3) GPIO_ACTIVE_HIGH>;
enable-active-high;
vin-supply = <&vdd_5v0_sys>;
};
sound { sound {
compatible = "nvidia,tegra-audio-wm8903-picasso", compatible = "nvidia,tegra-audio-wm8903-picasso",
"nvidia,tegra-audio-wm8903"; "nvidia,tegra-audio-wm8903";
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册