[PATCH] I2C: OMAP: Include OMAP_I2C_SYSC_REG in save and restore

[PATCH] I2C: OMAP: Include OMAP_I2C_SYSC_REG in save and restore

[Pakaravoor, Jagadeesh]

From: Jagadeesh Bhaskar Pakaravoor <j-pakaravoor@ti.com>

Save and restore should include OMAP_I2C_SYSC_REG.

Signed-off-by: Jagadeesh Bhaskar Pakaravoor <j-pakaravoor@ti.com>
CC: Jouni Hogander <jouni.hogander@nokia.com>
---
Index: linux-omap-2.6/drivers/i2c/busses/i2c-omap.c
===================================================================
--- linux-omap-2.6.orig/drivers/i2c/busses/i2c-omap.c	2009-01-22 12:11:12.000000000 +0530
+++ linux-omap-2.6/drivers/i2c/busses/i2c-omap.c	2009-01-22 12:44:12.202367296 +0530
@@ -182,6 +182,7 @@ struct omap_i2c_dev {
 	u16			scllstate;
 	u16			sclhstate;
 	u16			bufstate;
+	u16			syscstate;
 };
 
 static inline void omap_i2c_write_reg(struct omap_i2c_dev *i2c_dev,
@@ -240,6 +241,7 @@ static void omap_i2c_unidle(struct omap_
 		omap_i2c_write_reg(dev, OMAP_I2C_SCLL_REG, dev->scllstate);
 		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);
 	}
 	dev->idle = 0;
 	omap_i2c_write_reg(dev, OMAP_I2C_IE_REG, dev->iestate);
@@ -300,14 +302,15 @@ static int omap_i2c_init(struct omap_i2c
 		} else if (dev->rev >= OMAP_I2C_REV_ON_3430) {
 			u32 v;
 
-			v = SYSC_AUTOIDLE_MASK;
-			v |= SYSC_ENAWAKEUP_MASK;
-			v |= (SYSC_IDLEMODE_SMART <<
+			dev->syscstate = SYSC_AUTOIDLE_MASK;
+			dev->syscstate |= SYSC_ENAWAKEUP_MASK;
+			dev->syscstate |= (SYSC_IDLEMODE_SMART <<
 			      __ffs(SYSC_SIDLEMODE_MASK));
-			v |= (SYSC_CLOCKACTIVITY_FCLK <<
+			dev->syscstate |= (SYSC_CLOCKACTIVITY_FCLK <<
 			      __ffs(SYSC_CLOCKACTIVITY_MASK));
 
-			omap_i2c_write_reg(dev, OMAP_I2C_SYSC_REG, v);
+			omap_i2c_write_reg(dev, OMAP_I2C_SYSC_REG,
+							dev->syscstate);
 			/*
 			 * Enabling all wakup sources to stop I2C freezing on
 			 * WFI instruction.

--
With Regards,
Jagadeesh Bhaskar P
 
----------------------------
Some men see things as they are and say why - I dream things that never were and say why not.
- George Bernard Shaw
----------------------------

RE: [PATCH] I2C: OMAP: Include OMAP_I2C_SYSC_REG in save and restore

[Pakaravoor, Jagadeesh]

Sorry. I forgot to mention that this patch does not apply on mainline. It is meant for Linux Omap tree only.

Please review/ACK the patch, if you have time.

Thank you.

--
Jagadeesh


-----Original Message-----
From: linux-i2c-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org [mailto:linux-i2c-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org] On Behalf Of Pakaravoor, Jagadeesh
Sent: Friday, January 23, 2009 12:25 PM
To: linux-i2c-u79uwXL29TY76Z2rM5mHXA@public.gmane.org; linux-omap-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
Cc: Jean Delvare
Subject: [PATCH] I2C: OMAP: Include OMAP_I2C_SYSC_REG in save and restore

From: Jagadeesh Bhaskar Pakaravoor <j-pakaravoor-l0cyMroinI0@public.gmane.org>

Save and restore should include OMAP_I2C_SYSC_REG.

Signed-off-by: Jagadeesh Bhaskar Pakaravoor <j-pakaravoor-l0cyMroinI0@public.gmane.org>
CC: Jouni Hogander <jouni.hogander-xNZwKgViW5gAvxtiuMwx3w@public.gmane.org>
---
Index: linux-omap-2.6/drivers/i2c/busses/i2c-omap.c
===================================================================
--- linux-omap-2.6.orig/drivers/i2c/busses/i2c-omap.c	2009-01-22 12:11:12.000000000 +0530
+++ linux-omap-2.6/drivers/i2c/busses/i2c-omap.c	2009-01-22 12:44:12.202367296 +0530
@@ -182,6 +182,7 @@ struct omap_i2c_dev {
 	u16			scllstate;
 	u16			sclhstate;
 	u16			bufstate;
+	u16			syscstate;
 };
 
 static inline void omap_i2c_write_reg(struct omap_i2c_dev *i2c_dev,
@@ -240,6 +241,7 @@ static void omap_i2c_unidle(struct omap_
 		omap_i2c_write_reg(dev, OMAP_I2C_SCLL_REG, dev->scllstate);
 		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);
 	}
 	dev->idle = 0;
 	omap_i2c_write_reg(dev, OMAP_I2C_IE_REG, dev->iestate);
@@ -300,14 +302,15 @@ static int omap_i2c_init(struct omap_i2c
 		} else if (dev->rev >= OMAP_I2C_REV_ON_3430) {
 			u32 v;
 
-			v = SYSC_AUTOIDLE_MASK;
-			v |= SYSC_ENAWAKEUP_MASK;
-			v |= (SYSC_IDLEMODE_SMART <<
+			dev->syscstate = SYSC_AUTOIDLE_MASK;
+			dev->syscstate |= SYSC_ENAWAKEUP_MASK;
+			dev->syscstate |= (SYSC_IDLEMODE_SMART <<
 			      __ffs(SYSC_SIDLEMODE_MASK));
-			v |= (SYSC_CLOCKACTIVITY_FCLK <<
+			dev->syscstate |= (SYSC_CLOCKACTIVITY_FCLK <<
 			      __ffs(SYSC_CLOCKACTIVITY_MASK));
 
-			omap_i2c_write_reg(dev, OMAP_I2C_SYSC_REG, v);
+			omap_i2c_write_reg(dev, OMAP_I2C_SYSC_REG,
+							dev->syscstate);
 			/*
 			 * Enabling all wakup sources to stop I2C freezing on
 			 * WFI instruction.

--
With Regards,
Jagadeesh Bhaskar P
 
----------------------------
Some men see things as they are and say why - I dream things that never were and say why not.
- George Bernard Shaw
----------------------------

--
To unsubscribe from this list: send the line "unsubscribe linux-i2c" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH] I2C: OMAP: Include OMAP_I2C_SYSC_REG in save and restore

[Jean Delvare]

Hi Jagadeesh,

On Fri, 23 Jan 2009 12:51:23 +0530, Pakaravoor, Jagadeesh wrote:
> Sorry. I forgot to mention that this patch does not apply on
> mainline. It is meant for Linux Omap tree only.
> 
> Please review/ACK the patch, if you have time.

You should Cc Ben Dooks rather than me on i2c-omap patches, I do not
deal with embedded platforms.

-- 
Jean Delvare

Re: [PATCH] I2C: OMAP: Include OMAP_I2C_SYSC_REG in save and restore

[Aaro Koskinen]

Hello,

ext Pakaravoor, Jagadeesh wrote:
> From: Jagadeesh Bhaskar Pakaravoor <j-pakaravoor@ti.com>
> 
> Save and restore should include OMAP_I2C_SYSC_REG.
> 
> Signed-off-by: Jagadeesh Bhaskar Pakaravoor <j-pakaravoor@ti.com>
> CC: Jouni Hogander <jouni.hogander@nokia.com>
> ---
> Index: linux-omap-2.6/drivers/i2c/busses/i2c-omap.c
> ===================================================================
> --- linux-omap-2.6.orig/drivers/i2c/busses/i2c-omap.c   2009-01-22 12:11:12.000000000 +0530
> +++ linux-omap-2.6/drivers/i2c/busses/i2c-omap.c        2009-01-22 12:44:12.202367296 +0530
> @@ -182,6 +182,7 @@ struct omap_i2c_dev {
>         u16                     scllstate;
>         u16                     sclhstate;
>         u16                     bufstate;
> +       u16                     syscstate;
>  };
> 
>  static inline void omap_i2c_write_reg(struct omap_i2c_dev *i2c_dev,
> @@ -240,6 +241,7 @@ static void omap_i2c_unidle(struct omap_
>                 omap_i2c_write_reg(dev, OMAP_I2C_SCLL_REG, dev->scllstate);
>                 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);
>         }
>         dev->idle = 0;
>         omap_i2c_write_reg(dev, OMAP_I2C_IE_REG, dev->iestate);
> @@ -300,14 +302,15 @@ static int omap_i2c_init(struct omap_i2c
>                 } else if (dev->rev >= OMAP_I2C_REV_ON_3430) {
>                         u32 v;

This local variable is left unused, so you will get a compiler warning.

> -                       v = SYSC_AUTOIDLE_MASK;
> -                       v |= SYSC_ENAWAKEUP_MASK;
> -                       v |= (SYSC_IDLEMODE_SMART <<
> +                       dev->syscstate = SYSC_AUTOIDLE_MASK;
> +                       dev->syscstate |= SYSC_ENAWAKEUP_MASK;
> +                       dev->syscstate |= (SYSC_IDLEMODE_SMART <<
>                               __ffs(SYSC_SIDLEMODE_MASK));
> -                       v |= (SYSC_CLOCKACTIVITY_FCLK <<
> +                       dev->syscstate |= (SYSC_CLOCKACTIVITY_FCLK <<
>                               __ffs(SYSC_CLOCKACTIVITY_MASK));
> 
> -                       omap_i2c_write_reg(dev, OMAP_I2C_SYSC_REG, v);
> +                       omap_i2c_write_reg(dev, OMAP_I2C_SYSC_REG,
> +                                                       dev->syscstate);
>                         /*
>                          * Enabling all wakup sources to stop I2C freezing on
>                          * WFI instruction.
> 
> --
> With Regards,
> Jagadeesh Bhaskar P

A.

Re: [PATCH] I2C: OMAP: Include OMAP_I2C_SYSC_REG in save and restore

[Ben Dooks]

On Fri, Jan 23, 2009 at 12:24:45PM +0530, Pakaravoor, Jagadeesh wrote:
> From: Jagadeesh Bhaskar Pakaravoor <j-pakaravoor@ti.com>
> 
> Save and restore should include OMAP_I2C_SYSC_REG.

is this necessary for inclusion as a bugfix, or can it wait
for a merge window?

-- 
Ben (ben@fluff.org, http://www.fluff.org/)

  'a smiley only costs 4 bytes'

RE: [PATCH] I2C: OMAP: Include OMAP_I2C_SYSC_REG in save and restore

[Pakaravoor, Jagadeesh]

Hi,

> >         omap_i2c_write_reg(dev, OMAP_I2C_IE_REG, dev->iestate);
> > @@ -300,14 +302,15 @@ static int omap_i2c_init(struct omap_i2c
> >                 } else if (dev->rev >= OMAP_I2C_REV_ON_3430) {
> >                         u32 v;
> 
> This local variable is left unused, so you will get a compiler warning.
> 
> > -                       v = SYSC_AUTOIDLE_MASK;
> > -                       v |= SYSC_ENAWAKEUP_MASK;
> > -                       v |= (SYSC_IDLEMODE_SMART <<
> > +                       dev->syscstate = SYSC_AUTOIDLE_MASK;
> > +                       dev->syscstate |= SYSC_ENAWAKEUP_MASK;
> > +                       dev->syscstate |= (SYSC_IDLEMODE_SMART <<
> >                               __ffs(SYSC_SIDLEMODE_MASK));
> > -                       v |= (SYSC_CLOCKACTIVITY_FCLK <<
> > +                       dev->syscstate |= (SYSC_CLOCKACTIVITY_FCLK <<
> >                               __ffs(SYSC_CLOCKACTIVITY_MASK));
> >
> > -                       omap_i2c_write_reg(dev, OMAP_I2C_SYSC_REG, v);

The variable "v", holds the value to be written to OMAP_I2C_SYSC_REG. I compiled the code for omap_3430sdp_defconfig, and received no compiler warning.

-Jagadeesh

RE: [PATCH] I2C: OMAP: Include OMAP_I2C_SYSC_REG in save and restore

[Pakaravoor, Jagadeesh]

Ben,

> is this necessary for inclusion as a bugfix, or can it wait
> for a merge window?

This patch applies to Linux Omap tree only. It is a bug fix, and preferably taken ASAP. I'd like to incorporate your review comments, if you have any.

-Jagadeesh