All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] Fix for twl4030-power.c build failure for beagleboard
@ 2008-09-11 11:50 Peter 'p2' De Schrijver
  2008-09-11 11:50 ` [PATCH] Fix build " Peter 'p2' De Schrijver
  0 siblings, 1 reply; 11+ messages in thread
From: Peter 'p2' De Schrijver @ 2008-09-11 11:50 UTC (permalink / raw)
  To: linux-omap; +Cc: Peter 'p2' De Schrijver

This patch should fix the twl4030-power.c build failure for beagleboard.

Peter 'p2' De Schrijver (1):
  Fix build for beagleboard

 drivers/i2c/chips/twl4030-power.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)


^ permalink raw reply	[flat|nested] 11+ messages in thread

* [PATCH] Fix build for beagleboard
  2008-09-11 11:50 [PATCH] Fix for twl4030-power.c build failure for beagleboard Peter 'p2' De Schrijver
@ 2008-09-11 11:50 ` Peter 'p2' De Schrijver
  2008-09-11 18:15   ` Tony Lindgren
  2008-09-12 10:31   ` Felipe Balbi
  0 siblings, 2 replies; 11+ messages in thread
From: Peter 'p2' De Schrijver @ 2008-09-11 11:50 UTC (permalink / raw)
  To: linux-omap; +Cc: Peter 'p2' De Schrijver

---
 drivers/i2c/chips/twl4030-power.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/drivers/i2c/chips/twl4030-power.c b/drivers/i2c/chips/twl4030-power.c
index 195c3c4..04a13aa 100644
--- a/drivers/i2c/chips/twl4030-power.c
+++ b/drivers/i2c/chips/twl4030-power.c
@@ -149,7 +149,7 @@ struct triton_ins t2_wrst_seq[] __initdata = {
 struct triton_ins sleep_on_seq[] __initdata = {
 	{MSG_BROADCAST(DEV_GRP_NULL, RES_GRP_RC, RES_TYPE_ALL, RES_TYPE2_R0,
 			RES_STATE_SLEEP), 4},
-	{MSG_BROADCAST(DEV_GRP_NULL, RES_GRP_ALL, RES_TYPE_ALL, RES_TYPE_R7,
+	{MSG_BROADCAST(DEV_GRP_NULL, RES_GRP_ALL, RES_TYPE_ALL, RES_TYPE2_R0,
 			RES_STATE_SLEEP), 4},
 };
 
@@ -160,6 +160,9 @@ struct triton_ins sleep_off_seq[] __initdata = {
 	{MSG_BROADCAST(DEV_GRP_NULL, RES_GRP_ALL, RES_TYPE_ALL, RES_TYPE2_R0,
 			RES_STATE_ACTIVE), 0x2},
 };
+
+struct triton_ins t2_wrst_seq[] __initdata = { };
+
 #endif
 
 static int __init twl4030_write_script_byte(u8 address, u8 byte)
-- 
1.5.6.3


^ permalink raw reply related	[flat|nested] 11+ messages in thread

* Re: [PATCH] Fix build for beagleboard
  2008-09-11 11:50 ` [PATCH] Fix build " Peter 'p2' De Schrijver
@ 2008-09-11 18:15   ` Tony Lindgren
  2008-09-12 10:32     ` [PATCH] *** SUBJECT HERE *** Peter 'p2' De Schrijver
  2008-09-12 10:31   ` Felipe Balbi
  1 sibling, 1 reply; 11+ messages in thread
From: Tony Lindgren @ 2008-09-11 18:15 UTC (permalink / raw)
  To: Peter 'p2' De Schrijver; +Cc: linux-omap

* Peter 'p2' De Schrijver <peter.de-schrijver@nokia.com> [080911 04:50]:

Signed-off-by?

Tony

> ---
>  drivers/i2c/chips/twl4030-power.c |    5 ++++-
>  1 files changed, 4 insertions(+), 1 deletions(-)
> 
> diff --git a/drivers/i2c/chips/twl4030-power.c b/drivers/i2c/chips/twl4030-power.c
> index 195c3c4..04a13aa 100644
> --- a/drivers/i2c/chips/twl4030-power.c
> +++ b/drivers/i2c/chips/twl4030-power.c
> @@ -149,7 +149,7 @@ struct triton_ins t2_wrst_seq[] __initdata = {
>  struct triton_ins sleep_on_seq[] __initdata = {
>  	{MSG_BROADCAST(DEV_GRP_NULL, RES_GRP_RC, RES_TYPE_ALL, RES_TYPE2_R0,
>  			RES_STATE_SLEEP), 4},
> -	{MSG_BROADCAST(DEV_GRP_NULL, RES_GRP_ALL, RES_TYPE_ALL, RES_TYPE_R7,
> +	{MSG_BROADCAST(DEV_GRP_NULL, RES_GRP_ALL, RES_TYPE_ALL, RES_TYPE2_R0,
>  			RES_STATE_SLEEP), 4},
>  };
>  
> @@ -160,6 +160,9 @@ struct triton_ins sleep_off_seq[] __initdata = {
>  	{MSG_BROADCAST(DEV_GRP_NULL, RES_GRP_ALL, RES_TYPE_ALL, RES_TYPE2_R0,
>  			RES_STATE_ACTIVE), 0x2},
>  };
> +
> +struct triton_ins t2_wrst_seq[] __initdata = { };
> +
>  #endif
>  
>  static int __init twl4030_write_script_byte(u8 address, u8 byte)
> -- 
> 1.5.6.3
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-omap" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [PATCH] Fix build for beagleboard
  2008-09-11 11:50 ` [PATCH] Fix build " Peter 'p2' De Schrijver
  2008-09-11 18:15   ` Tony Lindgren
@ 2008-09-12 10:31   ` Felipe Balbi
  1 sibling, 0 replies; 11+ messages in thread
From: Felipe Balbi @ 2008-09-12 10:31 UTC (permalink / raw)
  To: ext Peter 'p2' De Schrijver; +Cc: linux-omap

From: Peter 'p2' De Schrijver <peter.de-schrijver@nokia.com>

Signed-off-by: Peter 'p2' De Schrijver <peter.de-schrijver@nokia.com>
---
 drivers/i2c/chips/twl4030-power.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/drivers/i2c/chips/twl4030-power.c b/drivers/i2c/chips/twl4030-power.c
index 195c3c4..04a13aa 100644
--- a/drivers/i2c/chips/twl4030-power.c
+++ b/drivers/i2c/chips/twl4030-power.c
@@ -149,7 +149,7 @@ struct triton_ins t2_wrst_seq[] __initdata = {
 struct triton_ins sleep_on_seq[] __initdata = {
 	{MSG_BROADCAST(DEV_GRP_NULL, RES_GRP_RC, RES_TYPE_ALL, RES_TYPE2_R0,
 			RES_STATE_SLEEP), 4},
-	{MSG_BROADCAST(DEV_GRP_NULL, RES_GRP_ALL, RES_TYPE_ALL, RES_TYPE_R7,
+	{MSG_BROADCAST(DEV_GRP_NULL, RES_GRP_ALL, RES_TYPE_ALL, RES_TYPE2_R0,
 			RES_STATE_SLEEP), 4},
 };
 
@@ -160,6 +160,9 @@ struct triton_ins sleep_off_seq[] __initdata = {
 	{MSG_BROADCAST(DEV_GRP_NULL, RES_GRP_ALL, RES_TYPE_ALL, RES_TYPE2_R0,
 			RES_STATE_ACTIVE), 0x2},
 };
+
+struct triton_ins t2_wrst_seq[] __initdata = { };
+
 #endif
 
 static int __init twl4030_write_script_byte(u8 address, u8 byte)

^ permalink raw reply related	[flat|nested] 11+ messages in thread

* [PATCH] *** SUBJECT HERE ***
  2008-09-11 18:15   ` Tony Lindgren
@ 2008-09-12 10:32     ` Peter 'p2' De Schrijver
  2008-09-12 10:32       ` [PATCH] Fix build for beagleboard Peter 'p2' De Schrijver
  0 siblings, 1 reply; 11+ messages in thread
From: Peter 'p2' De Schrijver @ 2008-09-12 10:32 UTC (permalink / raw)
  To: linux-omap; +Cc: Peter 'p2' De Schrijver

*** BLURB HERE ***

Peter 'p2' De Schrijver (1):
  Fix build for beagleboard

 drivers/i2c/chips/twl4030-power.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)


^ permalink raw reply	[flat|nested] 11+ messages in thread

* [PATCH] Fix build for beagleboard
  2008-09-12 10:32     ` [PATCH] *** SUBJECT HERE *** Peter 'p2' De Schrijver
@ 2008-09-12 10:32       ` Peter 'p2' De Schrijver
  2008-09-12 12:06         ` Felipe Balbi
  2008-09-12 14:02         ` Paul Walmsley
  0 siblings, 2 replies; 11+ messages in thread
From: Peter 'p2' De Schrijver @ 2008-09-12 10:32 UTC (permalink / raw)
  To: linux-omap; +Cc: Peter 'p2' De Schrijver


Signed-off-by: Peter 'p2' De Schrijver <peter.de-schrijver@nokia.com>
---
 drivers/i2c/chips/twl4030-power.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/drivers/i2c/chips/twl4030-power.c b/drivers/i2c/chips/twl4030-power.c
index 195c3c4..04a13aa 100644
--- a/drivers/i2c/chips/twl4030-power.c
+++ b/drivers/i2c/chips/twl4030-power.c
@@ -149,7 +149,7 @@ struct triton_ins t2_wrst_seq[] __initdata = {
 struct triton_ins sleep_on_seq[] __initdata = {
 	{MSG_BROADCAST(DEV_GRP_NULL, RES_GRP_RC, RES_TYPE_ALL, RES_TYPE2_R0,
 			RES_STATE_SLEEP), 4},
-	{MSG_BROADCAST(DEV_GRP_NULL, RES_GRP_ALL, RES_TYPE_ALL, RES_TYPE_R7,
+	{MSG_BROADCAST(DEV_GRP_NULL, RES_GRP_ALL, RES_TYPE_ALL, RES_TYPE2_R0,
 			RES_STATE_SLEEP), 4},
 };
 
@@ -160,6 +160,9 @@ struct triton_ins sleep_off_seq[] __initdata = {
 	{MSG_BROADCAST(DEV_GRP_NULL, RES_GRP_ALL, RES_TYPE_ALL, RES_TYPE2_R0,
 			RES_STATE_ACTIVE), 0x2},
 };
+
+struct triton_ins t2_wrst_seq[] __initdata = { };
+
 #endif
 
 static int __init twl4030_write_script_byte(u8 address, u8 byte)
-- 
1.5.6.3


^ permalink raw reply related	[flat|nested] 11+ messages in thread

* Re: [PATCH] Fix build for beagleboard
  2008-09-12 10:32       ` [PATCH] Fix build for beagleboard Peter 'p2' De Schrijver
@ 2008-09-12 12:06         ` Felipe Balbi
  2008-09-12 17:21           ` Tony Lindgren
  2008-09-12 14:02         ` Paul Walmsley
  1 sibling, 1 reply; 11+ messages in thread
From: Felipe Balbi @ 2008-09-12 12:06 UTC (permalink / raw)
  To: ext Peter 'p2' De Schrijver; +Cc: linux-omap

Hi Tony,

please amend the following into this patch:

On Fri, Sep 12, 2008 at 01:32:36PM +0300, Peter 'p2' De Schrijver wrote:
> 
> Signed-off-by: Peter 'p2' De Schrijver <peter.de-schrijver@nokia.com>
> ---
>  drivers/i2c/chips/twl4030-power.c |    5 ++++-
>  1 files changed, 4 insertions(+), 1 deletions(-)
> 
> diff --git a/drivers/i2c/chips/twl4030-power.c b/drivers/i2c/chips/twl4030-power.c
> index 195c3c4..04a13aa 100644
> --- a/drivers/i2c/chips/twl4030-power.c
> +++ b/drivers/i2c/chips/twl4030-power.c
> @@ -149,7 +149,7 @@ struct triton_ins t2_wrst_seq[] __initdata = {
>  struct triton_ins sleep_on_seq[] __initdata = {
>  	{MSG_BROADCAST(DEV_GRP_NULL, RES_GRP_RC, RES_TYPE_ALL, RES_TYPE2_R0,
>  			RES_STATE_SLEEP), 4},
> -	{MSG_BROADCAST(DEV_GRP_NULL, RES_GRP_ALL, RES_TYPE_ALL, RES_TYPE_R7,
> +	{MSG_BROADCAST(DEV_GRP_NULL, RES_GRP_ALL, RES_TYPE_ALL, RES_TYPE2_R0,
>  			RES_STATE_SLEEP), 4},
>  };
>  
> @@ -160,6 +160,9 @@ struct triton_ins sleep_off_seq[] __initdata = {
>  	{MSG_BROADCAST(DEV_GRP_NULL, RES_GRP_ALL, RES_TYPE_ALL, RES_TYPE2_R0,
>  			RES_STATE_ACTIVE), 0x2},
>  };
> +
> +struct triton_ins t2_wrst_seq[] __initdata = { };
> +
>  #endif
>  
>  static int __init twl4030_write_script_byte(u8 address, u8 byte)

diff -u b/drivers/i2c/chips/twl4030-power.c b/drivers/i2c/chips/twl4030-power.c
--- b/drivers/i2c/chips/twl4030-power.c
+++ b/drivers/i2c/chips/twl4030-power.c
@@ -215,7 +215,6 @@
 static int __init config_sleep_wake_sequence(void)
 {
 	int err = 0;
-	u8 data;
 
 	/*
 	 * CLKREQ is pulled high on the 2430SDP, therefore, we need to take


-- 
balbi

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [PATCH] Fix build for beagleboard
  2008-09-12 10:32       ` [PATCH] Fix build for beagleboard Peter 'p2' De Schrijver
  2008-09-12 12:06         ` Felipe Balbi
@ 2008-09-12 14:02         ` Paul Walmsley
  1 sibling, 0 replies; 11+ messages in thread
From: Paul Walmsley @ 2008-09-12 14:02 UTC (permalink / raw)
  To: Peter 'p2' De Schrijver; +Cc: linux-omap

On Fri, 12 Sep 2008, Peter 'p2' De Schrijver wrote:

> 
> Signed-off-by: Peter 'p2' De Schrijver <peter.de-schrijver@nokia.com>

This patch is also necessary for 2430SDP builds to succeed.

- Paul


> ---
>  drivers/i2c/chips/twl4030-power.c |    5 ++++-
>  1 files changed, 4 insertions(+), 1 deletions(-)
> 
> diff --git a/drivers/i2c/chips/twl4030-power.c b/drivers/i2c/chips/twl4030-power.c
> index 195c3c4..04a13aa 100644
> --- a/drivers/i2c/chips/twl4030-power.c
> +++ b/drivers/i2c/chips/twl4030-power.c
> @@ -149,7 +149,7 @@ struct triton_ins t2_wrst_seq[] __initdata = {
>  struct triton_ins sleep_on_seq[] __initdata = {
>  	{MSG_BROADCAST(DEV_GRP_NULL, RES_GRP_RC, RES_TYPE_ALL, RES_TYPE2_R0,
>  			RES_STATE_SLEEP), 4},
> -	{MSG_BROADCAST(DEV_GRP_NULL, RES_GRP_ALL, RES_TYPE_ALL, RES_TYPE_R7,
> +	{MSG_BROADCAST(DEV_GRP_NULL, RES_GRP_ALL, RES_TYPE_ALL, RES_TYPE2_R0,
>  			RES_STATE_SLEEP), 4},
>  };
>  
> @@ -160,6 +160,9 @@ struct triton_ins sleep_off_seq[] __initdata = {
>  	{MSG_BROADCAST(DEV_GRP_NULL, RES_GRP_ALL, RES_TYPE_ALL, RES_TYPE2_R0,
>  			RES_STATE_ACTIVE), 0x2},
>  };
> +
> +struct triton_ins t2_wrst_seq[] __initdata = { };
> +
>  #endif
>  
>  static int __init twl4030_write_script_byte(u8 address, u8 byte)
> -- 
> 1.5.6.3
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-omap" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> 


- Paul

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [PATCH] Fix build for beagleboard
  2008-09-12 12:06         ` Felipe Balbi
@ 2008-09-12 17:21           ` Tony Lindgren
  0 siblings, 0 replies; 11+ messages in thread
From: Tony Lindgren @ 2008-09-12 17:21 UTC (permalink / raw)
  To: Felipe Balbi; +Cc: ext Peter 'p2' De Schrijver, linux-omap

* Felipe Balbi <felipe.balbi@nokia.com> [080912 05:07]:
> Hi Tony,
> 
> please amend the following into this patch:
> 
> On Fri, Sep 12, 2008 at 01:32:36PM +0300, Peter 'p2' De Schrijver wrote:
> > 
> > Signed-off-by: Peter 'p2' De Schrijver <peter.de-schrijver@nokia.com>
> > ---
> >  drivers/i2c/chips/twl4030-power.c |    5 ++++-
> >  1 files changed, 4 insertions(+), 1 deletions(-)
> > 
> > diff --git a/drivers/i2c/chips/twl4030-power.c b/drivers/i2c/chips/twl4030-power.c
> > index 195c3c4..04a13aa 100644
> > --- a/drivers/i2c/chips/twl4030-power.c
> > +++ b/drivers/i2c/chips/twl4030-power.c
> > @@ -149,7 +149,7 @@ struct triton_ins t2_wrst_seq[] __initdata = {
> >  struct triton_ins sleep_on_seq[] __initdata = {
> >  	{MSG_BROADCAST(DEV_GRP_NULL, RES_GRP_RC, RES_TYPE_ALL, RES_TYPE2_R0,
> >  			RES_STATE_SLEEP), 4},
> > -	{MSG_BROADCAST(DEV_GRP_NULL, RES_GRP_ALL, RES_TYPE_ALL, RES_TYPE_R7,
> > +	{MSG_BROADCAST(DEV_GRP_NULL, RES_GRP_ALL, RES_TYPE_ALL, RES_TYPE2_R0,
> >  			RES_STATE_SLEEP), 4},
> >  };
> >  
> > @@ -160,6 +160,9 @@ struct triton_ins sleep_off_seq[] __initdata = {
> >  	{MSG_BROADCAST(DEV_GRP_NULL, RES_GRP_ALL, RES_TYPE_ALL, RES_TYPE2_R0,
> >  			RES_STATE_ACTIVE), 0x2},
> >  };
> > +
> > +struct triton_ins t2_wrst_seq[] __initdata = { };
> > +
> >  #endif
> >  
> >  static int __init twl4030_write_script_byte(u8 address, u8 byte)
> 
> diff -u b/drivers/i2c/chips/twl4030-power.c b/drivers/i2c/chips/twl4030-power.c
> --- b/drivers/i2c/chips/twl4030-power.c
> +++ b/drivers/i2c/chips/twl4030-power.c
> @@ -215,7 +215,6 @@
>  static int __init config_sleep_wake_sequence(void)
>  {
>  	int err = 0;
> -	u8 data;
>  
>  	/*
>  	 * CLKREQ is pulled high on the 2430SDP, therefore, we need to take
> 

Thanks, pushed with this change.

Tony

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [PATCH] Fix build for beagleboard
  2008-09-16 12:29 ` [PATCH] Fix build for beagleboard Peter 'p2' De Schrijver
@ 2008-09-23 10:54   ` Tony Lindgren
  0 siblings, 0 replies; 11+ messages in thread
From: Tony Lindgren @ 2008-09-23 10:54 UTC (permalink / raw)
  To: Peter 'p2' De Schrijver; +Cc: linux-omap, me

* Peter 'p2' De Schrijver <peter.de-schrijver@nokia.com> [080916 15:30]:

Pushing.

Tony

> 
> Signed-off-by: Peter 'p2' De Schrijver <peter.de-schrijver@nokia.com>
> ---
>  drivers/i2c/chips/twl4030-power.c |   25 +++++++++++++++----------
>  1 files changed, 15 insertions(+), 10 deletions(-)
> 
> diff --git a/drivers/i2c/chips/twl4030-power.c b/drivers/i2c/chips/twl4030-power.c
> index 195c3c4..ea8f447 100644
> --- a/drivers/i2c/chips/twl4030-power.c
> +++ b/drivers/i2c/chips/twl4030-power.c
> @@ -212,7 +216,6 @@ static int __init twl4030_write_script(u8 address, struct triton_ins *script,
>  static int __init config_sleep_wake_sequence(void)
>  {
>  	int err = 0;
> -	u8 data;
>  
>  	/*
>  	 * CLKREQ is pulled high on the 2430SDP, therefore, we need to take
> @@ -242,14 +245,16 @@ static int __init config_sleep_wake_sequence(void)
>  	err |= twl4030_write_script(0x2F, sleep_off_seq,
>  					ARRAY_SIZE(sleep_off_seq));
>  
> -#if defined(CONFIG_MACH_OMAP_3430SDP) || defined(CONFIG_MACH_OMAP_3430LABRADOR)
> -	/* Disabling AC charger effect on sleep-active transitions */
> -	err |= twl4030_i2c_read_u8(TWL4030_MODULE_PM_MASTER, &data,
> -					R_CFG_P1_TRANSITION);
> -	data &= 0x0;
> -	err |= twl4030_i2c_write_u8(TWL4030_MODULE_PM_MASTER, data ,
> -					R_CFG_P1_TRANSITION);
> -#endif
> +	if (machine_is_omap_3430sdp() || machine_is_omap_ldp()) {
> +		u8 data;
> +		/* Disabling AC charger effect on sleep-active transitions */
> +		err |= twl4030_i2c_read_u8(TWL4030_MODULE_PM_MASTER, &data,
> +						R_CFG_P1_TRANSITION);
> +		data &= ~(1<<1);
> +		err |= twl4030_i2c_write_u8(TWL4030_MODULE_PM_MASTER, data ,
> +						R_CFG_P1_TRANSITION);
> +	}
> +
>  	/* P1/P2/P3 LVL_WAKEUP should be on LEVEL */
>  	err |= twl4030_i2c_write_u8(TWL4030_MODULE_PM_MASTER, LVL_WAKEUP,
>  					R_P1_SW_EVENTS);
> -- 
> 1.5.6.3
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-omap" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html

^ permalink raw reply	[flat|nested] 11+ messages in thread

* [PATCH] Fix build for beagleboard
  2008-09-15 18:23 [patch] kill compile warning on twl4030-power.c Felipe Balbi
@ 2008-09-16 12:29 ` Peter 'p2' De Schrijver
  2008-09-23 10:54   ` Tony Lindgren
  0 siblings, 1 reply; 11+ messages in thread
From: Peter 'p2' De Schrijver @ 2008-09-16 12:29 UTC (permalink / raw)
  To: linux-omap, me; +Cc: Peter 'p2' De Schrijver


Signed-off-by: Peter 'p2' De Schrijver <peter.de-schrijver@nokia.com>
---
 drivers/i2c/chips/twl4030-power.c |   25 +++++++++++++++----------
 1 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/drivers/i2c/chips/twl4030-power.c b/drivers/i2c/chips/twl4030-power.c
index 195c3c4..ea8f447 100644
--- a/drivers/i2c/chips/twl4030-power.c
+++ b/drivers/i2c/chips/twl4030-power.c
@@ -212,7 +216,6 @@ static int __init twl4030_write_script(u8 address, struct triton_ins *script,
 static int __init config_sleep_wake_sequence(void)
 {
 	int err = 0;
-	u8 data;
 
 	/*
 	 * CLKREQ is pulled high on the 2430SDP, therefore, we need to take
@@ -242,14 +245,16 @@ static int __init config_sleep_wake_sequence(void)
 	err |= twl4030_write_script(0x2F, sleep_off_seq,
 					ARRAY_SIZE(sleep_off_seq));
 
-#if defined(CONFIG_MACH_OMAP_3430SDP) || defined(CONFIG_MACH_OMAP_3430LABRADOR)
-	/* Disabling AC charger effect on sleep-active transitions */
-	err |= twl4030_i2c_read_u8(TWL4030_MODULE_PM_MASTER, &data,
-					R_CFG_P1_TRANSITION);
-	data &= 0x0;
-	err |= twl4030_i2c_write_u8(TWL4030_MODULE_PM_MASTER, data ,
-					R_CFG_P1_TRANSITION);
-#endif
+	if (machine_is_omap_3430sdp() || machine_is_omap_ldp()) {
+		u8 data;
+		/* Disabling AC charger effect on sleep-active transitions */
+		err |= twl4030_i2c_read_u8(TWL4030_MODULE_PM_MASTER, &data,
+						R_CFG_P1_TRANSITION);
+		data &= ~(1<<1);
+		err |= twl4030_i2c_write_u8(TWL4030_MODULE_PM_MASTER, data ,
+						R_CFG_P1_TRANSITION);
+	}
+
 	/* P1/P2/P3 LVL_WAKEUP should be on LEVEL */
 	err |= twl4030_i2c_write_u8(TWL4030_MODULE_PM_MASTER, LVL_WAKEUP,
 					R_P1_SW_EVENTS);
-- 
1.5.6.3


^ permalink raw reply related	[flat|nested] 11+ messages in thread

end of thread, other threads:[~2008-09-23 10:54 UTC | newest]

Thread overview: 11+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2008-09-11 11:50 [PATCH] Fix for twl4030-power.c build failure for beagleboard Peter 'p2' De Schrijver
2008-09-11 11:50 ` [PATCH] Fix build " Peter 'p2' De Schrijver
2008-09-11 18:15   ` Tony Lindgren
2008-09-12 10:32     ` [PATCH] *** SUBJECT HERE *** Peter 'p2' De Schrijver
2008-09-12 10:32       ` [PATCH] Fix build for beagleboard Peter 'p2' De Schrijver
2008-09-12 12:06         ` Felipe Balbi
2008-09-12 17:21           ` Tony Lindgren
2008-09-12 14:02         ` Paul Walmsley
2008-09-12 10:31   ` Felipe Balbi
2008-09-15 18:23 [patch] kill compile warning on twl4030-power.c Felipe Balbi
2008-09-16 12:29 ` [PATCH] Fix build for beagleboard Peter 'p2' De Schrijver
2008-09-23 10:54   ` Tony Lindgren

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.