Messages in this thread | | | Date | Wed, 26 Sep 2012 21:00:08 +0300 | Subject | Re: [PATCHv2 1/4] dmaengine: dw_dmac: convert to platform driver | From | Andy Shevchenko <> |
| |
On Wed, Sep 26, 2012 at 5:13 PM, viresh kumar <viresh.kumar@linaro.org> wrote: > On Wed, Sep 26, 2012 at 6:10 PM, Andy Shevchenko > <andriy.shevchenko@linux.intel.com> wrote: >> From: Heikki Krogerus <heikki.krogerus@linux.intel.com> >> >> This driver could be used on different platforms. Thus, we converted it to be >> a platform driver. The HAVE_CLK dependency is dropped away as well. > > Commit log and patch content don't match. :( > We aren't converting it to a platform driver, it is already one. Okay, any suggestion for this part?
>> Signed-off-by: Heikki Krogerus <heikki.krogerus@linux.intel.com> >> Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> >> --- >> drivers/dma/Kconfig | 2 -- >> drivers/dma/dw_dmac.c | 21 +++++++-------------- >> 2 files changed, 7 insertions(+), 16 deletions(-) >> >> diff --git a/drivers/dma/Kconfig b/drivers/dma/Kconfig >> index 677cd6e..75cdcb5 100644 >> --- a/drivers/dma/Kconfig >> +++ b/drivers/dma/Kconfig >> @@ -83,9 +83,7 @@ config INTEL_IOP_ADMA >> >> config DW_DMAC >> tristate "Synopsys DesignWare AHB DMA support" >> - depends on HAVE_CLK > > This matches subject. > >> select DMA_ENGINE >> - default y if CPU_AT32AP7000 > > This doesn't. If you want this change, do this in a separate patch. Will do separate patch. However this change doesn't interfere with configuration on my side. So, might be better to keep that line to have compatibility with older kernels?
> >> help >> Support the Synopsys DesignWare AHB DMA controller. This >> can be integrated in chips such as the Atmel AT32ap7000. >> diff --git a/drivers/dma/dw_dmac.c b/drivers/dma/dw_dmac.c >> index c4b0eb3..9f0129d 100644 >> --- a/drivers/dma/dw_dmac.c >> +++ b/drivers/dma/dw_dmac.c >> @@ -1,14 +1,15 @@ >> /* >> - * Driver for the Synopsys DesignWare DMA Controller (aka DMACA on >> - * AVR32 systems.) >> + * Core driver for the Synopsys DesignWare DMA Controller >> * >> * Copyright (C) 2007-2008 Atmel Corporation >> * Copyright (C) 2010-2011 ST Microelectronics >> + * Copyright (C) 2012 Intel Corporation >> * >> * This program is free software; you can redistribute it and/or modify >> * it under the terms of the GNU General Public License version 2 as >> * published by the Free Software Foundation. >> */ >> + >> #include <linux/bitops.h> >> #include <linux/clk.h> >> #include <linux/delay.h> >> @@ -222,7 +223,6 @@ static inline void dwc_dump_chan_regs(struct dw_dma_chan *dwc) >> channel_readl(dwc, CTL_LO)); >> } >> >> - > > Above + and - also don't belong to this patch Separate patch? Will do.
> >> static inline void dwc_chan_disable(struct dw_dma *dw, struct dw_dma_chan *dwc) >> { >> channel_clear_bit(dw, CH_EN, dwc->mask); >> @@ -1679,6 +1679,7 @@ static int dw_resume_noirq(struct device *dev) >> >> clk_prepare_enable(dw->clk); >> dma_writel(dw, CFG, DW_CFG_DMA_EN); >> + >> return 0; >> } >> >> @@ -1700,6 +1701,7 @@ MODULE_DEVICE_TABLE(of, dw_dma_id_table); >> #endif >> >> static struct platform_driver dw_driver = { >> + .probe = dw_probe, >> .remove = __devexit_p(dw_remove), >> .shutdown = dw_shutdown, >> .driver = { >> @@ -1709,18 +1711,9 @@ static struct platform_driver dw_driver = { >> }, >> }; >> >> -static int __init dw_init(void) >> -{ >> - return platform_driver_probe(&dw_driver, dw_probe); >> -} >> -subsys_initcall(dw_init); >> - >> -static void __exit dw_exit(void) >> -{ >> - platform_driver_unregister(&dw_driver); >> -} >> -module_exit(dw_exit); >> +module_platform_driver(dw_driver); > > This should be a separate patch as well Good. Will do.
>> +MODULE_ALIAS("platform:dw_dmac"); >> MODULE_LICENSE("GPL v2"); >> MODULE_DESCRIPTION("Synopsys DesignWare DMA Controller driver"); >> MODULE_AUTHOR("Haavard Skinnemoen (Atmel)");
-- With Best Regards, Andy Shevchenko
| |