| Message ID | 1371621470-22279-4-git-send-email-j-keerthy@ti.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Hi, On Wed, Jun 19, 2013 at 11:27:49AM +0530, Keerthy wrote: > From: J Keerthy <j-keerthy@ti.com> > > The Patch adds TPS659038 PMIC support in the palmas mfd driver. > The TPS659038 has almost the same registers as of the earlier > supported variants of PALMAS family such as the TWL6035. > > The critical differences between TPS659038 and TWL6035 being: > > 1) TPS659038 has nothing related to battery charging and back up battery stuff. > 2) TPS659038 does not have does not have SMPS10(Boost) step up convertor. > 3) TPS659038 does not have Battery detection and anything related to battery. > 4) SD card detection, Battery presence detection, Vibrator, USB OTG are missing > when compared to TWL6035. > > Signed-off-by: J Keerthy <j-keerthy@ti.com> > --- > Documentation/devicetree/bindings/mfd/palmas.txt | 2 ++ > drivers/mfd/palmas.c | 5 +++++ > 2 files changed, 7 insertions(+), 0 deletions(-) This one does not apply against mfd-next as I don't have the palmas.txt. For Grant to take this one: Acked-by: Samuel Ortiz <sameo@linux.intel.com> If that creates conflicts (I already have a few palmas.c changes) then we'll have to find a way to fix them (Me taking the bindings file ?). Cheers, Samuel.
diff --git a/Documentation/devicetree/bindings/mfd/palmas.txt b/Documentation/devicetree/bindings/mfd/palmas.txt index 7bcd59c..89cb773 100644 --- a/Documentation/devicetree/bindings/mfd/palmas.txt +++ b/Documentation/devicetree/bindings/mfd/palmas.txt @@ -5,6 +5,7 @@ twl6035 (palmas) twl6037 (palmas) tps65913 (palmas) tps65914 (palmas) +tps659038 Required properties: - compatible : Should be from the list @@ -14,6 +15,7 @@ Required properties: ti,tps65913 ti,tps65914 ti,tps80036 + ti,tps659038 and also the generic series names ti,palmas - interrupt-controller : palmas has its own internal IRQs diff --git a/drivers/mfd/palmas.c b/drivers/mfd/palmas.c index 1cacc6a..0439edb 100644 --- a/drivers/mfd/palmas.c +++ b/drivers/mfd/palmas.c @@ -232,12 +232,17 @@ static void palmas_dt_to_pdata(struct i2c_client *i2c, } static unsigned int palmas_features = PALMAS_PMIC_FEATURE_SMPS10_BOOST; +static unsigned int tps659038_features; static const struct of_device_id of_palmas_match_tbl[] = { { .compatible = "ti,palmas", .data = &palmas_features, }, + { + .compatible = "ti,tps659038", + .data = &tps659038_features, + }, { }, };