linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
From: Gene Chen <gene.chen.richtek@gmail.com>
To: lee.jones@linaro.org, matthias.bgg@gmail.com
Cc: gene_chen@richtek.com, linux-kernel@vger.kernel.org,
	cy_huang@richtek.com, benjamin.chao@mediatek.com,
	linux-mediatek@lists.infradead.org,
	linux-arm-kernel@lists.infradead.org, shufan_lee@richtek.com
Subject: [PATCH v2 8/9] mfd: mt6360: Fix flow which is used to check ic exist
Date: Fri, 17 Jul 2020 19:03:30 +0800	[thread overview]
Message-ID: <1594983811-25908-9-git-send-email-gene.chen.richtek@gmail.com> (raw)
In-Reply-To: <1594983811-25908-1-git-send-email-gene.chen.richtek@gmail.com>

From: Gene Chen <gene_chen@richtek.com>

Fix flow which is used to check ic exist.

Signed-off-by: Gene Chen <gene_chen@richtek.com>
---
 drivers/mfd/mt6360-core.c | 28 +++++++++++++++++++---------
 1 file changed, 19 insertions(+), 9 deletions(-)

diff --git a/drivers/mfd/mt6360-core.c b/drivers/mfd/mt6360-core.c
index 5a68228..3186a7c 100644
--- a/drivers/mfd/mt6360-core.c
+++ b/drivers/mfd/mt6360-core.c
@@ -293,6 +293,23 @@ static const struct mfd_cell mt6360_devs[] = {
 		    NULL, 0, 0, "mediatek,mt6360-tcpc"),
 };
 
+static int mt6360_check_vendor_info(struct mt6360_data *data)
+{
+	u32 info;
+	int ret;
+
+	ret = regmap_read(data->regmap, MT6360_PMU_DEV_INFO, &info);
+	if (ret < 0)
+		return ret;
+
+	if ((info & CHIP_VEN_MASK) != CHIP_VEN_MT6360)
+		return -ENODEV;
+
+	data->chip_rev = info & CHIP_REV_MASK;
+
+	return 0;
+}
+
 static const unsigned short mt6360_slave_addr[MT6360_SLAVE_MAX] = {
 	MT6360_PMU_SLAVEID,
 	MT6360_PMIC_SLAVEID,
@@ -303,7 +320,6 @@ static const unsigned short mt6360_slave_addr[MT6360_SLAVE_MAX] = {
 static int mt6360_probe(struct i2c_client *client)
 {
 	struct mt6360_data *data;
-	unsigned int reg_data;
 	int i, ret;
 
 	data = devm_kzalloc(&client->dev, sizeof(*data), GFP_KERNEL);
@@ -319,16 +335,10 @@ static int mt6360_probe(struct i2c_client *client)
 		return PTR_ERR(data->regmap);
 	}
 
-	ret = regmap_read(data->regmap, MT6360_PMU_DEV_INFO, &reg_data);
+	ret = mt6360_check_vendor_info(data);
 	if (ret) {
-		dev_err(&client->dev, "Device not found\n");
-		return ret;
-	}
-
-	data->chip_rev = reg_data & CHIP_REV_MASK;
-	if (data->chip_rev != CHIP_VEN_MT6360) {
 		dev_err(&client->dev, "Device not supported\n");
-		return -ENODEV;
+		return ret;
 	}
 
 	ret = devm_regmap_add_irq_chip(&client->dev, data->regmap, client->irq,
-- 
2.7.4


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

  parent reply	other threads:[~2020-07-17 11:06 UTC|newest]

Thread overview: 30+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-07-17 11:03 [PATCH v2 0/9] mfd: mt6360: Merge different sub-devices i2c read/write Gene Chen
2020-07-17 11:03 ` [PATCH v2 1/9] mfd: mt6360: Rearrange include file Gene Chen
2020-07-27 11:08   ` Lee Jones
2020-07-27 18:16     ` Gene Chen
2020-07-28  6:56       ` Lee Jones
2020-07-17 11:03 ` [PATCH v2 2/9] mfd: mt6360: Remove redundant brackets around raw numbers Gene Chen
2020-07-27 11:09   ` Lee Jones
2020-07-17 11:03 ` [PATCH v2 3/9] mfd: mt6360: Indicate sub-dev compatible name by using "-" Gene Chen
2020-07-27 11:18   ` Lee Jones
2020-07-17 11:03 ` [PATCH v2 4/9] mfd: mt6360: Combine mt6360 pmic/ldo resouces into mt6360 regulator resources Gene Chen
2020-07-27 11:29   ` Lee Jones
2020-07-27 18:28     ` Gene Chen
2020-07-28  6:54       ` Lee Jones
2020-07-31  2:58         ` Gene Chen
2020-07-31 11:12           ` Lee Jones
2020-07-17 11:03 ` [PATCH v2 5/9] mfd: mt6360: Rename mt6360_pmu_data by mt6360_data Gene Chen
2020-07-27 12:06   ` Lee Jones
2020-07-17 11:03 ` [PATCH v2 6/9] mfd: mt6360: Rename mt6360_pmu by mt6360 Gene Chen
2020-07-27 12:21   ` Lee Jones
2020-07-17 11:03 ` [PATCH v2 7/9] mfd: mt6360: Remove handle_post_irq callback function Gene Chen
2020-07-27 12:23   ` Lee Jones
2020-07-17 11:03 ` Gene Chen [this message]
2020-07-27 12:26   ` [PATCH v2 8/9] mfd: mt6360: Fix flow which is used to check ic exist Lee Jones
2020-07-17 11:03 ` [PATCH v2 9/9] mfd: mt6360: Merge different sub-devices i2c read/write Gene Chen
2020-07-27 12:43   ` Lee Jones
2020-07-29  0:51     ` Gene Chen
2020-07-29 10:12       ` Lee Jones
2020-07-30  2:56         ` Gene Chen
2020-07-31  0:51           ` Gene Chen
2020-07-31  9:06             ` Lee Jones

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=1594983811-25908-9-git-send-email-gene.chen.richtek@gmail.com \
    --to=gene.chen.richtek@gmail.com \
    --cc=benjamin.chao@mediatek.com \
    --cc=cy_huang@richtek.com \
    --cc=gene_chen@richtek.com \
    --cc=lee.jones@linaro.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-mediatek@lists.infradead.org \
    --cc=matthias.bgg@gmail.com \
    --cc=shufan_lee@richtek.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).