Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1716056
| From | Heiko Stuebner <heiko@sntech.de> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | [PATCH v9 RESEND 1/9] mfd: rk808: fix up the chip id get failed |
| Date | 2017-08-21 03:30 +0200 |
| Message-ID | <ugJHs-66r-7@gated-at.bofh.it> (permalink) |
| References | <ugJHs-66r-1@gated-at.bofh.it> |
| Organization | linux.* mail to news gateway |
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>
Acked-for-MFD-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
---
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 fd087cbb0bde..8e60ebaeaadb 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 83701ef7d3c7..54feb140c210 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,
--
2.14.1
Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread
[PATCH v9 RESEND 0/9] mfd: rk808: Add RK805 support Heiko Stuebner <heiko@sntech.de> - 2017-08-21 03:30 +0200
[PATCH v9 RESEND 8/9] mfd: rk808: Add RK805 pinctrl support Heiko Stuebner <heiko@sntech.de> - 2017-08-21 03:30 +0200
[PATCH v9 RESEND 1/9] mfd: rk808: fix up the chip id get failed Heiko Stuebner <heiko@sntech.de> - 2017-08-21 03:30 +0200
[PATCH v9 RESEND 6/9] pinctrl: dt-bindings: add bindings for Rockchip RK805 PMIC Heiko Stuebner <heiko@sntech.de> - 2017-08-21 03:30 +0200
Re: [PATCH v9 RESEND 6/9] pinctrl: dt-bindings: add bindings for Rockchip RK805 PMIC Lee Jones <lee.jones@linaro.org> - 2017-08-21 10:20 +0200
[PATCH v9 RESEND 3/9] regulator: rk808: Add regulator driver for RK805 Heiko Stuebner <heiko@sntech.de> - 2017-08-21 03:30 +0200
[PATCH v9 RESEND 2/9] mfd: rk808: add rk805 regs addr and ID Heiko Stuebner <heiko@sntech.de> - 2017-08-21 03:40 +0200
[PATCH v9 RESEND 9/9] mfd: rk808: Add RK805 power key support Heiko Stuebner <heiko@sntech.de> - 2017-08-21 03:40 +0200
Re: [PATCH v9 RESEND 9/9] mfd: rk808: Add RK805 power key support Lee Jones <lee.jones@linaro.org> - 2017-08-21 10:20 +0200
[PATCH v9 RESEND 7/9] pinctrl: Add pinctrl driver for the RK805 PMIC Heiko Stuebner <heiko@sntech.de> - 2017-08-21 03:40 +0200
Re: [PATCH v9 RESEND 7/9] pinctrl: Add pinctrl driver for the RK805 PMIC Lee Jones <lee.jones@linaro.org> - 2017-08-21 10:20 +0200
[PATCH v9 RESEND 4/9] mfd: dt-bindings: Add RK805 device tree bindings document Heiko Stuebner <heiko@sntech.de> - 2017-08-21 03:40 +0200
Re: [PATCH v9 RESEND 4/9] mfd: dt-bindings: Add RK805 device tree bindings document Lee Jones <lee.jones@linaro.org> - 2017-08-21 10:20 +0200
[PATCH v9 RESEND 5/9] mfd: rk808: Add RK805 support Heiko Stuebner <heiko@sntech.de> - 2017-08-21 03:40 +0200
Re: [PATCH v9 RESEND 5/9] mfd: rk808: Add RK805 support Lee Jones <lee.jones@linaro.org> - 2017-08-21 10:20 +0200
[GIT PULL] Immutable branch between MFD, Pinctrl and Regulator due for the v4.14 merge window Lee Jones <lee.jones@linaro.org> - 2017-08-21 10:30 +0200
csiph-web