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

Commit 2161493b authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: msm: dts: Add a USB OTG regulator for APQ8084 liquid"

parents a88650c0 fafce3d3

arch/arm/boot/dts/apq8084-liquid.dtsi

+8 −0
Original line number Diff line number Diff line
@@ -71,6 +71,14 @@ 
		enable-active-high;

		gpio = <&pma8084_mpps 7 0>;

	};



	usb0_vreg: usb0_vreg {

		compatible = "regulator-fixed";

		regulator-name = "usb0_vreg";

		startup-delay-us = <18000>; /* the on time of TPD4S214 */

		enable-active-high;

		gpio = <&pma8084_gpios 8 0>;

	};

};



/include/ "dsi-panel-jdi-1080p-video.dtsi"

arch/arm/boot/dts/apq8084-regulator.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -516,7 +516,7 @@ 
		gpio = <&pma8084_gpios 20 0>;

	};



	hdmi_vreg: hdmi_vreg {

	vbus_det_vreg: hdmi_vreg: hdmi_vreg {

		compatible = "regulator-fixed";

		regulator-name = "hdmi_vreg";

		startup-delay-us = <400>;