From: Keerthy <j-keerthy@ti.com>
To: linux-omap@vger.kernel.org
Cc: broonie@kernel.org, j-keerthy@ti.com, ldewangan@nvidia.com,
sameo@linux.intel.com, grant.likely@secretlab.ca,
swarren@nvidia.com, linux-kernel@vger.kernel.org,
linux-doc@vger.kernel.org, devicetree-discuss@lists.ozlabs.org,
gg@slimlogic.co.uk
Subject: [PATCH v3 2/4] MFD: Palmas: Add SMPS10_BOOST feature
Date: Wed, 19 Jun 2013 11:27:48 +0530 [thread overview]
Message-ID: <1371621470-22279-3-git-send-email-j-keerthy@ti.com> (raw)
In-Reply-To: <1371621470-22279-1-git-send-email-j-keerthy@ti.com>
From: J Keerthy <j-keerthy@ti.com>
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: J Keerthy <j-keerthy@ti.com>
---
drivers/mfd/palmas.c | 27 ++++++++++++++++++++-------
drivers/regulator/palmas-regulator.c | 3 +++
include/linux/mfd/palmas.h | 14 ++++++++++++++
3 files changed, 37 insertions(+), 7 deletions(-)
diff --git a/drivers/mfd/palmas.c b/drivers/mfd/palmas.c
index b24bee3..1cacc6a 100644
--- a/drivers/mfd/palmas.c
+++ b/drivers/mfd/palmas.c
@@ -231,6 +231,16 @@ static void palmas_dt_to_pdata(struct i2c_client *i2c,
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,
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 device_node *node = i2c->dev.of_node;
int ret = 0, i;
- unsigned int reg, addr;
+ unsigned int reg, addr, *features;
int slave;
+ const struct of_device_id *match;
pdata = dev_get_platdata(&i2c->dev);
@@ -261,9 +272,16 @@ static int palmas_i2c_probe(struct i2c_client *i2c,
i2c_set_clientdata(i2c, palmas);
palmas->dev = &i2c->dev;
- palmas->id = id->driver_data;
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++) {
if (i == 0)
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);
-static struct of_device_id of_palmas_match_tbl[] = {
- { .compatible = "ti,palmas", },
- { /* end */ }
-};
-
static struct i2c_driver palmas_i2c_driver = {
.driver = {
.name = "palmas",
diff --git a/drivers/regulator/palmas-regulator.c b/drivers/regulator/palmas-regulator.c
index 3ae44ac..1ae1e83 100644
--- a/drivers/regulator/palmas-regulator.c
+++ b/drivers/regulator/palmas-regulator.c
@@ -838,6 +838,9 @@ static int palmas_regulators_probe(struct platform_device *pdev)
continue;
ramp_delay_support = true;
break;
+ case PALMAS_REG_SMPS10:
+ if (!PALMAS_PMIC_HAS(palmas, SMPS10_BOOST))
+ continue;
}
if ((id == PALMAS_REG_SMPS6) || (id == PALMAS_REG_SMPS8))
diff --git a/include/linux/mfd/palmas.h b/include/linux/mfd/palmas.h
index 8f21daf..98058ca 100644
--- a/include/linux/mfd/palmas.h
+++ b/include/linux/mfd/palmas.h
@@ -32,6 +32,19 @@
((a) == PALMAS_CHIP_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_gpadc;
struct palmas_resource;
@@ -46,6 +59,7 @@ struct palmas {
/* Stored chip id */
int id;
+ unsigned int features;
/* IRQ Data */
int irq;
u32 irq_mask;
--
1.7.5.4
next prev parent reply other threads:[~2013-06-19 5:57 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-06-19 5:57 [PATCH v3 0/4] MFD: Palmas: Add TPS659038 PMIC support on Palmas Keerthy
2013-06-19 5:57 ` [PATCH v3 1/4] MFD: Palmas: Check if irq is valid Keerthy
[not found] ` <1371621470-22279-2-git-send-email-j-keerthy-l0cyMroinI0@public.gmane.org>
2013-06-19 16:42 ` Mark Brown
2013-06-20 4:16 ` J, KEERTHY
2013-06-19 17:08 ` Stephen Warren
2013-06-20 4:19 ` J, KEERTHY
2013-06-20 4:25 ` J, KEERTHY
2013-07-11 11:25 ` Lee Jones
2013-07-11 11:27 ` Lee Jones
2013-06-19 5:57 ` Keerthy [this message]
2013-06-20 4:34 ` [PATCH v3 2/4] MFD: Palmas: Add SMPS10_BOOST feature J, KEERTHY
2013-06-20 9:07 ` Samuel Ortiz
2013-06-20 9:13 ` J, KEERTHY
[not found] ` <DC88CAD03C0052499C1907B327FC63229ECDCE-yXqyApvAXouIQmiDNMet8wC/G2K4zDHf@public.gmane.org>
2013-06-20 9:27 ` Samuel Ortiz
2013-06-20 9:28 ` J, KEERTHY
2013-06-19 5:57 ` [PATCH v3 3/4] mfd: Palmas: Add TPS659038 PMIC support Keerthy
2013-06-20 8:41 ` Samuel Ortiz
2013-06-19 5:57 ` [PATCH v3 4/4] regulator: Palmas: Add TPS659038 support Keerthy
[not found] ` <1371621470-22279-5-git-send-email-j-keerthy-l0cyMroinI0@public.gmane.org>
2013-06-19 16:42 ` Mark Brown
2013-06-20 4:19 ` J, KEERTHY
2013-06-20 8:39 ` [PATCH v3 0/4] MFD: Palmas: Add TPS659038 PMIC support on Palmas Samuel Ortiz
2013-06-20 8:41 ` J, KEERTHY
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=1371621470-22279-3-git-send-email-j-keerthy@ti.com \
--to=j-keerthy@ti.com \
--cc=broonie@kernel.org \
--cc=devicetree-discuss@lists.ozlabs.org \
--cc=gg@slimlogic.co.uk \
--cc=grant.likely@secretlab.ca \
--cc=ldewangan@nvidia.com \
--cc=linux-doc@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-omap@vger.kernel.org \
--cc=sameo@linux.intel.com \
--cc=swarren@nvidia.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).