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

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

Merge "ARM: dts: msm: Add nopmi support for holi-pm6125 and blair"

parents 81a9dbc7 f24830cd

qcom/Makefile

+5 −2
Original line number Diff line number Diff line
@@ -106,7 +106,8 @@ dtbo-$(CONFIG_ARCH_HOLI) += holi-rumi-overlay.dtbo \ 
	holi-cdp-lcd-pm6125-overlay.dtbo \

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

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

	holi-qrd-pm6125-overlay.dtbo

	holi-qrd-pm6125-overlay.dtbo \

	holi-qrd-pm6125-nopmi-overlay.dtbo



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

holi-mtp-overlay.dtbo-base := holi.dtb
@@ -121,6 +122,7 @@ 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

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

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



else

dtb-$(CONFIG_ARCH_HOLI) += holi-rumi.dtb \
@@ -135,7 +137,8 @@ dtb-$(CONFIG_ARCH_HOLI) += holi-rumi.dtb \ 
	holi-cdp-lcd-pm6125.dtb \

	holi-mtp-usbc-pm6125.dtb \

	holi-mtp-pm6125-nopmi.dtb \

	holi-qrd-pm6125.dtb

	holi-qrd-pm6125.dtb \

	holi-qrd-pm6125-nopmi.dtb



endif

qcom/blair-atp.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -622,7 +622,7 @@ 
};



&pm7250b_charger {

	dpdm-supply = <&qusb_phy0>;

	dpdm-supply = <&usb2_phy0>;



	smb5_vbus: qcom,smb5-vbus {

		regulator-name = "smb5-vbus";
@@ -677,7 +677,7 @@ 
	io-channel-names = "chg_type";

};



&qusb_phy0 {

&usb2_phy0 {

	vdd-supply = <&L18A>;

	vdda18-supply = <&L2A>;

	vdda33-supply = <&L3A>;

qcom/blair-cdp.dtsi

+2 −1
Original line number Diff line number Diff line 
#include "holi-audio-overlay.dtsi"

#include <dt-bindings/gpio/gpio.h>

#include <dt-bindings/input/linux-event-codes.h>

#include "holi-pm7250b.dtsi"

#include "holi-pmic-overlay-pm6125.dtsi"

#include "holi-thermal-overlay-pm6125.dtsi"

#include "display/holi-sde-display-cdp-pm6125.dtsi"
@@ -336,7 +337,7 @@ 
#include "camera/blair-camera-sensor-cdp.dtsi"



&pm7250b_charger {

	dpdm-supply = <&qusb_phy0>;

	dpdm-supply = <&usb2_phy0>;



	smb5_vbus: qcom,smb5-vbus {

		regulator-name = "smb5-vbus";

qcom/blair-mtp-nopmi-overlay.dts

+2 −0
Original line number Diff line number Diff line
@@ -8,5 +8,7 @@ 
	compatible = "qcom,blair-mtp", "qcom,blair", "qcom,mtp";

	qcom,msm-id = <507 0x10000>;

	qcom,board-id = <8 0>;

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

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

};

qcom/blair-mtp-nopmi.dts

+2 −0
Original line number Diff line number Diff line
@@ -7,5 +7,7 @@ 
	model = "Qualcomm Technologies, Inc. Blair MTP NOPMI";

	compatible = "qcom,blair-mtp", "qcom,blair", "qcom,mtp";

	qcom,board-id = <8 0>;

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

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

};