From: Joseph Chen <chenjh@rock-chips.com>
To: gnurou@gmail.com, linus.walleij@linaro.org, dmitry.torokhov@gmail.com
Cc: linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org,
huangtao@rock-chips.com, tony.xie@rock-chips.com,
zhangqing@rock-chips.com, wdc@rock-chips.com,
devicetree@vger.kernel.org, w.egorov@phytec.de,
lgirdwood@gmail.com, broonie@kernel.org, robh+dt@kernel.org,
mark.rutland@arm.com, linux-gpio@vger.kernel.org,
linux-input@vger.kernel.org, Joseph Chen <chenjh@rock-chips.com>
Subject: [PATCH v8 01/12] mfd: rk808: fix up the chip id get failed
Date: Thu, 3 Aug 2017 20:20:30 +0800 [thread overview]
Message-ID: <1501762841-20262-2-git-send-email-chenjh@rock-chips.com> (raw)
In-Reply-To: <1501762841-20262-1-git-send-email-chenjh@rock-chips.com>
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 */
+ 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,
--
1.9.1
next prev parent reply other threads:[~2017-08-03 12:21 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-08-03 12:20 [PATCH v8 00/12] rk808: Add RK805 support Joseph Chen
2017-08-03 12:20 ` Joseph Chen [this message]
2017-08-08 10:45 ` [PATCH v8 01/12] mfd: rk808: fix up the chip id get failed Lee Jones
2017-08-03 12:20 ` [PATCH v8 02/12] mfd: rk808: add rk805 regs addr and ID Joseph Chen
2017-08-08 10:39 ` Lee Jones
2017-08-03 12:20 ` [PATCH v8 03/12] regulator: rk808: Add regulator driver for RK805 Joseph Chen
2017-08-03 12:20 ` [PATCH v8 04/12] mfd: rk808: Add RK805 support Joseph Chen
2017-08-08 10:48 ` Lee Jones
2017-08-03 12:24 ` [PATCH v8 05/12] clk: Kconfig: Name RK805 in Kconfig for COMMON_CLK_RK808 Joseph Chen
2017-08-03 12:24 ` [PATCH v8 06/12] rtc: Kconfig: Name RK805 in Kconfig for RTC_DRV_RK808 Joseph Chen
2017-08-03 12:25 ` [PATCH v8 07/12] mfd: dt-bindings: Add RK805 device tree bindings document Joseph Chen
2017-08-08 10:48 ` Lee Jones
2017-08-03 12:25 ` [PATCH v8 08/12] pinctrl: Add pinctrl driver for the RK805 PMIC Joseph Chen
2017-08-07 12:49 ` Linus Walleij
2017-08-03 12:25 ` [PATCH v8 09/12] Input: Add power key driver for Rockchip " Joseph Chen
2017-08-03 12:25 ` [PATCH v8 10/12] mfd: rk808: Add RK805 pinctrl support Joseph Chen
2017-08-08 10:49 ` Lee Jones
2017-08-03 12:26 ` [PATCH v8 11/12] mfd: rk808: Add RK805 power key support Joseph Chen
2017-08-08 10:50 ` Lee Jones
2017-08-03 12:26 ` [PATCH v8 12/12] pinctrl: dt-bindings: add bindings for Rockchip RK805 PMIC Joseph Chen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1501762841-20262-2-git-send-email-chenjh@rock-chips.com \
--to=chenjh@rock-chips.com \
--cc=broonie@kernel.org \
--cc=devicetree@vger.kernel.org \
--cc=dmitry.torokhov@gmail.com \
--cc=gnurou@gmail.com \
--cc=huangtao@rock-chips.com \
--cc=lgirdwood@gmail.com \
--cc=linus.walleij@linaro.org \
--cc=linux-gpio@vger.kernel.org \
--cc=linux-input@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-rockchip@lists.infradead.org \
--cc=mark.rutland@arm.com \
--cc=robh+dt@kernel.org \
--cc=tony.xie@rock-chips.com \
--cc=w.egorov@phytec.de \
--cc=wdc@rock-chips.com \
--cc=zhangqing@rock-chips.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).