Re: [PATCH 8/9] regulator: palmas: add driver data and modularize the probe

2014-06-17 Thread Lee Jones 
 add driver data and modularize the probe.
 
 Signed-off-by: Keerthy j-keer...@ti.com
 ---
  drivers/mfd/palmas.c |   42 +--
  drivers/regulator/palmas-regulator.c |  656 
 --
  2 files changed, 395 insertions(+), 303 deletions(-)
 
 diff --git a/drivers/mfd/palmas.c b/drivers/mfd/palmas.c

[...]

 @@ -370,6 +334,8 @@ int palmas_ext_control_req_config(struct palmas *palmas,
   int bit_pos;
   int ret;
  
 + struct palmas_pmic_driver_data *pmic_ddata = palmas-pmic_ddata;
 +

Nit: I'd prefer the declarations to be grouped together, normally with
the struct defines above the ints etc.

[...]

-- 
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
--
To unsubscribe from this list: send the line unsubscribe linux-omap in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH 8/9] regulator: palmas: add driver data and modularize the probe

2014-06-17 Thread Keerthy 

On Tuesday 17 June 2014 10:15 PM, Lee Jones wrote:

add driver data and modularize the probe.

Signed-off-by: Keerthy j-keer...@ti.com
---
  drivers/mfd/palmas.c |   42 +--
  drivers/regulator/palmas-regulator.c |  656 --
  2 files changed, 395 insertions(+), 303 deletions(-)

diff --git a/drivers/mfd/palmas.c b/drivers/mfd/palmas.c

[...]


@@ -370,6 +334,8 @@ int palmas_ext_control_req_config(struct palmas *palmas,
int bit_pos;
int ret;
  
+	struct palmas_pmic_driver_data *pmic_ddata = palmas-pmic_ddata;

+

Nit: I'd prefer the declarations to be grouped together, normally with
the struct defines above the ints etc.


Ok. I will change this.



[...]



--
To unsubscribe from this list: send the line unsubscribe linux-omap in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH 8/9] regulator: palmas: add driver data and modularize the probe

2014-05-28 Thread Keerthy 
add driver data and modularize the probe.

Signed-off-by: Keerthy j-keer...@ti.com
---
 drivers/mfd/palmas.c |   42 +--
 drivers/regulator/palmas-regulator.c |  656 --
 2 files changed, 395 insertions(+), 303 deletions(-)

diff --git a/drivers/mfd/palmas.c b/drivers/mfd/palmas.c
index f1f31d5..d9a6051 100644
--- a/drivers/mfd/palmas.c
+++ b/drivers/mfd/palmas.c
@@ -25,42 +25,6 @@
 #include linux/mfd/palmas.h
 #include linux/of_device.h
 
-#define EXTERNAL_REQUESTOR(_id, _offset, _pos) \
-   [PALMAS_EXTERNAL_REQSTR_ID_##_id] = {   \
-   .id = PALMAS_EXTERNAL_REQSTR_ID_##_id,  \
-   .reg_offset = _offset,  \
-   .bit_pos = _pos,\
-   }
-
-static struct palmas_sleep_requestor_info sleep_req_info[] = {
-   EXTERNAL_REQUESTOR(REGEN1, 0, 0),
-   EXTERNAL_REQUESTOR(REGEN2, 0, 1),
-   EXTERNAL_REQUESTOR(SYSEN1, 0, 2),
-   EXTERNAL_REQUESTOR(SYSEN2, 0, 3),
-   EXTERNAL_REQUESTOR(CLK32KG, 0, 4),
-   EXTERNAL_REQUESTOR(CLK32KGAUDIO, 0, 5),
-   EXTERNAL_REQUESTOR(REGEN3, 0, 6),
-   EXTERNAL_REQUESTOR(SMPS12, 1, 0),
-   EXTERNAL_REQUESTOR(SMPS3, 1, 1),
-   EXTERNAL_REQUESTOR(SMPS45, 1, 2),
-   EXTERNAL_REQUESTOR(SMPS6, 1, 3),
-   EXTERNAL_REQUESTOR(SMPS7, 1, 4),
-   EXTERNAL_REQUESTOR(SMPS8, 1, 5),
-   EXTERNAL_REQUESTOR(SMPS9, 1, 6),
-   EXTERNAL_REQUESTOR(SMPS10, 1, 7),
-   EXTERNAL_REQUESTOR(LDO1, 2, 0),
-   EXTERNAL_REQUESTOR(LDO2, 2, 1),
-   EXTERNAL_REQUESTOR(LDO3, 2, 2),
-   EXTERNAL_REQUESTOR(LDO4, 2, 3),
-   EXTERNAL_REQUESTOR(LDO5, 2, 4),
-   EXTERNAL_REQUESTOR(LDO6, 2, 5),
-   EXTERNAL_REQUESTOR(LDO7, 2, 6),
-   EXTERNAL_REQUESTOR(LDO8, 2, 7),
-   EXTERNAL_REQUESTOR(LDO9, 3, 0),
-   EXTERNAL_REQUESTOR(LDOLN, 3, 1),
-   EXTERNAL_REQUESTOR(LDOUSB, 3, 2),
-};
-
 static const struct regmap_config palmas_regmap_config[PALMAS_NUM_CLIENTS] = {
{
.reg_bits = 8,
@@ -370,6 +334,8 @@ int palmas_ext_control_req_config(struct palmas *palmas,
int bit_pos;
int ret;
 
+   struct palmas_pmic_driver_data *pmic_ddata = palmas-pmic_ddata;
+
if (!(ext_ctrl  PALMAS_EXT_REQ))
return 0;
 
@@ -387,8 +353,8 @@ int palmas_ext_control_req_config(struct palmas *palmas,
preq_mask_bit = 2;
}
 
-   bit_pos = sleep_req_info[id].bit_pos;
-   reg_add += sleep_req_info[id].reg_offset;
+   bit_pos = pmic_ddata-sleep_req_info[id].bit_pos;
+   reg_add += pmic_ddata-sleep_req_info[id].reg_offset;
if (enable)
ret = palmas_update_bits(palmas, PALMAS_RESOURCE_BASE,
reg_add, BIT(bit_pos), BIT(bit_pos));
diff --git a/drivers/regulator/palmas-regulator.c 
b/drivers/regulator/palmas-regulator.c
index d41f3de..94c9863 100644
--- a/drivers/regulator/palmas-regulator.c
+++ b/drivers/regulator/palmas-regulator.c
@@ -39,7 +39,7 @@ static const struct regulator_linear_range smps_high_ranges[] 
= {
REGULATOR_LINEAR_RANGE(330, 0x7A, 0x7f, 0),
 };
 
-static const struct regs_info palmas_regs_info[] = {
+static struct regs_info palmas_regs_info[] = {
{
.name   = SMPS12,
.sname  = smps1-in,
@@ -225,6 +225,42 @@ static const struct regs_info palmas_regs_info[] = {
},
 };
 
+#define EXTERNAL_REQUESTOR(_id, _offset, _pos) \
+   [PALMAS_EXTERNAL_REQSTR_ID_##_id] = {   \
+   .id = PALMAS_EXTERNAL_REQSTR_ID_##_id,  \
+   .reg_offset = _offset,  \
+   .bit_pos = _pos,\
+   }
+
+struct palmas_sleep_requestor_info palma_sleep_req_info[] = {
+   EXTERNAL_REQUESTOR(REGEN1, 0, 0),
+   EXTERNAL_REQUESTOR(REGEN2, 0, 1),
+   EXTERNAL_REQUESTOR(SYSEN1, 0, 2),
+   EXTERNAL_REQUESTOR(SYSEN2, 0, 3),
+   EXTERNAL_REQUESTOR(CLK32KG, 0, 4),
+   EXTERNAL_REQUESTOR(CLK32KGAUDIO, 0, 5),
+   EXTERNAL_REQUESTOR(REGEN3, 0, 6),
+   EXTERNAL_REQUESTOR(SMPS12, 1, 0),
+   EXTERNAL_REQUESTOR(SMPS3, 1, 1),
+   EXTERNAL_REQUESTOR(SMPS45, 1, 2),
+   EXTERNAL_REQUESTOR(SMPS6, 1, 3),
+   EXTERNAL_REQUESTOR(SMPS7, 1, 4),
+   EXTERNAL_REQUESTOR(SMPS8, 1, 5),
+   EXTERNAL_REQUESTOR(SMPS9, 1, 6),
+   EXTERNAL_REQUESTOR(SMPS10, 1, 7),
+   EXTERNAL_REQUESTOR(LDO1, 2, 0),
+   EXTERNAL_REQUESTOR(LDO2, 2, 1),
+   EXTERNAL_REQUESTOR(LDO3, 2, 2),
+   EXTERNAL_REQUESTOR(LDO4, 2, 3),
+   EXTERNAL_REQUESTOR(LDO5, 2, 4),
+   EXTERNAL_REQUESTOR(LDO6, 2, 5),
+   EXTERNAL_REQUESTOR(LDO7, 2, 6),
+   EXTERNAL_REQUESTOR(LDO8, 2, 7),
+   EXTERNAL_REQUESTOR(LDO9, 3, 0),
+   EXTERNAL_REQUESTOR(LDOLN, 3, 1),
+   EXTERNAL_REQUESTOR(LDOUSB, 3, 2),
+};
+
 static unsigned int palmas_smps_ramp_delay[4] = {0, 1, 5000, 2500};
 
 #define