hwmon: pm8xxx_adc: Remove pm8921-adc
Switch clients to use pm8xxx-adc and remove pm8921-adc.
pm8xxx-adc supports PMIC HK/XOADC for 8960, 9x15, 8064
platforms.
Change-Id: Id27fa908cc097d52e6033c28ce243c6bcf64ed27
Signed-off-by: Siddartha Mohanadoss <smohanad@codeaurora.org>
diff --git a/drivers/power/pm8921-bms.c b/drivers/power/pm8921-bms.c
index 143d9b5..6741ef4 100644
--- a/drivers/power/pm8921-bms.c
+++ b/drivers/power/pm8921-bms.c
@@ -18,7 +18,7 @@
#include <linux/errno.h>
#include <linux/mfd/pm8xxx/pm8921-bms.h>
#include <linux/mfd/pm8xxx/core.h>
-#include <linux/mfd/pm8xxx/pm8921-adc.h>
+#include <linux/mfd/pm8xxx/pm8xxx-adc.h>
#include <linux/mfd/pm8xxx/ccadc.h>
#include <linux/interrupt.h>
#include <linux/bitops.h>
@@ -839,9 +839,9 @@
static int get_battery_uvolts(struct pm8921_bms_chip *chip, int *uvolts)
{
int rc;
- struct pm8921_adc_chan_result result;
+ struct pm8xxx_adc_chan_result result;
- rc = pm8921_adc_read(chip->vbat_channel, &result);
+ rc = pm8xxx_adc_read(chip->vbat_channel, &result);
if (rc) {
pr_err("error reading adc channel = %d, rc = %d\n",
chip->vbat_channel, rc);
@@ -1107,9 +1107,9 @@
static void calib_hkadc(struct pm8921_bms_chip *chip)
{
int voltage, rc;
- struct pm8921_adc_chan_result result;
+ struct pm8xxx_adc_chan_result result;
- rc = pm8921_adc_read(the_chip->ref1p25v_channel, &result);
+ rc = pm8xxx_adc_read(the_chip->ref1p25v_channel, &result);
if (rc) {
pr_err("ADC failed for 1.25volts rc = %d\n", rc);
return;
@@ -1126,7 +1126,7 @@
voltage = XOADC_MIN_1P25V;
chip->xoadc_v125 = voltage;
- rc = pm8921_adc_read(the_chip->ref625mv_channel, &result);
+ rc = pm8xxx_adc_read(the_chip->ref625mv_channel, &result);
if (rc) {
pr_err("ADC failed for 1.25volts rc = %d\n", rc);
return;
@@ -1210,14 +1210,14 @@
int pm8921_bms_get_percent_charge(void)
{
int batt_temp, rc;
- struct pm8921_adc_chan_result result;
+ struct pm8xxx_adc_chan_result result;
if (!the_chip) {
pr_err("called before initialization\n");
return -EINVAL;
}
- rc = pm8921_adc_read(the_chip->batt_temp_channel, &result);
+ rc = pm8xxx_adc_read(the_chip->batt_temp_channel, &result);
if (rc) {
pr_err("error reading adc channel = %d, rc = %d\n",
the_chip->batt_temp_channel, rc);
@@ -1234,14 +1234,14 @@
int pm8921_bms_get_fcc(void)
{
int batt_temp, rc;
- struct pm8921_adc_chan_result result;
+ struct pm8xxx_adc_chan_result result;
if (!the_chip) {
pr_err("called before initialization\n");
return -EINVAL;
}
- rc = pm8921_adc_read(the_chip->batt_temp_channel, &result);
+ rc = pm8xxx_adc_read(the_chip->batt_temp_channel, &result);
if (rc) {
pr_err("error reading adc channel = %d, rc = %d\n",
the_chip->batt_temp_channel, rc);
@@ -1266,9 +1266,9 @@
if (is_battery_full && the_chip != NULL) {
unsigned long flags;
int batt_temp, rc, cc_reading;
- struct pm8921_adc_chan_result result;
+ struct pm8xxx_adc_chan_result result;
- rc = pm8921_adc_read(the_chip->batt_temp_channel, &result);
+ rc = pm8xxx_adc_read(the_chip->batt_temp_channel, &result);
if (rc) {
pr_err("error reading adc channel = %d, rc = %d\n",
the_chip->batt_temp_channel, rc);
@@ -1481,9 +1481,9 @@
static int64_t read_battery_id(struct pm8921_bms_chip *chip)
{
int rc;
- struct pm8921_adc_chan_result result;
+ struct pm8xxx_adc_chan_result result;
- rc = pm8921_adc_read(chip->batt_id_channel, &result);
+ rc = pm8xxx_adc_read(chip->batt_id_channel, &result);
if (rc) {
pr_err("error reading batt id channel = %d, rc = %d\n",
chip->vbat_channel, rc);
diff --git a/drivers/power/pm8921-charger.c b/drivers/power/pm8921-charger.c
index d7a7b5a..a91630a 100644
--- a/drivers/power/pm8921-charger.c
+++ b/drivers/power/pm8921-charger.c
@@ -18,7 +18,7 @@
#include <linux/errno.h>
#include <linux/mfd/pm8xxx/pm8921-charger.h>
#include <linux/mfd/pm8xxx/pm8921-bms.h>
-#include <linux/mfd/pm8xxx/pm8921-adc.h>
+#include <linux/mfd/pm8xxx/pm8xxx-adc.h>
#include <linux/mfd/pm8xxx/ccadc.h>
#include <linux/mfd/pm8xxx/core.h>
#include <linux/interrupt.h>
@@ -264,7 +264,7 @@
static struct pm8921_chg_chip *the_chip;
-static struct pm8921_adc_arb_btm_param btm_config;
+static struct pm8xxx_adc_arb_btm_param btm_config;
static int pm_chg_masked_write(struct pm8921_chg_chip *chip, u16 addr,
u8 mask, u8 val)
@@ -722,9 +722,9 @@
static int64_t read_battery_id(struct pm8921_chg_chip *chip)
{
int rc;
- struct pm8921_adc_chan_result result;
+ struct pm8xxx_adc_chan_result result;
- rc = pm8921_adc_read(chip->batt_id_channel, &result);
+ rc = pm8xxx_adc_read(chip->batt_id_channel, &result);
if (rc) {
pr_err("error reading batt id channel = %d, rc = %d\n",
chip->vbat_channel, rc);
@@ -925,9 +925,9 @@
static int get_prop_battery_mvolts(struct pm8921_chg_chip *chip)
{
int rc;
- struct pm8921_adc_chan_result result;
+ struct pm8xxx_adc_chan_result result;
- rc = pm8921_adc_read(chip->vbat_channel, &result);
+ rc = pm8xxx_adc_read(chip->vbat_channel, &result);
if (rc) {
pr_err("error reading adc channel = %d, rc = %d\n",
chip->vbat_channel, rc);
@@ -1067,9 +1067,9 @@
static int get_prop_batt_temp(struct pm8921_chg_chip *chip)
{
int rc;
- struct pm8921_adc_chan_result result;
+ struct pm8xxx_adc_chan_result result;
- rc = pm8921_adc_read(chip->batt_temp_channel, &result);
+ rc = pm8xxx_adc_read(chip->batt_temp_channel, &result);
if (rc) {
pr_err("error reading adc channel = %d, rc = %d\n",
chip->vbat_channel, rc);
@@ -1935,7 +1935,7 @@
{
int rc;
- rc = pm8921_adc_btm_configure(&btm_config);
+ rc = pm8xxx_adc_btm_configure(&btm_config);
if (rc)
pr_err("failed to configure btm rc=%d", rc);
}
@@ -1996,10 +1996,10 @@
btm_config.low_thr_temp = chip->cool_temp;
btm_config.high_thr_temp = chip->warm_temp;
btm_config.interval = chip->temp_check_period;
- rc = pm8921_adc_btm_configure(&btm_config);
+ rc = pm8xxx_adc_btm_configure(&btm_config);
if (rc)
pr_err("failed to configure btm rc = %d\n", rc);
- rc = pm8921_adc_btm_start();
+ rc = pm8xxx_adc_btm_start();
if (rc)
pr_err("failed to start btm rc = %d\n", rc);