Re: [i2c] [PATCH 5/8] i2c-omap: Add support on 34xx

2008-10-17 Thread Tony Lindgren 
* Ben Dooks [EMAIL PROTECTED] [080929 15:28]:
 On Thu, Sep 25, 2008 at 10:53:51AM +0300, Tony Lindgren wrote:
  From: Chandra shekhar [EMAIL PROTECTED]
 
 Not very informative description in here. At lease you could have
 copied the subject?

Here's this one updated.

Tony


  
  Signed-off-by: chandra shekhar [EMAIL PROTECTED]
  Signed-off-by: Tony Lindgren [EMAIL PROTECTED]
  ---
   drivers/i2c/busses/i2c-omap.c |   12 +++-
   1 files changed, 7 insertions(+), 5 deletions(-)
  
  diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c
  index ded4636..b41431a 100644
  --- a/drivers/i2c/busses/i2c-omap.c
  +++ b/drivers/i2c/busses/i2c-omap.c
  @@ -156,7 +156,7 @@ static inline u16 omap_i2c_read_reg(struct omap_i2c_dev 
  *i2c_dev, int reg)
   
   static int omap_i2c_get_clocks(struct omap_i2c_dev *dev)
   {
  -   if (cpu_is_omap16xx() || cpu_is_omap24xx()) {
  +   if (cpu_is_omap16xx() || cpu_class_is_omap2()) {
  dev-iclk = clk_get(dev-dev, i2c_ick);
  if (IS_ERR(dev-iclk)) {
  dev-iclk = NULL;
  @@ -279,7 +279,7 @@ static int omap_i2c_init(struct omap_i2c_dev *dev)
  psc = fclk_rate / 1200;
  }
   
  -   if (cpu_is_omap2430()) {
  +   if (cpu_is_omap2430() || cpu_is_omap34xx()) {
   
  /* HSI2C controller internal clk rate should be 19.2 Mhz */
  internal_clk = 19200;
  @@ -616,7 +616,8 @@ omap_i2c_isr(int this_irq, void *dev_id)
  *dev-buf++ = w;
  dev-buf_len--;
  /* Data reg from 2430 is 8 bit wide */
  -   if (!cpu_is_omap2430()) {
  +   if (!cpu_is_omap2430() 
  +   !cpu_is_omap34xx()) {
  if (dev-buf_len) {
  *dev-buf++ = w  8;
  dev-buf_len--;
  @@ -654,7 +655,8 @@ omap_i2c_isr(int this_irq, void *dev_id)
  w = *dev-buf++;
  dev-buf_len--;
  /* Data reg from  2430 is 8 bit wide */
  -   if (!cpu_is_omap2430()) {
  +   if (!cpu_is_omap2430() 
  +   !cpu_is_omap34xx()) {
  if (dev-buf_len) {
  w |= *dev-buf++  8;
  dev-buf_len--;
  @@ -748,7 +750,7 @@ omap_i2c_probe(struct platform_device *pdev)
  if (cpu_is_omap15xx())
  dev-rev1 = omap_i2c_read_reg(dev, OMAP_I2C_REV_REG)  0x20;
   
  -   if (cpu_is_omap2430()) {
  +   if (cpu_is_omap2430() || cpu_is_omap34xx()) {
  u16 s;
   
  /* Set up the fifo size - Get total size */
  -- 
  1.5.6.rc3.21.g8c6b5
  
  
  ___
  i2c mailing list
  [EMAIL PROTECTED]
  http://lists.lm-sensors.org/mailman/listinfo/i2c
 
 -- 
 Ben ([EMAIL PROTECTED], http://www.fluff.org/)
 
   'a smiley only costs 4 bytes'
From e5bba093a9541e2943f8e582bd459343d9574b38 Mon Sep 17 00:00:00 2001
From: Chandra shekhar [EMAIL PROTECTED]
Date: Fri, 17 Oct 2008 07:44:01 -0700
Subject: [PATCH] i2c-omap: Add support for omap34xx

Add support for omap34xx

Signed-off-by: chandra shekhar [EMAIL PROTECTED]
Signed-off-by: Tony Lindgren [EMAIL PROTECTED]
---
 drivers/i2c/busses/i2c-omap.c |   12 +++-
 1 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c
index a87e21c..5dd8a24 100644
--- a/drivers/i2c/busses/i2c-omap.c
+++ b/drivers/i2c/busses/i2c-omap.c
@@ -156,7 +156,7 @@ static inline u16 omap_i2c_read_reg(struct omap_i2c_dev *i2c_dev, int reg)
 
 static int omap_i2c_get_clocks(struct omap_i2c_dev *dev)
 {
-	if (cpu_is_omap16xx() || cpu_is_omap24xx()) {
+	if (cpu_is_omap16xx() || cpu_class_is_omap2()) {
 		dev-iclk = clk_get(dev-dev, i2c_ick);
 		if (IS_ERR(dev-iclk)) {
 			dev-iclk = NULL;
@@ -268,7 +268,7 @@ static int omap_i2c_init(struct omap_i2c_dev *dev)
 			psc = fclk_rate / 1200;
 	}
 
-	if (cpu_is_omap2430()) {
+	if (cpu_is_omap2430() || cpu_is_omap34xx()) {
 
 		/* HSI2C controller internal clk rate should be 19.2 Mhz */
 		internal_clk = 19200;
@@ -611,7 +611,8 @@ omap_i2c_isr(int this_irq, void *dev_id)
 	*dev-buf++ = w;
 	dev-buf_len--;
 	/* Data reg from 2430 is 8 bit wide */
-	if (!cpu_is_omap2430()) {
+	if (!cpu_is_omap2430() 
+			!cpu_is_omap34xx()) {
 		if (dev-buf_len) {
 			*dev-buf++ = w  8;
 			dev-buf_len--;
@@ -649,7 +650,8 @@ omap_i2c_isr(int this_irq, void *dev_id)
 	w = *dev-buf++;
 	dev-buf_len--;
 	/* Data reg

Re: [i2c] [PATCH 5/8] i2c-omap: Add support on 34xx

2008-09-29 Thread Ben Dooks 
On Thu, Sep 25, 2008 at 10:53:51AM +0300, Tony Lindgren wrote:
 From: Chandra shekhar [EMAIL PROTECTED]

Not very informative description in here. At lease you could have
copied the subject?
 
 Signed-off-by: chandra shekhar [EMAIL PROTECTED]
 Signed-off-by: Tony Lindgren [EMAIL PROTECTED]
 ---
  drivers/i2c/busses/i2c-omap.c |   12 +++-
  1 files changed, 7 insertions(+), 5 deletions(-)
 
 diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c
 index ded4636..b41431a 100644
 --- a/drivers/i2c/busses/i2c-omap.c
 +++ b/drivers/i2c/busses/i2c-omap.c
 @@ -156,7 +156,7 @@ static inline u16 omap_i2c_read_reg(struct omap_i2c_dev 
 *i2c_dev, int reg)
  
  static int omap_i2c_get_clocks(struct omap_i2c_dev *dev)
  {
 - if (cpu_is_omap16xx() || cpu_is_omap24xx()) {
 + if (cpu_is_omap16xx() || cpu_class_is_omap2()) {
   dev-iclk = clk_get(dev-dev, i2c_ick);
   if (IS_ERR(dev-iclk)) {
   dev-iclk = NULL;
 @@ -279,7 +279,7 @@ static int omap_i2c_init(struct omap_i2c_dev *dev)
   psc = fclk_rate / 1200;
   }
  
 - if (cpu_is_omap2430()) {
 + if (cpu_is_omap2430() || cpu_is_omap34xx()) {
  
   /* HSI2C controller internal clk rate should be 19.2 Mhz */
   internal_clk = 19200;
 @@ -616,7 +616,8 @@ omap_i2c_isr(int this_irq, void *dev_id)
   *dev-buf++ = w;
   dev-buf_len--;
   /* Data reg from 2430 is 8 bit wide */
 - if (!cpu_is_omap2430()) {
 + if (!cpu_is_omap2430() 
 + !cpu_is_omap34xx()) {
   if (dev-buf_len) {
   *dev-buf++ = w  8;
   dev-buf_len--;
 @@ -654,7 +655,8 @@ omap_i2c_isr(int this_irq, void *dev_id)
   w = *dev-buf++;
   dev-buf_len--;
   /* Data reg from  2430 is 8 bit wide */
 - if (!cpu_is_omap2430()) {
 + if (!cpu_is_omap2430() 
 + !cpu_is_omap34xx()) {
   if (dev-buf_len) {
   w |= *dev-buf++  8;
   dev-buf_len--;
 @@ -748,7 +750,7 @@ omap_i2c_probe(struct platform_device *pdev)
   if (cpu_is_omap15xx())
   dev-rev1 = omap_i2c_read_reg(dev, OMAP_I2C_REV_REG)  0x20;
  
 - if (cpu_is_omap2430()) {
 + if (cpu_is_omap2430() || cpu_is_omap34xx()) {
   u16 s;
  
   /* Set up the fifo size - Get total size */
 -- 
 1.5.6.rc3.21.g8c6b5
 
 
 ___
 i2c mailing list
 [EMAIL PROTECTED]
 http://lists.lm-sensors.org/mailman/listinfo/i2c

-- 
Ben ([EMAIL PROTECTED], http://www.fluff.org/)

  'a smiley only costs 4 bytes'
--
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 5/8] i2c-omap: Add support on 34xx

2008-09-25 Thread Tony Lindgren 
From: Chandra shekhar [EMAIL PROTECTED]

Signed-off-by: chandra shekhar [EMAIL PROTECTED]
Signed-off-by: Tony Lindgren [EMAIL PROTECTED]
---
 drivers/i2c/busses/i2c-omap.c |   12 +++-
 1 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c
index 6cd4d54..fdebf96 100644
--- a/drivers/i2c/busses/i2c-omap.c
+++ b/drivers/i2c/busses/i2c-omap.c
@@ -156,7 +156,7 @@ static inline u16 omap_i2c_read_reg(struct omap_i2c_dev 
*i2c_dev, int reg)
 
 static int omap_i2c_get_clocks(struct omap_i2c_dev *dev)
 {
-   if (cpu_is_omap16xx() || cpu_is_omap24xx()) {
+   if (cpu_is_omap16xx() || cpu_class_is_omap2()) {
dev-iclk = clk_get(dev-dev, i2c_ick);
if (IS_ERR(dev-iclk)) {
dev-iclk = NULL;
@@ -279,7 +279,7 @@ static int omap_i2c_init(struct omap_i2c_dev *dev)
psc = fclk_rate / 1200;
}
 
-   if (cpu_is_omap2430()) {
+   if (cpu_is_omap2430() || cpu_is_omap34xx()) {
 
/* HSI2C controller internal clk rate should be 19.2 Mhz */
internal_clk = 19200;
@@ -614,7 +614,8 @@ omap_i2c_isr(int this_irq, void *dev_id)
*dev-buf++ = w;
dev-buf_len--;
/* Data reg from 2430 is 8 bit wide */
-   if (!cpu_is_omap2430() {
+   if (!cpu_is_omap2430() 
+   !cpu_is_omap34xx()) {
if (dev-buf_len) {
*dev-buf++ = w  8;
dev-buf_len--;
@@ -651,7 +652,8 @@ omap_i2c_isr(int this_irq, void *dev_id)
w = *dev-buf++;
dev-buf_len--;
/* Data reg from  2430 is 8 bit wide */
-   if (!cpu_is_omap2430() {
+   if (!cpu_is_omap2430() 
+   !cpu_is_omap34xx()) {
if (dev-buf_len) {
w |= *dev-buf++  8;
dev-buf_len--;
@@ -745,7 +747,7 @@ omap_i2c_probe(struct platform_device *pdev)
if (cpu_is_omap15xx())
dev-rev1 = omap_i2c_read_reg(dev, OMAP_I2C_REV_REG)  0x20;
 
-   if (cpu_is_omap2430()) {
+   if (cpu_is_omap2430() || cpu_is_omap34xx()) {
u16 s;
 
/* Set up the fifo size - Get total size */
-- 
1.5.6.rc3.21.g8c6b5

--
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 5/8] i2c-omap: Add support on 34xx

2008-09-25 Thread Tony Lindgren 
From: Chandra shekhar [EMAIL PROTECTED]

Signed-off-by: chandra shekhar [EMAIL PROTECTED]
Signed-off-by: Tony Lindgren [EMAIL PROTECTED]
---
 drivers/i2c/busses/i2c-omap.c |   12 +++-
 1 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c
index ded4636..b41431a 100644
--- a/drivers/i2c/busses/i2c-omap.c
+++ b/drivers/i2c/busses/i2c-omap.c
@@ -156,7 +156,7 @@ static inline u16 omap_i2c_read_reg(struct omap_i2c_dev 
*i2c_dev, int reg)
 
 static int omap_i2c_get_clocks(struct omap_i2c_dev *dev)
 {
-   if (cpu_is_omap16xx() || cpu_is_omap24xx()) {
+   if (cpu_is_omap16xx() || cpu_class_is_omap2()) {
dev-iclk = clk_get(dev-dev, i2c_ick);
if (IS_ERR(dev-iclk)) {
dev-iclk = NULL;
@@ -279,7 +279,7 @@ static int omap_i2c_init(struct omap_i2c_dev *dev)
psc = fclk_rate / 1200;
}
 
-   if (cpu_is_omap2430()) {
+   if (cpu_is_omap2430() || cpu_is_omap34xx()) {
 
/* HSI2C controller internal clk rate should be 19.2 Mhz */
internal_clk = 19200;
@@ -616,7 +616,8 @@ omap_i2c_isr(int this_irq, void *dev_id)
*dev-buf++ = w;
dev-buf_len--;
/* Data reg from 2430 is 8 bit wide */
-   if (!cpu_is_omap2430()) {
+   if (!cpu_is_omap2430() 
+   !cpu_is_omap34xx()) {
if (dev-buf_len) {
*dev-buf++ = w  8;
dev-buf_len--;
@@ -654,7 +655,8 @@ omap_i2c_isr(int this_irq, void *dev_id)
w = *dev-buf++;
dev-buf_len--;
/* Data reg from  2430 is 8 bit wide */
-   if (!cpu_is_omap2430()) {
+   if (!cpu_is_omap2430() 
+   !cpu_is_omap34xx()) {
if (dev-buf_len) {
w |= *dev-buf++  8;
dev-buf_len--;
@@ -748,7 +750,7 @@ omap_i2c_probe(struct platform_device *pdev)
if (cpu_is_omap15xx())
dev-rev1 = omap_i2c_read_reg(dev, OMAP_I2C_REV_REG)  0x20;
 
-   if (cpu_is_omap2430()) {
+   if (cpu_is_omap2430() || cpu_is_omap34xx()) {
u16 s;
 
/* Set up the fifo size - Get total size */
-- 
1.5.6.rc3.21.g8c6b5

--
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