diff options
| author | Chen-Yu Tsai <wens@csie.org> | 2016-06-03 09:50:50 +0300 |
|---|---|---|
| committer | Maxime Ripard <maxime.ripard@free-electrons.com> | 2016-07-04 22:17:55 +0300 |
| commit | 5f4d0ebe88b98ee7e878d4fc823e61a172c28060 (patch) | |
| tree | ed89cd80e519db8db94fe3989bd29a0aaa31b7e2 /arch/arm/boot/dts/sun9i-a80-optimus.dts | |
| parent | 2480c018ea2ae53879725b79beba4a9e38ce5e82 (diff) | |
| download | linux-5f4d0ebe88b98ee7e878d4fc823e61a172c28060.tar.xz | |
ARM: dts: sun9i: a80-optimus: Drop sunxi-common-regulators.dtsi
sunxi-common-regulators.dtsi provided dummy regulators vcc3v0, vcc3v3,
vcc5v0. 3.0V/3.3V and 5.0V are commonly used voltages in Allwinner
devices. These dummy regulators provide a stand-in when bindings that
require one, but the real regulator is not supported yet.
Since these are no longer needed, we can drop the include file by
copying over reg_usb1_vbus.
Signed-off-by: Chen-Yu Tsai <wens@csie.org>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Diffstat (limited to 'arch/arm/boot/dts/sun9i-a80-optimus.dts')
| -rw-r--r-- | arch/arm/boot/dts/sun9i-a80-optimus.dts | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/arch/arm/boot/dts/sun9i-a80-optimus.dts b/arch/arm/boot/dts/sun9i-a80-optimus.dts index 6cfc02194035..78fddd9152a5 100644 --- a/arch/arm/boot/dts/sun9i-a80-optimus.dts +++ b/arch/arm/boot/dts/sun9i-a80-optimus.dts @@ -44,7 +44,6 @@ /dts-v1/; #include "sun9i-a80.dtsi" -#include "sunxi-common-regulators.dtsi" #include <dt-bindings/gpio/gpio.h> #include <dt-bindings/pinctrl/sun4i-a10.h> @@ -85,6 +84,17 @@ }; }; + reg_usb1_vbus: usb1-vbus { + compatible = "regulator-fixed"; + pinctrl-names = "default"; + pinctrl-0 = <&usb1_vbus_pin_optimus>; + regulator-name = "usb1-vbus"; + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; + enable-active-high; + gpio = <&pio 7 4 GPIO_ACTIVE_HIGH>; /* PH4 */ + }; + reg_usb3_vbus: usb3-vbus { compatible = "regulator-fixed"; pinctrl-names = "default"; @@ -172,12 +182,6 @@ allwinner,drive = <SUN4I_PINCTRL_40_MA>; }; -®_usb1_vbus { - pinctrl-0 = <&usb1_vbus_pin_optimus>; - gpio = <&pio 7 4 GPIO_ACTIVE_HIGH>; /* PH4 */ - status = "okay"; -}; - &r_ir { status = "okay"; }; |