Re: [PATCH 1/1 v2] i2c: Add default configuration into the Nomadik I2C driver.
On Tue, Aug 7, 2012 at 5:31 PM, Lee Jones lee.jo...@linaro.org wrote: From: Lee Jones lee.jo...@linaro.org Date: Tue, 7 Aug 2012 12:27:24 +0100 Subject: [PATCH 1/1 v3] i2c: Add default configuration into the Nomadik I2C driver. This has some bad whitespace damage, and the subject should be i2c/nomadik: Cc: linux-i2c@vger.kernel.org Acked-by: srinidhi kasagar srinidhi.kasa...@stericsson.com Acked-by: Linus Walleij linus.wall...@linaro.org Signed-off-by: Lee Jones lee.jo...@linaro.org Signed-off-by: Lee Jones lee.jo...@linaro.org Double sign-off. Unless Wolfram volunteers to fix this up I suggest you fix it nocheinmal und senden einer neues version. Ihre, Linus Walleij -- To unsubscribe from this list: send the line unsubscribe linux-i2c in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 1/1 v2] i2c: Add default configuration into the Nomadik I2C driver.
On Wed, Aug 08, 2012 at 02:38:23PM +0200, Linus Walleij wrote: On Tue, Aug 7, 2012 at 5:31 PM, Lee Jones lee.jo...@linaro.org wrote: From: Lee Jones lee.jo...@linaro.org Date: Tue, 7 Aug 2012 12:27:24 +0100 Subject: [PATCH 1/1 v3] i2c: Add default configuration into the Nomadik I2C driver. This has some bad whitespace damage, and the subject should be i2c/nomadik: White space damage? You mean the subject line-wrap? `git format-patch` does that. I'll change the subject line to i2c/nomadik. Cc: linux-i2c@vger.kernel.org Acked-by: srinidhi kasagar srinidhi.kasa...@stericsson.com Acked-by: Linus Walleij linus.wall...@linaro.org Signed-off-by: Lee Jones lee.jo...@linaro.org Signed-off-by: Lee Jones lee.jo...@linaro.org Double sign-off. Hmm... this is fast becoming my nemosis patch! Unless Wolfram volunteers to fix this up I suggest you fix it nocheinmal und senden einer neues version. That's okay, it's my error, I'll fix. -- Lee Jones Linaro ST-Ericsson Landing Team Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog -- To unsubscribe from this list: send the line unsubscribe linux-i2c in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 1/1 v2] i2c: Add default configuration into the Nomadik I2C driver.
On Mon, Aug 6, 2012 at 5:35 PM, Lee Jones lee.jo...@linaro.org wrote: Looks like I introduced a merge error on the last patch. Trying again: .../mali/mali400ko/driver/src/devicedrv/mali/arch |1 + (...) diff --git a/drivers/gpu/mali/mali400ko/driver/src/devicedrv/mali/arch b/drivers/gpu/mali/mali400ko/driver/src/devicedrv/mali/arch new file mode 12 index 000..427334b --- /dev/null +++ b/drivers/gpu/mali/mali400ko/driver/src/devicedrv/mali/arch @@ -0,0 +1 @@ +/home/ljkenny/projects/linaro/snowball/snowball/drivers/gpu/mali/mali400ko/driver/src/devicedrv/mali/arch-ux500 \ No newline at end of file NACK, what is this stuff? It's even out-of-tree code. Please be careful with git add -A, I prefer to use git add pathspec I suspect that may be why this happened... Please fix it up and send a v3. Yours, Linus Walleij -- To unsubscribe from this list: send the line unsubscribe linux-i2c in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 1/1 v2] i2c: Add default configuration into the Nomadik I2C driver.
diff --git a/drivers/gpu/mali/mali400ko/driver/src/devicedrv/mali/arch b/drivers/gpu/mali/mali400ko/driver/src/devicedrv/mali/arch new file mode 12 index 000..427334b --- /dev/null +++ b/drivers/gpu/mali/mali400ko/driver/src/devicedrv/mali/arch @@ -0,0 +1 @@ NACK, what is this stuff? It's even out-of-tree code. Whoa, no idea! Good spot though, I missed this completely. Please be careful with git add -A, I prefer to use git add pathspec I suspect that may be why this happened... I don't use `git add -A`, ever. If I'm adding files, I usually use `git commit -s -- pathspec`, or `git commit -a` if I'm sure I require all the necessary changes. I guess I could have accidentally collected it using `git add -i` whist fixing it up, or a similar misdemeanor. Please fix it up and send a v3. Of course. -- Lee Jones Linaro ST-Ericsson Landing Team Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog -- To unsubscribe from this list: send the line unsubscribe linux-i2c in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 1/1 v2] i2c: Add default configuration into the Nomadik I2C driver.
From: Lee Jones lee.jo...@linaro.org
Date: Tue, 7 Aug 2012 12:27:24 +0100
Subject: [PATCH 1/1 v3] i2c: Add default configuration into the Nomadik I2C
driver.
At this moment in time there is only one known configuration for the
Nomadik I2C driver. By not holding that configuration in the driver
adds some unnecessary overhead in platform code. The configuration
as already been removed from platform code, this patch checks for any
over-riding configurations. If there aren't any, the default is used.
Cc: linux-i2c@vger.kernel.org
Acked-by: srinidhi kasagar srinidhi.kasa...@stericsson.com
Acked-by: Linus Walleij linus.wall...@linaro.org
Signed-off-by: Lee Jones lee.jo...@linaro.org
Signed-off-by: Lee Jones lee.jo...@linaro.org
---
drivers/i2c/busses/i2c-nomadik.c | 28 ++--
1 file changed, 18 insertions(+), 10 deletions(-)
diff --git a/drivers/i2c/busses/i2c-nomadik.c b/drivers/i2c/busses/i2c-nomadik.c
index 5e6f1ee..61b00ed 100644
--- a/drivers/i2c/busses/i2c-nomadik.c
+++ b/drivers/i2c/busses/i2c-nomadik.c
@@ -350,10 +350,6 @@ static void setup_i2c_controller(struct nmk_i2c_dev *dev)
i2c_clk = clk_get_rate(dev-clk);
- /* fallback to std. mode if machine has not provided it */
- if (dev-cfg.clk_freq == 0)
- dev-cfg.clk_freq = 10;
-
/*
* The spec says, in case of std. mode the divider is
* 2 whereas it is 3 for fast and fastplus mode of
@@ -911,20 +907,32 @@ static const struct i2c_algorithm nmk_i2c_algo = {
.functionality = nmk_i2c_functionality
};
+static struct nmk_i2c_controller u8500_i2c = {
+ /*
+* Slave data setup time; 250ns, 100ns, and 10ns, which
+* is 14, 6 and 2 respectively for a 48Mhz i2c clock.
+*/
+ .slsu = 0xe,
+ .tft= 1, /* Tx FIFO threshold */
+ .rft= 8, /* Rx FIFO threshold */
+ .clk_freq = 40, /* fast mode operation */
+ .timeout= 200,/* Slave response timeout(ms) */
+ .sm = I2C_FREQ_MODE_FAST,
+};
+
static atomic_t adapter_id = ATOMIC_INIT(0);
static int nmk_i2c_probe(struct amba_device *adev, const struct amba_id *id)
{
int ret = 0;
- struct nmk_i2c_controller *pdata =
- adev-dev.platform_data;
+ struct nmk_i2c_controller *pdata = adev-dev.platform_data;
struct nmk_i2c_dev *dev;
struct i2c_adapter *adap;
- if (!pdata) {
- dev_warn(adev-dev, no platform data\n);
- return -ENODEV;
- }
+ if (!pdata)
+ /* No i2c configuration found, using the default. */
+ pdata = u8500_i2c;
+
dev = kzalloc(sizeof(struct nmk_i2c_dev), GFP_KERNEL);
if (!dev) {
dev_err(adev-dev, cannot allocate memory\n);
--
1.7.9.5
--
To unsubscribe from this list: send the line unsubscribe linux-i2c in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 1/1 v2] i2c: Add default configuration into the Nomadik I2C driver.
Looks like I introduced a merge error on the last patch. Trying again:
From: Lee Jones lee.jo...@linaro.org
Date: Mon, 6 Aug 2012 11:04:14 +0100
Subject: [PATCH 1/1 v2] i2c: Add default configuration into the Nomadik I2C
driver.
At this moment in time there is only one known configuration for the
Nomadik I2C driver. By not holding that configuration in the driver
adds some unnecessary overhead in platform code. The configuration
as already been removed from platform code, this patch checks for any
over-riding configurations. If there aren't any, the default is used.
Cc: linux-i2c@vger.kernel.org
Acked-by: srinidhi kasagar srinidhi.kasa...@stericsson.com
Acked-by: Linus Walleij linus.wall...@linaro.org
Signed-off-by: Lee Jones lee.jo...@linaro.org
---
.../mali/mali400ko/driver/src/devicedrv/mali/arch |1 +
drivers/i2c/busses/i2c-nomadik.c | 28 +---
2 files changed, 19 insertions(+), 10 deletions(-)
create mode 12 drivers/gpu/mali/mali400ko/driver/src/devicedrv/mali/arch
diff --git a/drivers/gpu/mali/mali400ko/driver/src/devicedrv/mali/arch
b/drivers/gpu/mali/mali400ko/driver/src/devicedrv/mali/arch
new file mode 12
index 000..427334b
--- /dev/null
+++ b/drivers/gpu/mali/mali400ko/driver/src/devicedrv/mali/arch
@@ -0,0 +1 @@
+/home/ljkenny/projects/linaro/snowball/snowball/drivers/gpu/mali/mali400ko/driver/src/devicedrv/mali/arch-ux500
\ No newline at end of file
diff --git a/drivers/i2c/busses/i2c-nomadik.c b/drivers/i2c/busses/i2c-nomadik.c
index 5e6f1ee..61b00ed 100644
--- a/drivers/i2c/busses/i2c-nomadik.c
+++ b/drivers/i2c/busses/i2c-nomadik.c
@@ -350,10 +350,6 @@ static void setup_i2c_controller(struct nmk_i2c_dev *dev)
i2c_clk = clk_get_rate(dev-clk);
- /* fallback to std. mode if machine has not provided it */
- if (dev-cfg.clk_freq == 0)
- dev-cfg.clk_freq = 10;
-
/*
* The spec says, in case of std. mode the divider is
* 2 whereas it is 3 for fast and fastplus mode of
@@ -911,20 +907,32 @@ static const struct i2c_algorithm nmk_i2c_algo = {
.functionality = nmk_i2c_functionality
};
+static struct nmk_i2c_controller u8500_i2c = {
+ /*
+* Slave data setup time; 250ns, 100ns, and 10ns, which
+* is 14, 6 and 2 respectively for a 48Mhz i2c clock.
+*/
+ .slsu = 0xe,
+ .tft= 1, /* Tx FIFO threshold */
+ .rft= 8, /* Rx FIFO threshold */
+ .clk_freq = 40, /* fast mode operation */
+ .timeout= 200,/* Slave response timeout(ms) */
+ .sm = I2C_FREQ_MODE_FAST,
+};
+
static atomic_t adapter_id = ATOMIC_INIT(0);
static int nmk_i2c_probe(struct amba_device *adev, const struct amba_id *id)
{
int ret = 0;
- struct nmk_i2c_controller *pdata =
- adev-dev.platform_data;
+ struct nmk_i2c_controller *pdata = adev-dev.platform_data;
struct nmk_i2c_dev *dev;
struct i2c_adapter *adap;
- if (!pdata) {
- dev_warn(adev-dev, no platform data\n);
- return -ENODEV;
- }
+ if (!pdata)
+ /* No i2c configuration found, using the default. */
+ pdata = u8500_i2c;
+
dev = kzalloc(sizeof(struct nmk_i2c_dev), GFP_KERNEL);
if (!dev) {
dev_err(adev-dev, cannot allocate memory\n);
--
1.7.9.5
--
To unsubscribe from this list: send the line unsubscribe linux-i2c in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
