diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2016-01-12 20:52:19 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2016-01-12 20:52:19 +0000 |
| commit | cdb83aaf5fe8de98b909d6655d6c7b9d8d2aadb2 (patch) | |
| tree | aeb91c1e1c35fc3c481922ebb7234903b6c855e8 /target/linux/imx6/patches-4.3/207-i2c-imx-add-retries-for-NAK-s-on-ventana-boards.patch | |
| parent | 93b50ade934436d00e5f68c3feabf030ace8d98d (diff) | |
| download | upstream-cdb83aaf5fe8de98b909d6655d6c7b9d8d2aadb2.tar.gz upstream-cdb83aaf5fe8de98b909d6655d6c7b9d8d2aadb2.tar.bz2 upstream-cdb83aaf5fe8de98b909d6655d6c7b9d8d2aadb2.zip | |
kernel/4.3: update to version 4.3.3
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de
SVN-Revision: 48224
Diffstat (limited to 'target/linux/imx6/patches-4.3/207-i2c-imx-add-retries-for-NAK-s-on-ventana-boards.patch')
| -rw-r--r-- | target/linux/imx6/patches-4.3/207-i2c-imx-add-retries-for-NAK-s-on-ventana-boards.patch | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/target/linux/imx6/patches-4.3/207-i2c-imx-add-retries-for-NAK-s-on-ventana-boards.patch b/target/linux/imx6/patches-4.3/207-i2c-imx-add-retries-for-NAK-s-on-ventana-boards.patch index bfb5707ff0..fa3bf138f6 100644 --- a/target/linux/imx6/patches-4.3/207-i2c-imx-add-retries-for-NAK-s-on-ventana-boards.patch +++ b/target/linux/imx6/patches-4.3/207-i2c-imx-add-retries-for-NAK-s-on-ventana-boards.patch @@ -1,8 +1,6 @@ -Index: linux-4.3/drivers/i2c/busses/i2c-imx.c -=================================================================== ---- linux-4.3.orig/drivers/i2c/busses/i2c-imx.c 2015-11-01 16:05:25.000000000 -0800 -+++ linux-4.3/drivers/i2c/busses/i2c-imx.c 2015-12-18 10:39:44.971158318 -0800 -@@ -461,6 +461,8 @@ +--- a/drivers/i2c/busses/i2c-imx.c ++++ b/drivers/i2c/busses/i2c-imx.c +@@ -461,6 +461,8 @@ static int i2c_imx_acked(struct imx_i2c_ { if (imx_i2c_read_reg(i2c_imx, IMX_I2C_I2SR) & I2SR_RXAK) { dev_dbg(&i2c_imx->adapter.dev, "<%s> No ACK\n", __func__); @@ -11,7 +9,7 @@ Index: linux-4.3/drivers/i2c/busses/i2c-imx.c return -EIO; /* No ACK */ } -@@ -1010,6 +1012,10 @@ +@@ -1010,6 +1012,10 @@ static int i2c_imx_probe(struct platform i2c_imx->adapter.nr = pdev->id; i2c_imx->adapter.dev.of_node = pdev->dev.of_node; i2c_imx->base = base; |