ALSA, dmaengine: dw: Remove AVR32 bits in drivers
Andy Shevchenko
reviewerv2 cover ALSA, dmaengine: dw: Remove AVR32 bits in drivers
AVR32 is gone. Remove bits in sound/atmel and drivers/dma/dw folders related to it.
Sound part hasn't been tested anyhow.
Changes since v1:
- fix kbuild bot complainings
- append Nicolas' Ack
- don't forget to send to all TWIMC
Andy Shevchenko (2):
ALSA: atmel: Remove AVR32 bits from the driver
dmaengine: dw: Remove AVR32 bits from the driver
drivers/dma/dw/Kconfig | 7 +- drivers/dma/dw/core.c | 332 +-------------------------- drivers/dma/dw/regs.h | 50 +--- include/linux/dma/dw.h | 21 -- sound/atmel/Kconfig | 13 +- sound/atmel/Makefile | 2 - sound/atmel/abdac.c | 610 ------------------------------------------------- sound/atmel/ac97c.c | 447 ++++++------------------------------ 8 files changed, 88 insertions(+), 1394 deletions(-) delete mode 100644 sound/atmel/abdac.c
Signature · 1 line
2.11.0
Andy Shevchenko
reviewerPATCH v2 1/2 ALSA: atmel: Remove AVR32 bits from the driver
AVR32 is gone. Now it's time to clean up the driver by removing leftovers that was used by AVR32 related code.
--- sound/atmel/Kconfig | 13 +- sound/atmel/Makefile | 2 - sound/atmel/abdac.c | 610 --------------------------------------------------- sound/atmel/ac97c.c | 447 ++++++------------------------------- 4 files changed, 74 insertions(+), 998 deletions(-) delete mode 100644 sound/atmel/abdac.c
sound/atmel/Kconfig +3 -10
@@ -1,18 +1,11 @@ -menu "Atmel devices (AVR32 and AT91)" - depends on AVR32 || ARCH_AT91 - -config SND_ATMEL_ABDAC - tristate "Atmel Audio Bitstream DAC (ABDAC) driver" - select SND_PCM - depends on DW_DMAC && AVR32 - help - ALSA sound driver for the Atmel Audio Bitstream DAC (ABDAC). +menu "Atmel devices (AT91)" + depends on ARCH_AT91 config SND_ATMEL_AC97C tristate "Atmel AC97 Controller (AC97C) driver" select SND_PCM select SND_AC97_CODEC - depends on (DW_DMAC && AVR32) || ARCH_AT91 + depends on ARCH_AT91 help ALSA sound driver for the Atmel AC97 controller.
sound/atmel/Makefile +0 -2
@@ -1,5 +1,3 @@ -snd-atmel-abdac-objs := abdac.o snd-atmel-ac97c-objs := ac97c.o -obj-$(CONFIG_SND_ATMEL_ABDAC) += snd-atmel-abdac.o obj-$(CONFIG_SND_ATMEL_AC97C) += snd-atmel-ac97c.o
sound/atmel/abdac.c deleted +0 -610
610 lines not on this page · raw message
sound/atmel/ac97c.c +71 -376
661 lines not on this page · raw message
Signature · 1 line
2.11.0
Andy Shevchenko
reviewerPATCH v2 2/2 dmaengine: dw: Remove AVR32 bits from the driver
In reply to Andy ShevchenkoAVR32 is gone. Now it's time to clean up the driver by removing leftovers that was used by AVR32 related code.
--- drivers/dma/dw/Kconfig | 7 +- drivers/dma/dw/core.c | 332 +------------------------------------------------ drivers/dma/dw/regs.h | 50 ++------ include/linux/dma/dw.h | 21 ---- 4 files changed, 14 insertions(+), 396 deletions(-)
drivers/dma/dw/Kconfig +1 -6
@@ -6,17 +6,12 @@ config DW_DMAC_CORE tristate select DMA_ENGINE -config DW_DMAC_BIG_ENDIAN_IO - bool - config DW_DMAC tristate "Synopsys DesignWare AHB DMA platform driver" select DW_DMAC_CORE - select DW_DMAC_BIG_ENDIAN_IO if AVR32 - default y if CPU_AT32AP7000 help Support the Synopsys DesignWare AHB DMA controller. This - can be integrated in chips such as the Atmel AT32ap7000. + can be integrated in chips such as the Intel Cherrytrail. config DW_DMAC_PCI tristate "Synopsys DesignWare AHB DMA PCI driver"
drivers/dma/dw/core.c +2 -330
364 lines not on this page · raw message
drivers/dma/dw/regs.h +11 -39
99 lines not on this page · raw message
include/linux/dma/dw.h +0 -21
@@ -50,25 +50,4 @@ static inline int dw_dma_probe(struct dw_dma_chip *chip) { return -ENODEV; }static inline int dw_dma_remove (struct dw_dma_chip *chip) {return 0 ; }#endif /* CONFIG_DW_DMAC_CORE */ -/* DMA API extensions */ -struct dw_desc ; - -struct dw_cyclic_desc { -struct dw_desc **desc; -unsigned long periods; -void (*period_callback)(void *param); -void *period_callback_param; -}; - -struct dw_cyclic_desc *dw_dma_cyclic_prep (struct dma_chan *chan, -dma_addr_t buf_addr,size_t buf_len,size_t period_len, -enum dma_transfer_direction direction); -void dw_dma_cyclic_free (struct dma_chan *chan); -int dw_dma_cyclic_start (struct dma_chan *chan); -void dw_dma_cyclic_stop (struct dma_chan *chan); - -dma_addr_t dw_dma_get_src_addr (struct dma_chan *chan); - -dma_addr_t dw_dma_get_dst_addr (struct dma_chan *chan); -#endif /* _DMA_DW_H */
Signature · 1 line
2.11.0
Re: [PATCH v2 2/2] dmaengine: dw: Remove AVR32 bits from the driver
Quoted 2 lines · Andy Shevchenko
AVR32 is gone. Now it's time to clean up the driver by removing leftovers that was used by AVR32 related code.
Since the cover didn't mention any dependency, I went ahead and applied this now
Signature · 1 line
~Vinod
Andy Shevchenko
reviewerRe: [PATCH v2 2/2] dmaengine: dw: Remove AVR32 bits from the driver
Quoted 8 lines · Vinod Koul
Quoted 2 lines · Andy Shevchenko
AVR32 is gone. Now it's time to clean up the driver by removing leftovers that was used by AVR32 related code.
Since the cover didn't mention any dependency, I went ahead and applied this
now
Sorry, I forgot to mention that it's supposed to go via either tree, though together. Since first we remove users of non-standard DMA callbacks.
Signature · 2 lines
Andy Shevchenko <[email protected]> Intel Finland Oy
Re: [PATCH v2 2/2] dmaengine: dw: Remove AVR32 bits from the driver
Quoted 5 lines · Andy Shevchenko
Quoted 4 lines · Vinod Koul
Quoted 2 lines · Andy Shevchenko
AVR32 is gone. Now it's time to clean up the driver by removing leftovers that was used by AVR32 related code.
Quoted 9 lines
Quoted 4 lines
Since the cover didn't mention any dependency, I went ahead and applied this
nowSorry, I forgot to mention that it's supposed to go via either tree, though together. Since first we remove users of non-standard DMA callbacks.
Since there is no hurry maybe split it over multiple releases. Audio patch now through the audio tree and once it has made it to a upstream release apply the DMA patch through the DMA tree.
Andy Shevchenko
reviewerRe: [PATCH v2 2/2] dmaengine: dw: Remove AVR32 bits from the driver
Quoted 16 lines · Lars-Peter Clausen
Quoted 5 lines · Andy Shevchenko
Quoted 4 lines · Vinod Koul
Quoted 2 lines · Andy Shevchenko
AVR32 is gone. Now it's time to clean up the driver by removing leftovers that was used by AVR32 related code.
Quoted 9 lines
Quoted 4 lines
Since the cover didn't mention any dependency, I went ahead and applied this
nowSorry, I forgot to mention that it's supposed to go via either tree, though together. Since first we remove users of non-standard DMA callbacks.
Quoted 5 lines
Since there is no hurry maybe split it over multiple releases. Audio patch
now through the audio tree and once it has made it to a upstream release
apply the DMA patch through the DMA tree.
While there is indeed no hurry (I'm not expecting long patches against dw_dmac), we may do that, though OTOH better to do it at once to minimize a probability that the second change might be forgotten for longer.
Signature · 2 lines
Andy Shevchenko <[email protected]> Intel Finland Oy
Vinod Koul
Acked-byRe: [alsa-devel] [PATCH v2 2/2] dmaengine: dw: Remove AVR32 bits from the driver
In reply to Andy ShevchenkoQuoted 5 lines · Andy Shevchenko
Quoted 4 lines · Vinod Koul
Quoted 2 lines · Andy Shevchenko
AVR32 is gone. Now it's time to clean up the driver by removing leftovers that was used by AVR32 related code.
Quoted 8 lines
Quoted 4 lines
Since the cover didn't mention any dependency, I went ahead and applied this
nowSorry, I forgot to mention that it's supposed to go via either tree, though together. Since first we remove users of non-standard DMA callbacks.
Okay dropped it, anyway the kbuild complained due to dependency
SO if you want this to be merged thru sound tree:
Signature · 1 line
~Vinod
Re: [alsa-devel] [PATCH v2 2/2] dmaengine: dw: Remove AVR32 bits from the driver
Quoted 16 lines · Vinod Koul
Quoted 5 lines · Andy Shevchenko
Quoted 4 lines · Vinod Koul
Quoted 2 lines · Andy Shevchenko
AVR32 is gone. Now it's time to clean up the driver by removing leftovers that was used by AVR32 related code.
Quoted 8 lines
Quoted 4 lines
Since the cover didn't mention any dependency, I went ahead and applied this
nowSorry, I forgot to mention that it's supposed to go via either tree, though together. Since first we remove users of non-standard DMA callbacks.
Quoted 5 lines
Okay dropped it, anyway the kbuild complained due to dependency
SO if you want this to be merged thru sound tree:
Acked-by Vinod Koul <[email protected]>
OK, I merged two patches in topic/avr32-removal branch. It's based on 4.12-rc1, so it should be mergeable to your tree cleanly.
thanks,
Takashi
Re: [alsa-devel] [PATCH v2 2/2] dmaengine: dw: Remove AVR32 bits from the driver
Quoted 18 lines · Takashi Iwai
Quoted 16 lines · Vinod Koul
Quoted 13 lines · Andy Shevchenko
Quoted 8 lines · Vinod Koul
Quoted 2 lines · Andy Shevchenko
AVR32 is gone. Now it's time to clean up the driver by removing leftovers that was used by AVR32 related code.
Since the cover didn't mention any dependency, I went ahead and applied this
nowSorry, I forgot to mention that it's supposed to go via either tree, though together. Since first we remove users of non-standard DMA callbacks.
Quoted 8 lines
Quoted 5 lines
Okay dropped it, anyway the kbuild complained due to dependency
SO if you want this to be merged thru sound tree:
Acked-by Vinod Koul <[email protected]>OK, I merged two patches in topic/avr32-removal branch. It's based on 4.12-rc1, so it should be mergeable to your tree cleanly.
Thanks Takashi,
I have pulled and this is also in dmaengine-next now
Signature · 1 line
~Vinod
Re: [alsa-devel] [PATCH v2 2/2] dmaengine: dw: Remove AVR32 bits from the driver
Quoted 12 lines · Vinod Koul
Quoted 11 lines · Takashi Iwai
Quoted 8 lines · Vinod Koul
Quoted 3 lines
Sorry, I forgot to mention that it's supposed to go via either tree, though together. Since first we remove users of non-standard DMA callbacks.
Okay dropped it, anyway the kbuild complained due to dependency
SO if you want this to be merged thru sound tree:
Quoted 8 lines
Quoted 4 lines
Quoted 1 line
Acked-by Vinod Koul <[email protected]>OK, I merged two patches in topic/avr32-removal branch. It's based on 4.12-rc1, so it should be mergeable to your tree cleanly.
Thanks Takashi,
I have pulled and this is also in dmaengine-next now
Thanks, everybody!
Signature · 2 lines
With Best Regards, Andy Shevchenko