Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5f4d0ebe authored by Chen-Yu Tsai's avatar Chen-Yu Tsai Committed by Maxime Ripard
Browse files

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: default avatarChen-Yu Tsai <wens@csie.org>
Signed-off-by: default avatarMaxime Ripard <maxime.ripard@free-electrons.com>
parent 2480c018

arch/arm/boot/dts/sun9i-a80-optimus.dts

+11 −7
Original line number Diff line number Diff line
@@ -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>;

};



&reg_usb1_vbus {

	pinctrl-0 = <&usb1_vbus_pin_optimus>;

	gpio = <&pio 7 4 GPIO_ACTIVE_HIGH>; /* PH4 */

	status = "okay";

};



&r_ir {

	status = "okay";

};