From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755218AbdCWMOW (ORCPT ); Thu, 23 Mar 2017 08:14:22 -0400 Received: from mail-wr0-f180.google.com ([209.85.128.180]:32960 "EHLO mail-wr0-f180.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752152AbdCWMOU (ORCPT ); Thu, 23 Mar 2017 08:14:20 -0400 Date: Thu, 23 Mar 2017 12:14:15 +0000 From: Lee Jones To: Elaine Zhang Cc: lgirdwood@gmail.com, broonie@kernel.org, huangtao@rock-chips.com, xxx@rock-chips.com, linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org, chenjh@rock-chips.com, robh+dt@kernel.org, mark.rutland@arm.com, devicetree@vger.kernel.org, w.egorov@phytec.de Subject: Re: [PATCH v4 1/7] mfd: rk808: fix up the chip id get failed Message-ID: <20170323121415.tv7sljjgbjw57qyl@dell> References: <1489734377-1716-1-git-send-email-zhangqing@rock-chips.com> <1489734377-1716-2-git-send-email-zhangqing@rock-chips.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <1489734377-1716-2-git-send-email-zhangqing@rock-chips.com> User-Agent: Mutt/1.6.2-neo (2016-08-21) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, 17 Mar 2017, Elaine Zhang wrote: > the rk8xx chip id is: > ((MSB << 8) | LSB) & 0xfff0 > > Signed-off-by: Elaine Zhang > --- > drivers/mfd/rk808.c | 21 +++++++++++++++------ > include/linux/mfd/rk808.h | 1 + > 2 files changed, 16 insertions(+), 6 deletions(-) For my own reference: Acked-for-MFD-by: Lee Jones > diff --git a/drivers/mfd/rk808.c b/drivers/mfd/rk808.c > index fd087cbb0bde..3334a2a7f3fb 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, -- Lee Jones Linaro STMicroelectronics Landing Team Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog From mboxrd@z Thu Jan 1 00:00:00 1970 From: Lee Jones Subject: Re: [PATCH v4 1/7] mfd: rk808: fix up the chip id get failed Date: Thu, 23 Mar 2017 12:14:15 +0000 Message-ID: <20170323121415.tv7sljjgbjw57qyl@dell> References: <1489734377-1716-1-git-send-email-zhangqing@rock-chips.com> <1489734377-1716-2-git-send-email-zhangqing@rock-chips.com> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Return-path: Content-Disposition: inline In-Reply-To: <1489734377-1716-2-git-send-email-zhangqing-TNX95d0MmH7DzftRWevZcw@public.gmane.org> Sender: devicetree-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org To: Elaine Zhang Cc: lgirdwood-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org, broonie-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org, huangtao-TNX95d0MmH7DzftRWevZcw@public.gmane.org, xxx-TNX95d0MmH7DzftRWevZcw@public.gmane.org, linux-rockchip-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org, linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, chenjh-TNX95d0MmH7DzftRWevZcw@public.gmane.org, robh+dt-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org, mark.rutland-5wv7dgnIgG8@public.gmane.org, devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, w.egorov-guT5V/WYfQezQB+pC5nmwQ@public.gmane.org List-Id: devicetree@vger.kernel.org On Fri, 17 Mar 2017, Elaine Zhang wrote: > the rk8xx chip id is: > ((MSB << 8) | LSB) & 0xfff0 > > Signed-off-by: Elaine Zhang > --- > drivers/mfd/rk808.c | 21 +++++++++++++++------ > include/linux/mfd/rk808.h | 1 + > 2 files changed, 16 insertions(+), 6 deletions(-) For my own reference: Acked-for-MFD-by: Lee Jones > diff --git a/drivers/mfd/rk808.c b/drivers/mfd/rk808.c > index fd087cbb0bde..3334a2a7f3fb 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, -- Lee Jones Linaro STMicroelectronics Landing Team Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html