subject:"\[PATCH\] Fix build for beagleboard"

Re: [PATCH] Fix build for beagleboard

2008-09-23 Thread Tony Lindgren

* Peter 'p2' De Schrijver [EMAIL PROTECTED] [080916 15:30]:

Pushing.

Tony

 
 Signed-off-by: Peter 'p2' De Schrijver [EMAIL PROTECTED]
 ---
  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 = ~(11);
 + 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 [EMAIL PROTECTED]
 More majordomo info at  http://vger.kernel.org/majordomo-info.html
--
To unsubscribe from this list: send the line unsubscribe linux-omap in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH] Fix build for beagleboard

2008-09-12 Thread Peter 'p2' De Schrijver


Signed-off-by: Peter 'p2' De Schrijver [EMAIL PROTECTED]
---
 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 [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH] Fix build for beagleboard

2008-09-12 Thread Felipe Balbi

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 [EMAIL PROTECTED]
 ---
  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
--
To unsubscribe from this list: send the line unsubscribe linux-omap in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH] Fix build for beagleboard

2008-09-11 Thread 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

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

Re: [PATCH] Fix build for beagleboard

2008-09-11 Thread Tony Lindgren

* Peter 'p2' De Schrijver [EMAIL PROTECTED] [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 [EMAIL PROTECTED]
 More majordomo info at  http://vger.kernel.org/majordomo-info.html
--
To unsubscribe from this list: send the line unsubscribe linux-omap in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH] Fix build for beagleboard

[PATCH] Fix build for beagleboard

Re: [PATCH] Fix build for beagleboard

[PATCH] Fix build for beagleboard

Re: [PATCH] Fix build for beagleboard

5 matches

Site Navigation

Mail list logo

Footer information