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

Commit 9cd6b852 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: Add regulator and PMIC support for holi-pm6125"

parents 3026e7ed 337db00d

qcom/Makefile

+19 −2
Original line number Diff line number Diff line
@@ -100,7 +100,12 @@ dtbo-$(CONFIG_ARCH_HOLI) += holi-rumi-overlay.dtbo \ 
	holi-cdp-lcd-overlay.dtbo \

	holi-qrd-overlay.dtbo \

	holi-atp-overlay.dtbo \

	holi-mtp-usbc-overlay.dtbo

	holi-mtp-usbc-overlay.dtbo \

	holi-mtp-pm6125-overlay.dtbo \

	holi-cdp-pm6125-overlay.dtbo \

	holi-cdp-lcd-pm6125-overlay.dtbo \

	holi-mtp-usbc-pm6125-overlay.dtbo \

	holi-mtp-pm6125-nopmi-overlay.dtbo



holi-rumi-overlay.dtbo-base := holi.dtb

holi-mtp-overlay.dtbo-base := holi.dtb
@@ -109,6 +114,12 @@ holi-cdp-lcd-overlay.dtbo-base := holi.dtb 
holi-qrd-overlay.dtbo-base := holi.dtb

holi-atp-overlay.dtbo-base := holi.dtb

holi-mtp-usbc-overlay.dtbo-base := holi.dtb

holi-mtp-pm6125-overlay.dtbo-base := holi.dtb

holi-cdp-pm6125-overlay.dtbo-base := holi.dtb

holi-cdp-lcd-pm6125-overlay.dtbo-base := holi.dtb

holi-mtp-usbc-pm6125-overlay.dtbo-base := holi.dtb

holi-mtp-pm6125-nopmi-overlay.dtbo-base := holi.dtb



else

dtb-$(CONFIG_ARCH_HOLI) += holi-rumi.dtb \

	holi-mtp.dtb \
@@ -116,7 +127,13 @@ dtb-$(CONFIG_ARCH_HOLI) += holi-rumi.dtb \ 
	holi-cdp-lcd.dtb \

	holi-qrd.dtb \

	holi-atp.dtb \

	holi-mtp-usbc.dtb

	holi-mtp-usbc.dtb\

	holi-mtp-pm6125.dtb \

	holi-cdp-pm6125.dtb \

	holi-cdp-lcd-pm6125.dtb \

	holi-mtp-usbc-pm6125.dtb \

	holi-mtp-pm6125-nopmi.dtb



endif



ifeq ($(CONFIG_BUILD_ARM64_DT_OVERLAY),y)

qcom/holi-cdp-lcd-pm6125-overlay.dts

0 → 100644
+20 −0
Original line number Diff line number Diff line 
/dts-v1/;

/plugin/;



#include "holi-pm6125-overlay.dtsi"

#include "holi-regulators-pm6125.dtsi"

#include "holi-cdp-lcd-pm6125.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. Holi CDP-LCD PM6125 attached";

	compatible = "qcom,holi-cdp", "qcom,holi", "qcom,cdp";

	qcom,msm-id = <454 0x10000>, <472 0x10000>;

	qcom,board-id = <1 1>;

	qcom,pmic-id-size = <4>;

	qcom,pmic-id = <0x2D 0x0 0x2E 0x0>;

};



&wsa881x_analog_reset_gpio {

	pinctrl-0 = <&spkr_1_sd_n_active>;

	pinctrl-1 = <&spkr_1_sd_n_sleep>;

};

qcom/holi-cdp-lcd-pm6125.dts

0 → 100644
+13 −0
Original line number Diff line number Diff line 
/dts-v1/;



#include "holi.dtsi"

#include "holi-pm6125-overlay.dtsi"

#include "holi-regulators-pm6125.dtsi"

#include "holi-cdp-lcd-pm6125.dtsi"

/ {

	model = "Qualcomm Technologies, Inc. Holi CDP-LCD PM6125 attach";

	compatible = "qcom,holi-cdp", "qcom,holi", "qcom,cdp";

	qcom,board-id = <1 1>;

	qcom,pmic-id-size = <4>;

	qcom,pmic-id = <0x2D 0x0 0x2E 0x0>;

};

qcom/holi-cdp-lcd-pm6125.dtsi

0 → 100644
+30 −0
Original line number Diff line number Diff line 
#include "holi-cdp-pm6125.dtsi"



&qupv3_se8_i2c {

	qcom,i2c-touch-active="synaptics,dsx-i2c";



	synaptics_dsx@22 {

		compatible = "synaptics,dsx-i2c";

		reg = <0x22>;

		interrupt-parent = <&tlmm>;

		interrupts = <39 0x2008>;

		vdd-supply = <&L11A>;

		avdd-supply = <&L6A>;

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

						"pmx_ts_release";

		pinctrl-0 = <&ts_active>;

		pinctrl-1 = <&ts_int_suspend &ts_reset_suspend>;

		pinctrl-2 = <&pmx_ts_release>;

		synaptics,pwr-reg-name = "avdd";

		synaptics,bus-reg-name = "vdd";

		synaptics,ub-i2c-addr = <0x22>;

		synaptics,max-y-for-2d = <1859>;

		synaptics,irq-gpio = <&tlmm 22 0x2008>;

		synaptics,reset-gpio = <&tlmm 21 0x0>;

		synaptics,irq-on-state = <0>;

		synaptics,power-delay-ms = <200>;

		synaptics,reset-delay-ms = <200>;

		synaptics,reset-on-state = <0>;

		synaptics,reset-active-ms = <20>;

	};

};

qcom/holi-cdp-pm6125-overlay.dts

0 → 100644
+20 −0
Original line number Diff line number Diff line 
/dts-v1/;

/plugin/;



#include "holi-pm6125-overlay.dtsi"

#include "holi-regulators-pm6125.dtsi"

#include "holi-cdp-pm6125.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. Holi CDP PM6125";

	compatible = "qcom,holi-cdp", "qcom,holi", "qcom,cdp";

	qcom,msm-id = <454 0x10000>, <472 0x10000>;

	qcom,board-id = <1 0>;

	qcom,pmic-id-size = <4>;

	qcom,pmic-id = <0x2D 0x0 0x2E 0x0>;

};



&wsa881x_analog_reset_gpio {

	pinctrl-0 = <&spkr_1_sd_n_active>;

	pinctrl-1 = <&spkr_1_sd_n_sleep>;

};