All of lore.kernel.org
 help / color / mirror / Atom feed
From: Magnus Damm <magnus.damm@gmail.com>
To: linux-i2c@vger.kernel.org
Cc: linux-sh@vger.kernel.org, lethal@linux-sh.org, simon@horms.net,
	ben-linux@fluff.org, khali@linux-fr.org,
	Magnus Damm <magnus.damm@gmail.com>
Subject: [PATCH] i2c: i2c-sh_mobile bus speed platform data
Date: Thu, 21 Apr 2011 22:22:54 +0900	[thread overview]
Message-ID: <20110421132254.3725.84300.sendpatchset@t400s> (raw)

From: Magnus Damm <damm@opensource.se>

Add support to the i2c-sh_mobile driver for setting
the I2C bus speed using platform data.

Signed-off-by: Magnus Damm <damm@opensource.se>
---

 drivers/i2c/busses/i2c-sh_mobile.c |   13 +++++++++++--
 include/linux/i2c-sh_mobile.h      |   10 ++++++++++
 2 files changed, 21 insertions(+), 2 deletions(-)

--- 0013/drivers/i2c/busses/i2c-sh_mobile.c
+++ work/drivers/i2c/busses/i2c-sh_mobile.c	2011-04-21 20:20:23.000000000 +0900
@@ -32,6 +32,7 @@
 #include <linux/clk.h>
 #include <linux/io.h>
 #include <linux/slab.h>
+#include <linux/i2c-sh_mobile.h>
 
 /* Transmit operation:                                                      */
 /*                                                                          */
@@ -117,7 +118,7 @@ struct sh_mobile_i2c_data {
 	struct device *dev;
 	void __iomem *reg;
 	struct i2c_adapter adap;
-
+	unsigned long bus_speed;
 	struct clk *clk;
 	u_int8_t icic;
 	u_int8_t iccl;
@@ -205,7 +206,7 @@ static void activate_ch(struct sh_mobile
 	 * We also round off the result.
 	 */
 	num = i2c_clk * 5;
-	denom = NORMAL_SPEED * 9;
+	denom = pd->bus_speed * 9;
 	tmp = num * 10 / denom;
 	if (tmp % 10 >= 5)
 		pd->iccl = (u_int8_t)((num/denom) + 1);
@@ -574,6 +575,7 @@ static int sh_mobile_i2c_hook_irqs(struc
 
 static int sh_mobile_i2c_probe(struct platform_device *dev)
 {
+	struct i2c_sh_mobile_platform_data *pdata = dev->dev.platform_data;
 	struct sh_mobile_i2c_data *pd;
 	struct i2c_adapter *adap;
 	struct resource *res;
@@ -618,6 +620,11 @@ static int sh_mobile_i2c_probe(struct pl
 		goto err_irq;
 	}
 
+	/* Use platformd data bus speed or NORMAL_SPEED */
+	pd->bus_speed = NORMAL_SPEED;
+	if (pdata && pdata->bus_speed)
+		pd->bus_speed = pdata->bus_speed;
+
 	/* The IIC blocks on SH-Mobile ARM processors
 	 * come with two new bits in ICIC.
 	 */
@@ -658,6 +665,8 @@ static int sh_mobile_i2c_probe(struct pl
 		goto err_all;
 	}
 
+	dev_info(&dev->dev, "I2C adapter %d with bus speed %lu Hz\n",
+		 adap->nr, pd->bus_speed);
 	return 0;
 
  err_all:
--- /dev/null
+++ work/include/linux/i2c-sh_mobile.h	2011-04-21 20:06:59.000000000 +0900
@@ -0,0 +1,10 @@
+#ifndef __I2C_SH_MOBILE_H__
+#define __I2C_SH_MOBILE_H__
+
+#include <linux/platform_device.h>
+
+struct i2c_sh_mobile_platform_data {
+	unsigned long bus_speed;
+};
+
+#endif /* __I2C_SH_MOBILE_H__ */

WARNING: multiple messages have this Message-ID (diff)
From: Magnus Damm <magnus.damm@gmail.com>
To: linux-i2c@vger.kernel.org
Cc: linux-sh@vger.kernel.org, lethal@linux-sh.org, simon@horms.net,
	ben-linux@fluff.org, khali@linux-fr.org,
	Magnus Damm <magnus.damm@gmail.com>
Subject: [PATCH] i2c: i2c-sh_mobile bus speed platform data
Date: Thu, 21 Apr 2011 13:22:54 +0000	[thread overview]
Message-ID: <20110421132254.3725.84300.sendpatchset@t400s> (raw)

From: Magnus Damm <damm@opensource.se>

Add support to the i2c-sh_mobile driver for setting
the I2C bus speed using platform data.

Signed-off-by: Magnus Damm <damm@opensource.se>
---

 drivers/i2c/busses/i2c-sh_mobile.c |   13 +++++++++++--
 include/linux/i2c-sh_mobile.h      |   10 ++++++++++
 2 files changed, 21 insertions(+), 2 deletions(-)

--- 0013/drivers/i2c/busses/i2c-sh_mobile.c
+++ work/drivers/i2c/busses/i2c-sh_mobile.c	2011-04-21 20:20:23.000000000 +0900
@@ -32,6 +32,7 @@
 #include <linux/clk.h>
 #include <linux/io.h>
 #include <linux/slab.h>
+#include <linux/i2c-sh_mobile.h>
 
 /* Transmit operation:                                                      */
 /*                                                                          */
@@ -117,7 +118,7 @@ struct sh_mobile_i2c_data {
 	struct device *dev;
 	void __iomem *reg;
 	struct i2c_adapter adap;
-
+	unsigned long bus_speed;
 	struct clk *clk;
 	u_int8_t icic;
 	u_int8_t iccl;
@@ -205,7 +206,7 @@ static void activate_ch(struct sh_mobile
 	 * We also round off the result.
 	 */
 	num = i2c_clk * 5;
-	denom = NORMAL_SPEED * 9;
+	denom = pd->bus_speed * 9;
 	tmp = num * 10 / denom;
 	if (tmp % 10 >= 5)
 		pd->iccl = (u_int8_t)((num/denom) + 1);
@@ -574,6 +575,7 @@ static int sh_mobile_i2c_hook_irqs(struc
 
 static int sh_mobile_i2c_probe(struct platform_device *dev)
 {
+	struct i2c_sh_mobile_platform_data *pdata = dev->dev.platform_data;
 	struct sh_mobile_i2c_data *pd;
 	struct i2c_adapter *adap;
 	struct resource *res;
@@ -618,6 +620,11 @@ static int sh_mobile_i2c_probe(struct pl
 		goto err_irq;
 	}
 
+	/* Use platformd data bus speed or NORMAL_SPEED */
+	pd->bus_speed = NORMAL_SPEED;
+	if (pdata && pdata->bus_speed)
+		pd->bus_speed = pdata->bus_speed;
+
 	/* The IIC blocks on SH-Mobile ARM processors
 	 * come with two new bits in ICIC.
 	 */
@@ -658,6 +665,8 @@ static int sh_mobile_i2c_probe(struct pl
 		goto err_all;
 	}
 
+	dev_info(&dev->dev, "I2C adapter %d with bus speed %lu Hz\n",
+		 adap->nr, pd->bus_speed);
 	return 0;
 
  err_all:
--- /dev/null
+++ work/include/linux/i2c-sh_mobile.h	2011-04-21 20:06:59.000000000 +0900
@@ -0,0 +1,10 @@
+#ifndef __I2C_SH_MOBILE_H__
+#define __I2C_SH_MOBILE_H__
+
+#include <linux/platform_device.h>
+
+struct i2c_sh_mobile_platform_data {
+	unsigned long bus_speed;
+};
+
+#endif /* __I2C_SH_MOBILE_H__ */

             reply	other threads:[~2011-04-21 13:22 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-04-21 13:22 Magnus Damm [this message]
2011-04-21 13:22 ` [PATCH] i2c: i2c-sh_mobile bus speed platform data Magnus Damm
2011-04-27 22:14 ` Simon Horman
2011-04-27 22:14   ` Simon Horman
2011-04-28  1:06   ` Magnus Damm
2011-04-28  1:06     ` Magnus Damm
     [not found]     ` <BANLkTi=YbtWYKLdcEkv6TDRfm-BbXGXa4w-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2011-04-28  1:18       ` Simon Horman
2011-04-28  1:18         ` Simon Horman
2011-04-28  2:22         ` Paul Mundt
2011-04-28  2:22           ` Paul Mundt
     [not found]           ` <20110428022214.GB13539-M7jkjyW5wf5g9hUCZPvPmw@public.gmane.org>
2011-04-28  2:46             ` Magnus Damm
2011-04-28  2:46               ` Magnus Damm
2011-04-28  3:11               ` Paul Mundt
2011-04-28  3:11                 ` Paul Mundt
     [not found]                 ` <20110428031115.GD13539-M7jkjyW5wf5g9hUCZPvPmw@public.gmane.org>
2011-04-28  3:25                   ` Magnus Damm
2011-04-28  3:25                     ` Magnus Damm
2011-04-28  4:43                     ` Simon Horman
2011-04-28  4:43                       ` Simon Horman
  -- strict thread matches above, loose matches on Subject: below --
2011-04-28  4:25 [PATCH] i2c: i2c-sh_mobile bus speed platform data V2 Magnus Damm
2011-04-28  4:25 ` Magnus Damm
2011-04-28 23:03 ` Simon Horman
2011-04-28 23:03   ` Simon Horman
2011-05-04  0:59 [PATCH] i2c: i2c-sh_mobile bus speed platform data dong chen
2011-05-04  0:59 ` dong chen

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20110421132254.3725.84300.sendpatchset@t400s \
    --to=magnus.damm@gmail.com \
    --cc=ben-linux@fluff.org \
    --cc=khali@linux-fr.org \
    --cc=lethal@linux-sh.org \
    --cc=linux-i2c@vger.kernel.org \
    --cc=linux-sh@vger.kernel.org \
    --cc=simon@horms.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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.