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

Commit dbba1a85 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: enable ADPS9900 L-P sensor for 8916MTP and CDP"

parents f1f31171 7a45669e

arch/arm/boot/dts/qcom/msm8916-cdp.dtsi

+21 −0
Original line number Diff line number Diff line
@@ -94,6 +94,27 @@ 
			invn,gpio-int = <&msm_gpio 115 0x2>;

			invn,place = "Portrait Down Back Side";

		};



		avago@39 { /* Ambient light and proximity sensor */

			compatible = "avago,apds9900";

			reg = <0x39>;

			pinctrl-names = "default","sleep";

			pinctrl-0 = <&apds99xx_default>;

			pinctrl-1 = <&apds99xx_sleep>;

			interrupt-parent = <&msm_gpio>;

			interrupts = <113 0x2002>;

			vdd-supply = <&pm8916_l17>;

			vio-supply = <&pm8916_l6>;

			avago,irq-gpio = <&msm_gpio 113 0x2002>;

			avago,ps-threshold = <600>;

			avago,ps-hysteresis-threshold = <500>;

			avago,ps-pulse = <8>;

			avago,ps-pgain = <0>;

			avago,als-B = <223>;

			avago,als-C = <70>;

			avago,als-D = <142>;

			avago,ga-value = <48>;

		};

	};



	sound {

arch/arm/boot/dts/qcom/msm8916-mtp.dtsi

+21 −0
Original line number Diff line number Diff line
@@ -87,6 +87,27 @@ 
			invn,gpio-int = <&msm_gpio 115 0x2>;

			invn,place = "Portrait Down Back Side";

		};



		avago@39 { /* Ambient light and proximity sensor */

			compatible = "avago,apds9900";

			reg = <0x39>;

			pinctrl-names = "default","sleep";

			pinctrl-0 = <&apds99xx_default>;

			pinctrl-1 = <&apds99xx_sleep>;

			interrupt-parent = <&msm_gpio>;

			interrupts = <113 0x2002>;

			vdd-supply = <&pm8916_l17>;

			vio-supply = <&pm8916_l6>;

			avago,irq-gpio = <&msm_gpio 113 0x2002>;

			avago,ps-threshold = <600>;

			avago,ps-hysteresis-threshold = <500>;

			avago,ps-pulse = <8>;

			avago,ps-pgain = <0>;

			avago,als-B = <223>;

			avago,als-C = <70>;

			avago,als-D = <142>;

			avago,ga-value = <48>;

		};

	};



	sound {

arch/arm/boot/dts/qcom/msm8916-pinctrl.dtsi

+14 −0
Original line number Diff line number Diff line
@@ -1211,6 +1211,20 @@ 
			};

			mpu6050_sleep: mpu6050_sleep {

				drive-strength = <2>;

			};

		};



		apds99xx_int_pin {

			qcom,pins = <&gp 113>;

			qcom,pin-func = <0>;

			qcom,num-grp-pins = <1>;

			label = "apds99xx-irq";

			apds99xx_default: apds99xx_default {

				drive-strength = <6>;

				bias-pull-up;

			};

			apds99xx_sleep: apds99xx_sleep {

				drive-strength = <2>;

				bias-pull-down;

			};

		};

arch/arm/boot/dts/qcom/msm8916-qrd-skuh.dtsi

+13 −23
Original line number Diff line number Diff line
@@ -30,17 +30,6 @@ 
		};

	};



	apds9930_int_pin {

		qcom,pins = <&gp 113>;

		qcom,pin-func = <0>;

		qcom,num-grp-pins = <1>;

		label = "apds9930-irq";

		apds9930_default: apds9930_default {

			drive-strength = <6>;

			bias-pull-up;

		};

	};



	lis3dh_int1_pin {

		qcom,pins = <&gp 115>;

		qcom,num-grp-pins = <1>;
@@ -81,21 +70,22 @@ 
	avago@39 {

		compatible = "avago,apds9930";

		reg = <0x39>;

		pinctrl-names = "default";

		pinctrl-0 = <&apds9930_default>;

		pinctrl-names = "default","sleep";

		pinctrl-0 = <&apds99xx_default>;

		pinctrl-1 = <&apds99xx_sleep>;

		interrupt-parent = <&msm_gpio>;

		interrupts = <113 0x2>;

		interrupts = <113 0x2002>;

		vdd-supply = <&pm8916_l17>;

		vio-supply = <&pm8916_l6>;

		avago,irq-gpio = <&msm_gpio 113 0x2>;

		avago,ps_threshold = <600>;

		avago,ps_hysteresis_threshold = <500>;

		avago,ps_pulse = <8>;

		avago,ps_pgain = <0>;

		avago,als_B = <223>;

		avago,als_C = <70>;

		avago,als_D = <142>;

		avago,ga_value = <48>;

		avago,irq-gpio = <&msm_gpio 113 0x2002>;

		avago,ps-threshold = <600>;

		avago,ps-hysteresis-threshold = <500>;

		avago,ps-pulse = <8>;

		avago,ps-pgain = <0>;

		avago,als-B = <223>;

		avago,als-C = <70>;

		avago,als-D = <142>;

		avago,ga-value = <48>;

	};



	st@18 {

arch/arm/boot/dts/qcom/msm8916-qrd-skui.dtsi

+13 −23
Original line number Diff line number Diff line
@@ -133,17 +133,6 @@ 
};



&tlmm_pinmux {

	apds9930_int_pin {

		qcom,pins = <&gp 113>;

		qcom,pin-func = <0>;

		qcom,num-grp-pins = <1>;

		label = "apds9930-irq";

		apds9930_default: apds9930_default {

			drive-strength = <6>;

			bias-pull-up;

		};

	};



	bma2x2_int1_pin {

		qcom,pins = <&gp 112>;

		qcom,num-grp-pins = <1>;
@@ -169,21 +158,22 @@ 
	avago@39 { /* Ambient light and proximity sensor */

		compatible = "avago,apds9930";

		reg = <0x39>;

		pinctrl-names = "default";

		pinctrl-0 = <&apds9930_default>;

		pinctrl-names = "default","sleep";

		pinctrl-0 = <&apds99xx_default>;

		pinctrl-1 = <&apds99xx_sleep>;

		interrupt-parent = <&msm_gpio>;

		interrupts = <113 0x2>;

		interrupts = <113 0x2002>;

		vdd-supply = <&pm8916_l17>;

		vio-supply = <&pm8916_l6>;

		avago,irq-gpio = <&msm_gpio 113 0x2>;

		avago,ps_threshold = <600>;

		avago,ps_hysteresis_threshold = <500>;

		avago,ps_pulse = <8>;

		avago,ps_pgain = <0>;

		avago,als_B = <223>;

		avago,als_C = <70>;

		avago,als_D = <142>;

		avago,ga_value = <48>;

		avago,irq-gpio = <&msm_gpio 113 0x2002>;

		avago,ps-threshold = <600>;

		avago,ps-hysteresis-threshold = <500>;

		avago,ps-pulse = <8>;

		avago,ps-pgain = <0>;

		avago,als-B = <223>;

		avago,als-C = <70>;

		avago,als-D = <142>;

		avago,ga-value = <48>;

	};



	bosch@18 { /* Accelerometer sensor */