| Message ID | 1501762841-20262-2-git-send-email-chenjh@rock-chips.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Thu, 03 Aug 2017, Joseph Chen wrote: > From: Elaine Zhang <zhangqing@rock-chips.com> > > the rk8xx chip id is: > ((MSB << 8) | LSB) & 0xfff0 > > Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com> > Signed-off-by: Joseph Chen <chenjh@rock-chips.com> > --- > drivers/mfd/rk808.c | 21 +++++++++++++++------ > include/linux/mfd/rk808.h | 1 + > 2 files changed, 16 insertions(+), 6 deletions(-) > > diff --git a/drivers/mfd/rk808.c b/drivers/mfd/rk808.c > index fd087cb..3334a2a 100644 > --- a/drivers/mfd/rk808.c > +++ b/drivers/mfd/rk808.c > @@ -325,7 +325,7 @@ static int rk808_probe(struct i2c_client *client, > void (*pm_pwroff_fn)(void); > int nr_pre_init_regs; > int nr_cells; > - int pm_off = 0; > + int pm_off = 0, msb, lsb; > int ret; > int i; > > @@ -333,14 +333,23 @@ static int rk808_probe(struct i2c_client *client, > if (!rk808) > return -ENOMEM; > > - rk808->variant = i2c_smbus_read_word_data(client, RK808_ID_MSB); > - if (rk808->variant < 0) { > - dev_err(&client->dev, "Failed to read the chip id at 0x%02x\n", > + /* read Chip variant */ Nit: This should read "Read chip variant" However, I realise that the rest of the comments do not use correctly formatted English grammar either, so just s/Chip/chip/. Once fixed you can apply my: For my own reference: Acked-for-MFD-by: Lee Jones <lee.jones@linaro.org>
diff --git a/drivers/mfd/rk808.c b/drivers/mfd/rk808.c index fd087cb..3334a2a 100644 --- a/drivers/mfd/rk808.c +++ b/drivers/mfd/rk808.c @@ -325,7 +325,7 @@ static int rk808_probe(struct i2c_client *client, void (*pm_pwroff_fn)(void); int nr_pre_init_regs; int nr_cells; - int pm_off = 0; + int pm_off = 0, msb, lsb; int ret; int i; @@ -333,14 +333,23 @@ static int rk808_probe(struct i2c_client *client, if (!rk808) return -ENOMEM; - rk808->variant = i2c_smbus_read_word_data(client, RK808_ID_MSB); - if (rk808->variant < 0) { - dev_err(&client->dev, "Failed to read the chip id at 0x%02x\n", + /* read Chip variant */ + msb = i2c_smbus_read_byte_data(client, RK808_ID_MSB); + if (msb < 0) { + dev_err(&client->dev, "failed to read the chip id at 0x%x\n", RK808_ID_MSB); - return rk808->variant; + return msb; } - dev_dbg(&client->dev, "Chip id: 0x%x\n", (unsigned int)rk808->variant); + lsb = i2c_smbus_read_byte_data(client, RK808_ID_LSB); + if (lsb < 0) { + dev_err(&client->dev, "failed to read the chip id at 0x%x\n", + RK808_ID_LSB); + return lsb; + } + + rk808->variant = ((msb << 8) | lsb) & RK8XX_ID_MSK; + dev_info(&client->dev, "Chip id: 0x%x\n", (unsigned int)rk808->variant); switch (rk808->variant) { case RK808_ID: diff --git a/include/linux/mfd/rk808.h b/include/linux/mfd/rk808.h index 83701ef..54feb14 100644 --- a/include/linux/mfd/rk808.h +++ b/include/linux/mfd/rk808.h @@ -298,6 +298,7 @@ enum rk818_reg { #define VOUT_LO_INT BIT(0) #define CLK32KOUT2_EN BIT(0) +#define RK8XX_ID_MSK 0xfff0 enum { BUCK_ILMIN_50MA, BUCK_ILMIN_100MA,