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

Commit 1ffb0be3 authored by J Keerthy's avatar J Keerthy Committed by Samuel Ortiz
Browse files

mfd: palmas: Add SMPS10_BOOST feature 



The SMPS10 regulator is not presesnt in all the variants
of the PALMAS PMIC family. Hence adding a feature to distingush
between them.

Signed-off-by: default avatarJ Keerthy <j-keerthy@ti.com>
Signed-off-by: default avatarSamuel Ortiz <sameo@linux.intel.com>
parent ad522f4e

drivers/mfd/palmas.c

+21 −8
Original line number Original line Diff line number Diff line
@@ -23,7 +23,7 @@ 
#include <linux/err.h>

#include <linux/err.h>

#include <linux/mfd/core.h>

#include <linux/mfd/core.h>

#include <linux/mfd/palmas.h>

#include <linux/mfd/palmas.h>

#include <linux/of_platform.h>

#include <linux/of_device.h>





static const struct regmap_config palmas_regmap_config[PALMAS_NUM_CLIENTS] = {

static const struct regmap_config palmas_regmap_config[PALMAS_NUM_CLIENTS] = {

	{

	{
@@ -231,6 +231,16 @@ static void palmas_dt_to_pdata(struct i2c_client *i2c, 
		palmas_set_pdata_irq_flag(i2c, pdata);

		palmas_set_pdata_irq_flag(i2c, pdata);

}

}





static unsigned int palmas_features = PALMAS_PMIC_FEATURE_SMPS10_BOOST;



static const struct of_device_id of_palmas_match_tbl[] = {

	{

		.compatible = "ti,palmas",

		.data = &palmas_features,

	},

	{ },

};



static int palmas_i2c_probe(struct i2c_client *i2c,

static int palmas_i2c_probe(struct i2c_client *i2c,

			    const struct i2c_device_id *id)

			    const struct i2c_device_id *id)

{

{
@@ -238,8 +248,9 @@ static int palmas_i2c_probe(struct i2c_client *i2c, 
	struct palmas_platform_data *pdata;

	struct palmas_platform_data *pdata;

	struct device_node *node = i2c->dev.of_node;

	struct device_node *node = i2c->dev.of_node;

	int ret = 0, i;

	int ret = 0, i;

	unsigned int reg, addr;

	unsigned int reg, addr, *features;

	int slave;

	int slave;

	const struct of_device_id *match;





	pdata = dev_get_platdata(&i2c->dev);

	pdata = dev_get_platdata(&i2c->dev);
@@ -261,9 +272,16 @@ static int palmas_i2c_probe(struct i2c_client *i2c, 




	i2c_set_clientdata(i2c, palmas);

	i2c_set_clientdata(i2c, palmas);

	palmas->dev = &i2c->dev;

	palmas->dev = &i2c->dev;

	palmas->id = id->driver_data;

	palmas->irq = i2c->irq;

	palmas->irq = i2c->irq;





	match = of_match_device(of_match_ptr(of_palmas_match_tbl), &i2c->dev);



	if (!match)

		return -ENODATA;



	features = (unsigned int *)match->data;

	palmas->features = *features;



	for (i = 0; i < PALMAS_NUM_CLIENTS; i++) {

	for (i = 0; i < PALMAS_NUM_CLIENTS; i++) {

		if (i == 0)

		if (i == 0)

			palmas->i2c_clients[i] = i2c;

			palmas->i2c_clients[i] = i2c;
@@ -433,11 +451,6 @@ static const struct i2c_device_id palmas_i2c_id[] = { 
};

};

MODULE_DEVICE_TABLE(i2c, palmas_i2c_id);

MODULE_DEVICE_TABLE(i2c, palmas_i2c_id);





static struct of_device_id of_palmas_match_tbl[] = {

	{ .compatible = "ti,palmas", },

	{ /* end */ }

};



static struct i2c_driver palmas_i2c_driver = {

static struct i2c_driver palmas_i2c_driver = {

	.driver = {

	.driver = {

		   .name = "palmas",

		   .name = "palmas",

drivers/regulator/palmas-regulator.c

+3 −0
Original line number Original line Diff line number Diff line
@@ -838,6 +838,9 @@ static int palmas_regulators_probe(struct platform_device *pdev) 
				continue;

				continue;

			ramp_delay_support = true;

			ramp_delay_support = true;

			break;

			break;

		case PALMAS_REG_SMPS10:

			if (!PALMAS_PMIC_HAS(palmas, SMPS10_BOOST))

				continue;

		}

		}





		if ((id == PALMAS_REG_SMPS6) || (id == PALMAS_REG_SMPS8))

		if ((id == PALMAS_REG_SMPS6) || (id == PALMAS_REG_SMPS8))

include/linux/mfd/palmas.h

+14 −0
Original line number Original line Diff line number Diff line
@@ -32,6 +32,19 @@ 
			((a) == PALMAS_CHIP_ID))

			((a) == PALMAS_CHIP_ID))

#define is_palmas_charger(a) ((a) == PALMAS_CHIP_CHARGER_ID)

#define is_palmas_charger(a) ((a) == PALMAS_CHIP_CHARGER_ID)





/**

 * Palmas PMIC feature types

 *

 * PALMAS_PMIC_FEATURE_SMPS10_BOOST - used when the PMIC provides SMPS10_BOOST

 *	regulator.

 *

 * PALMAS_PMIC_HAS(b, f) - macro to check if a bandgap device is capable of a

 *	specific feature (above) or not. Return non-zero, if yes.

 */

#define PALMAS_PMIC_FEATURE_SMPS10_BOOST	BIT(0)

#define PALMAS_PMIC_HAS(b, f)			\

			((b)->features & PALMAS_PMIC_FEATURE_ ## f)



struct palmas_pmic;

struct palmas_pmic;

struct palmas_gpadc;

struct palmas_gpadc;

struct palmas_resource;

struct palmas_resource;
@@ -46,6 +59,7 @@ struct palmas { 
	/* Stored chip id */

	/* Stored chip id */

	int id;

	int id;





	unsigned int features;

	/* IRQ Data */

	/* IRQ Data */

	int irq;

	int irq;

	u32 irq_mask;

	u32 irq_mask;