[Armadeus-commitlog] armadeus branch, master, updated. release-3.3-275-g8b31f32
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. release-3.3-275-g8b31f32
|
From: Fabien M <fa...@us...> - 2011-02-03 10:50:40
|
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 8b31f3229f7789295dbb874f39f06846eebea069 (commit)
via 667f3afd1059d49318b2dfabdb21e7c41bccc036 (commit)
via 4992ef7ba3dd955c629cc0ca0cf2d3040fe0a404 (commit)
via cbf0278fc3d671a396e7d2cdf5705ab596eea5e4 (commit)
from ced35ab65fe24be471ab73e56ce862ebae6c0fa1 (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 8b31f3229f7789295dbb874f39f06846eebea069
Merge: 667f3afd1059d49318b2dfabdb21e7c41bccc036 ced35ab65fe24be471ab73e56ce862ebae6c0fa1
Author: Fabien Marteau <fab...@ar...>
Date: Thu Feb 3 11:50:20 2011 +0100
Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
commit 667f3afd1059d49318b2dfabdb21e7c41bccc036
Author: Fabien Marteau <fab...@ar...>
Date: Thu Feb 3 11:50:03 2011 +0100
[linux][spidev] Check if platform pointer is null before initialization in probe()
commit 4992ef7ba3dd955c629cc0ca0cf2d3040fe0a404
Author: Fabien Marteau <fab...@ar...>
Date: Mon Jan 31 16:31:55 2011 +0100
[linux] Clean i2c-imx patch according to checkpatches.pl rules (bis)
commit cbf0278fc3d671a396e7d2cdf5705ab596eea5e4
Author: Fabien Marteau <fab...@ar...>
Date: Mon Jan 31 16:16:45 2011 +0100
[linux] Clean i2c-imx patch according to checkpatches.pl rules
-----------------------------------------------------------------------
Summary of changes:
...-add_platform_data_init_support_to_spidev.patch | 11 ++--
...ing_mangling_capability_on_i2c_imx_driver.patch | 77 +++++---------------
2 files changed, 24 insertions(+), 64 deletions(-)
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/339-apf27-armadeus-add_platform_data_init_support_to_spidev.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/339-apf27-armadeus-add_platform_data_init_support_to_spidev.patch
index 9b412f4..2844554 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/339-apf27-armadeus-add_platform_data_init_support_to_spidev.patch
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/339-apf27-armadeus-add_platform_data_init_support_to_spidev.patch
@@ -7,7 +7,7 @@ Signed-off-by: Gwenhaël Goavec-Merou <gw...@tr...>
Index: linux-2.6.36/drivers/spi/spidev.c
===================================================================
--- linux-2.6.36.orig/drivers/spi/spidev.c 2010-10-20 22:30:22.000000000 +0200
-+++ linux-2.6.36/drivers/spi/spidev.c 2010-11-25 19:22:06.000000000 +0100
++++ linux-2.6.36/drivers/spi/spidev.c 2011-02-03 11:42:13.000000000 +0100
@@ -560,6 +560,7 @@
static int __devinit spidev_probe(struct spi_device *spi)
@@ -16,13 +16,14 @@ Index: linux-2.6.36/drivers/spi/spidev.c
struct spidev_data *spidev;
int status;
unsigned long minor;
-@@ -597,6 +598,10 @@
+@@ -597,6 +598,11 @@
set_bit(minor, minors);
list_add(&spidev->device_entry, &device_list);
}
+ /* allocate GPIO / IRQ if necessary */
-+ if (pdata->init)
-+ pdata->init();
++ if (pdata != NULL)
++ if (pdata->init)
++ pdata->init();
+
mutex_unlock(&device_list_lock);
@@ -30,7 +31,7 @@ Index: linux-2.6.36/drivers/spi/spidev.c
Index: linux-2.6.36/include/linux/spi/spidev.h
===================================================================
--- linux-2.6.36.orig/include/linux/spi/spidev.h 2010-10-20 22:30:22.000000000 +0200
-+++ linux-2.6.36/include/linux/spi/spidev.h 2010-11-25 19:22:06.000000000 +0100
++++ linux-2.6.36/include/linux/spi/spidev.h 2011-02-02 11:43:03.000000000 +0100
@@ -103,6 +103,10 @@
*/
};
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/358-armadeus-imx-adding_mangling_capability_on_i2c_imx_driver.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/358-armadeus-imx-adding_mangling_capability_on_i2c_imx_driver.patch
index bec8298..4b0cca6 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/358-armadeus-imx-adding_mangling_capability_on_i2c_imx_driver.patch
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/358-armadeus-imx-adding_mangling_capability_on_i2c_imx_driver.patch
@@ -1,53 +1,25 @@
+Adding Mangling capability to i2c imx bus controller.
+
+Signed-off-by: Fabien Marteau <fab...@ar...>
+---
Index: linux-2.6.36/drivers/i2c/busses/i2c-imx.c
===================================================================
--- linux-2.6.36.orig/drivers/i2c/busses/i2c-imx.c 2010-10-20 22:30:22.000000000 +0200
-+++ linux-2.6.36/drivers/i2c/busses/i2c-imx.c 2010-12-29 18:36:16.000000000 +0100
-@@ -34,7 +34,6 @@
-
- /** Includes *******************************************************************
- *******************************************************************************/
--
- #include <linux/init.h>
- #include <linux/kernel.h>
- #include <linux/module.h>
-@@ -214,10 +213,12 @@
- static void i2c_imx_stop(struct imx_i2c_struct *i2c_imx)
- {
- unsigned int temp = 0;
-+ int ret;
-+
-
- if (!i2c_imx->stopped) {
- /* Stop I2C transaction */
-- dev_dbg(&i2c_imx->adapter.dev, "<%s>\n", __func__);
-+ dev_dbg(&i2c_imx->adapter.dev, "<%s>***\n", __func__);
- temp = readb(i2c_imx->base + IMX_I2C_I2CR);
- temp &= ~(I2CR_MSTA | I2CR_MTX);
- writeb(temp, i2c_imx->base + IMX_I2C_I2CR);
-@@ -231,7 +232,9 @@
- }
-
- if (!i2c_imx->stopped) {
-- i2c_imx_bus_busy(i2c_imx, 0);
-+
-+ ret = i2c_imx_bus_busy(i2c_imx, 0);
-+
- i2c_imx->stopped = 1;
- }
-
-@@ -300,17 +303,27 @@
++++ linux-2.6.36/drivers/i2c/busses/i2c-imx.c 2011-01-31 16:23:34.000000000 +0100
+@@ -300,17 +300,28 @@
{
int i, result;
- dev_dbg(&i2c_imx->adapter.dev, "<%s> write slave address: addr=0x%x\n",
- __func__, msgs->addr << 1);
-+ if ( (msgs->flags & I2C_M_NOSTART) == 0) {
++ if ((msgs->flags & I2C_M_NOSTART) == 0) {
+ /* write slave address */
+ if (msgs->flags & I2C_M_REV_DIR_ADDR) {
+ dev_dbg(&i2c_imx->adapter.dev,
+ "<%s> write slave address: addr=0x%x\n",
+ __func__, msgs->addr << 1 | 0x01);
-+ writeb((msgs->addr << 1) | 0x01, i2c_imx->base + IMX_I2C_I2DR);
++ writeb((msgs->addr << 1) | 0x01,
++ i2c_imx->base + IMX_I2C_I2DR);
+ } else {
+ dev_dbg(&i2c_imx->adapter.dev,
+ "<%s> write slave address: addr=0x%x\n",
@@ -73,16 +45,16 @@ Index: linux-2.6.36/drivers/i2c/busses/i2c-imx.c
dev_dbg(&i2c_imx->adapter.dev, "<%s> write data\n", __func__);
/* write data */
-@@ -323,7 +336,7 @@
+@@ -323,7 +334,7 @@
if (result)
return result;
result = i2c_imx_acked(i2c_imx);
- if (result)
-+ if ( (result != 0) && ((msgs[0].flags & I2C_M_IGNORE_NAK) == 0))
++ if ((result != 0) && ((msgs[0].flags & I2C_M_IGNORE_NAK) == 0))
return result;
}
return 0;
-@@ -334,18 +347,26 @@
+@@ -334,18 +345,27 @@
int i, result;
unsigned int temp;
@@ -98,7 +70,7 @@ Index: linux-2.6.36/drivers/i2c/busses/i2c-imx.c
- result = i2c_imx_acked(i2c_imx);
- if (result)
- return result;
-+ if ( (msgs->flags & I2C_M_NOSTART) == 0) {
++ if ((msgs->flags & I2C_M_NOSTART) == 0) {
+ /* write slave address */
+ if (msgs->flags & I2C_M_REV_DIR_ADDR) {
+ dev_dbg(&i2c_imx->adapter.dev,
@@ -109,7 +81,8 @@ Index: linux-2.6.36/drivers/i2c/busses/i2c-imx.c
+ dev_dbg(&i2c_imx->adapter.dev,
+ "<%s> write slave address: addr=0x%x\n",
+ __func__, (msgs->addr << 1) | 0x01);
-+ writeb((msgs->addr << 1) | 0x01, i2c_imx->base + IMX_I2C_I2DR);
++ writeb((msgs->addr << 1) | 0x01,
++ i2c_imx->base + IMX_I2C_I2DR);
+ }
+ result = i2c_imx_trx_complete(i2c_imx);
+ if (result)
@@ -121,30 +94,16 @@ Index: linux-2.6.36/drivers/i2c/busses/i2c-imx.c
dev_dbg(&i2c_imx->adapter.dev, "<%s> setup bus\n", __func__);
-@@ -405,7 +426,7 @@
+@@ -405,7 +425,7 @@
/* read/write data */
for (i = 0; i < num; i++) {
- if (i) {
-+ if (i && ((msgs[i].flags & I2C_M_NOSTART)==0)) {
++ if (i && ((msgs[i].flags & I2C_M_NOSTART) == 0)) {
dev_dbg(&i2c_imx->adapter.dev,
"<%s> repeated start\n", __func__);
temp = readb(i2c_imx->base + IMX_I2C_I2CR);
-@@ -435,9 +456,13 @@
- (temp & I2SR_RXAK ? 1 : 0));
- #endif
- if (msgs[i].flags & I2C_M_RD)
-+ {
- result = i2c_imx_read(i2c_imx, &msgs[i]);
-+ }
- else
-+ {
- result = i2c_imx_write(i2c_imx, &msgs[i]);
-+ }
- if (result)
- goto fail0;
- }
-@@ -454,7 +479,7 @@
+@@ -454,7 +474,7 @@
static u32 i2c_imx_func(struct i2c_adapter *adapter)
{
hooks/post-receive
--
armadeus
|
