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 v7] ARM: davinci: i2c: add OF support
Hello, On 30.07.2012 09:21, Heiko Schocher wrote: add of support for the davinci i2c driver. Signed-off-by: Heiko Schocherh...@denx.de Signed-off-by: Sekhar Norinsek...@ti.com Cc: davinci-linux-open-sou...@linux.davincidsp.com Cc: linux-arm-ker...@lists.infradead.org Cc: devicetree-disc...@lists.ozlabs.org Cc: linux-i2c@vger.kernel.org Cc: Ben Dooksben-li...@fluff.org Cc: Wolfram Sangw.s...@pengutronix.de Cc: Grant Likelygrant.lik...@secretlab.ca Cc: Sekhar Norinsek...@ti.com Cc: Wolfgang Denkw...@denx.de Cc: Sylwester Nawrockis.nawro...@samsung.com --- - changes for v2: - add comments from Sylwester Nawrockis.nawro...@samsung.com: - use cell-index instead id - OF_DEV_AUXDATA in the machine code, instead pre-define platform device name - add comment from Grant Likely: - removed id resp. cell-index completely - fixed documentation - use of_match_ptr() - use devm_kzalloc() for allocating plattform data mem - fixed a whitespace issue - no changes for v3 - changes for v4 remove pinmux-handle property as discussed here: http://www.spinics.net/lists/arm-kernel/msg175701.html with Nori Sekhar - changes for v5 add comments from Grant Likely: - do not change value of dev-dev-platform_data, instead hold a copy in davinci_i2c_dev. - changes for v6: add comments from Sekhar Nori: - removed unneccessary include - merge patch from Sekhar Nori: setup the newly introduced dev-pdata member correctly once in probe - i2c_get_plattformdata(() not needed, remove a lot of checks for pdata in code - add Signed-off-by: Sekhar Norinsek...@ti.com - patch no longer in patchserie, as it has no dependencies. - changes for v7: add comments from Wolfram Sang: - move Documentation/devicetree/bindings/arm/davinci/i2c.txt to Documentation/devicetree/bindings/i2c/davinci.txt - remove bus-delay property Documentation/devicetree/bindings/i2c/davinci.txt | 28 drivers/i2c/busses/i2c-davinci.c | 48 - 2 files changed, 65 insertions(+), 11 deletions(-) create mode 100644 Documentation/devicetree/bindings/i2c/davinci.txt ping ... any comments? bye, Heiko -- DENX Software Engineering GmbH, MD: Wolfgang Denk Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany -- 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
