Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm

* 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm: (241 commits)
  [ARM] 5171/1: ep93xx: fix compilation of modules using clocks
  [ARM] 5133/2: at91sam9g20 defconfig file
  [ARM] 5130/4: Support for the at91sam9g20
  [ARM] 5160/1: IOP3XX: gpio/gpiolib support
  [ARM] at91: Fix NAND FLASH timings for at91sam9x evaluation kits.
  [ARM] 5084/1: zylonite: Register AC97 device
  [ARM] 5085/2: PXA: Move AC97 over to the new central device declaration model
  [ARM] 5120/1: pxa: correct platform driver names for PXA25x and PXA27x UDC drivers
  [ARM] 5147/1: pxaficp_ir: drop pxa_gpio_mode calls, as pin setting
  [ARM] 5145/1: PXA2xx: provide api to control IrDA pins state
  [ARM] 5144/1: pxaficp_ir: cleanup includes
  [ARM] pxa: remove pxa_set_cken()
  [ARM] pxa: allow clk aliases
  [ARM] Feroceon: don't disable BPU on boot
  [ARM] Orion: LED support for HP mv2120
  [ARM] Orion: add RD88F5181L-FXO support
  [ARM] Orion: add RD88F5181L-GE support
  [ARM] Orion: add Netgear WNR854T support
  [ARM] s3c2410_defconfig: update for current build
  [ARM] Acer n30: Minor style and indentation fixes.
  ...

1 files changed, 20 insertions, 3 deletions

diff --git a/drivers/mmc/host/imxmmc.c b/drivers/mmc/host/imxmmc.c
index 95f33e87a99c..eed211b2ac70 100644
--- a/drivers/mmc/host/imxmmc.c
+++ b/drivers/mmc/host/imxmmc.c
@@ -42,6 +42,7 @@
 #include <linux/mmc/host.h>
 #include <linux/mmc/card.h>
 #include <linux/delay.h>
+#include <linux/clk.h>
 
 #include <asm/dma.h>
 #include <asm/io.h>
@@ -92,6 +93,8 @@ struct imxmci_host {
         unsigned char           actual_bus_width;
 
         int                     prev_cmd_code;
+
+        struct clk              *clk;
 };
 
 #define IMXMCI_PEND_IRQ_b       0
@@ -841,7 +844,7 @@ static void imxmci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
                 /* The prescaler is 5 for PERCLK2 equal to 96MHz
                  * then 96MHz / 5 = 19.2 MHz
                  */
-                clk=imx_get_perclk2();
+                clk = clk_get_rate(host->clk);
                 prescaler=(clk+(CLK_RATE*7)/8)/CLK_RATE;
                 switch(prescaler) {
                 case 0:
@@ -994,6 +997,13 @@ static int imxmci_probe(struct platform_device *pdev)
         host->res = r;
         host->irq = irq;
 
+        host->clk = clk_get(&pdev->dev, "perclk2");
+        if (IS_ERR(host->clk)) {
+                ret = PTR_ERR(host->clk);
+                goto out;
+        }
+        clk_enable(host->clk);
+
         imx_gpio_mode(PB8_PF_SD_DAT0);
         imx_gpio_mode(PB9_PF_SD_DAT1);
         imx_gpio_mode(PB10_PF_SD_DAT2);
@@ -1017,8 +1027,8 @@ static int imxmci_probe(struct platform_device *pdev)
         host->imask = IMXMCI_INT_MASK_DEFAULT;
         MMC_INT_MASK = host->imask;
 
-
-        if(imx_dma_request_by_prio(&host->dma, DRIVER_NAME, DMA_PRIO_LOW)<0){
+        host->dma = imx_dma_request_by_prio(DRIVER_NAME, DMA_PRIO_LOW);
+        if(host->dma < 0) {
                 dev_err(mmc_dev(host->mmc), "imx_dma_request_by_prio failed\n");
                 ret = -EBUSY;
                 goto out;
@@ -1053,6 +1063,10 @@ out:
                         imx_dma_free(host->dma);
                         host->dma_allocated=0;
                 }
+                if (host->clk) {
+                        clk_disable(host->clk);
+                        clk_put(host->clk);
+                }
         }
         if (mmc)
                 mmc_free_host(mmc);
@@ -1082,6 +1096,9 @@ static int imxmci_remove(struct platform_device *pdev)
 
                 tasklet_kill(&host->tasklet);
 
+                clk_disable(host->clk);
+                clk_put(host->clk);
+
                 release_resource(host->res);
 
                 mmc_free_host(mmc);