Skip to content

Commit 03633c4

Browse files
lorenzmmind
authored andcommitted
arm64: dts: rockchip: fix USB regulator on ROCK64
Currently the ROCK64 device tree specifies two regulators, vcc_host_5v and vcc_host1_5v for USB VBUS on the device. Both of those are however specified with RK_PA2 as the GPIO enabling them, causing the following error when booting: rockchip-pinctrl pinctrl: pin gpio0-2 already requested by vcc-host-5v-regulator; cannot claim for vcc-host1-5v-regulator rockchip-pinctrl pinctrl: pin-2 (vcc-host1-5v-regulator) status -22 rockchip-pinctrl pinctrl: could not request pin 2 (gpio0-2) from group usb20-host-drv on device rockchip-pinctrl reg-fixed-voltage vcc-host1-5v-regulator: Error applying setting, reverse things back Looking at the schematic, there are in fact three USB regulators, vcc_host_5v, vcc_host1_5v and vcc_otg_v5. But the enable signal for all three is driven by Q2604 which is in turn driven by GPIO_A2/PA2. Since these three regulators are not controllable separately, I removed the second one which was causing the error and added labels for all rails to the single regulator. Signed-off-by: Lorenz Brun <[email protected]> Tested-by: Diederik de Haas <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Heiko Stuebner <[email protected]>
1 parent ac9a786 commit 03633c4

File tree

1 file changed

+2
-12
lines changed

1 file changed

+2
-12
lines changed

arch/arm64/boot/dts/rockchip/rk3328-rock64.dts

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,8 @@
3737
vin-supply = <&vcc_io>;
3838
};
3939

40-
vcc_host_5v: vcc-host-5v-regulator {
40+
/* Common enable line for all of the rails mentioned in the labels */
41+
vcc_host_5v: vcc_host1_5v: vcc_otg_5v: vcc-host-5v-regulator {
4142
compatible = "regulator-fixed";
4243
gpio = <&gpio0 RK_PA2 GPIO_ACTIVE_LOW>;
4344
pinctrl-names = "default";
@@ -48,17 +49,6 @@
4849
vin-supply = <&vcc_sys>;
4950
};
5051

51-
vcc_host1_5v: vcc_otg_5v: vcc-host1-5v-regulator {
52-
compatible = "regulator-fixed";
53-
gpio = <&gpio0 RK_PA2 GPIO_ACTIVE_LOW>;
54-
pinctrl-names = "default";
55-
pinctrl-0 = <&usb20_host_drv>;
56-
regulator-name = "vcc_host1_5v";
57-
regulator-always-on;
58-
regulator-boot-on;
59-
vin-supply = <&vcc_sys>;
60-
};
61-
6252
vcc_sys: vcc-sys {
6353
compatible = "regulator-fixed";
6454
regulator-name = "vcc_sys";

0 commit comments

Comments
 (0)