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

Commit 6e95d881 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 missing PMIC peripherals for msm8953"

parents caa26bf4 3cf207bd

arch/arm/configs/msm8953-perf_defconfig

+6 −0
Original line number Diff line number Diff line
@@ -315,8 +315,10 @@ CONFIG_POWER_SUPPLY=y 
CONFIG_QPNP_FG=y

CONFIG_SMB135X_CHARGER=y

CONFIG_SMB1351_USB_CHARGER=y

CONFIG_QPNP_SMB5=y

CONFIG_QPNP_SMBCHARGER=y

CONFIG_QPNP_TYPEC=y

CONFIG_QPNP_QG=y

CONFIG_MSM_APM=y

CONFIG_SENSORS_QPNP_ADC_VOLTAGE=y

CONFIG_THERMAL=y
@@ -329,6 +331,7 @@ CONFIG_MFD_SPMI_PMIC=y 
CONFIG_REGULATOR=y

CONFIG_REGULATOR_FIXED_VOLTAGE=y

CONFIG_REGULATOR_PROXY_CONSUMER=y

CONFIG_REGULATOR_CPR=y

CONFIG_REGULATOR_CPR4_APSS=y

CONFIG_REGULATOR_CPRH_KBSS=y

CONFIG_REGULATOR_MEM_ACC=y
@@ -431,6 +434,7 @@ CONFIG_MMC_SDHCI_MSM_ICE=y 
CONFIG_MMC_CQ_HCI=y

CONFIG_NEW_LEDS=y

CONFIG_LEDS_CLASS=y

CONFIG_LEDS_QTI_TRI_LED=y

CONFIG_LEDS_QPNP=y

CONFIG_LEDS_QPNP_FLASH=y

CONFIG_LEDS_QPNP_FLASH_V2=y
@@ -438,6 +442,7 @@ CONFIG_LEDS_QPNP_WLED=y 
CONFIG_LEDS_QPNP_HAPTICS=y

CONFIG_LEDS_QPNP_VIBRATOR_LDO=y

CONFIG_LEDS_TRIGGERS=y

CONFIG_LEDS_TRIGGER_TIMER=y

CONFIG_EDAC=y

CONFIG_EDAC_MM_EDAC=y

CONFIG_RTC_CLASS=y
@@ -496,6 +501,7 @@ CONFIG_DEVFREQ_GOV_QCOM_BW_HWMON=y 
CONFIG_QCOM_DEVFREQ_DEVBW=y

CONFIG_PWM=y

CONFIG_PWM_QPNP=y

CONFIG_PWM_QTI_LPG=y

CONFIG_QTI_MPM=y

CONFIG_ANDROID=y

CONFIG_ANDROID_BINDER_IPC=y

arch/arm/configs/msm8953_defconfig

+6 −0
Original line number Diff line number Diff line
@@ -327,8 +327,10 @@ CONFIG_POWER_SUPPLY=y 
CONFIG_QPNP_FG=y

CONFIG_SMB135X_CHARGER=y

CONFIG_SMB1351_USB_CHARGER=y

CONFIG_QPNP_SMB5=y

CONFIG_QPNP_SMBCHARGER=y

CONFIG_QPNP_TYPEC=y

CONFIG_QPNP_QG=y

CONFIG_MSM_APM=y

CONFIG_SENSORS_QPNP_ADC_VOLTAGE=y

CONFIG_THERMAL=y
@@ -341,6 +343,7 @@ CONFIG_MFD_SPMI_PMIC=y 
CONFIG_REGULATOR=y

CONFIG_REGULATOR_FIXED_VOLTAGE=y

CONFIG_REGULATOR_PROXY_CONSUMER=y

CONFIG_REGULATOR_CPR=y

CONFIG_REGULATOR_CPR4_APSS=y

CONFIG_REGULATOR_CPRH_KBSS=y

CONFIG_REGULATOR_MEM_ACC=y
@@ -445,6 +448,7 @@ CONFIG_MMC_SDHCI_MSM_ICE=y 
CONFIG_MMC_CQ_HCI=y

CONFIG_NEW_LEDS=y

CONFIG_LEDS_CLASS=y

CONFIG_LEDS_QTI_TRI_LED=y

CONFIG_LEDS_QPNP=y

CONFIG_LEDS_QPNP_FLASH=y

CONFIG_LEDS_QPNP_FLASH_V2=y
@@ -452,6 +456,7 @@ CONFIG_LEDS_QPNP_WLED=y 
CONFIG_LEDS_QPNP_HAPTICS=y

CONFIG_LEDS_QPNP_VIBRATOR_LDO=y

CONFIG_LEDS_TRIGGERS=y

CONFIG_LEDS_TRIGGER_TIMER=y

CONFIG_EDAC=y

CONFIG_EDAC_MM_EDAC=y

CONFIG_RTC_CLASS=y
@@ -517,6 +522,7 @@ CONFIG_DEVFREQ_GOV_QCOM_BW_HWMON=y 
CONFIG_QCOM_DEVFREQ_DEVBW=y

CONFIG_PWM=y

CONFIG_PWM_QPNP=y

CONFIG_PWM_QTI_LPG=y

CONFIG_QTI_MPM=y

CONFIG_ANDROID=y

CONFIG_ANDROID_BINDER_IPC=y

drivers/power/supply/qcom/qpnp-qg.c

+2 −2
Original line number Diff line number Diff line
@@ -1224,7 +1224,7 @@ static ssize_t qg_device_write(struct file *file, const char __user *buf, 
	}



	if (count != 0 && count < data_size) {

		pr_err("Invalid datasize %zu expected %zu\n", count, data_size);

		pr_err("Invalid datasize %zu expected %lu\n", count, data_size);

		goto fail;

	}
@@ -1336,7 +1336,7 @@ static int get_batt_id_ohm(struct qpnp_qg *chip, u32 *batt_id_ohm) 
		return rc;

	}



	batt_id_mv = result.physical / 1000;

	batt_id_mv = div_s64(result.physical, 1000);

	if (batt_id_mv == 0) {

		pr_debug("batt_id_mv = 0 from ADC\n");

		return 0;