3 files changed, 106 insertions, 64 deletions

diff --git a/drivers/net/irda/pxaficp_ir.c b/drivers/net/irda/pxaficp_ir.c
index 55ff0fbe525a..8c09344f58dc 100644
--- a/drivers/net/irda/pxaficp_ir.c
+++ b/drivers/net/irda/pxaficp_ir.c
@@ -23,6 +23,7 @@
 #include <linux/dma-mapping.h>
 #include <linux/platform_device.h>
 #include <linux/pm.h>
+#include <linux/clk.h>
 
 #include <net/irda/irda.h>
 #include <net/irda/irmod.h>
@@ -87,8 +88,30 @@ struct pxa_irda {
 
         struct device           *dev;
         struct pxaficp_platform_data *pdata;
+        struct clk              *fir_clk;
+        struct clk              *sir_clk;
+        struct clk              *cur_clk;
 };
 
+static inline void pxa_irda_disable_clk(struct pxa_irda *si)
+{
+        if (si->cur_clk)
+                clk_disable(si->cur_clk);
+        si->cur_clk = NULL;
+}
+
+static inline void pxa_irda_enable_firclk(struct pxa_irda *si)
+{
+        si->cur_clk = si->fir_clk;
+        clk_enable(si->fir_clk);
+}
+
+static inline void pxa_irda_enable_sirclk(struct pxa_irda *si)
+{
+        si->cur_clk = si->sir_clk;
+        clk_enable(si->sir_clk);
+}
+
 
 #define IS_FIR(si)              ((si)->speed >= 4000000)
 #define IRDA_FRAME_SIZE_LIMIT   2047
@@ -134,7 +157,7 @@ static int pxa_irda_set_speed(struct pxa_irda *si, int speed)
                         DCSR(si->rxdma) &= ~DCSR_RUN;
                         /* disable FICP */
                         ICCR0 = 0;
-                        pxa_set_cken(CKEN_FICP, 0);
+                        pxa_irda_disable_clk(si);
 
                         /* set board transceiver to SIR mode */
                         si->pdata->transceiver_mode(si->dev, IR_SIRMODE);
@@ -144,7 +167,7 @@ static int pxa_irda_set_speed(struct pxa_irda *si, int speed)
                         pxa_gpio_mode(GPIO47_STTXD_MD);
 
                         /* enable the STUART clock */
-                        pxa_set_cken(CKEN_STUART, 1);
+                        pxa_irda_enable_sirclk(si);
                 }
 
                 /* disable STUART first */
@@ -169,7 +192,7 @@ static int pxa_irda_set_speed(struct pxa_irda *si, int speed)
                 /* disable STUART */
                 STIER = 0;
                 STISR = 0;
-                pxa_set_cken(CKEN_STUART, 0);
+                pxa_irda_disable_clk(si);
 
                 /* disable FICP first */
                 ICCR0 = 0;
@@ -182,7 +205,7 @@ static int pxa_irda_set_speed(struct pxa_irda *si, int speed)
                 pxa_gpio_mode(GPIO47_ICPTXD_MD);
 
                 /* enable the FICP clock */
-                pxa_set_cken(CKEN_FICP, 1);
+                pxa_irda_enable_firclk(si);
 
                 si->speed = speed;
                 pxa_irda_fir_dma_rx_start(si);
@@ -592,16 +615,15 @@ static void pxa_irda_shutdown(struct pxa_irda *si)
         STIER = 0;
         /* disable STUART SIR mode */
         STISR = 0;
-        /* disable the STUART clock */
-        pxa_set_cken(CKEN_STUART, 0);
 
         /* disable DMA */
         DCSR(si->txdma) &= ~DCSR_RUN;
         DCSR(si->rxdma) &= ~DCSR_RUN;
         /* disable FICP */
         ICCR0 = 0;
-        /* disable the FICP clock */
-        pxa_set_cken(CKEN_FICP, 0);
+
+        /* disable the STUART or FICP clocks */
+        pxa_irda_disable_clk(si);
 
         DRCMR17 = 0;
         DRCMR18 = 0;
@@ -792,6 +814,13 @@ static int pxa_irda_probe(struct platform_device *pdev)
         si->dev = &pdev->dev;
         si->pdata = pdev->dev.platform_data;
 
+        si->sir_clk = clk_get(&pdev->dev, "UARTCLK");
+        si->fir_clk = clk_get(&pdev->dev, "FICPCLK");
+        if (IS_ERR(si->sir_clk) || IS_ERR(si->fir_clk)) {
+                err = PTR_ERR(IS_ERR(si->sir_clk) ? si->sir_clk : si->fir_clk);
+                goto err_mem_4;
+        }
+
         /*
          * Initialise the SIR buffers
          */
@@ -831,6 +860,10 @@ static int pxa_irda_probe(struct platform_device *pdev)
 err_mem_5:
                 kfree(si->rx_buff.head);
 err_mem_4:
+                if (si->sir_clk && !IS_ERR(si->sir_clk))
+                        clk_put(si->sir_clk);
+                if (si->fir_clk && !IS_ERR(si->fir_clk))
+                        clk_put(si->fir_clk);
                 free_netdev(dev);
 err_mem_3:
                 release_mem_region(__PREG(FICP), 0x1c);
@@ -850,6 +883,8 @@ static int pxa_irda_remove(struct platform_device *_dev)
                 unregister_netdev(dev);
                 kfree(si->tx_buff.head);
                 kfree(si->rx_buff.head);
+                clk_put(si->fir_clk);
+                clk_put(si->sir_clk);
                 free_netdev(dev);
         }
 
diff --git a/drivers/net/smc91x.c b/drivers/net/smc91x.c
index 24e610e711e8..7da7589d45dd 100644
--- a/drivers/net/smc91x.c
+++ b/drivers/net/smc91x.c
@@ -173,49 +173,6 @@ MODULE_LICENSE("GPL");
  */
 #define MII_DELAY               1
 
-/* store this information for the driver.. */
-struct smc_local {
-        /*
-         * If I have to wait until memory is available to send a
-         * packet, I will store the skbuff here, until I get the
-         * desired memory.  Then, I'll send it out and free it.
-         */
-        struct sk_buff *pending_tx_skb;
-        struct tasklet_struct tx_task;
-
-        /* version/revision of the SMC91x chip */
-        int     version;
-
-        /* Contains the current active transmission mode */
-        int     tcr_cur_mode;
-
-        /* Contains the current active receive mode */
-        int     rcr_cur_mode;
-
-        /* Contains the current active receive/phy mode */
-        int     rpc_cur_mode;
-        int     ctl_rfduplx;
-        int     ctl_rspeed;
-
-        u32     msg_enable;
-        u32     phy_type;
-        struct mii_if_info mii;
-
-        /* work queue */
-        struct work_struct phy_configure;
-        struct net_device *dev;
-        int     work_pending;
-
-        spinlock_t lock;
-
-#ifdef SMC_USE_PXA_DMA
-        /* DMA needs the physical address of the chip */
-        u_long physaddr;
-#endif
-        void __iomem *base;
-        void __iomem *datacs;
-};
-
 #if SMC_DEBUG > 0
 #define DBG(n, args...)                                 \
         do {                                            \
@@ -2215,17 +2172,19 @@ static int smc_drv_probe(struct platform_device *pdev)
                 goto out_release_attrib;
         }
 
-        platform_set_drvdata(pdev, ndev);
-        ret = smc_probe(ndev, addr);
-        if (ret != 0)
-                goto out_iounmap;
 #ifdef SMC_USE_PXA_DMA
-        else {
+        {
                 struct smc_local *lp = netdev_priv(ndev);
+                lp->device = &pdev->dev;
                 lp->physaddr = res->start;
         }
 #endif
 
+        platform_set_drvdata(pdev, ndev);
+        ret = smc_probe(ndev, addr);
+        if (ret != 0)
+                goto out_iounmap;
+
         smc_request_datacs(pdev, ndev);
 
         return 0;
diff --git a/drivers/net/smc91x.h b/drivers/net/smc91x.h
index af9e6bf59552..729fd28c08b5 100644
--- a/drivers/net/smc91x.h
+++ b/drivers/net/smc91x.h
@@ -462,6 +462,52 @@ static inline void LPD7_SMC_outsw (unsigned char* a, int r,
 
 #endif
 
+
+/* store this information for the driver.. */
+struct smc_local {
+        /*
+         * If I have to wait until memory is available to send a
+         * packet, I will store the skbuff here, until I get the
+         * desired memory.  Then, I'll send it out and free it.
+         */
+        struct sk_buff *pending_tx_skb;
+        struct tasklet_struct tx_task;
+
+        /* version/revision of the SMC91x chip */
+        int     version;
+
+        /* Contains the current active transmission mode */
+        int     tcr_cur_mode;
+
+        /* Contains the current active receive mode */
+        int     rcr_cur_mode;
+
+        /* Contains the current active receive/phy mode */
+        int     rpc_cur_mode;
+        int     ctl_rfduplx;
+        int     ctl_rspeed;
+
+        u32     msg_enable;
+        u32     phy_type;
+        struct mii_if_info mii;
+
+        /* work queue */
+        struct work_struct phy_configure;
+        struct net_device *dev;
+        int     work_pending;
+
+        spinlock_t lock;
+
+#ifdef SMC_USE_PXA_DMA
+        /* DMA needs the physical address of the chip */
+        u_long physaddr;
+        struct device *device;
+#endif
+        void __iomem *base;
+        void __iomem *datacs;
+};
+
+
 #ifdef SMC_USE_PXA_DMA
 /*
  * Let's use the DMA engine on the XScale PXA2xx for RX packets. This is
@@ -476,11 +522,12 @@ static inline void LPD7_SMC_outsw (unsigned char* a, int r,
 #ifdef SMC_insl
 #undef SMC_insl
 #define SMC_insl(a, r, p, l) \
-        smc_pxa_dma_insl(a, lp->physaddr, r, dev->dma, p, l)
+        smc_pxa_dma_insl(a, lp, r, dev->dma, p, l)
 static inline void
-smc_pxa_dma_insl(void __iomem *ioaddr, u_long physaddr, int reg, int dma,
+smc_pxa_dma_insl(void __iomem *ioaddr, struct smc_local *lp, int reg, int dma,
                  u_char *buf, int len)
 {
+        u_long physaddr = lp->physaddr;
         dma_addr_t dmabuf;
 
         /* fallback if no DMA available */
@@ -497,7 +544,7 @@ smc_pxa_dma_insl(void __iomem *ioaddr, u_long physaddr, int reg, int dma,
         }
 
         len *= 4;
-        dmabuf = dma_map_single(NULL, buf, len, DMA_FROM_DEVICE);
+        dmabuf = dma_map_single(lp->device, buf, len, DMA_FROM_DEVICE);
         DCSR(dma) = DCSR_NODESC;
         DTADR(dma) = dmabuf;
         DSADR(dma) = physaddr + reg;
@@ -507,18 +554,19 @@ smc_pxa_dma_insl(void __iomem *ioaddr, u_long physaddr, int reg, int dma,
         while (!(DCSR(dma) & DCSR_STOPSTATE))
                 cpu_relax();
         DCSR(dma) = 0;
-        dma_unmap_single(NULL, dmabuf, len, DMA_FROM_DEVICE);
+        dma_unmap_single(lp->device, dmabuf, len, DMA_FROM_DEVICE);
 }
 #endif
 
 #ifdef SMC_insw
 #undef SMC_insw
 #define SMC_insw(a, r, p, l) \
-        smc_pxa_dma_insw(a, lp->physaddr, r, dev->dma, p, l)
+        smc_pxa_dma_insw(a, lp, r, dev->dma, p, l)
 static inline void
-smc_pxa_dma_insw(void __iomem *ioaddr, u_long physaddr, int reg, int dma,
+smc_pxa_dma_insw(void __iomem *ioaddr, struct smc_local *lp, int reg, int dma,
                  u_char *buf, int len)
 {
+        u_long physaddr = lp->physaddr;
         dma_addr_t dmabuf;
 
         /* fallback if no DMA available */
@@ -535,7 +583,7 @@ smc_pxa_dma_insw(void __iomem *ioaddr, u_long physaddr, int reg, int dma,
         }
 
         len *= 2;
-        dmabuf = dma_map_single(NULL, buf, len, DMA_FROM_DEVICE);
+        dmabuf = dma_map_single(lp->device, buf, len, DMA_FROM_DEVICE);
         DCSR(dma) = DCSR_NODESC;
         DTADR(dma) = dmabuf;
         DSADR(dma) = physaddr + reg;
@@ -545,7 +593,7 @@ smc_pxa_dma_insw(void __iomem *ioaddr, u_long physaddr, int reg, int dma,
         while (!(DCSR(dma) & DCSR_STOPSTATE))
                 cpu_relax();
         DCSR(dma) = 0;
-        dma_unmap_single(NULL, dmabuf, len, DMA_FROM_DEVICE);
+        dma_unmap_single(lp->device, dmabuf, len, DMA_FROM_DEVICE);
 }
 #endif