[PATCH v2 8/9] mfd: mt6360: Fix flow which is used to check ic exist

Gene Chen
2020-07-17T11:04:22Z

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