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

Commit 23618161 authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Merge 4a1a63fe on remote branch 

Change-Id: Id3bc7533f54ec39c3c25ce6fe99b1935389634a0
parents 199c4af4 4a1a63fe

bindings/regulator/qcom,pm8008-regulator.txt

+1 −1
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ PM8008 chip regulator specific properties: 
- compatible:

  Usage: required

  Value type: <string>

  Definition: must be "qcom,pm8008-regulator"

  Definition: must be "qcom,pm8008-regulator" or "qcom,pm8010-regulator"



- <pin>-supply:

  Usage: optional

qcom/Makefile

+5 −1
Original line number Diff line number Diff line
@@ -190,7 +190,8 @@ dtb-$(CONFIG_ARCH_BENGAL) += bengal-rumi.dtb \ 
		bengal-iot-idp-usbc.dtb \

		bengalp-iot-idp-2gb.dtb \

		bengalp-iot-idp-usbc-2gb.dtb \

		bengalp-iot-idp-usbc.dtb

		bengalp-iot-idp-usbc.dtb \

		bengalp-iot-idp-2gb.dtb

endif



ifeq ($(CONFIG_BUILD_ARM64_DT_OVERLAY),y)
@@ -242,6 +243,7 @@ ifeq ($(CONFIG_BUILD_ARM64_DT_OVERLAY),y) 
		khaje-qrd-nowcd9375-overlay.dtbo \

		khaje-idp-nopmi-overlay.dtbo \

		khaje-idp-usbc-overlay.dtbo \

		khaje-idp-pm8010-overlay.dtbo \

		khaje-qrd-nopmi-overlay.dtbo \

		khaje-idps-display-90hz-overlay.dtbo \

		khaje-atp-overlay.dtbo
@@ -252,6 +254,7 @@ khaje-qrd-hvdcp3p5-overlay.dtbo-base := khaje.dtb 
khaje-qrd-nowcd9375-overlay.dtbo-base := khaje.dtb

khaje-idp-nopmi-overlay.dtbo-base := khaje.dtb

khaje-idp-usbc-overlay.dtbo-base := khaje.dtb

khaje-idp-pm8010-overlay.dtbo-base := khaje.dtb

khaje-qrd-nopmi-overlay.dtbo-base := khaje.dtb

khaje-idps-display-90hz-overlay.dtbo-base := khaje.dtb

khaje-atp-overlay.dtbo-base := khaje.dtb
@@ -262,6 +265,7 @@ dtb-$(CONFIG_ARCH_KHAJE) += khaje-idp.dtb \ 
		khaje-qrd-nowcd9375.dtb \

		khaje-idp-nopmi.dtb \

		khaje-idp-usbc.dtb \

		khaje-idp-pm8010.dtb \

		khaje-qrd-nopmi.dtb \

		khaje-idps-display-90hz.dtb \

		khaje-atp.dtb

qcom/khaje-atp.dtsi

+22 −0
Original line number Diff line number Diff line
@@ -284,3 +284,25 @@ 
		panel = <&dsi_nt36672e_fhd_plus_90hz_video>;

	};

};



&pm7250b_charger {

	dpdm-supply = <&usb2_phy0>;



	smb5_vbus: qcom,smb5-vbus {

		regulator-name = "smb5-vbus";

	};



	smb5_vconn: qcom,smb5-vconn {

		regulator-name = "smb5-vconn";

	};

};



&pm7250b_pdphy {

	vdd-pdphy-supply = <&L15A>;

	vbus-supply = <&smb5_vbus>;

	vconn-supply = <&smb5_vconn>;

};



&usb0 {

	extcon = <&pm7250b_pdphy>, <&pm7250b_charger>, <&eud>;

};

qcom/khaje-idp-pm8010-overlay.dts

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

/plugin/;



#include <dt-bindings/interrupt-controller/arm-gic.h>

#include "khaje-idp.dtsi"

#include "khaje-idp-pm8010.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. Khaje IDP with PM8010";

	compatible = "qcom,khaje-idp", "qcom,khaje", "qcom,idp";

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

	qcom,board-id = <0x10222 0>;

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

};

qcom/khaje-idp-pm8010.dts

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



#include "khaje.dtsi"

#include "khaje-idp.dtsi"

#include "khaje-idp-pm8010.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. KHAJE IDP with PM8010";

	compatible = "qcom,khaje-idp", "qcom,khaje", "qcom,idp";

	qcom,board-id = <0x10222 0>;

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

};