diff options
author | Matthias Schiffer <mschiffer@universe-factory.net> | 2018-08-09 20:25:38 +0200 |
---|---|---|
committer | Matthias Schiffer <mschiffer@universe-factory.net> | 2018-08-09 23:17:09 +0200 |
commit | 91d209362b97fc1ff2ab931fe854c99f5a5aae73 (patch) | |
tree | 778bbfec6ccf416367686e9ec2ed73f45aacf745 /target/linux/imx6/patches-4.4/207-i2c-imx-add-retries-for-NAK-s-on-ventana-boards.patch | |
parent | b5d9776cd24bc7dfd181c40560af85712a0040f7 (diff) | |
download | upstream-91d209362b97fc1ff2ab931fe854c99f5a5aae73.tar.gz upstream-91d209362b97fc1ff2ab931fe854c99f5a5aae73.tar.bz2 upstream-91d209362b97fc1ff2ab931fe854c99f5a5aae73.zip |
kernel: bump kernel 4.4 to version 4.4.147
target/linux/ar71xx/patches-4.4/103-MIPS-ath79-fix-register-address-in-ath79_ddr_wb_flus.patch
has been applied upstream; the two deleted brcm2708 patches have been
useless even before (as the second one only reverted the first one).
Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
Diffstat (limited to 'target/linux/imx6/patches-4.4/207-i2c-imx-add-retries-for-NAK-s-on-ventana-boards.patch')
-rw-r--r-- | target/linux/imx6/patches-4.4/207-i2c-imx-add-retries-for-NAK-s-on-ventana-boards.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/imx6/patches-4.4/207-i2c-imx-add-retries-for-NAK-s-on-ventana-boards.patch b/target/linux/imx6/patches-4.4/207-i2c-imx-add-retries-for-NAK-s-on-ventana-boards.patch index 700513ab0a..173fcd5a0f 100644 --- a/target/linux/imx6/patches-4.4/207-i2c-imx-add-retries-for-NAK-s-on-ventana-boards.patch +++ b/target/linux/imx6/patches-4.4/207-i2c-imx-add-retries-for-NAK-s-on-ventana-boards.patch @@ -1,6 +1,6 @@ --- a/drivers/i2c/busses/i2c-imx.c +++ b/drivers/i2c/busses/i2c-imx.c -@@ -468,6 +468,8 @@ static int i2c_imx_acked(struct imx_i2c_ +@@ -469,6 +469,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__); @@ -9,7 +9,7 @@ return -ENXIO; /* No ACK */ } -@@ -1073,6 +1075,10 @@ static int i2c_imx_probe(struct platform +@@ -1072,6 +1074,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; |