diff options
| author | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2018-11-14 13:53:03 +0100 |
|---|---|---|
| committer | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2018-11-14 16:27:43 +0100 |
| commit | 7e20e4ab96ffc4d425fc3c6593a65d813f641fd1 (patch) | |
| tree | e5a8922efcd5dbceda05164f7736e2d89f6aeb49 /target/linux/brcm2708/patches-4.9/950-0112-i2c-bcm2835-Add-support-for-dynamic-clock.patch | |
| parent | f7a406deafb4d2524f46a405d84a6d20c65022a9 (diff) | |
| download | upstream-7e20e4ab96ffc4d425fc3c6593a65d813f641fd1.tar.gz upstream-7e20e4ab96ffc4d425fc3c6593a65d813f641fd1.tar.bz2 upstream-7e20e4ab96ffc4d425fc3c6593a65d813f641fd1.zip | |
kernel: bump 4.9 to 4.9.137
Refreshed all patches.
Removed upstreamed hunks in:
- 703-phy-support-layerscape.patch
Compile-tested on: ar71xx, layerscape
Runtime-tested on: ar71xx
Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/brcm2708/patches-4.9/950-0112-i2c-bcm2835-Add-support-for-dynamic-clock.patch')
| -rw-r--r-- | target/linux/brcm2708/patches-4.9/950-0112-i2c-bcm2835-Add-support-for-dynamic-clock.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/brcm2708/patches-4.9/950-0112-i2c-bcm2835-Add-support-for-dynamic-clock.patch b/target/linux/brcm2708/patches-4.9/950-0112-i2c-bcm2835-Add-support-for-dynamic-clock.patch index afe2b2297c..d287ae2cb7 100644 --- a/target/linux/brcm2708/patches-4.9/950-0112-i2c-bcm2835-Add-support-for-dynamic-clock.patch +++ b/target/linux/brcm2708/patches-4.9/950-0112-i2c-bcm2835-Add-support-for-dynamic-clock.patch @@ -56,7 +56,7 @@ Reviewed-by: Martin Sperl <kernel@martin.sperl.org> static void bcm2835_fill_txfifo(struct bcm2835_i2c_dev *i2c_dev) { u32 val; -@@ -224,7 +249,7 @@ static int bcm2835_i2c_xfer(struct i2c_a +@@ -226,7 +251,7 @@ static int bcm2835_i2c_xfer(struct i2c_a { struct bcm2835_i2c_dev *i2c_dev = i2c_get_adapdata(adap); unsigned long time_left; @@ -65,7 +65,7 @@ Reviewed-by: Martin Sperl <kernel@martin.sperl.org> for (i = 0; i < (num - 1); i++) if (msgs[i].flags & I2C_M_RD) { -@@ -233,6 +258,10 @@ static int bcm2835_i2c_xfer(struct i2c_a +@@ -235,6 +260,10 @@ static int bcm2835_i2c_xfer(struct i2c_a return -EOPNOTSUPP; } @@ -76,7 +76,7 @@ Reviewed-by: Martin Sperl <kernel@martin.sperl.org> i2c_dev->curr_msg = msgs; i2c_dev->num_msgs = num; reinit_completion(&i2c_dev->completion); -@@ -282,7 +311,6 @@ static int bcm2835_i2c_probe(struct plat +@@ -284,7 +313,6 @@ static int bcm2835_i2c_probe(struct plat { struct bcm2835_i2c_dev *i2c_dev; struct resource *mem, *irq; @@ -84,7 +84,7 @@ Reviewed-by: Martin Sperl <kernel@martin.sperl.org> int ret; struct i2c_adapter *adap; -@@ -306,28 +334,13 @@ static int bcm2835_i2c_probe(struct plat +@@ -308,28 +336,13 @@ static int bcm2835_i2c_probe(struct plat } ret = of_property_read_u32(pdev->dev.of_node, "clock-frequency", |