summaryrefslogtreecommitdiff
path: root/arch/arm/boot/dts/sun9i-a80-optimus.dts
diff options
context:
space:
mode:
authorMaxime Ripard <maxime.ripard@bootlin.com>2019-03-25 16:52:34 +0300
committerMaxime Ripard <maxime.ripard@bootlin.com>2019-03-25 23:26:25 +0300
commitc2a5b554751545023056559121a8ecf86aebe541 (patch)
tree8eb104ed9f9c614da81e0d8ba65a6b64d87a4d31 /arch/arm/boot/dts/sun9i-a80-optimus.dts
parentbe354500c101d0cbd779fd8c86be2ed809db7ea9 (diff)
downloadlinux-c2a5b554751545023056559121a8ecf86aebe541.tar.xz
ARM: dts: sun9i: optimus: Fix fixed-regulators
Commit 1848f3f44444 ("ARM: dts: sun9i: Remove GPIO pinctrl nodes to avoid warnings") was wrong on the optimus, and instead of droping the pinctrl-names property, it dropped the regulator-name one. Obviously, that wasn't what was intended. Reinstate regulator-name and drop pinctrl-names. Fixes: 1848f3f44444 ("ARM: dts: sun9i: Remove GPIO pinctrl nodes to avoid warnings") Acked-by: Chen-Yu Tsai <wens@csie.org> Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
Diffstat (limited to 'arch/arm/boot/dts/sun9i-a80-optimus.dts')
-rw-r--r--arch/arm/boot/dts/sun9i-a80-optimus.dts4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/sun9i-a80-optimus.dts b/arch/arm/boot/dts/sun9i-a80-optimus.dts
index 864715ec3cb0..2ed28d9e2787 100644
--- a/arch/arm/boot/dts/sun9i-a80-optimus.dts
+++ b/arch/arm/boot/dts/sun9i-a80-optimus.dts
@@ -82,7 +82,7 @@
reg_usb1_vbus: usb1-vbus {
compatible = "regulator-fixed";
- pinctrl-names = "default";
+ regulator-name = "usb1-vbus";
regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>;
enable-active-high;
@@ -91,7 +91,7 @@
reg_usb3_vbus: usb3-vbus {
compatible = "regulator-fixed";
- pinctrl-names = "default";
+ regulator-name = "usb3-vbus";
regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>;
enable-active-high;