From 19c46c113b25771d1032c9816e6aa64a74985c2c Mon Sep 17 00:00:00 2001
From: Andrew Lunn <andrew@lunn.ch>
Date: Sun, 19 Feb 2012 11:39:27 +0100
Subject: [PATCH] --- yaml --- r: 308287 b: refs/heads/master c:
 f4f7561e032777cd7376800ac97352d5b1684d8f h: refs/heads/master i:   308285:
 b659669ae1410fa6f3244a877e72829f0e851a96   308283:
 2d4d49a233080dfaed134016c8ca40ec704bbcd4   308279:
 e5036240d511986b0aedbb655aa0c3c5d1e423b5   308271:
 e81065fac622534c26122c1657b8427ba866940b   308255:
 da1edb657c11ab79bebb39c1848ff3b39005aeb9   308223:
 093901882938352c356c35a06307a0e852c58328 v: v3

---
 [refs]                                |  2 +-
 trunk/arch/arm/mach-kirkwood/common.c |  5 +++--
 trunk/drivers/mmc/host/mvsdio.c       | 14 ++++++++++++++
 3 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 28bbf4369288..2743d8490c2b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9c2bd504b55ce3e680ae0d3768e78c15fef3448d
+refs/heads/master: f4f7561e032777cd7376800ac97352d5b1684d8f
diff --git a/trunk/arch/arm/mach-kirkwood/common.c b/trunk/arch/arm/mach-kirkwood/common.c
index 99adebce7073..88a1667af4c3 100644
--- a/trunk/arch/arm/mach-kirkwood/common.c
+++ b/trunk/arch/arm/mach-kirkwood/common.c
@@ -86,7 +86,7 @@ static struct clk __init *kirkwood_register_gate(const char *name, u8 bit_idx)
 
 void __init kirkwood_clk_init(void)
 {
-	struct clk *runit, *ge0, *ge1, *sata0, *sata1, *usb0;
+	struct clk *runit, *ge0, *ge1, *sata0, *sata1, *usb0, *sdio;
 
 	tclk = clk_register_fixed_rate(NULL, "tclk", NULL,
 				       CLK_IS_ROOT, kirkwood_tclk);
@@ -97,7 +97,7 @@ void __init kirkwood_clk_init(void)
 	sata0 = kirkwood_register_gate("sata0",  CGC_BIT_SATA0);
 	sata1 = kirkwood_register_gate("sata1",  CGC_BIT_SATA1);
 	usb0 = kirkwood_register_gate("usb0",   CGC_BIT_USB0);
-	kirkwood_register_gate("sdio",   CGC_BIT_SDIO);
+	sdio = kirkwood_register_gate("sdio",   CGC_BIT_SDIO);
 	kirkwood_register_gate("crypto", CGC_BIT_CRYPTO);
 	kirkwood_register_gate("xor0",   CGC_BIT_XOR0);
 	kirkwood_register_gate("xor1",   CGC_BIT_XOR1);
@@ -117,6 +117,7 @@ void __init kirkwood_clk_init(void)
 	orion_clkdev_add("1", "sata_mv.0", sata1);
 	orion_clkdev_add(NULL, "orion-ehci.0", usb0);
 	orion_clkdev_add(NULL, "orion_nand", runit);
+	orion_clkdev_add(NULL, "mvsdio", sdio);
 }
 
 /*****************************************************************************
diff --git a/trunk/drivers/mmc/host/mvsdio.c b/trunk/drivers/mmc/host/mvsdio.c
index eeb8cd125b0c..3b9136c1a475 100644
--- a/trunk/drivers/mmc/host/mvsdio.c
+++ b/trunk/drivers/mmc/host/mvsdio.c
@@ -19,6 +19,7 @@
 #include <linux/dma-mapping.h>
 #include <linux/scatterlist.h>
 #include <linux/irq.h>
+#include <linux/clk.h>
 #include <linux/gpio.h>
 #include <linux/mmc/host.h>
 
@@ -51,6 +52,7 @@ struct mvsd_host {
 	struct device *dev;
 	struct resource *res;
 	int irq;
+	struct clk *clk;
 	int gpio_card_detect;
 	int gpio_write_protect;
 };
@@ -770,6 +772,13 @@ static int __init mvsd_probe(struct platform_device *pdev)
 	} else
 		host->irq = irq;
 
+	/* Not all platforms can gate the clock, so it is not
+	   an error if the clock does not exists. */
+	host->clk = clk_get(&pdev->dev, NULL);
+	if (!IS_ERR(host->clk)) {
+		clk_prepare_enable(host->clk);
+	}
+
 	if (mvsd_data->gpio_card_detect) {
 		ret = gpio_request(mvsd_data->gpio_card_detect,
 				   DRIVER_NAME " cd");
@@ -854,6 +863,11 @@ static int __exit mvsd_remove(struct platform_device *pdev)
 		mvsd_power_down(host);
 		iounmap(host->base);
 		release_resource(host->res);
+
+		if (!IS_ERR(host->clk)) {
+			clk_disable_unprepare(host->clk);
+			clk_put(host->clk);
+		}
 		mmc_free_host(mmc);
 	}
 	platform_set_drvdata(pdev, NULL);