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

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

Merge "platform: qpnp-revid: Add REVID support for PM8150A/PME9205"

parents cfa92f91 737e5c99

arch/arm64/boot/dts/qcom/pm8009.dtsi

+0 −5
Original line number Diff line number Diff line
@@ -24,11 +24,6 @@ 
			reg = <0x100 0x100>;

		};



		pm8009_pon: qcom,power-on@800 {

			compatible = "qcom,qpnp-power-on";

			reg = <0x800 0x100>;

		};



		pm8009_gpios: pinctrl@c000 {

			compatible = "qcom,spmi-gpio";

			reg = <0xc000 0x400>;

arch/arm64/boot/dts/qcom/sdmmagpie-idp.dtsi

+7 −2
Original line number Diff line number Diff line
@@ -228,12 +228,16 @@ 
		      <&pm6150_vadc ADC_USB_IN_I>,

		      <&pm6150_vadc ADC_CHG_TEMP>,

		      <&pm6150_vadc ADC_DIE_TEMP>,

		      <&pm6150l_vadc ADC_AMUX_THM1_PU2>;

		      <&pm6150l_vadc ADC_AMUX_THM1_PU2>,

		      <&pm6150_vadc ADC_SBUx>,

		      <&pm6150_vadc ADC_VPH_PWR>;

	io-channel-names = "usb_in_voltage",

			   "usb_in_current",

			   "chg_temp",

			   "die_temp",

			   "conn_temp";

			   "conn_temp",

			   "sbux_res",

			   "vph_voltage";

	qcom,battery-data = <&mtp_batterydata>;

	qcom,step-charging-enable;

	qcom,sw-jeita-enable;
@@ -279,6 +283,7 @@ 
};



&smb1390_charger {

	compatible = "qcom,smb1390-charger-psy";

	io-channels = <&pm6150l_vadc ADC_AMUX_THM2>;

	io-channel-names = "cp_die_temp";

	status = "ok";

arch/arm64/boot/dts/qcom/sdmmagpie-qrd.dtsi

+7 −2
Original line number Diff line number Diff line
@@ -269,12 +269,16 @@ 
		      <&pm6150_vadc ADC_USB_IN_I>,

		      <&pm6150_vadc ADC_CHG_TEMP>,

		      <&pm6150_vadc ADC_DIE_TEMP>,

		      <&pm6150l_vadc ADC_AMUX_THM1_PU2>;

		      <&pm6150l_vadc ADC_AMUX_THM1_PU2>,

		      <&pm6150_vadc ADC_SBUx>,

		      <&pm6150_vadc ADC_VPH_PWR>;

	io-channel-names = "usb_in_voltage",

			   "usb_in_current",

			   "chg_temp",

			   "die_temp",

			   "conn_temp";

			   "conn_temp",

			   "sbux_res",

			   "vph_voltage";

	qcom,battery-data = <&mtp_batterydata>;

	qcom,sw-jeita-enable;

	qcom,fcc-stepping-enable;
@@ -308,6 +312,7 @@ 
};



&smb1390_charger {

	compatible = "qcom,smb1390-charger-psy";

	io-channels = <&pm6150l_vadc ADC_AMUX_THM2>;

	io-channel-names = "cp_die_temp";

	status = "ok";

drivers/platform/msm/qpnp-revid.c

+2 −0
Original line number Diff line number Diff line
@@ -65,6 +65,8 @@ static const char *const pmic_names[] = { 
	[PM8150B_SUBTYPE] = "PM8150B",

	[PM8150L_SUBTYPE] = "PM8150L",

	[PM6150_SUBTYPE] = "PM6150",

	[PM8150A_SUBTYPE] = "PM8150A",

	[PME9205_SUBTYPE] = "PME9205",

};



struct revid_chip {

include/linux/qpnp/qpnp-revid.h

+28 −0
Original line number Diff line number Diff line
@@ -185,10 +185,15 @@ 
#define PM8150_SUBTYPE		0x1E

#define PM8150L_SUBTYPE		0x1F

#define PM8150B_SUBTYPE		0x20

#define PM8150A_SUBTYPE		0x27



/* PM6150 SUBTYPE */

#define PM6150_SUBTYPE		0x28

#define PM6150L_SUBTYPE		0x1F



/* PME9205 SUBTYPE */

#define PME9205_SUBTYPE		0x24



/* PMI632 */

#define PMI632_SUBTYPE	0x25
@@ -263,6 +268,29 @@ 
#define PM8150L_V3P0_REV3	0x00

#define PM8150L_V3P0_REV4	0x03



/* PM8150A_REV_ID */

#define PM8150A_V1P0_REV1	0x00

#define PM8150A_V1P0_REV2	0x00

#define PM8150A_V1P0_REV3	0x00

#define PM8150A_V1P0_REV4	0x01



#define PM8150A_V2P0_REV1	0x00

#define PM8150A_V2P0_REV2	0x00

#define PM8150A_V2P0_REV3	0x00

#define PM8150A_V2P0_REV4	0x02



/* PME9205_REV_ID */

#define PME9205_V1P0_REV1	0x00

#define PME9205_V1P0_REV2	0x00

#define PME9205_V1P0_REV3	0x00

#define PME9205_V1P0_REV4	0x01



#define PME9205_V2P0_REV1	0x00

#define PME9205_V2P0_REV2	0x00

#define PME9205_V2P0_REV3	0x00

#define PME9205_V2P0_REV4	0x02



/* PM6150_REV_ID */

#define PM6150_V1P0_REV1	0x00

#define PM6150_V1P0_REV2	0x00

#define PM6150_V1P0_REV3	0x00