[Armadeus-commitlog] armadeus branch, master, updated. release-3.2-496-g422fa54

[Fabien M <fa...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".

The branch, master has been updated
       via  422fa54856442ff19721f529256b0658062e0b3b (commit)
      from  69e8c126199a4e9d29db461ce6e50b23d57cf81f (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 422fa54856442ff19721f529256b0658062e0b3b
Author: Fabien Marteau <fab...@ar...>
Date:   Thu Jun 24 09:43:55 2010 +0200

    Suppress some indent modification

-----------------------------------------------------------------------

Summary of changes:
 ...ing_mangling_capability_on_i2c_mxc_driver.patch |   41 +-------------------
 1 files changed, 1 insertions(+), 40 deletions(-)

diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/358-armadeus-imx-adding_mangling_capability_on_i2c_mxc_driver.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/358-armadeus-imx-adding_mangling_capability_on_i2c_mxc_driver.patch
index e410285..a01bf99 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/358-armadeus-imx-adding_mangling_capability_on_i2c_mxc_driver.patch
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/358-armadeus-imx-adding_mangling_capability_on_i2c_mxc_driver.patch
@@ -1,11 +1,7 @@
-Adding mangling capability on mxc I²C driver.
-
-Signed-off-by: Fabien Marteau <fab...@ar...>
-
 Index: linux-2.6.29.6/drivers/i2c/busses/i2c-mxc.c
 ===================================================================
 --- linux-2.6.29.6.orig/drivers/i2c/busses/i2c-mxc.c	2010-06-23 17:56:23.000000000 +0200
-+++ linux-2.6.29.6/drivers/i2c/busses/i2c-mxc.c	2010-06-24 09:05:32.000000000 +0200
++++ linux-2.6.29.6/drivers/i2c/busses/i2c-mxc.c	2010-06-24 09:42:49.000000000 +0200
 @@ -45,6 +45,7 @@
  	struct clk *clk;
  	bool low_power;
@@ -65,15 +61,6 @@ Index: linux-2.6.29.6/drivers/i2c/busses/i2c-mxc.c
  		addr_trans |= 0x01;
  	}
  	cr = readw(dev->membase + MXC_I2CR);
-@@ -213,7 +227,7 @@
-  * The function returns the number of bytes read or -1 on time out.
-  */
- static int imx_i2c_readbytes(imx_i2c_device * dev, struct i2c_msg *msg,
--			     int last, int addr_comp)
-+				 int last, int addr_comp)
- {
- 	int i;
- 	char *buf = msg->buf;
 @@ -245,10 +259,16 @@
  			imx_i2c_stop(dev);
  			return -1;
@@ -138,29 +125,3 @@ Index: linux-2.6.29.6/drivers/i2c/busses/i2c-mxc.c
  }
  
  /*
-@@ -450,6 +472,7 @@
- #endif
- 	} else {
- 		/* Interrupt due byte transfer completion */
-+
- 		tx_success = false;
- 		/* Check if RXAK is received in Transmit mode */
- 		if (cr & MXC_I2CR_MTX) {
-@@ -542,7 +565,7 @@
- 	}
- 	if (!request_mem_region(res->start, res->end - res->start + 1, DRV_NAME)) {
- 		dev_err(&pdev->dev, "request_mem_region failed for IMX I2C %d\n", id);
--		     ret = -EBUSY;
-+			 ret = -EBUSY;
- 		goto err1;
- 	}
- 
-@@ -581,7 +604,7 @@
- 	if (i2c_plat_data->max_clk) {
- 		/* Calculate divider and round up any fractional part */
- 		int div = (clk_freq + i2c_plat_data->max_clk - 1) /
--		    i2c_plat_data->max_clk;
-+			i2c_plat_data->max_clk;
- 		for (i = 0; i2c_clk_table[i].div != 0; i++) {
- 			if (i2c_clk_table[i].div >= div) {
- 				imx_i2c->clkdiv = i2c_clk_table[i].reg_value;


hooks/post-receive
-- 
armadeus