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

Commit f11fa179 authored by Tero Kristo's avatar Tero Kristo Committed by Mark Brown
Browse files

mfd: tps65218: add version check to the PMIC probe 



Version information will be needed to handle some error cases under the
regulator driver, so store the information once during MFD probe.

Signed-off-by: default avatarTero Kristo <t-kristo@ti.com>
Signed-off-by: default avatarDave Gerlach <d-gerlach@ti.com>
Signed-off-by: default avatarKeerthy <j-keerthy@ti.com>
Acked-by: default avatarLee Jones <lee.jones@linaro.org>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 29b4817d

drivers/mfd/tps65218.c

+9 −0
Original line number Original line Diff line number Diff line
@@ -219,6 +219,7 @@ static int tps65218_probe(struct i2c_client *client, 
	struct tps65218 *tps;

	struct tps65218 *tps;

	const struct of_device_id *match;

	const struct of_device_id *match;

	int ret;

	int ret;

	unsigned int chipid;





	match = of_match_device(of_tps65218_match_table, &client->dev);

	match = of_match_device(of_tps65218_match_table, &client->dev);

	if (!match) {

	if (!match) {
@@ -250,6 +251,14 @@ static int tps65218_probe(struct i2c_client *client, 
	if (ret < 0)

	if (ret < 0)

		return ret;

		return ret;





	ret = tps65218_reg_read(tps, TPS65218_REG_CHIPID, &chipid);

	if (ret) {

		dev_err(tps->dev, "Failed to read chipid: %d\n", ret);

		return ret;

	}



	tps->rev = chipid & TPS65218_CHIPID_REV_MASK;



	ret = of_platform_populate(client->dev.of_node, NULL, NULL,

	ret = of_platform_populate(client->dev.of_node, NULL, NULL,

				   &client->dev);

				   &client->dev);

	if (ret < 0)

	if (ret < 0)

include/linux/mfd/tps65218.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -267,6 +267,7 @@ struct tps_info { 
struct tps65218 {

struct tps65218 {

	struct device *dev;

	struct device *dev;

	unsigned int id;

	unsigned int id;

	u8 rev;





	struct mutex tps_lock;		/* lock guarding the data structure */

	struct mutex tps_lock;		/* lock guarding the data structure */

	/* IRQ Data */

	/* IRQ Data */