diff options
| author | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2018-11-14 12:32:49 +0100 |
|---|---|---|
| committer | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2018-11-14 16:27:43 +0100 |
| commit | 6f388adef82057675c61b24afb7b2e0d8136c3fd (patch) | |
| tree | 32c9e1d4a4ac202178c185886e96a07a9e407cec /target/linux/brcm2708/patches-4.9/950-0113-i2c-bcm2835-Add-debug-support.patch | |
| parent | b0d08ec3aef3cc4fb105f1d65681907ebef9be0f (diff) | |
| download | upstream-6f388adef82057675c61b24afb7b2e0d8136c3fd.tar.gz upstream-6f388adef82057675c61b24afb7b2e0d8136c3fd.tar.bz2 upstream-6f388adef82057675c61b24afb7b2e0d8136c3fd.zip | |
kernel: bump 4.9 to 4.9.137
Refreshed all patches.
Removed upstreamed hunks:
- 703-phy-support-layerscape.patch
Compile-tested on: ar71xx
Runtime-tested on: ar71xx
Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/brcm2708/patches-4.9/950-0113-i2c-bcm2835-Add-debug-support.patch')
| -rw-r--r-- | target/linux/brcm2708/patches-4.9/950-0113-i2c-bcm2835-Add-debug-support.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/brcm2708/patches-4.9/950-0113-i2c-bcm2835-Add-debug-support.patch b/target/linux/brcm2708/patches-4.9/950-0113-i2c-bcm2835-Add-debug-support.patch index f69a48f623..8e31bcc5e7 100644 --- a/target/linux/brcm2708/patches-4.9/950-0113-i2c-bcm2835-Add-debug-support.patch +++ b/target/linux/brcm2708/patches-4.9/950-0113-i2c-bcm2835-Add-debug-support.patch @@ -151,7 +151,7 @@ Signed-off-by: Noralf Trønnes <noralf@tronnes.org> err = val & (BCM2835_I2C_S_CLKT | BCM2835_I2C_S_ERR); if (err) { -@@ -251,6 +335,13 @@ static int bcm2835_i2c_xfer(struct i2c_a +@@ -253,6 +337,13 @@ static int bcm2835_i2c_xfer(struct i2c_a unsigned long time_left; int i, ret; @@ -165,7 +165,7 @@ Signed-off-by: Noralf Trønnes <noralf@tronnes.org> for (i = 0; i < (num - 1); i++) if (msgs[i].flags & I2C_M_RD) { dev_warn_once(i2c_dev->dev, -@@ -270,6 +361,10 @@ static int bcm2835_i2c_xfer(struct i2c_a +@@ -272,6 +363,10 @@ static int bcm2835_i2c_xfer(struct i2c_a time_left = wait_for_completion_timeout(&i2c_dev->completion, adap->timeout); @@ -176,7 +176,7 @@ Signed-off-by: Noralf Trønnes <noralf@tronnes.org> if (!time_left) { bcm2835_i2c_writel(i2c_dev, BCM2835_I2C_C, BCM2835_I2C_C_CLEAR); -@@ -280,7 +375,9 @@ static int bcm2835_i2c_xfer(struct i2c_a +@@ -282,7 +377,9 @@ static int bcm2835_i2c_xfer(struct i2c_a if (!i2c_dev->msg_err) return num; |