aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/layerscape
diff options
context:
space:
mode:
authorKoen Vandeputte <koen.vandeputte@ncentric.com>2018-08-09 17:15:40 +0200
committerKoen Vandeputte <koen.vandeputte@ncentric.com>2018-08-10 18:43:23 +0200
commit21a229317f63e89be9184f614a3270b0c9ec7100 (patch)
treeea693b34e77874b960db6e81fc895ab49faa9ef3 /target/linux/layerscape
parent1961948585e008ad0095d7074784893229b00d06 (diff)
downloadupstream-21a229317f63e89be9184f614a3270b0c9ec7100.tar.gz
upstream-21a229317f63e89be9184f614a3270b0c9ec7100.tar.bz2
upstream-21a229317f63e89be9184f614a3270b0c9ec7100.zip
kernel: bump 4.9 to 4.9.119
Refreshed all patches. Delete upstreamed patch: - 100-tcp-add-tcp_ooo_try_coalesce-helper.patch Compile-tested on: ar71xx Runtime-tested on: ar71xx Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/layerscape')
-rw-r--r--target/linux/layerscape/patches-4.9/809-i2c-support-layerscape.patch10
1 files changed, 5 insertions, 5 deletions
diff --git a/target/linux/layerscape/patches-4.9/809-i2c-support-layerscape.patch b/target/linux/layerscape/patches-4.9/809-i2c-support-layerscape.patch
index 0b5f5837fb..ffb95cc342 100644
--- a/target/linux/layerscape/patches-4.9/809-i2c-support-layerscape.patch
+++ b/target/linux/layerscape/patches-4.9/809-i2c-support-layerscape.patch
@@ -95,7 +95,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
};
static const struct imx_i2c_hwdata imx1_i2c_hwdata = {
-@@ -879,6 +938,78 @@ static int i2c_imx_read(struct imx_i2c_s
+@@ -878,6 +937,78 @@ static int i2c_imx_read(struct imx_i2c_s
return 0;
}
@@ -174,7 +174,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
static int i2c_imx_xfer(struct i2c_adapter *adapter,
struct i2c_msg *msgs, int num)
{
-@@ -889,6 +1020,19 @@ static int i2c_imx_xfer(struct i2c_adapt
+@@ -888,6 +1019,19 @@ static int i2c_imx_xfer(struct i2c_adapt
dev_dbg(&i2c_imx->adapter.dev, "<%s>\n", __func__);
@@ -194,7 +194,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
result = pm_runtime_get_sync(i2c_imx->adapter.dev.parent);
if (result < 0)
goto out;
-@@ -1031,6 +1175,50 @@ static int i2c_imx_init_recovery_info(st
+@@ -1030,6 +1174,50 @@ static int i2c_imx_init_recovery_info(st
return 0;
}
@@ -245,7 +245,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
static u32 i2c_imx_func(struct i2c_adapter *adapter)
{
return I2C_FUNC_I2C | I2C_FUNC_SMBUS_EMUL
-@@ -1086,6 +1274,11 @@ static int i2c_imx_probe(struct platform
+@@ -1085,6 +1273,11 @@ static int i2c_imx_probe(struct platform
i2c_imx->adapter.dev.of_node = pdev->dev.of_node;
i2c_imx->base = base;
@@ -257,7 +257,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
/* Get I2C clock */
i2c_imx->clk = devm_clk_get(&pdev->dev, NULL);
if (IS_ERR(i2c_imx->clk)) {
-@@ -1100,7 +1293,7 @@ static int i2c_imx_probe(struct platform
+@@ -1099,7 +1292,7 @@ static int i2c_imx_probe(struct platform
}
/* Request IRQ */