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

Commit 89ad5ba0 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: add APDS9930 device node for msm8909 MTP"

parents 16e30328 950ed89e

arch/arm/boot/dts/qcom/apq8009-mtp-wcd9326.dts

+1 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
/dts-v1/;



#include "msm8909-mtp.dtsi"

#include "msm8909-regulator.dtsi"

#include "msm8909-pm8916.dtsi"

#include "msm8909-pm8916-mtp.dtsi"

#include "apq8009-audio-external_codec.dtsi"

arch/arm/boot/dts/qcom/apq8009w-bg-wtp-v2.dts

+1 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
#include "msm8909w.dtsi"

#include "msm8909w-pm660-mtp.dtsi"

#include "apq8009w-memory.dtsi"

#include "msm8909-regulator.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. APQ8009W-PM660 BLACKGHOST WTP";

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

+45 −0
Original line number Diff line number Diff line
@@ -388,6 +388,27 @@ 
		invn,gpio-int = <&msm_gpio 96 0x1>;

		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 = <94 0x2002>;

		vdd-supply = <&pm8909_l17>;

		vio-supply = <&pm8909_l6>;

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

		avago,ps-threshold = <600>;

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

		avago,ps-pulse = <8>;

		avago,ps-pgain = <0>;

		avago,als-B = <186>;

		avago,als-C = <75>;

		avago,als-D = <129>;

		avago,ga-value = <256>;

	};

};



&mdss_mdp {
@@ -495,6 +516,30 @@ 
			};

		};

	};

	apds99xx_int_pin {

		apds99xx_default: apds99xx_default {

			mux {

				pins = "gpio94";

				function = "gpio";

			};

			config {

				pins = "gpio94";

				drive-strength = <6>;

				bias-pull-up;

			};

		};

		apds99xx_sleep: apds99xx_sleep {

			mux {

				pins = "gpio94";

				function = "gpio";

			};

			config {

				pins = "gpio94";

				drive-strength = <2>;

				bias-pull-down;

			};

		};

	};

};



&mdss_dsi0 {

arch/arm/boot/dts/qcom/msm8909w-bg-wtp-v2.dts

+1 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
#include "msm8909w.dtsi"

#include "msm8909w-memory.dtsi"

#include "msm8909w-pm660-mtp.dtsi"

#include "msm8909-regulator.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. MSM8909W-PM660 BLACKGHOST WTP";