diff options
author | Felix Fietkau <nbd@openwrt.org> | 2014-12-13 11:55:11 +0000 |
---|---|---|
committer | Felix Fietkau <nbd@openwrt.org> | 2014-12-13 11:55:11 +0000 |
commit | 45380ebd1ab3d604ece3dd14a84f89fbc69ea7b1 (patch) | |
tree | 816e479975bb22e39e9cbdde8fdfb400f38f72a9 /target/linux/brcm2708/patches-3.10/0012-sdhci-bcm2708-remove-custom-clock-handling.patch | |
parent | 170ce2961703fe3c2c74e9aa3088df2905b3697e (diff) | |
download | upstream-45380ebd1ab3d604ece3dd14a84f89fbc69ea7b1.tar.gz upstream-45380ebd1ab3d604ece3dd14a84f89fbc69ea7b1.tar.bz2 upstream-45380ebd1ab3d604ece3dd14a84f89fbc69ea7b1.zip |
brcm2708: remove linux 3.10 support
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
SVN-Revision: 43687
Diffstat (limited to 'target/linux/brcm2708/patches-3.10/0012-sdhci-bcm2708-remove-custom-clock-handling.patch')
-rw-r--r-- | target/linux/brcm2708/patches-3.10/0012-sdhci-bcm2708-remove-custom-clock-handling.patch | 100 |
1 files changed, 0 insertions, 100 deletions
diff --git a/target/linux/brcm2708/patches-3.10/0012-sdhci-bcm2708-remove-custom-clock-handling.patch b/target/linux/brcm2708/patches-3.10/0012-sdhci-bcm2708-remove-custom-clock-handling.patch deleted file mode 100644 index 0145d79769..0000000000 --- a/target/linux/brcm2708/patches-3.10/0012-sdhci-bcm2708-remove-custom-clock-handling.patch +++ /dev/null @@ -1,100 +0,0 @@ -From d63cca1d57881d931236d101fe16fd249d91b060 Mon Sep 17 00:00:00 2001 -From: Grigori Goronzy <greg@blackbox> -Date: Mon, 11 Jun 2012 18:52:04 +0200 -Subject: [PATCH 012/196] sdhci-bcm2708: remove custom clock handling - -The custom clock handling code is redundant and buggy. The MMC/SDHCI -subsystem does a better job than it, so remove it for good. ---- - drivers/mmc/host/sdhci-bcm2708.c | 65 +--------------------------------------- - 1 file changed, 1 insertion(+), 64 deletions(-) - -diff --git a/drivers/mmc/host/sdhci-bcm2708.c b/drivers/mmc/host/sdhci-bcm2708.c -index a6bdc25..0ed4d85 100644 ---- a/drivers/mmc/host/sdhci-bcm2708.c -+++ b/drivers/mmc/host/sdhci-bcm2708.c -@@ -353,68 +353,9 @@ void sdhci_bcm2708_writeb(struct sdhci_host *host, u8 val, int reg) - - static unsigned int sdhci_bcm2708_get_max_clock(struct sdhci_host *host) - { -- return 20000000; // this value is in Hz (20MHz) -+ return BCM2708_EMMC_CLOCK_FREQ; - } - --static unsigned int sdhci_bcm2708_get_timeout_clock(struct sdhci_host *host) --{ -- if(host->clock) -- return (host->clock / 1000); // this value is in kHz (100MHz) -- else -- return (sdhci_bcm2708_get_max_clock(host) / 1000); --} -- --static void sdhci_bcm2708_set_clock(struct sdhci_host *host, unsigned int clock) --{ -- int div = 0; -- u16 clk = 0; -- unsigned long timeout; -- -- if (clock == host->clock) -- return; -- -- sdhci_writew(host, 0, SDHCI_CLOCK_CONTROL); -- -- if (clock == 0) -- goto out; -- -- if (BCM2708_EMMC_CLOCK_FREQ <= clock) -- div = 1; -- else { -- for (div = 2; div < SDHCI_MAX_DIV_SPEC_300; div += 2) { -- if ((BCM2708_EMMC_CLOCK_FREQ / div) <= clock) -- break; -- } -- } -- -- DBG( "desired SD clock: %d, actual: %d\n", -- clock, BCM2708_EMMC_CLOCK_FREQ / div); -- -- clk |= (div & SDHCI_DIV_MASK) << SDHCI_DIVIDER_SHIFT; -- clk |= ((div & SDHCI_DIV_HI_MASK) >> SDHCI_DIV_MASK_LEN) -- << SDHCI_DIVIDER_HI_SHIFT; -- clk |= SDHCI_CLOCK_INT_EN; -- -- sdhci_writew(host, clk, SDHCI_CLOCK_CONTROL); -- -- timeout = 20; -- while (!((clk = sdhci_readw(host, SDHCI_CLOCK_CONTROL)) -- & SDHCI_CLOCK_INT_STABLE)) { -- if (timeout == 0) { -- printk(KERN_ERR "%s: Internal clock never " -- "stabilised.\n", mmc_hostname(host->mmc)); -- return; -- } -- timeout--; -- mdelay(1); -- } -- -- clk |= SDHCI_CLOCK_CARD_EN; -- sdhci_writew(host, clk, SDHCI_CLOCK_CONTROL); --out: -- host->clock = clock; -- } -- - /*****************************************************************************\ - * * - * DMA Operation * -@@ -1189,11 +1130,7 @@ static struct sdhci_ops sdhci_bcm2708_ops = { - #else - #error The BCM2708 SDHCI driver needs CONFIG_MMC_SDHCI_IO_ACCESSORS to be set - #endif -- //.enable_dma = NULL, -- .set_clock = sdhci_bcm2708_set_clock, - .get_max_clock = sdhci_bcm2708_get_max_clock, -- //.get_min_clock = NULL, -- .get_timeout_clock = sdhci_bcm2708_get_timeout_clock, - - #ifdef CONFIG_MMC_SDHCI_BCM2708_DMA - // Platform DMA operations --- -1.9.1 - |