aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm2708/patches-4.9/950-0110-i2c-bcm2835-Add-support-for-Repeated-Start-Condition.patch
diff options
context:
space:
mode:
authorKoen Vandeputte <koen.vandeputte@ncentric.com>2018-11-14 12:32:49 +0100
committerKoen Vandeputte <koen.vandeputte@ncentric.com>2018-11-14 16:27:43 +0100
commit6f388adef82057675c61b24afb7b2e0d8136c3fd (patch)
tree32c9e1d4a4ac202178c185886e96a07a9e407cec /target/linux/brcm2708/patches-4.9/950-0110-i2c-bcm2835-Add-support-for-Repeated-Start-Condition.patch
parentb0d08ec3aef3cc4fb105f1d65681907ebef9be0f (diff)
downloadupstream-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-0110-i2c-bcm2835-Add-support-for-Repeated-Start-Condition.patch')
-rw-r--r--target/linux/brcm2708/patches-4.9/950-0110-i2c-bcm2835-Add-support-for-Repeated-Start-Condition.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/brcm2708/patches-4.9/950-0110-i2c-bcm2835-Add-support-for-Repeated-Start-Condition.patch b/target/linux/brcm2708/patches-4.9/950-0110-i2c-bcm2835-Add-support-for-Repeated-Start-Condition.patch
index 0cd5aa4693..9ae16e426a 100644
--- a/target/linux/brcm2708/patches-4.9/950-0110-i2c-bcm2835-Add-support-for-Repeated-Start-Condition.patch
+++ b/target/linux/brcm2708/patches-4.9/950-0110-i2c-bcm2835-Add-support-for-Repeated-Start-Condition.patch
@@ -86,7 +86,7 @@ Acked-by: Eric Anholt <eric@anholt.net>
* Note about I2C_C_CLEAR on error:
* The I2C_C_CLEAR on errors will take some time to resolve -- if you were in
* non-idle state and I2C_C_READ, it sets an abort_rx flag and runs through
-@@ -151,6 +191,12 @@ static irqreturn_t bcm2835_i2c_isr(int t
+@@ -153,6 +193,12 @@ static irqreturn_t bcm2835_i2c_isr(int t
}
bcm2835_fill_txfifo(i2c_dev);
@@ -99,7 +99,7 @@ Acked-by: Eric Anholt <eric@anholt.net>
return IRQ_HANDLED;
}
-@@ -175,30 +221,25 @@ complete:
+@@ -177,30 +223,25 @@ complete:
return IRQ_HANDLED;
}
@@ -144,7 +144,7 @@ Acked-by: Eric Anholt <eric@anholt.net>
time_left = wait_for_completion_timeout(&i2c_dev->completion,
BCM2835_I2C_TIMEOUT);
-@@ -209,31 +250,15 @@ static int bcm2835_i2c_xfer_msg(struct b
+@@ -211,31 +252,15 @@ static int bcm2835_i2c_xfer_msg(struct b
return -ETIMEDOUT;
}