leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mfd: rk808: Fix up the chip id get failed

Browse Source 
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>
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
This commit is contained in:
Elaine Zhang 2017-08-21 03:28:34 +02:00 committed by Lee Jones
parent 5771a8c088
commit 9d6105e19f
2 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
drivers/mfd/rk808.c
View File

@ -325,7 +325,7 @@ static int rk808_probe(struct i2c_client *client,
void (*pm_pwroff_fn)(void); void (*pm_pwroff_fn)(void);
int nr_pre_init_regs; int nr_pre_init_regs;
int nr_cells; int nr_cells;
int pm_off = 0; int pm_off = 0, msb, lsb;
int ret; int ret;
int i; int i;
@ -333,14 +333,23 @@ static int rk808_probe(struct i2c_client *client,
if (!rk808) if (!rk808)
return -ENOMEM; return -ENOMEM;
rk808->variant = i2c_smbus_read_word_data(client, RK808_ID_MSB); /* Read chip variant */
if (rk808->variant < 0) { msb = i2c_smbus_read_byte_data(client, RK808_ID_MSB);
dev_err(&client->dev, "Failed to read the chip id at 0x%02x\n", if (msb < 0) {
dev_err(&client->dev, "failed to read the chip id at 0x%x\n",
RK808_ID_MSB); 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) { switch (rk808->variant) {
case RK808_ID: case RK808_ID:

1
include/linux/mfd/rk808.h
View File

@ -298,6 +298,7 @@ enum rk818_reg {
#define VOUT_LO_INT BIT(0) #define VOUT_LO_INT BIT(0)
#define CLK32KOUT2_EN BIT(0) #define CLK32KOUT2_EN BIT(0)
#define RK8XX_ID_MSK 0xfff0
enum { enum {
BUCK_ILMIN_50MA, BUCK_ILMIN_50MA,
BUCK_ILMIN_100MA, BUCK_ILMIN_100MA,