[PATCH 0/2] twl4030 power support for 3430SDP

[PATCH 0/2] twl4030 power support for 3430SDP

[Kevin Hilman]

I've been carrying these in the PM branch, but now that twl4030 power
support is in mainline, these can be queued for 2.6.33.

Kevin Hilman (1):
  OMAP3: PM: 3430SDP: add initial twl4030 power scripts

Rajendra Nayak (1):
  OMAP3: PM: 3430SDP: Update twl4030 power scripts and device groups

 arch/arm/mach-omap2/board-3430sdp.c |   93 ++++++++++++++++++++++++++++++++++-
 1 files changed, 91 insertions(+), 2 deletions(-)

[PATCH 1/2] OMAP3: PM: 3430SDP: add initial twl4030 power scripts

[Kevin Hilman]

Now that twl4030 power support is upstream, add the original power
scripts for the 3430SDP to the board setup.

Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>
---
 arch/arm/mach-omap2/board-3430sdp.c |   82 +++++++++++++++++++++++++++++++++++
 1 files changed, 82 insertions(+), 0 deletions(-)

diff --git a/arch/arm/mach-omap2/board-3430sdp.c b/arch/arm/mach-omap2/board-3430sdp.c
index 2dfab17..a610355 100644
--- a/arch/arm/mach-omap2/board-3430sdp.c
+++ b/arch/arm/mach-omap2/board-3430sdp.c
@@ -278,6 +278,87 @@ static struct twl4030_madc_platform_data sdp3430_madc_data = {
 	.irq_line	= 1,
 };
 
+
+static struct twl4030_ins __initdata sleep_on_seq[] = {
+/*
+ * Turn off VDD1 and VDD2.
+ */
+	{MSG_SINGULAR(DEV_GRP_P1, 0xf, RES_STATE_OFF), 4},
+	{MSG_SINGULAR(DEV_GRP_P1, 0x10, RES_STATE_OFF), 2},
+#ifdef CONFIG_DISABLE_HFCLK
+/*
+ * And also turn off the OMAP3 PLLs and the sysclk output.
+ */
+	{MSG_SINGULAR(DEV_GRP_P1, 0x7, RES_STATE_OFF), 3},
+	{MSG_SINGULAR(DEV_GRP_P1, 0x19, RES_STATE_OFF), 3},
+#endif
+};
+
+static struct twl4030_script sleep_on_script __initdata = {
+	.script	= sleep_on_seq,
+	.size	= ARRAY_SIZE(sleep_on_seq),
+	.flags	= TWL4030_SLEEP_SCRIPT,
+};
+
+static struct twl4030_ins wakeup_seq[] __initdata = {
+#ifndef CONFIG_DISABLE_HFCLK
+/*
+ * Wakeup VDD1 and VDD2.
+ */
+	{MSG_SINGULAR(DEV_GRP_P1, 0xf, RES_STATE_ACTIVE), 4},
+	{MSG_SINGULAR(DEV_GRP_P1, 0x10, RES_STATE_ACTIVE), 2},
+#else
+/*
+ * Reenable the OMAP3 PLLs.
+ * Wakeup VDD1 and VDD2.
+ * Reenable sysclk output.
+ */
+	{MSG_SINGULAR(DEV_GRP_P1, 0x7, RES_STATE_ACTIVE), 0x30},
+	{MSG_SINGULAR(DEV_GRP_P1, 0xf, RES_STATE_ACTIVE), 0x30},
+	{MSG_SINGULAR(DEV_GRP_P1, 0x10, RES_STATE_ACTIVE), 0x37},
+	{MSG_SINGULAR(DEV_GRP_P1, 0x19, RES_STATE_ACTIVE), 3},
+#endif /* #ifndef CONFIG_DISABLE_HFCLK */
+};
+
+static struct twl4030_script wakeup_script __initdata = {
+	.script	= wakeup_seq,
+	.size	= ARRAY_SIZE(wakeup_seq),
+	.flags	= TWL4030_WAKEUP12_SCRIPT | TWL4030_WAKEUP3_SCRIPT,
+};
+
+static struct twl4030_ins wrst_seq[] __initdata = {
+/*
+ * Reset twl4030.
+ * Reset VDD1 regulator.
+ * Reset VDD2 regulator.
+ * Reset VPLL1 regulator.
+ * Enable sysclk output.
+ * Reenable twl4030.
+ */
+	{MSG_SINGULAR(DEV_GRP_NULL, 0x1b, RES_STATE_OFF), 2},
+	{MSG_SINGULAR(DEV_GRP_P1, 0xf, RES_STATE_WRST), 15},
+	{MSG_SINGULAR(DEV_GRP_P1, 0x10, RES_STATE_WRST), 15},
+	{MSG_SINGULAR(DEV_GRP_P1, 0x7, RES_STATE_WRST), 0x60},
+	{MSG_SINGULAR(DEV_GRP_P1, 0x19, RES_STATE_ACTIVE), 2},
+	{MSG_SINGULAR(DEV_GRP_NULL, 0x1b, RES_STATE_ACTIVE), 2},
+};
+static struct twl4030_script wrst_script __initdata = {
+	.script = wrst_seq,
+	.size   = ARRAY_SIZE(wakeup_seq),
+	.flags  = TWL4030_WRST_SCRIPT,
+};
+
+static struct twl4030_script *twl4030_scripts[] __initdata = {
+	&sleep_on_script,
+	&wakeup_script,
+	&wrst_script,
+};
+
+static struct twl4030_power_data sdp3430_t2scripts_data __initdata = {
+	.scripts	= twl4030_scripts,
+	.num		= ARRAY_SIZE(twl4030_scripts),
+};
+
 /*
  * Apply all the fixed voltages since most versions of U-Boot
  * don't bother with that initialization.
@@ -419,6 +500,7 @@ static struct twl4030_platform_data sdp3430_twldata = {
 	.gpio		= &sdp3430_gpio_data,
 	.madc		= &sdp3430_madc_data,
 	.keypad		= &sdp3430_kp_data,
+	.power		= &sdp3430_t2scripts_data,
 	.usb		= &sdp3430_usb_data,
 
 	.vaux1		= &sdp3430_vaux1,
-- 
1.6.4.3

[PATCH 2/2] OMAP3: PM: 3430SDP: Update twl4030 power scripts and device groups

[Kevin Hilman]

From: Rajendra Nayak <rnayak@ti.com>

This patch updates the sleep and wake sequences and updates the
device group associations:

Sleep sequence:
-1-Turn off HFCLKOUT
-2-Turn off Vdd1
-3-Turn off Vdd2
-4-Turn off VPLL1

Wakeup p3 sequence
-1-Turn on HFCLKOUT

Wakeup P12 sequence
-1-Turn on HFCLKOUT
-2-Turn on Vdd1
-3-Turn on Vdd2
-4-Turn on VPLL1

Also HFCLKOUT is associated to device group P3. This makes
sure sys clk from PMIC to OMAP is cut during RET as well as OFF.

VDD1 and VDD2 are associated to device group P1 so that they
are cut only during OFF.

CLKEN by default is assigned to all device groups and is left
unchanged. This makes sure the oscillator is not shutdown
in RET states.

Signed-off-by: Rajendra Nayak <rnayak@ti.com>
Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>
---
 arch/arm/mach-omap2/board-3430sdp.c |   79 +++++++++++++++++++----------------
 1 files changed, 43 insertions(+), 36 deletions(-)

diff --git a/arch/arm/mach-omap2/board-3430sdp.c b/arch/arm/mach-omap2/board-3430sdp.c
index a610355..3ced0f8 100644
--- a/arch/arm/mach-omap2/board-3430sdp.c
+++ b/arch/arm/mach-omap2/board-3430sdp.c
@@ -44,8 +44,6 @@
 #include "sdram-qimonda-hyb18m512160af-6.h"
 #include "mmc-twl4030.h"
 
-#define CONFIG_DISABLE_HFCLK 1
-
 #define SDP3430_TS_GPIO_IRQ_SDPV1	3
 #define SDP3430_TS_GPIO_IRQ_SDPV2	2
 
@@ -280,18 +278,14 @@ static struct twl4030_madc_platform_data sdp3430_madc_data = {
 
 
 static struct twl4030_ins __initdata sleep_on_seq[] = {
-/*
- * Turn off VDD1 and VDD2.
- */
-	{MSG_SINGULAR(DEV_GRP_P1, 0xf, RES_STATE_OFF), 4},
+	/* Turn off HFCLKOUT */
+	{MSG_SINGULAR(DEV_GRP_P1, 0x19, RES_STATE_OFF), 2},
+	/* Turn OFF VDD1 */
+	{MSG_SINGULAR(DEV_GRP_P1, 0xf, RES_STATE_OFF), 2},
+	/* Turn OFF VDD2 */
 	{MSG_SINGULAR(DEV_GRP_P1, 0x10, RES_STATE_OFF), 2},
-#ifdef CONFIG_DISABLE_HFCLK
-/*
- * And also turn off the OMAP3 PLLs and the sysclk output.
- */
-	{MSG_SINGULAR(DEV_GRP_P1, 0x7, RES_STATE_OFF), 3},
-	{MSG_SINGULAR(DEV_GRP_P1, 0x19, RES_STATE_OFF), 3},
-#endif
+	/* Turn OFF VPLL1 */
+	{MSG_SINGULAR(DEV_GRP_P1, 0x7, RES_STATE_OFF), 2},
 };
 
 static struct twl4030_script sleep_on_script __initdata = {
@@ -300,30 +294,31 @@ static struct twl4030_script sleep_on_script __initdata = {
 	.flags	= TWL4030_SLEEP_SCRIPT,
 };
 
-static struct twl4030_ins wakeup_seq[] __initdata = {
-#ifndef CONFIG_DISABLE_HFCLK
-/*
- * Wakeup VDD1 and VDD2.
- */
-	{MSG_SINGULAR(DEV_GRP_P1, 0xf, RES_STATE_ACTIVE), 4},
+static struct twl4030_ins wakeup_p12_seq[] __initdata = {
+	/* Turn on HFCLKOUT */
+	{MSG_SINGULAR(DEV_GRP_P1, 0x19, RES_STATE_ACTIVE), 2},
+	/* Turn ON VDD1 */
+	{MSG_SINGULAR(DEV_GRP_P1, 0xf, RES_STATE_ACTIVE), 2},
+	/* Turn ON VDD2 */
 	{MSG_SINGULAR(DEV_GRP_P1, 0x10, RES_STATE_ACTIVE), 2},
-#else
-/*
- * Reenable the OMAP3 PLLs.
- * Wakeup VDD1 and VDD2.
- * Reenable sysclk output.
- */
-	{MSG_SINGULAR(DEV_GRP_P1, 0x7, RES_STATE_ACTIVE), 0x30},
-	{MSG_SINGULAR(DEV_GRP_P1, 0xf, RES_STATE_ACTIVE), 0x30},
-	{MSG_SINGULAR(DEV_GRP_P1, 0x10, RES_STATE_ACTIVE), 0x37},
-	{MSG_SINGULAR(DEV_GRP_P1, 0x19, RES_STATE_ACTIVE), 3},
-#endif /* #ifndef CONFIG_DISABLE_HFCLK */
+	/* Turn ON VPLL1 */
+	{MSG_SINGULAR(DEV_GRP_P1, 0x7, RES_STATE_ACTIVE), 2},
 };
 
-static struct twl4030_script wakeup_script __initdata = {
-	.script	= wakeup_seq,
-	.size	= ARRAY_SIZE(wakeup_seq),
-	.flags	= TWL4030_WAKEUP12_SCRIPT | TWL4030_WAKEUP3_SCRIPT,
+static struct twl4030_script wakeup_p12_script __initdata = {
+	.script	= wakeup_p12_seq,
+	.size	= ARRAY_SIZE(wakeup_p12_seq),
+	.flags	= TWL4030_WAKEUP12_SCRIPT,
+};
+
+static struct twl4030_ins wakeup_p3_seq[] __initdata = {
+	{MSG_SINGULAR(DEV_GRP_P1, 0x19, RES_STATE_ACTIVE), 2},
+};
+
+static struct twl4030_script wakeup_p3_script __initdata = {
+	.script = wakeup_p3_seq,
+	.size   = ARRAY_SIZE(wakeup_p3_seq),
+	.flags  = TWL4030_WAKEUP3_SCRIPT,
 };
 
 static struct twl4030_ins wrst_seq[] __initdata = {
@@ -344,19 +339,31 @@ static struct twl4030_ins wrst_seq[] __initdata = {
 };
 static struct twl4030_script wrst_script __initdata = {
 	.script = wrst_seq,
-	.size   = ARRAY_SIZE(wakeup_seq),
+	.size   = ARRAY_SIZE(wrst_seq),
 	.flags  = TWL4030_WRST_SCRIPT,
 };
 
 static struct twl4030_script *twl4030_scripts[] __initdata = {
 	&sleep_on_script,
-	&wakeup_script,
+	&wakeup_p12_script,
+	&wakeup_p3_script,
 	&wrst_script,
 };
 
+static struct twl4030_resconfig twl4030_rconfig[] = {
+	{ .resource = RES_HFCLKOUT, .devgroup = DEV_GRP_P3, .type = -1,
+		.type2 = -1 },
+	{ .resource = RES_VDD1, .devgroup = DEV_GRP_P1, .type = -1,
+		.type2 = -1 },
+	{ .resource = RES_VDD2, .devgroup = DEV_GRP_P1, .type = -1,
+		.type2 = -1 },
+	{ 0, 0},
+};
+
 static struct twl4030_power_data sdp3430_t2scripts_data __initdata = {
 	.scripts	= twl4030_scripts,
 	.num		= ARRAY_SIZE(twl4030_scripts),
+	.resource_config = twl4030_rconfig,
 };
 
 /*
-- 
1.6.4.3

Re: [PATCH 0/2] twl4030 power support for 3430SDP

[Amit Kucheria]

On 09 Oct 01, Kevin Hilman wrote:
> I've been carrying these in the PM branch, but now that twl4030 power
> support is in mainline, these can be queued for 2.6.33.
> 
> Kevin Hilman (1):
>   OMAP3: PM: 3430SDP: add initial twl4030 power scripts
> 
> Rajendra Nayak (1):
>   OMAP3: PM: 3430SDP: Update twl4030 power scripts and device groups
> 
>  arch/arm/mach-omap2/board-3430sdp.c |   93 ++++++++++++++++++++++++++++++++++-
>  1 files changed, 91 insertions(+), 2 deletions(-)
> 

Hi Kevin,

Do you want to wait until I push patches that modify the way the scripts are
loaded in memory? (they now allow overlapping scripts to work around space
constraints)

Also we now have very simplified scripts that use broadcast messages. These
might still need to be tweaked for the various boards though. It works on the
RX51.

Regards,
Amit

-- 
-------------------------------------------------------------------------
Amit Kucheria,				 Kernel Developer, Verdurent
-------------------------------------------------------------------------

Re: [PATCH 0/2] twl4030 power support for 3430SDP

[Kevin Hilman]

Amit Kucheria <amit.kucheria@canonical.com> writes:

> On 09 Oct 01, Kevin Hilman wrote:
>> I've been carrying these in the PM branch, but now that twl4030 power
>> support is in mainline, these can be queued for 2.6.33.
>> 
>> Kevin Hilman (1):
>>   OMAP3: PM: 3430SDP: add initial twl4030 power scripts
>> 
>> Rajendra Nayak (1):
>>   OMAP3: PM: 3430SDP: Update twl4030 power scripts and device groups
>> 
>>  arch/arm/mach-omap2/board-3430sdp.c |   93 ++++++++++++++++++++++++++++++++++-
>>  1 files changed, 91 insertions(+), 2 deletions(-)
>> 
>
> Hi Kevin,
>
> Do you want to wait until I push patches that modify the way the scripts are
> loaded in memory? (they now allow overlapping scripts to work around space
> constraints)
>
> Also we now have very simplified scripts that use broadcast messages. These
> might still need to be tweaked for the various boards though. It works on the
> RX51.

Well, I don't *want* to wait because that means I would have to rework
these patches.  :)  

But it sounds waiting is the right thing.  How close are you to having
the new scripting stuff ready?  Should we put it into the PM branch in
the meantime so it can get some testing on other boards than RX51?

Kevin

Re: [PATCH 0/2] twl4030 power support for 3430SDP

[Amit Kucheria]

On 09 Oct 01, Kevin Hilman wrote:
> Amit Kucheria <amit.kucheria@canonical.com> writes:
> 
> > On 09 Oct 01, Kevin Hilman wrote:
> >> I've been carrying these in the PM branch, but now that twl4030 power
> >> support is in mainline, these can be queued for 2.6.33.
> >> 
> >> Kevin Hilman (1):
> >>   OMAP3: PM: 3430SDP: add initial twl4030 power scripts
> >> 
> >> Rajendra Nayak (1):
> >>   OMAP3: PM: 3430SDP: Update twl4030 power scripts and device groups
> >> 
> >>  arch/arm/mach-omap2/board-3430sdp.c |   93 ++++++++++++++++++++++++++++++++++-
> >>  1 files changed, 91 insertions(+), 2 deletions(-)
> >> 
> >
> > Hi Kevin,
> >
> > Do you want to wait until I push patches that modify the way the scripts are
> > loaded in memory? (they now allow overlapping scripts to work around space
> > constraints)
> >
> > Also we now have very simplified scripts that use broadcast messages. These
> > might still need to be tweaked for the various boards though. It works on the
> > RX51.
> 
> Well, I don't *want* to wait because that means I would have to rework
> these patches.  :)  
> 
> But it sounds waiting is the right thing.  How close are you to having
> the new scripting stuff ready?  Should we put it into the PM branch in
> the meantime so it can get some testing on other boards than RX51?

I haven't started looking at it yet. It will have to wait until w42 though.

I guess you can push your patches to the PM branch and revert them at a later
time when I have the changes ready?

/Amit
-- 
-------------------------------------------------------------------------
Amit Kucheria,				 Kernel Developer, Verdurent
-------------------------------------------------------------------------

Re: [PATCH 0/2] twl4030 power support for 3430SDP

[Kevin Hilman]

Amit Kucheria <amit.kucheria@verdurent.com> writes:

> On 09 Oct 01, Kevin Hilman wrote:
>> Amit Kucheria <amit.kucheria@canonical.com> writes:
>> 
>> > On 09 Oct 01, Kevin Hilman wrote:
>> >> I've been carrying these in the PM branch, but now that twl4030 power
>> >> support is in mainline, these can be queued for 2.6.33.
>> >> 
>> >> Kevin Hilman (1):
>> >>   OMAP3: PM: 3430SDP: add initial twl4030 power scripts
>> >> 
>> >> Rajendra Nayak (1):
>> >>   OMAP3: PM: 3430SDP: Update twl4030 power scripts and device groups
>> >> 
>> >>  arch/arm/mach-omap2/board-3430sdp.c |   93 ++++++++++++++++++++++++++++++++++-
>> >>  1 files changed, 91 insertions(+), 2 deletions(-)
>> >> 
>> >
>> > Hi Kevin,
>> >
>> > Do you want to wait until I push patches that modify the way the scripts are
>> > loaded in memory? (they now allow overlapping scripts to work around space
>> > constraints)
>> >
>> > Also we now have very simplified scripts that use broadcast messages. These
>> > might still need to be tweaked for the various boards though. It works on the
>> > RX51.
>> 
>> Well, I don't *want* to wait because that means I would have to rework
>> these patches.  :)  
>> 
>> But it sounds waiting is the right thing.  How close are you to having
>> the new scripting stuff ready?  Should we put it into the PM branch in
>> the meantime so it can get some testing on other boards than RX51?
>
> I haven't started looking at it yet. It will have to wait until w42 though.
>
> I guess you can push your patches to the PM branch and revert them at a later
> time when I have the changes ready?

This series is already in the PM branch, and has been for a while.
I've been waiting for the twl4030 power code to hit mainline before
submitting them.

If you think you'll get the new script stuff done in the next few
weeks, I'll wait.

Kevin

Re: [PATCH 0/2] twl4030 power support for 3430SDP

[Amit Kucheria]

On 09 Oct 01, Kevin Hilman wrote:
> Amit Kucheria <amit.kucheria@canonical.com> writes:
> 
> > On 09 Oct 01, Kevin Hilman wrote:
> >> I've been carrying these in the PM branch, but now that twl4030 power
> >> support is in mainline, these can be queued for 2.6.33.
> >> 
> >> Kevin Hilman (1):
> >>   OMAP3: PM: 3430SDP: add initial twl4030 power scripts
> >> 
> >> Rajendra Nayak (1):
> >>   OMAP3: PM: 3430SDP: Update twl4030 power scripts and device groups
> >> 
> >>  arch/arm/mach-omap2/board-3430sdp.c |   93 ++++++++++++++++++++++++++++++++++-
> >>  1 files changed, 91 insertions(+), 2 deletions(-)
> >> 
> >
> > Hi Kevin,
> >
> > Do you want to wait until I push patches that modify the way the scripts are
> > loaded in memory? (they now allow overlapping scripts to work around space
> > constraints)
> >
> > Also we now have very simplified scripts that use broadcast messages. These
> > might still need to be tweaked for the various boards though. It works on the
> > RX51.
> 
> Well, I don't *want* to wait because that means I would have to rework
> these patches.  :)  
> 
> But it sounds waiting is the right thing.  How close are you to having
> the new scripting stuff ready?  Should we put it into the PM branch in
> the meantime so it can get some testing on other boards than RX51?
> 
> Kevin

Kevin,

I take back my objections to these patches. On studying the current state of
the scripts it looks like the feature allowing overlapping scripts to work
around space constraints might no longer be necessary after the conversion of
the scripts to use broadcast messages instead of the singular ones. <whew>

I'll push the optimised scripts shortly.

Acked-by: Amit Kucheria <amit.kucheria@verdurent.com>

-- 
-------------------------------------------------------------------------
Amit Kucheria,				 Kernel Developer, Verdurent
-------------------------------------------------------------------------