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

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

Merge "ARM: dts: msm: register L6 as CTP i2c regulator for msm8909 qrd"

parents 5fd602b4 8b2aae26

arch/arm/boot/dts/qcom/msm8909-qrd-skua.dtsi

+1 −7
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ 
			interrupt-parent = <&msm_gpio>;

			interrupts = <13 0x2008>;

			vdd-supply = <&pm8909_l17>;

			vcc_i2c-supply = <&vcc_i2c_vreg>;

			vcc_i2c-supply = <&pm8909_l6>;

			/* pins used by touchscreen */

			pinctrl-names = "pmx_ts_active","pmx_ts_suspend","pmx_ts_release";

			pinctrl-0 = <&ts_int_active &ts_reset_active>;
@@ -55,12 +55,6 @@ 
		};

	};



	vcc_i2c_vreg: vcc_i2c_vreg {

		compatible = "regulator-fixed";

		status = "ok";

		regulator-name = "vcc_vreg";

	};



	gen-vkeys {

		compatible = "qcom,gen-vkeys";

		label = "ft5x06_ts";