Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit df7878f9 authored by Marek Vasut's avatar Marek Vasut Committed by Lee Jones
Browse files

mfd: da9063: Rename PMIC_DA9063 to PMIC_CHIP_ID_DA9063 



The PMIC_DA9063 is a complete misnomer, it denotes the value of the
DA9063 chip ID register, so rename it as such. It is also the value
of chip ID register of DA9063L though, so drop the enum as all the
DA9063 "models" share the same chip ID and thus the distinction will
have to be made using DT or otherwise.

Signed-off-by: default avatarMarek Vasut <marek.vasut+renesas@gmail.com>
Acked-by: default avatarMark Brown <broonie@kernel.org>
Reviewed-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Acked-by: default avatarSteve Twiss <stwiss.opensource@diasemi.com>
Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
parent c727eea9

drivers/mfd/da9063-core.c

+1 −1
Original line number Diff line number Diff line
@@ -192,7 +192,7 @@ int da9063_device_init(struct da9063 *da9063, unsigned int irq) 
		dev_err(da9063->dev, "Cannot read chip model id.\n");

		return -EIO;

	}

	if (model != PMIC_DA9063) {

	if (model != PMIC_CHIP_ID_DA9063) {

		dev_err(da9063->dev, "Invalid chip model id: 0x%02x\n", model);

		return -ENODEV;

	}

drivers/mfd/da9063-i2c.c

+1 −1
Original line number Diff line number Diff line
@@ -181,7 +181,7 @@ static int da9063_i2c_probe(struct i2c_client *i2c, 
}



static const struct i2c_device_id da9063_i2c_id[] = {

	{"da9063", PMIC_DA9063},

	{ "da9063", PMIC_CHIP_ID_DA9063 },

	{},

};

MODULE_DEVICE_TABLE(i2c, da9063_i2c_id);

drivers/regulator/da9063-regulator.c

+1 −1
Original line number Diff line number Diff line
@@ -585,7 +585,7 @@ static struct da9063_dev_model regulators_models[] = { 
	{

		.regulator_info = da9063_regulator_info,

		.n_regulators = ARRAY_SIZE(da9063_regulator_info),

		.dev_model = PMIC_DA9063,

		.dev_model = PMIC_CHIP_ID_DA9063,

	},

	{ }

};

include/linux/mfd/da9063/core.h

+1 −3
Original line number Diff line number Diff line
@@ -29,9 +29,7 @@ 
#define DA9063_DRVNAME_RTC		"da9063-rtc"

#define DA9063_DRVNAME_VIBRATION	"da9063-vibration"



enum da9063_models {

	PMIC_DA9063 = 0x61,

};

#define PMIC_CHIP_ID_DA9063		0x61



enum da9063_variant_codes {

	PMIC_DA9063_AD = 0x3,