ARM: pxa: remove get_memclk_frequency_10khz()

Introduce 'struct clk' for memory and remove
get_memclk_frequency_10khz().

Signed-off-by: Eric Miao <eric.y.miao@gmail.com>

2 files changed, 17 insertions, 3 deletions

diff --git a/drivers/pcmcia/pxa2xx_base.c b/drivers/pcmcia/pxa2xx_base.c
index 55a7d0b045b1..3c01774eb393 100644
--- a/drivers/pcmcia/pxa2xx_base.c
+++ b/drivers/pcmcia/pxa2xx_base.c
@@ -179,8 +179,8 @@ static int pxa2xx_pcmcia_set_mcxx(struct soc_pcmcia_socket *skt, unsigned int cl
 
 static int pxa2xx_pcmcia_set_timing(struct soc_pcmcia_socket *skt)
 {
-        unsigned int clk = get_memclk_frequency_10khz();
-        return pxa2xx_pcmcia_set_mcxx(skt, clk);
+        unsigned long clk = clk_get_rate(skt->clk);
+        return pxa2xx_pcmcia_set_mcxx(skt, clk / 10000);
 }
 
 #ifdef CONFIG_CPU_FREQ
@@ -282,24 +282,33 @@ static int pxa2xx_drv_pcmcia_probe(struct platform_device *dev)
         struct pcmcia_low_level *ops;
         struct skt_dev_info *sinfo;
         struct soc_pcmcia_socket *skt;
+        struct clk *clk;
 
         ops = (struct pcmcia_low_level *)dev->dev.platform_data;
         if (!ops)
                 return -ENODEV;
 
+        clk = clk_get(&dev->dev, NULL);
+        if (!clk)
+                return -ENODEV;
+
         pxa2xx_drv_pcmcia_ops(ops);
 
         sinfo = kzalloc(SKT_DEV_INFO_SIZE(ops->nr), GFP_KERNEL);
-        if (!sinfo)
+        if (!sinfo) {
+                clk_put(clk);
                 return -ENOMEM;
+        }
 
         sinfo->nskt = ops->nr;
+        sinfo->clk = clk;
 
         /* Initialize processor specific parameters */
         for (i = 0; i < ops->nr; i++) {
                 skt = &sinfo->skt[i];
 
                 skt->nr = ops->first + i;
+                skt->clk = clk;
                 skt->ops = ops;
                 skt->socket.owner = ops->owner;
                 skt->socket.dev.parent = &dev->dev;
@@ -314,6 +323,7 @@ static int pxa2xx_drv_pcmcia_probe(struct platform_device *dev)
                 while (--i >= 0)
                         soc_pcmcia_remove_one(&sinfo->skt[i]);
                 kfree(sinfo);
+                clk_put(clk);
         } else {
                 pxa2xx_configure_sockets(&dev->dev);
                 dev_set_drvdata(&dev->dev, sinfo);
@@ -332,6 +342,7 @@ static int pxa2xx_drv_pcmcia_remove(struct platform_device *dev)
         for (i = 0; i < sinfo->nskt; i++)
                 soc_pcmcia_remove_one(&sinfo->skt[i]);
 
+        clk_put(sinfo->clk);
         kfree(sinfo);
         return 0;
 }
diff --git a/drivers/pcmcia/soc_common.h b/drivers/pcmcia/soc_common.h
index bbcd5385a221..9daa73615c8b 100644
--- a/drivers/pcmcia/soc_common.h
+++ b/drivers/pcmcia/soc_common.h
@@ -10,6 +10,7 @@
 #define _ASM_ARCH_PCMCIA
 
 /* include the world */
+#include <linux/clk.h>
 #include <linux/cpufreq.h>
 #include <pcmcia/ss.h>
 #include <pcmcia/cistpl.h>
@@ -29,6 +30,7 @@ struct soc_pcmcia_socket {
          * Info from low level handler
          */
         unsigned int            nr;
+        struct clk              *clk;
 
         /*
          * Core PCMCIA state
@@ -56,6 +58,7 @@ struct soc_pcmcia_socket {
 
 struct skt_dev_info {
         int nskt;
+        struct clk *clk;
         struct soc_pcmcia_socket skt[0];
 };