dw_dmac: use proper casting to print dma_addr_t values

[~andy/linux] / drivers / dma / dw_dmac.c

diff --git a/drivers/dma/dw_dmac.c b/drivers/dma/dw_dmac.c
index 7439079f5eed9c58bc9d39e0fc92795e29adc7dd..9794f00810f6dc326c4be949b3ce47fd1e3d0e56 100644 (file)
--- a/drivers/dma/dw_dmac.c
+++ b/drivers/dma/dw_dmac.c
@@ -17,6 +17,7 @@
 #include <linux/init.h>
 #include <linux/interrupt.h>
 #include <linux/io.h>
+#include <linux/of.h>
 #include <linux/mm.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
@@ -336,7 +337,8 @@ static void dwc_scan_descriptors(struct dw_dma *dw, struct dw_dma_chan *dwc)
                return;
        }
 
-       dev_vdbg(chan2dev(&dwc->chan), "scan_descriptors: llp=0x%x\n", llp);
+       dev_vdbg(chan2dev(&dwc->chan), "scan_descriptors: llp=0x%llx\n",
+                       (unsigned long long)llp);
 
        list_for_each_entry_safe(desc, _desc, &dwc->active_list, desc_node) {
                /* check first descriptors addr */
@@ -386,8 +388,10 @@ static void dwc_scan_descriptors(struct dw_dma *dw, struct dw_dma_chan *dwc)
 static void dwc_dump_lli(struct dw_dma_chan *dwc, struct dw_lli *lli)
 {
        dev_printk(KERN_CRIT, chan2dev(&dwc->chan),
-                       "  desc: s0x%x d0x%x l0x%x c0x%x:%x\n",
-                       lli->sar, lli->dar, lli->llp,
+                       "  desc: s0x%llx d0x%llx l0x%llx c0x%x:%x\n",
+                       (unsigned long long)lli->sar,
+                       (unsigned long long)lli->dar,
+                       (unsigned long long)lli->llp,
                        lli->ctlhi, lli->ctllo);
 }
 
@@ -626,8 +630,10 @@ dwc_prep_dma_memcpy(struct dma_chan *chan, dma_addr_t dest, dma_addr_t src,
        unsigned int            dst_width;
        u32                     ctllo;
 
-       dev_vdbg(chan2dev(chan), "prep_dma_memcpy d0x%x s0x%x l0x%zx f0x%lx\n",
-                       dest, src, len, flags);
+       dev_vdbg(chan2dev(chan),
+                       "prep_dma_memcpy d0x%llx s0x%llx l0x%zx f0x%lx\n",
+                       (unsigned long long)dest, (unsigned long long)src,
+                       len, flags);
 
        if (unlikely(!len)) {
                dev_dbg(chan2dev(chan), "prep_dma_memcpy: length is zero!\n");
@@ -742,7 +748,7 @@ dwc_prep_slave_sg(struct dma_chan *chan, struct scatterlist *sgl,
                        struct dw_desc  *desc;
                        u32             len, dlen, mem;
 
-                       mem = sg_phys(sg);
+                       mem = sg_dma_address(sg);
                        len = sg_dma_len(sg);
 
                        if (!((mem | len) & 7))
@@ -809,7 +815,7 @@ slave_sg_todev_fill_desc:
                        struct dw_desc  *desc;
                        u32             len, dlen, mem;
 
-                       mem = sg_phys(sg);
+                       mem = sg_dma_address(sg);
                        len = sg_dma_len(sg);
 
                        if (!((mem | len) & 7))
@@ -1307,9 +1313,9 @@ struct dw_cyclic_desc *dw_dma_cyclic_prep(struct dma_chan *chan,
        dma_sync_single_for_device(chan2parent(chan), last->txd.phys,
                        sizeof(last->lli), DMA_TO_DEVICE);
 
-       dev_dbg(chan2dev(&dwc->chan), "cyclic prepared buf 0x%08x len %zu "
-                       "period %zu periods %d\n", buf_addr, buf_len,
-                       period_len, periods);
+       dev_dbg(chan2dev(&dwc->chan), "cyclic prepared buf 0x%llx len %zu "
+                       "period %zu periods %d\n", (unsigned long long)buf_addr,
+                       buf_len, period_len, periods);
 
        cdesc->periods = periods;
        dwc->cdesc = cdesc;
@@ -1429,7 +1435,7 @@ static int __init dw_probe(struct platform_device *pdev)
                err = PTR_ERR(dw->clk);
                goto err_clk;
        }
-       clk_enable(dw->clk);
+       clk_prepare_enable(dw->clk);
 
        /* force dma off, just in case */
        dw_dma_off(dw);
@@ -1510,7 +1516,7 @@ static int __init dw_probe(struct platform_device *pdev)
        return 0;
 
 err_irq:
-       clk_disable(dw->clk);
+       clk_disable_unprepare(dw->clk);
        clk_put(dw->clk);
 err_clk:
        iounmap(dw->regs);
@@ -1540,7 +1546,7 @@ static int __exit dw_remove(struct platform_device *pdev)
                channel_clear_bit(dw, CH_EN, dwc->mask);
        }
 
-       clk_disable(dw->clk);
+       clk_disable_unprepare(dw->clk);
        clk_put(dw->clk);
 
        iounmap(dw->regs);
@@ -1559,7 +1565,7 @@ static void dw_shutdown(struct platform_device *pdev)
        struct dw_dma   *dw = platform_get_drvdata(pdev);
 
        dw_dma_off(platform_get_drvdata(pdev));
-       clk_disable(dw->clk);
+       clk_disable_unprepare(dw->clk);
 }
 
 static int dw_suspend_noirq(struct device *dev)
@@ -1568,7 +1574,7 @@ static int dw_suspend_noirq(struct device *dev)
        struct dw_dma   *dw = platform_get_drvdata(pdev);
 
        dw_dma_off(platform_get_drvdata(pdev));
-       clk_disable(dw->clk);
+       clk_disable_unprepare(dw->clk);
 
        return 0;
 }
@@ -1578,7 +1584,7 @@ static int dw_resume_noirq(struct device *dev)
        struct platform_device *pdev = to_platform_device(dev);
        struct dw_dma   *dw = platform_get_drvdata(pdev);
 
-       clk_enable(dw->clk);
+       clk_prepare_enable(dw->clk);
        dma_writel(dw, CFG, DW_CFG_DMA_EN);
        return 0;
 }
@@ -1592,12 +1598,21 @@ static const struct dev_pm_ops dw_dev_pm_ops = {
        .poweroff_noirq = dw_suspend_noirq,
 };
 
+#ifdef CONFIG_OF
+static const struct of_device_id dw_dma_id_table[] = {
+       { .compatible = "snps,dma-spear1340" },
+       {}
+};
+MODULE_DEVICE_TABLE(of, dw_dma_id_table);
+#endif
+
 static struct platform_driver dw_driver = {
        .remove         = __exit_p(dw_remove),
        .shutdown       = dw_shutdown,
        .driver = {
                .name   = "dw_dmac",
                .pm     = &dw_dev_pm_ops,
+               .of_match_table = of_match_ptr(dw_dma_id_table),
        },
 };