diff options
| author | Jonas Gorski <jogo@openwrt.org> | 2012-04-09 14:48:51 +0000 |
|---|---|---|
| committer | Jonas Gorski <jogo@openwrt.org> | 2012-04-09 14:48:51 +0000 |
| commit | 16b4cbcdd64d92f6e79d41e11eda25a178ef3b53 (patch) | |
| tree | bd75cb94a45491fc7adfc7874a0f794afe565cbc /target/linux/xburst/patches-3.2/0013-MMC-JZ4740-Added-support-for-CPU-frequency-changing.patch | |
| parent | 1a57b05f472e60b05a8a4360718253820e8fece4 (diff) | |
| download | master-31e0f0ae-16b4cbcdd64d92f6e79d41e11eda25a178ef3b53.tar.gz master-31e0f0ae-16b4cbcdd64d92f6e79d41e11eda25a178ef3b53.tar.bz2 master-31e0f0ae-16b4cbcdd64d92f6e79d41e11eda25a178ef3b53.zip | |
kernel: update linux 3.2 to 3.2.14
SVN-Revision: 31222
Diffstat (limited to 'target/linux/xburst/patches-3.2/0013-MMC-JZ4740-Added-support-for-CPU-frequency-changing.patch')
| -rw-r--r-- | target/linux/xburst/patches-3.2/0013-MMC-JZ4740-Added-support-for-CPU-frequency-changing.patch | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/target/linux/xburst/patches-3.2/0013-MMC-JZ4740-Added-support-for-CPU-frequency-changing.patch b/target/linux/xburst/patches-3.2/0013-MMC-JZ4740-Added-support-for-CPU-frequency-changing.patch index da1c4f1e9b..f42d67a6fa 100644 --- a/target/linux/xburst/patches-3.2/0013-MMC-JZ4740-Added-support-for-CPU-frequency-changing.patch +++ b/target/linux/xburst/patches-3.2/0013-MMC-JZ4740-Added-support-for-CPU-frequency-changing.patch @@ -10,8 +10,6 @@ Also the frequency change is postponed if an I/O operation is in progress. drivers/mmc/host/jz4740_mmc.c | 69 +++++++++++++++++++++++++++++++++++++++- 1 files changed, 67 insertions(+), 2 deletions(-) -diff --git a/drivers/mmc/host/jz4740_mmc.c b/drivers/mmc/host/jz4740_mmc.c -index 74218ad..6e40f1b 100644 --- a/drivers/mmc/host/jz4740_mmc.c +++ b/drivers/mmc/host/jz4740_mmc.c @@ -23,6 +23,7 @@ @@ -22,7 +20,7 @@ index 74218ad..6e40f1b 100644 #include <linux/bitops.h> #include <linux/gpio.h> -@@ -685,6 +686,60 @@ static void jz4740_mmc_enable_sdio_irq(struct mmc_host *mmc, int enable) +@@ -685,6 +686,60 @@ static void jz4740_mmc_enable_sdio_irq(s jz4740_mmc_set_irq_enabled(host, JZ_MMC_IRQ_SDIO, enable); } @@ -83,7 +81,7 @@ index 74218ad..6e40f1b 100644 static const struct mmc_host_ops jz4740_mmc_ops = { .request = jz4740_mmc_request, .set_ios = jz4740_mmc_set_ios, -@@ -834,11 +889,18 @@ static int __devinit jz4740_mmc_probe(struct platform_device* pdev) +@@ -834,11 +889,18 @@ static int __devinit jz4740_mmc_probe(st goto err_free_host; } @@ -103,7 +101,7 @@ index 74218ad..6e40f1b 100644 } host->mem = request_mem_region(host->mem->start, -@@ -846,7 +908,7 @@ static int __devinit jz4740_mmc_probe(struct platform_device* pdev) +@@ -846,7 +908,7 @@ static int __devinit jz4740_mmc_probe(st if (!host->mem) { ret = -EBUSY; dev_err(&pdev->dev, "Failed to request base memory region\n"); @@ -121,7 +119,7 @@ index 74218ad..6e40f1b 100644 err_clk_put: clk_put(host->clk); err_free_host: -@@ -958,6 +1022,7 @@ static int __devexit jz4740_mmc_remove(struct platform_device *pdev) +@@ -958,6 +1022,7 @@ static int __devexit jz4740_mmc_remove(s iounmap(host->base); release_mem_region(host->mem->start, resource_size(host->mem)); @@ -129,6 +127,3 @@ index 74218ad..6e40f1b 100644 clk_put(host->clk); platform_set_drvdata(pdev, NULL); --- -1.7.5.4 - |