mfd: 88pm80x: Change chip id definition and detection
Change the chip id definition and detection and then: 1. We no longer need to add PM800_CHIP_XXX for the coming revision. 2. We no longer need to pass driver_data in i2c_device_id as we can distinguish the chips from the CHIP_ID register. Signed-off-by: Chao Xie <chao.xie@marvell.com> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
This commit is contained in:
Chao Xie
Samuel Ortiz
parent
52705344d0
commit
03dcc544bf
4 changed files with 51 additions and 61 deletions
|
|
@ -28,8 +28,6 @@
|
|||
#include <linux/mfd/88pm80x.h>
|
||||
#include <linux/slab.h>
|
||||
|
||||
#define PM800_CHIP_ID (0x00)
|
||||
|
||||
/* Interrupt Registers */
|
||||
#define PM800_INT_STATUS1 (0x05)
|
||||
#define PM800_ONKEY_INT_STS1 (1 << 0)
|
||||
|
|
@ -114,20 +112,11 @@ enum {
|
|||
PM800_MAX_IRQ,
|
||||
};
|
||||
|
||||
enum {
|
||||
/* Procida */
|
||||
PM800_CHIP_A0 = 0x60,
|
||||
PM800_CHIP_A1 = 0x61,
|
||||
PM800_CHIP_B0 = 0x62,
|
||||
PM800_CHIP_C0 = 0x63,
|
||||
PM800_CHIP_END = PM800_CHIP_C0,
|
||||
|
||||
/* Make sure to update this to the last stepping */
|
||||
PM8XXX_CHIP_END = PM800_CHIP_END
|
||||
};
|
||||
/* PM800: generation identification number */
|
||||
#define PM800_CHIP_GEN_ID_NUM 0x3
|
||||
|
||||
static const struct i2c_device_id pm80x_id_table[] = {
|
||||
{"88PM800", CHIP_PM800},
|
||||
{"88PM800", 0},
|
||||
{} /* NULL terminated */
|
||||
};
|
||||
MODULE_DEVICE_TABLE(i2c, pm80x_id_table);
|
||||
|
|
@ -434,28 +423,9 @@ static void pm800_pages_exit(struct pm80x_chip *chip)
|
|||
static int device_800_init(struct pm80x_chip *chip,
|
||||
struct pm80x_platform_data *pdata)
|
||||
{
|
||||
int ret, pmic_id;
|
||||
int ret;
|
||||
unsigned int val;
|
||||
|
||||
ret = regmap_read(chip->regmap, PM800_CHIP_ID, &val);
|
||||
if (ret < 0) {
|
||||
dev_err(chip->dev, "Failed to read CHIP ID: %d\n", ret);
|
||||
goto out;
|
||||
}
|
||||
|
||||
pmic_id = val & PM80X_VERSION_MASK;
|
||||
|
||||
if ((pmic_id >= PM800_CHIP_A0) && (pmic_id <= PM800_CHIP_END)) {
|
||||
chip->version = val;
|
||||
dev_info(chip->dev,
|
||||
"88PM80x:Marvell 88PM800 (ID:0x%x) detected\n", val);
|
||||
} else {
|
||||
dev_err(chip->dev,
|
||||
"Failed to detect Marvell 88PM800:ChipID[0x%x]\n", val);
|
||||
ret = -EINVAL;
|
||||
goto out;
|
||||
}
|
||||
|
||||
/*
|
||||
* alarm wake up bit will be clear in device_irq_init(),
|
||||
* read before that
|
||||
|
|
@ -523,7 +493,7 @@ static int pm800_probe(struct i2c_client *client,
|
|||
struct pm80x_platform_data *pdata = client->dev.platform_data;
|
||||
struct pm80x_subchip *subchip;
|
||||
|
||||
ret = pm80x_init(client, id);
|
||||
ret = pm80x_init(client);
|
||||
if (ret) {
|
||||
dev_err(&client->dev, "pm800_init fail\n");
|
||||
goto out_init;
|
||||
|
|
@ -553,7 +523,7 @@ static int pm800_probe(struct i2c_client *client,
|
|||
|
||||
ret = device_800_init(chip, pdata);
|
||||
if (ret) {
|
||||
dev_err(chip->dev, "%s id 0x%x failed!\n", __func__, chip->id);
|
||||
dev_err(chip->dev, "Failed to initialize 88pm800 devices\n");
|
||||
goto err_device_init;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -29,10 +29,8 @@
|
|||
#include <linux/slab.h>
|
||||
#include <linux/delay.h>
|
||||
|
||||
#define PM805_CHIP_ID (0x00)
|
||||
|
||||
static const struct i2c_device_id pm80x_id_table[] = {
|
||||
{"88PM805", CHIP_PM805},
|
||||
{"88PM805", 0},
|
||||
{} /* NULL terminated */
|
||||
};
|
||||
MODULE_DEVICE_TABLE(i2c, pm80x_id_table);
|
||||
|
|
@ -192,7 +190,6 @@ static struct regmap_irq_chip pm805_irq_chip = {
|
|||
static int device_805_init(struct pm80x_chip *chip)
|
||||
{
|
||||
int ret = 0;
|
||||
unsigned int val;
|
||||
struct regmap *map = chip->regmap;
|
||||
|
||||
if (!map) {
|
||||
|
|
@ -200,13 +197,6 @@ static int device_805_init(struct pm80x_chip *chip)
|
|||
return -EINVAL;
|
||||
}
|
||||
|
||||
ret = regmap_read(map, PM805_CHIP_ID, &val);
|
||||
if (ret < 0) {
|
||||
dev_err(chip->dev, "Failed to read CHIP ID: %d\n", ret);
|
||||
goto out_irq_init;
|
||||
}
|
||||
chip->version = val;
|
||||
|
||||
chip->regmap_irq_chip = &pm805_irq_chip;
|
||||
|
||||
ret = device_irq_init_805(chip);
|
||||
|
|
@ -239,7 +229,7 @@ static int pm805_probe(struct i2c_client *client,
|
|||
struct pm80x_chip *chip;
|
||||
struct pm80x_platform_data *pdata = client->dev.platform_data;
|
||||
|
||||
ret = pm80x_init(client, id);
|
||||
ret = pm80x_init(client);
|
||||
if (ret) {
|
||||
dev_err(&client->dev, "pm805_init fail!\n");
|
||||
goto out_init;
|
||||
|
|
@ -249,7 +239,7 @@ static int pm805_probe(struct i2c_client *client,
|
|||
|
||||
ret = device_805_init(chip);
|
||||
if (ret) {
|
||||
dev_err(chip->dev, "%s id 0x%x failed!\n", __func__, chip->id);
|
||||
dev_err(chip->dev, "Failed to initialize 88pm805 devices\n");
|
||||
goto err_805_init;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -18,6 +18,23 @@
|
|||
#include <linux/uaccess.h>
|
||||
#include <linux/err.h>
|
||||
|
||||
/* 88pm80x chips have same definition for chip id register. */
|
||||
#define PM80X_CHIP_ID (0x00)
|
||||
#define PM80X_CHIP_ID_NUM(x) (((x) >> 5) & 0x7)
|
||||
#define PM80X_CHIP_ID_REVISION(x) ((x) & 0x1F)
|
||||
|
||||
struct pm80x_chip_mapping {
|
||||
unsigned int id;
|
||||
int type;
|
||||
};
|
||||
|
||||
static struct pm80x_chip_mapping chip_mapping[] = {
|
||||
/* 88PM800 chip id number */
|
||||
{0x3, CHIP_PM800},
|
||||
/* 88PM805 chip id number */
|
||||
{0x0, CHIP_PM805},
|
||||
};
|
||||
|
||||
/*
|
||||
* workaround: some registers needed by pm805 are defined in pm800, so
|
||||
* need to use this global variable to maintain the relation between
|
||||
|
|
@ -31,12 +48,13 @@ const struct regmap_config pm80x_regmap_config = {
|
|||
};
|
||||
EXPORT_SYMBOL_GPL(pm80x_regmap_config);
|
||||
|
||||
int pm80x_init(struct i2c_client *client,
|
||||
const struct i2c_device_id *id)
|
||||
|
||||
int pm80x_init(struct i2c_client *client)
|
||||
{
|
||||
struct pm80x_chip *chip;
|
||||
struct regmap *map;
|
||||
int ret = 0;
|
||||
unsigned int val;
|
||||
int i, ret = 0;
|
||||
|
||||
chip =
|
||||
devm_kzalloc(&client->dev, sizeof(struct pm80x_chip), GFP_KERNEL);
|
||||
|
|
@ -51,10 +69,6 @@ int pm80x_init(struct i2c_client *client,
|
|||
return ret;
|
||||
}
|
||||
|
||||
chip->id = id->driver_data;
|
||||
if (chip->id < CHIP_PM800 || chip->id > CHIP_PM805)
|
||||
return -EINVAL;
|
||||
|
||||
chip->client = client;
|
||||
chip->regmap = map;
|
||||
|
||||
|
|
@ -64,6 +78,25 @@ int pm80x_init(struct i2c_client *client,
|
|||
dev_set_drvdata(chip->dev, chip);
|
||||
i2c_set_clientdata(chip->client, chip);
|
||||
|
||||
ret = regmap_read(chip->regmap, PM80X_CHIP_ID, &val);
|
||||
if (ret < 0) {
|
||||
dev_err(chip->dev, "Failed to read CHIP ID: %d\n", ret);
|
||||
return ret;
|
||||
}
|
||||
|
||||
for (i = 0; i < ARRAY_SIZE(chip_mapping); i++) {
|
||||
if (chip_mapping[i].id == PM80X_CHIP_ID_NUM(val)) {
|
||||
chip->type = chip_mapping[i].type;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if (i == ARRAY_SIZE(chip_mapping)) {
|
||||
dev_err(chip->dev,
|
||||
"Failed to detect Marvell 88PM800:ChipID[0x%x]\n", val);
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
device_init_wakeup(&client->dev, 1);
|
||||
|
||||
/*
|
||||
|
|
|
|||
|
|
@ -17,7 +17,6 @@
|
|||
#include <linux/regmap.h>
|
||||
#include <linux/atomic.h>
|
||||
|
||||
#define PM80X_VERSION_MASK (0xFF) /* 80X chip ID mask */
|
||||
enum {
|
||||
CHIP_INVALID = 0,
|
||||
CHIP_PM800,
|
||||
|
|
@ -299,8 +298,7 @@ struct pm80x_chip {
|
|||
struct regmap *regmap;
|
||||
struct regmap_irq_chip *regmap_irq_chip;
|
||||
struct regmap_irq_chip_data *irq_data;
|
||||
unsigned char version;
|
||||
int id;
|
||||
int type;
|
||||
int irq;
|
||||
int irq_mode;
|
||||
unsigned long wu_flag;
|
||||
|
|
@ -361,7 +359,6 @@ static inline int pm80x_dev_resume(struct device *dev)
|
|||
}
|
||||
#endif
|
||||
|
||||
extern int pm80x_init(struct i2c_client *client,
|
||||
const struct i2c_device_id *id);
|
||||
extern int pm80x_init(struct i2c_client *client);
|
||||
extern int pm80x_deinit(void);
|
||||
#endif /* __LINUX_MFD_88PM80X_H */
|
||||
|
|
|
|||
Loading…
Reference in a new issue