aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm2708/patches-3.18/0047-spi-bcm2708-Prepare-for-Common-Clock-Framework-migra.patch
diff options
context:
space:
mode:
authorJohn Crispin <blogic@openwrt.org>2015-02-13 07:38:27 +0000
committerJohn Crispin <blogic@openwrt.org>2015-02-13 07:38:27 +0000
commit50a4aa688be2e05464d250686df0d4272b3c8c17 (patch)
tree2b2acdd9795e115eaece266c0323367885de17bd /target/linux/brcm2708/patches-3.18/0047-spi-bcm2708-Prepare-for-Common-Clock-Framework-migra.patch
parentdb3443e8953c04280ecfefba9b36aed9176c4abc (diff)
downloadmaster-187ad058-50a4aa688be2e05464d250686df0d4272b3c8c17.tar.gz
master-187ad058-50a4aa688be2e05464d250686df0d4272b3c8c17.tar.bz2
master-187ad058-50a4aa688be2e05464d250686df0d4272b3c8c17.zip
brcm2708: refresh patches
Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@44433 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/brcm2708/patches-3.18/0047-spi-bcm2708-Prepare-for-Common-Clock-Framework-migra.patch')
-rw-r--r--[-rwxr-xr-x]target/linux/brcm2708/patches-3.18/0047-spi-bcm2708-Prepare-for-Common-Clock-Framework-migra.patch11
1 files changed, 3 insertions, 8 deletions
diff --git a/target/linux/brcm2708/patches-3.18/0047-spi-bcm2708-Prepare-for-Common-Clock-Framework-migra.patch b/target/linux/brcm2708/patches-3.18/0047-spi-bcm2708-Prepare-for-Common-Clock-Framework-migra.patch
index b6dc5562b1..73be69f815 100755..100644
--- a/target/linux/brcm2708/patches-3.18/0047-spi-bcm2708-Prepare-for-Common-Clock-Framework-migra.patch
+++ b/target/linux/brcm2708/patches-3.18/0047-spi-bcm2708-Prepare-for-Common-Clock-Framework-migra.patch
@@ -15,11 +15,9 @@ Signed-off-by: Noralf Tronnes <notro@tronnes.org>
drivers/spi/spi-bcm2708.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
-diff --git a/drivers/spi/spi-bcm2708.c b/drivers/spi/spi-bcm2708.c
-index b04a57d..349d21f 100644
--- a/drivers/spi/spi-bcm2708.c
+++ b/drivers/spi/spi-bcm2708.c
-@@ -545,7 +545,7 @@ static int bcm2708_spi_probe(struct platform_device *pdev)
+@@ -545,7 +545,7 @@ static int bcm2708_spi_probe(struct plat
}
/* initialise the hardware */
@@ -28,7 +26,7 @@ index b04a57d..349d21f 100644
bcm2708_wr(bs, SPI_CS, SPI_CS_REN | SPI_CS_CLEAR_RX | SPI_CS_CLEAR_TX);
err = spi_register_master(master);
-@@ -561,6 +561,7 @@ static int bcm2708_spi_probe(struct platform_device *pdev)
+@@ -561,6 +561,7 @@ static int bcm2708_spi_probe(struct plat
out_free_irq:
free_irq(bs->irq, master);
@@ -36,7 +34,7 @@ index b04a57d..349d21f 100644
out_workqueue:
destroy_workqueue(bs->workq);
out_iounmap:
-@@ -585,7 +586,7 @@ static int bcm2708_spi_remove(struct platform_device *pdev)
+@@ -585,7 +586,7 @@ static int bcm2708_spi_remove(struct pla
flush_work(&bs->work);
@@ -45,6 +43,3 @@ index b04a57d..349d21f 100644
clk_put(bs->clk);
free_irq(bs->irq, master);
iounmap(bs->base);
---
-1.8.3.2
-