linux-omap.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PM PATCH] OMAP3: PM: Save and restore I2C wakeup sources
@ 2009-03-25 13:38 Aaro Koskinen
  2009-03-25 17:50 ` Kevin Hilman
                   ` (2 more replies)
  0 siblings, 3 replies; 4+ messages in thread
From: Aaro Koskinen @ 2009-03-25 13:38 UTC (permalink / raw)
  To: linux-omap

Save and restore I2C wakeup sources.

Signed-off-by: Aaro Koskinen <aaro.koskinen@nokia.com>
---
 drivers/i2c/busses/i2c-omap.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c
index 50f3285..5ce055c 100644
--- a/drivers/i2c/busses/i2c-omap.c
+++ b/drivers/i2c/busses/i2c-omap.c
@@ -183,6 +183,7 @@ struct omap_i2c_dev {
 	u16			sclhstate;
 	u16			bufstate;
 	u16			syscstate;
+	u16			westate;
 };
 
 static inline void omap_i2c_write_reg(struct omap_i2c_dev *i2c_dev,
@@ -242,6 +243,7 @@ static void omap_i2c_unidle(struct omap_i2c_dev *dev)
 		omap_i2c_write_reg(dev, OMAP_I2C_SCLH_REG, dev->sclhstate);
 		omap_i2c_write_reg(dev, OMAP_I2C_BUF_REG, dev->bufstate);
 		omap_i2c_write_reg(dev, OMAP_I2C_SYSC_REG, dev->syscstate);
+		omap_i2c_write_reg(dev, OMAP_I2C_WE_REG, dev->westate);
 	}
 	dev->idle = 0;
 	omap_i2c_write_reg(dev, OMAP_I2C_IE_REG, dev->iestate);
@@ -316,8 +318,8 @@ static int omap_i2c_init(struct omap_i2c_dev *dev)
 			 * WFI instruction.
 			 * REVISIT: Some wkup sources might not be needed.
 			 */
-			omap_i2c_write_reg(dev, OMAP_I2C_WE_REG,
-							OMAP_I2C_WE_ALL);
+			dev->westate = OMAP_I2C_WE_ALL;
+			omap_i2c_write_reg(dev, OMAP_I2C_WE_REG, dev->westate);
 
 		}
 	}
-- 
1.5.4.3


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

* Re: [PM PATCH] OMAP3: PM: Save and restore I2C wakeup sources
  2009-03-25 13:38 [PM PATCH] OMAP3: PM: Save and restore I2C wakeup sources Aaro Koskinen
@ 2009-03-25 17:50 ` Kevin Hilman
  2009-04-20 23:15 ` Kevin Hilman
  2009-05-13 14:54 ` Kevin Hilman
  2 siblings, 0 replies; 4+ messages in thread
From: Kevin Hilman @ 2009-03-25 17:50 UTC (permalink / raw)
  To: Aaro Koskinen; +Cc: linux-omap

Aaro Koskinen <aaro.koskinen@nokia.com> writes:

> Save and restore I2C wakeup sources.
>
> Signed-off-by: Aaro Koskinen <aaro.koskinen@nokia.com>

Thanks, pushing to PM branch.

Kevin

> ---
>  drivers/i2c/busses/i2c-omap.c |    6 ++++--
>  1 files changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c
> index 50f3285..5ce055c 100644
> --- a/drivers/i2c/busses/i2c-omap.c
> +++ b/drivers/i2c/busses/i2c-omap.c
> @@ -183,6 +183,7 @@ struct omap_i2c_dev {
>  	u16			sclhstate;
>  	u16			bufstate;
>  	u16			syscstate;
> +	u16			westate;
>  };
>  
>  static inline void omap_i2c_write_reg(struct omap_i2c_dev *i2c_dev,
> @@ -242,6 +243,7 @@ static void omap_i2c_unidle(struct omap_i2c_dev *dev)
>  		omap_i2c_write_reg(dev, OMAP_I2C_SCLH_REG, dev->sclhstate);
>  		omap_i2c_write_reg(dev, OMAP_I2C_BUF_REG, dev->bufstate);
>  		omap_i2c_write_reg(dev, OMAP_I2C_SYSC_REG, dev->syscstate);
> +		omap_i2c_write_reg(dev, OMAP_I2C_WE_REG, dev->westate);
>  	}
>  	dev->idle = 0;
>  	omap_i2c_write_reg(dev, OMAP_I2C_IE_REG, dev->iestate);
> @@ -316,8 +318,8 @@ static int omap_i2c_init(struct omap_i2c_dev *dev)
>  			 * WFI instruction.
>  			 * REVISIT: Some wkup sources might not be needed.
>  			 */
> -			omap_i2c_write_reg(dev, OMAP_I2C_WE_REG,
> -							OMAP_I2C_WE_ALL);
> +			dev->westate = OMAP_I2C_WE_ALL;
> +			omap_i2c_write_reg(dev, OMAP_I2C_WE_REG, dev->westate);
>  
>  		}
>  	}
> -- 
> 1.5.4.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] 4+ messages in thread

* Re: [PM PATCH] OMAP3: PM: Save and restore I2C wakeup sources
  2009-03-25 13:38 [PM PATCH] OMAP3: PM: Save and restore I2C wakeup sources Aaro Koskinen
  2009-03-25 17:50 ` Kevin Hilman
@ 2009-04-20 23:15 ` Kevin Hilman
  2009-05-13 14:54 ` Kevin Hilman
  2 siblings, 0 replies; 4+ messages in thread
From: Kevin Hilman @ 2009-04-20 23:15 UTC (permalink / raw)
  To: Aaro Koskinen; +Cc: linux-omap

Aaro Koskinen <aaro.koskinen@nokia.com> writes:

> Save and restore I2C wakeup sources.
>
> Signed-off-by: Aaro Koskinen <aaro.koskinen@nokia.com>

Sorry for the delay, this one slipped through the cracks.
Pushing to PM branch.

Kevin

> ---
>  drivers/i2c/busses/i2c-omap.c |    6 ++++--
>  1 files changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c
> index 50f3285..5ce055c 100644
> --- a/drivers/i2c/busses/i2c-omap.c
> +++ b/drivers/i2c/busses/i2c-omap.c
> @@ -183,6 +183,7 @@ struct omap_i2c_dev {
>  	u16			sclhstate;
>  	u16			bufstate;
>  	u16			syscstate;
> +	u16			westate;
>  };
>  
>  static inline void omap_i2c_write_reg(struct omap_i2c_dev *i2c_dev,
> @@ -242,6 +243,7 @@ static void omap_i2c_unidle(struct omap_i2c_dev *dev)
>  		omap_i2c_write_reg(dev, OMAP_I2C_SCLH_REG, dev->sclhstate);
>  		omap_i2c_write_reg(dev, OMAP_I2C_BUF_REG, dev->bufstate);
>  		omap_i2c_write_reg(dev, OMAP_I2C_SYSC_REG, dev->syscstate);
> +		omap_i2c_write_reg(dev, OMAP_I2C_WE_REG, dev->westate);
>  	}
>  	dev->idle = 0;
>  	omap_i2c_write_reg(dev, OMAP_I2C_IE_REG, dev->iestate);
> @@ -316,8 +318,8 @@ static int omap_i2c_init(struct omap_i2c_dev *dev)
>  			 * WFI instruction.
>  			 * REVISIT: Some wkup sources might not be needed.
>  			 */
> -			omap_i2c_write_reg(dev, OMAP_I2C_WE_REG,
> -							OMAP_I2C_WE_ALL);
> +			dev->westate = OMAP_I2C_WE_ALL;
> +			omap_i2c_write_reg(dev, OMAP_I2C_WE_REG, dev->westate);
>  
>  		}
>  	}
> -- 
> 1.5.4.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] 4+ messages in thread

* Re: [PM PATCH] OMAP3: PM: Save and restore I2C wakeup sources
  2009-03-25 13:38 [PM PATCH] OMAP3: PM: Save and restore I2C wakeup sources Aaro Koskinen
  2009-03-25 17:50 ` Kevin Hilman
  2009-04-20 23:15 ` Kevin Hilman
@ 2009-05-13 14:54 ` Kevin Hilman
  2 siblings, 0 replies; 4+ messages in thread
From: Kevin Hilman @ 2009-05-13 14:54 UTC (permalink / raw)
  To: Aaro Koskinen; +Cc: linux-omap

Aaro Koskinen <aaro.koskinen@nokia.com> writes:

> Save and restore I2C wakeup sources.
>
> Signed-off-by: Aaro Koskinen <aaro.koskinen@nokia.com>

Thanks, pushing to PM branch.

Kevin

> ---
>  drivers/i2c/busses/i2c-omap.c |    6 ++++--
>  1 files changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c
> index 50f3285..5ce055c 100644
> --- a/drivers/i2c/busses/i2c-omap.c
> +++ b/drivers/i2c/busses/i2c-omap.c
> @@ -183,6 +183,7 @@ struct omap_i2c_dev {
>  	u16			sclhstate;
>  	u16			bufstate;
>  	u16			syscstate;
> +	u16			westate;
>  };
>  
>  static inline void omap_i2c_write_reg(struct omap_i2c_dev *i2c_dev,
> @@ -242,6 +243,7 @@ static void omap_i2c_unidle(struct omap_i2c_dev *dev)
>  		omap_i2c_write_reg(dev, OMAP_I2C_SCLH_REG, dev->sclhstate);
>  		omap_i2c_write_reg(dev, OMAP_I2C_BUF_REG, dev->bufstate);
>  		omap_i2c_write_reg(dev, OMAP_I2C_SYSC_REG, dev->syscstate);
> +		omap_i2c_write_reg(dev, OMAP_I2C_WE_REG, dev->westate);
>  	}
>  	dev->idle = 0;
>  	omap_i2c_write_reg(dev, OMAP_I2C_IE_REG, dev->iestate);
> @@ -316,8 +318,8 @@ static int omap_i2c_init(struct omap_i2c_dev *dev)
>  			 * WFI instruction.
>  			 * REVISIT: Some wkup sources might not be needed.
>  			 */
> -			omap_i2c_write_reg(dev, OMAP_I2C_WE_REG,
> -							OMAP_I2C_WE_ALL);
> +			dev->westate = OMAP_I2C_WE_ALL;
> +			omap_i2c_write_reg(dev, OMAP_I2C_WE_REG, dev->westate);
>  
>  		}
>  	}
> -- 
> 1.5.4.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] 4+ messages in thread

end of thread, other threads:[~2009-05-13 14:54 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2009-03-25 13:38 [PM PATCH] OMAP3: PM: Save and restore I2C wakeup sources Aaro Koskinen
2009-03-25 17:50 ` Kevin Hilman
2009-04-20 23:15 ` Kevin Hilman
2009-05-13 14:54 ` Kevin Hilman

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).