* [PATCH] MFD: TWL4030: introduce remove_script function
@ 2010-02-22 17:16 mturquette
2010-02-28 22:54 ` Samuel Ortiz
0 siblings, 1 reply; 2+ messages in thread
From: mturquette @ 2010-02-22 17:16 UTC (permalink / raw)
To: sameo; +Cc: linux-kernel, linux-omap, Mike Turquette
From: Mike Turquette <mturquette@ti.com>
New function twl4030_remove_script(u8 flags) takes a script type as
defined in twl.h and prevents any script already loaded in that position
from running. This is accomplished by programming SEQ_ADD_* to 0x3f,
the END_OF_SCRIPT value, where SEQ_ADD_* is determined by flags.
Signed-off-by: Mike Turquette <mturquette@ti.com>
---
Based on MFD for-next branch.
Future users of this function include OMAP board files for machines
facing a race condition between sleep and warm reset.
drivers/mfd/twl4030-power.c | 50 +++++++++++++++++++++++++++++++++++++++++++
include/linux/i2c/twl.h | 1 +
2 files changed, 51 insertions(+), 0 deletions(-)
diff --git a/drivers/mfd/twl4030-power.c b/drivers/mfd/twl4030-power.c
index 5b045ff..7efa878 100644
--- a/drivers/mfd/twl4030-power.c
+++ b/drivers/mfd/twl4030-power.c
@@ -461,6 +461,56 @@ out:
return err;
}
+int twl4030_remove_script(u8 flags)
+{
+ int err = 0;
+
+ err = twl_i2c_write_u8(TWL4030_MODULE_PM_MASTER, R_KEY_1,
+ R_PROTECT_KEY);
+ if (err) {
+ pr_err("twl4030: unable to unlock PROTECT_KEY\n");
+ return err;
+ }
+
+ err = twl_i2c_write_u8(TWL4030_MODULE_PM_MASTER, R_KEY_2,
+ R_PROTECT_KEY);
+ if (err) {
+ pr_err("twl4030: unable to unlock PROTECT_KEY\n");
+ return err;
+ }
+
+ if (flags & TWL4030_WRST_SCRIPT) {
+ err = twl_i2c_write_u8(TWL4030_MODULE_PM_MASTER, END_OF_SCRIPT,
+ R_SEQ_ADD_WARM);
+ if (err)
+ return err;
+ }
+ if (flags & TWL4030_WAKEUP12_SCRIPT) {
+ if (err)
+ err = twl_i2c_write_u8(TWL4030_MODULE_PM_MASTER, END_OF_SCRIPT,
+ R_SEQ_ADD_S2A12);
+ return err;
+ }
+ if (flags & TWL4030_WAKEUP3_SCRIPT) {
+ err = twl_i2c_write_u8(TWL4030_MODULE_PM_MASTER, END_OF_SCRIPT,
+ R_SEQ_ADD_S2A3);
+ if (err)
+ return err;
+ }
+ if (flags & TWL4030_SLEEP_SCRIPT) {
+ err = twl_i2c_write_u8(TWL4030_MODULE_PM_MASTER, END_OF_SCRIPT,
+ R_SEQ_ADD_A2S);
+ if (err)
+ return err;
+ }
+
+ err = twl_i2c_write_u8(TWL4030_MODULE_PM_MASTER, 0, R_PROTECT_KEY);
+ if (err)
+ pr_err("TWL4030 Unable to relock registers\n");
+
+ return err;
+}
+
void __init twl4030_power_init(struct twl4030_power_data *twl4030_scripts)
{
int err = 0;
diff --git a/include/linux/i2c/twl.h b/include/linux/i2c/twl.h
index 33d9d5c..d4baff8 100644
--- a/include/linux/i2c/twl.h
+++ b/include/linux/i2c/twl.h
@@ -550,6 +550,7 @@ struct twl4030_power_data {
};
extern void twl4030_power_init(struct twl4030_power_data *triton2_scripts);
+extern int twl4030_remove_script(u8 flags);
struct twl4030_codec_audio_data {
unsigned int audio_mclk;
--
1.6.3.2
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] MFD: TWL4030: introduce remove_script function
2010-02-22 17:16 [PATCH] MFD: TWL4030: introduce remove_script function mturquette
@ 2010-02-28 22:54 ` Samuel Ortiz
0 siblings, 0 replies; 2+ messages in thread
From: Samuel Ortiz @ 2010-02-28 22:54 UTC (permalink / raw)
To: mturquette; +Cc: linux-kernel, linux-omap, Mike Turquette
Hi Mike,
On Mon, Feb 22, 2010 at 11:16:30AM -0600, mturquette@gmail.com wrote:
> From: Mike Turquette <mturquette@ti.com>
>
> New function twl4030_remove_script(u8 flags) takes a script type as
> defined in twl.h and prevents any script already loaded in that position
> from running. This is accomplished by programming SEQ_ADD_* to 0x3f,
> the END_OF_SCRIPT value, where SEQ_ADD_* is determined by flags.
Patch applied, thanks a lot.
Cheers,
Samuel.
> Signed-off-by: Mike Turquette <mturquette@ti.com>
> ---
>
> Based on MFD for-next branch.
>
> Future users of this function include OMAP board files for machines
> facing a race condition between sleep and warm reset.
>
> drivers/mfd/twl4030-power.c | 50 +++++++++++++++++++++++++++++++++++++++++++
> include/linux/i2c/twl.h | 1 +
> 2 files changed, 51 insertions(+), 0 deletions(-)
>
> diff --git a/drivers/mfd/twl4030-power.c b/drivers/mfd/twl4030-power.c
> index 5b045ff..7efa878 100644
> --- a/drivers/mfd/twl4030-power.c
> +++ b/drivers/mfd/twl4030-power.c
> @@ -461,6 +461,56 @@ out:
> return err;
> }
>
> +int twl4030_remove_script(u8 flags)
> +{
> + int err = 0;
> +
> + err = twl_i2c_write_u8(TWL4030_MODULE_PM_MASTER, R_KEY_1,
> + R_PROTECT_KEY);
> + if (err) {
> + pr_err("twl4030: unable to unlock PROTECT_KEY\n");
> + return err;
> + }
> +
> + err = twl_i2c_write_u8(TWL4030_MODULE_PM_MASTER, R_KEY_2,
> + R_PROTECT_KEY);
> + if (err) {
> + pr_err("twl4030: unable to unlock PROTECT_KEY\n");
> + return err;
> + }
> +
> + if (flags & TWL4030_WRST_SCRIPT) {
> + err = twl_i2c_write_u8(TWL4030_MODULE_PM_MASTER, END_OF_SCRIPT,
> + R_SEQ_ADD_WARM);
> + if (err)
> + return err;
> + }
> + if (flags & TWL4030_WAKEUP12_SCRIPT) {
> + if (err)
> + err = twl_i2c_write_u8(TWL4030_MODULE_PM_MASTER, END_OF_SCRIPT,
> + R_SEQ_ADD_S2A12);
> + return err;
> + }
> + if (flags & TWL4030_WAKEUP3_SCRIPT) {
> + err = twl_i2c_write_u8(TWL4030_MODULE_PM_MASTER, END_OF_SCRIPT,
> + R_SEQ_ADD_S2A3);
> + if (err)
> + return err;
> + }
> + if (flags & TWL4030_SLEEP_SCRIPT) {
> + err = twl_i2c_write_u8(TWL4030_MODULE_PM_MASTER, END_OF_SCRIPT,
> + R_SEQ_ADD_A2S);
> + if (err)
> + return err;
> + }
> +
> + err = twl_i2c_write_u8(TWL4030_MODULE_PM_MASTER, 0, R_PROTECT_KEY);
> + if (err)
> + pr_err("TWL4030 Unable to relock registers\n");
> +
> + return err;
> +}
> +
> void __init twl4030_power_init(struct twl4030_power_data *twl4030_scripts)
> {
> int err = 0;
> diff --git a/include/linux/i2c/twl.h b/include/linux/i2c/twl.h
> index 33d9d5c..d4baff8 100644
> --- a/include/linux/i2c/twl.h
> +++ b/include/linux/i2c/twl.h
> @@ -550,6 +550,7 @@ struct twl4030_power_data {
> };
>
> extern void twl4030_power_init(struct twl4030_power_data *triton2_scripts);
> +extern int twl4030_remove_script(u8 flags);
>
> struct twl4030_codec_audio_data {
> unsigned int audio_mclk;
> --
> 1.6.3.2
>
--
Intel Open Source Technology Centre
http://oss.intel.com/
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2010-02-28 22:52 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-02-22 17:16 [PATCH] MFD: TWL4030: introduce remove_script function mturquette
2010-02-28 22:54 ` Samuel Ortiz
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox