* [PATCH] TWL4030: add function to send PB messages
@ 2009-04-23 13:08 Peter 'p2' De Schrijver
2009-04-23 13:08 ` [PATCH] TWL4030: Make sure the regulator is active after calling twl4030reg_enable Peter 'p2' De Schrijver
2009-04-23 14:52 ` [PATCH] TWL4030: add function to send PB messages Mark Brown
0 siblings, 2 replies; 4+ messages in thread
From: Peter 'p2' De Schrijver @ 2009-04-23 13:08 UTC (permalink / raw)
To: linux-kernel; +Cc: Peter 'p2' De Schrijver
And now with fix to make it compile.
This patch moves sending of powerbus messages to a separate function. It also
makes sure I2C access to the powerbus is enabled.
Signed-off-by: Peter 'p2' De Schrijver <peter.de-schrijver@nokia.com>
---
drivers/regulator/twl4030-regulator.c | 72 +++++++++++++++++++++++++++++---
1 files changed, 65 insertions(+), 7 deletions(-)
diff --git a/drivers/regulator/twl4030-regulator.c b/drivers/regulator/twl4030-regulator.c
index 472c35a..df9a94b 100644
--- a/drivers/regulator/twl4030-regulator.c
+++ b/drivers/regulator/twl4030-regulator.c
@@ -16,6 +16,7 @@
#include <linux/regulator/driver.h>
#include <linux/regulator/machine.h>
#include <linux/i2c/twl4030.h>
+#include <linux/delay.h>
/*
@@ -81,6 +82,69 @@ twl4030reg_write(struct twlreg_info *info, unsigned offset, u8 value)
value, info->base + offset);
}
+static int twl4030_wait_pb_ready(void)
+{
+
+ u8 pb_status;
+ int status, timeout = 10;
+
+ do {
+ status = twl4030_i2c_read_u8(TWL4030_MODULE_PM_MASTER,
+ &pb_status, 0x14);
+ if (status < 0)
+ return status;
+
+ if (!(pb_status & 1))
+ return 0;
+
+ mdelay(1);
+ timeout--;
+
+ } while (timeout);
+
+ return -ETIMEDOUT;
+}
+
+static int twl4030_send_pb_msg(unsigned msg)
+{
+
+ u8 pb_state;
+ int status;
+
+ /* save powerbus configuration */
+ status = twl4030_i2c_read_u8(TWL4030_MODULE_PM_MASTER,
+ &pb_state, 0x14);
+ if (status < 0)
+ return status;
+
+ /* Enable I2C access to powerbus */
+ status = twl4030_i2c_write_u8(TWL4030_MODULE_PM_MASTER,
+ pb_state | (1<<1), 0x14);
+ if (status < 0)
+ return status;
+
+ status = twl4030_wait_pb_ready();
+ if (status < 0)
+ return status;
+
+ status = twl4030_i2c_write_u8(TWL4030_MODULE_PM_MASTER, msg >> 8,
+ 0x15 /* PB_WORD_MSB */);
+ if (status < 0)
+ return status;
+
+ status = twl4030_i2c_write_u8(TWL4030_MODULE_PM_MASTER, msg & 0xff,
+ 0x16 /* PB_WORD_LSB */);
+ if (status < 0)
+ return status;
+
+ status = twl4030_wait_pb_ready();
+ if (status < 0)
+ return status;
+
+ /* Restore powerbus configuration */
+ return twl4030_i2c_write_u8(TWL4030_MODULE_PM_MASTER, pb_state, 0x14);
+}
+
/*----------------------------------------------------------------------*/
/* generic power resource operations, which work on all regulators */
@@ -177,13 +241,7 @@ static int twl4030reg_set_mode(struct regulator_dev *rdev, unsigned mode)
if (!(status & (P3_GRP | P2_GRP | P1_GRP)))
return -EACCES;
- status = twl4030_i2c_write_u8(TWL4030_MODULE_PM_MASTER,
- message >> 8, 0x15 /* PB_WORD_MSB */ );
- if (status >= 0)
- return status;
-
- return twl4030_i2c_write_u8(TWL4030_MODULE_PM_MASTER,
- message, 0x16 /* PB_WORD_LSB */ );
+ return twl4030_send_pb_msg(message);
}
/*----------------------------------------------------------------------*/
--
1.5.6.3
^ permalink raw reply [flat|nested] 4+ messages in thread* [PATCH] TWL4030: Make sure the regulator is active after calling twl4030reg_enable
2009-04-23 13:08 [PATCH] TWL4030: add function to send PB messages Peter 'p2' De Schrijver
@ 2009-04-23 13:08 ` Peter 'p2' De Schrijver
2009-04-23 14:56 ` Mark Brown
2009-04-23 14:52 ` [PATCH] TWL4030: add function to send PB messages Mark Brown
1 sibling, 1 reply; 4+ messages in thread
From: Peter 'p2' De Schrijver @ 2009-04-23 13:08 UTC (permalink / raw)
To: linux-kernel; +Cc: Peter 'p2' De Schrijver
This patch makes sure a regulator is active when enabled. After a warm reboot, only adding
a regulator to a power group is not enough to activate it.
Signed-off-by: Peter 'p2' De Schrijver <peter.de-schrijver@nokia.com>
---
drivers/regulator/twl4030-regulator.c | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/drivers/regulator/twl4030-regulator.c b/drivers/regulator/twl4030-regulator.c
index df9a94b..80a4e10 100644
--- a/drivers/regulator/twl4030-regulator.c
+++ b/drivers/regulator/twl4030-regulator.c
@@ -177,14 +177,21 @@ static int twl4030reg_is_enabled(struct regulator_dev *rdev)
static int twl4030reg_enable(struct regulator_dev *rdev)
{
struct twlreg_info *info = rdev_get_drvdata(rdev);
- int grp;
+ int grp, status;
+ unsigned message;
grp = twl4030reg_read(info, VREG_GRP);
if (grp < 0)
return grp;
grp |= P1_GRP;
- return twl4030reg_write(info, VREG_GRP, grp);
+ status = twl4030reg_write(info, VREG_GRP, grp);
+ if (status < 0)
+ return status;
+
+ message = MSG_SINGULAR(DEV_GRP_P1, info->id, RES_STATE_ACTIVE);
+
+ return twl4030_send_pb_msg(message);
}
static int twl4030reg_disable(struct regulator_dev *rdev)
--
1.5.6.3
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] TWL4030: Make sure the regulator is active after calling twl4030reg_enable
2009-04-23 13:08 ` [PATCH] TWL4030: Make sure the regulator is active after calling twl4030reg_enable Peter 'p2' De Schrijver
@ 2009-04-23 14:56 ` Mark Brown
0 siblings, 0 replies; 4+ messages in thread
From: Mark Brown @ 2009-04-23 14:56 UTC (permalink / raw)
To: Peter 'p2' De Schrijver; +Cc: linux-kernel, lrg, dbrownell
On Thu, Apr 23, 2009 at 04:08:09PM +0300, Peter 'p2' De Schrijver wrote:
> This patch makes sure a regulator is active when enabled. After a warm reboot, only adding
> a regulator to a power group is not enough to activate it.
> Signed-off-by: Peter 'p2' De Schrijver <peter.de-schrijver@nokia.com>
CCing people in again.
> ---
> drivers/regulator/twl4030-regulator.c | 11 +++++++++--
> 1 files changed, 9 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/regulator/twl4030-regulator.c b/drivers/regulator/twl4030-regulator.c
> index df9a94b..80a4e10 100644
> --- a/drivers/regulator/twl4030-regulator.c
> +++ b/drivers/regulator/twl4030-regulator.c
> @@ -177,14 +177,21 @@ static int twl4030reg_is_enabled(struct regulator_dev *rdev)
> static int twl4030reg_enable(struct regulator_dev *rdev)
> {
> struct twlreg_info *info = rdev_get_drvdata(rdev);
> - int grp;
> + int grp, status;
> + unsigned message;
>
> grp = twl4030reg_read(info, VREG_GRP);
> if (grp < 0)
> return grp;
>
> grp |= P1_GRP;
> - return twl4030reg_write(info, VREG_GRP, grp);
> + status = twl4030reg_write(info, VREG_GRP, grp);
> + if (status < 0)
> + return status;
> +
> + message = MSG_SINGULAR(DEV_GRP_P1, info->id, RES_STATE_ACTIVE);
> +
> + return twl4030_send_pb_msg(message);
> }
>
> static int twl4030reg_disable(struct regulator_dev *rdev)
> --
> 1.5.6.3
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at http://www.tux.org/lkml/
>
--
"You grabbed my hand and we fell into it, like a daydream - or a fever."
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] TWL4030: add function to send PB messages
2009-04-23 13:08 [PATCH] TWL4030: add function to send PB messages Peter 'p2' De Schrijver
2009-04-23 13:08 ` [PATCH] TWL4030: Make sure the regulator is active after calling twl4030reg_enable Peter 'p2' De Schrijver
@ 2009-04-23 14:52 ` Mark Brown
1 sibling, 0 replies; 4+ messages in thread
From: Mark Brown @ 2009-04-23 14:52 UTC (permalink / raw)
To: Peter 'p2' De Schrijver; +Cc: linux-kernel, lrg, dbrownell
On Thu, Apr 23, 2009 at 04:08:08PM +0300, Peter 'p2' De Schrijver wrote:
> And now with fix to make it compile.
>
> This patch moves sending of powerbus messages to a separate function. It also
> makes sure I2C access to the powerbus is enabled.
>
> Signed-off-by: Peter 'p2' De Schrijver <peter.de-schrijver@nokia.com>
CCing in Liam (the primary regulator maintainer) and David (the TWL4030
regulator expert). When submitting patches it is always best to CC the
relevant maintainers, it is extremely easy for things to get dropped on
the floor otherwise.
> ---
> drivers/regulator/twl4030-regulator.c | 72 +++++++++++++++++++++++++++++---
> 1 files changed, 65 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/regulator/twl4030-regulator.c b/drivers/regulator/twl4030-regulator.c
> index 472c35a..df9a94b 100644
> --- a/drivers/regulator/twl4030-regulator.c
> +++ b/drivers/regulator/twl4030-regulator.c
> @@ -16,6 +16,7 @@
> #include <linux/regulator/driver.h>
> #include <linux/regulator/machine.h>
> #include <linux/i2c/twl4030.h>
> +#include <linux/delay.h>
>
>
> /*
> @@ -81,6 +82,69 @@ twl4030reg_write(struct twlreg_info *info, unsigned offset, u8 value)
> value, info->base + offset);
> }
>
> +static int twl4030_wait_pb_ready(void)
> +{
> +
> + u8 pb_status;
> + int status, timeout = 10;
> +
> + do {
> + status = twl4030_i2c_read_u8(TWL4030_MODULE_PM_MASTER,
> + &pb_status, 0x14);
> + if (status < 0)
> + return status;
> +
> + if (!(pb_status & 1))
> + return 0;
> +
> + mdelay(1);
> + timeout--;
> +
> + } while (timeout);
> +
> + return -ETIMEDOUT;
> +}
> +
> +static int twl4030_send_pb_msg(unsigned msg)
> +{
> +
> + u8 pb_state;
> + int status;
> +
> + /* save powerbus configuration */
> + status = twl4030_i2c_read_u8(TWL4030_MODULE_PM_MASTER,
> + &pb_state, 0x14);
> + if (status < 0)
> + return status;
> +
> + /* Enable I2C access to powerbus */
> + status = twl4030_i2c_write_u8(TWL4030_MODULE_PM_MASTER,
> + pb_state | (1<<1), 0x14);
> + if (status < 0)
> + return status;
> +
> + status = twl4030_wait_pb_ready();
> + if (status < 0)
> + return status;
> +
> + status = twl4030_i2c_write_u8(TWL4030_MODULE_PM_MASTER, msg >> 8,
> + 0x15 /* PB_WORD_MSB */);
> + if (status < 0)
> + return status;
> +
> + status = twl4030_i2c_write_u8(TWL4030_MODULE_PM_MASTER, msg & 0xff,
> + 0x16 /* PB_WORD_LSB */);
> + if (status < 0)
> + return status;
> +
> + status = twl4030_wait_pb_ready();
> + if (status < 0)
> + return status;
> +
> + /* Restore powerbus configuration */
> + return twl4030_i2c_write_u8(TWL4030_MODULE_PM_MASTER, pb_state, 0x14);
> +}
> +
> /*----------------------------------------------------------------------*/
>
> /* generic power resource operations, which work on all regulators */
> @@ -177,13 +241,7 @@ static int twl4030reg_set_mode(struct regulator_dev *rdev, unsigned mode)
> if (!(status & (P3_GRP | P2_GRP | P1_GRP)))
> return -EACCES;
>
> - status = twl4030_i2c_write_u8(TWL4030_MODULE_PM_MASTER,
> - message >> 8, 0x15 /* PB_WORD_MSB */ );
> - if (status >= 0)
> - return status;
> -
> - return twl4030_i2c_write_u8(TWL4030_MODULE_PM_MASTER,
> - message, 0x16 /* PB_WORD_LSB */ );
> + return twl4030_send_pb_msg(message);
> }
>
> /*----------------------------------------------------------------------*/
> --
> 1.5.6.3
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at http://www.tux.org/lkml/
>
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2009-04-23 14:56 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2009-04-23 13:08 [PATCH] TWL4030: add function to send PB messages Peter 'p2' De Schrijver
2009-04-23 13:08 ` [PATCH] TWL4030: Make sure the regulator is active after calling twl4030reg_enable Peter 'p2' De Schrijver
2009-04-23 14:56 ` Mark Brown
2009-04-23 14:52 ` [PATCH] TWL4030: add function to send PB messages Mark Brown
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®