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

Commit 6b7f9f84 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "defconfig: msm: Enable PMIC drivers for QM215"

parents 6a507633 f977e88f

arch/arm/configs/msm8937-perf_defconfig

+4 −0
Original line number Diff line number Diff line
@@ -355,10 +355,13 @@ CONFIG_QCOM_DLOAD_MODE=y 
CONFIG_POWER_SUPPLY=y

CONFIG_QPNP_FG=y

CONFIG_SMB135X_CHARGER=y

CONFIG_SMB1360_CHARGER_FG=y

CONFIG_SMB1355_SLAVE_CHARGER=y

CONFIG_SMB1351_USB_CHARGER=y

CONFIG_QPNP_SMB5=y

CONFIG_QPNP_SMBCHARGER=y

CONFIG_QPNP_VM_BMS=y

CONFIG_QPNP_LINEAR_CHARGER=y

CONFIG_QPNP_TYPEC=y

CONFIG_QPNP_QG=y

CONFIG_MSM_APM=y
@@ -514,6 +517,7 @@ CONFIG_LEDS_QPNP_FLASH_V2=y 
CONFIG_LEDS_QPNP_WLED=y

CONFIG_LEDS_QPNP_HAPTICS=y

CONFIG_LEDS_QPNP_VIBRATOR_LDO=y

CONFIG_LEDS_QPNP_VIBRATOR=y

CONFIG_LEDS_TRIGGERS=y

CONFIG_LEDS_TRIGGER_TIMER=y

CONFIG_EDAC=y

arch/arm/configs/msm8937_defconfig

+4 −0
Original line number Diff line number Diff line
@@ -361,10 +361,13 @@ CONFIG_QCOM_DLOAD_MODE=y 
CONFIG_POWER_SUPPLY=y

CONFIG_QPNP_FG=y

CONFIG_SMB135X_CHARGER=y

CONFIG_SMB1360_CHARGER_FG=y

CONFIG_SMB1355_SLAVE_CHARGER=y

CONFIG_SMB1351_USB_CHARGER=y

CONFIG_QPNP_SMB5=y

CONFIG_QPNP_SMBCHARGER=y

CONFIG_QPNP_VM_BMS=y

CONFIG_QPNP_LINEAR_CHARGER=y

CONFIG_QPNP_TYPEC=y

CONFIG_QPNP_QG=y

CONFIG_MSM_APM=y
@@ -524,6 +527,7 @@ CONFIG_LEDS_QPNP_FLASH_V2=y 
CONFIG_LEDS_QPNP_WLED=y

CONFIG_LEDS_QPNP_HAPTICS=y

CONFIG_LEDS_QPNP_VIBRATOR_LDO=y

CONFIG_LEDS_QPNP_VIBRATOR=y

CONFIG_LEDS_TRIGGERS=y

CONFIG_LEDS_TRIGGER_TIMER=y

CONFIG_EDAC=y

arch/arm64/configs/msm8937-perf_defconfig

+4 −0
Original line number Diff line number Diff line
@@ -352,10 +352,13 @@ CONFIG_POWER_RESET_QCOM=y 
CONFIG_QCOM_DLOAD_MODE=y

CONFIG_QPNP_FG=y

CONFIG_SMB135X_CHARGER=y

CONFIG_SMB1360_CHARGER_FG=y

CONFIG_SMB1355_SLAVE_CHARGER=y

CONFIG_SMB1351_USB_CHARGER=y

CONFIG_QPNP_SMB5=y

CONFIG_QPNP_SMBCHARGER=y

CONFIG_QPNP_VM_BMS=y

CONFIG_QPNP_LINEAR_CHARGER=y

CONFIG_QPNP_TYPEC=y

CONFIG_QPNP_QG=y

CONFIG_MSM_APM=y
@@ -509,6 +512,7 @@ CONFIG_LEDS_QPNP_FLASH_V2=y 
CONFIG_LEDS_QPNP_WLED=y

CONFIG_LEDS_QPNP_HAPTICS=y

CONFIG_LEDS_QPNP_VIBRATOR_LDO=y

CONFIG_LEDS_QPNP_VIBRATOR=y

CONFIG_LEDS_TRIGGERS=y

CONFIG_LEDS_TRIGGER_TIMER=y

CONFIG_EDAC=y

arch/arm64/configs/msm8937_defconfig

+4 −0
Original line number Diff line number Diff line
@@ -360,10 +360,13 @@ CONFIG_POWER_RESET_QCOM=y 
CONFIG_QCOM_DLOAD_MODE=y

CONFIG_QPNP_FG=y

CONFIG_SMB135X_CHARGER=y

CONFIG_SMB1360_CHARGER_FG=y

CONFIG_SMB1355_SLAVE_CHARGER=y

CONFIG_SMB1351_USB_CHARGER=y

CONFIG_QPNP_SMB5=y

CONFIG_QPNP_SMBCHARGER=y

CONFIG_QPNP_VM_BMS=y

CONFIG_QPNP_LINEAR_CHARGER=y

CONFIG_QPNP_TYPEC=y

CONFIG_QPNP_QG=y

CONFIG_MSM_APM=y
@@ -521,6 +524,7 @@ CONFIG_LEDS_QPNP_FLASH_V2=y 
CONFIG_LEDS_QPNP_WLED=y

CONFIG_LEDS_QPNP_HAPTICS=y

CONFIG_LEDS_QPNP_VIBRATOR_LDO=y

CONFIG_LEDS_QPNP_VIBRATOR=y

CONFIG_LEDS_TRIGGERS=y

CONFIG_LEDS_TRIGGER_TIMER=y

CONFIG_EDAC=y

drivers/power/supply/qcom/batterydata-interface.c

+4 −4
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ static long battery_data_ioctl(struct file *file, unsigned int cmd, 


	switch (cmd) {

	case BPIOCXSOC:

		soc = interpolate_pc(battery->profile->pc_temp_ocv_lut,

		soc = interpolate_pc_bms(battery->profile->pc_temp_ocv_lut,

					bp.batt_temp, bp.ocv_uv / 1000);

		rc = put_user(soc, &bp_user->soc);

		if (rc) {
@@ -77,7 +77,7 @@ static long battery_data_ioctl(struct file *file, unsigned int cmd, 
				bp.ocv_uv / 1000, bp.batt_temp, soc);

		break;

	case BPIOCXRBATT:

		rbatt_sf = interpolate_scalingfactor(

		rbatt_sf = interpolate_scalingfactor_bms(

				battery->profile->rbatt_sf_lut,

				bp.batt_temp, bp.soc);

		rc = put_user(rbatt_sf, &bp_user->rbatt_sf);
@@ -89,7 +89,7 @@ static long battery_data_ioctl(struct file *file, unsigned int cmd, 
					bp.soc, bp.batt_temp, rbatt_sf);

		break;

	case BPIOCXSLOPE:

		slope = interpolate_slope(battery->profile->pc_temp_ocv_lut,

		slope = interpolate_slope_bms(battery->profile->pc_temp_ocv_lut,

							bp.batt_temp, bp.soc);

		rc = put_user(slope, &bp_user->slope);

		if (rc) {
@@ -100,7 +100,7 @@ static long battery_data_ioctl(struct file *file, unsigned int cmd, 
					bp.soc, bp.batt_temp, slope);

		break;

	case BPIOCXFCC:

		fcc_mah = interpolate_fcc(battery->profile->fcc_temp_lut,

		fcc_mah = interpolate_fcc_bms(battery->profile->fcc_temp_lut,

							bp.batt_temp);

		rc = put_user(fcc_mah, &bp_user->fcc_mah);

		if (rc) {