Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6c742509 authored by Sedji Gaouaou's avatar Sedji Gaouaou Committed by Mark Brown
Browse files

ASoC: Merge AT91 and AVR32 support into a single atmel architecture 



The Ateml AT91 and AVR32 SoC share common IP for audio and can share the
same driver code using the atmel-ssc API provided for both architectures.
Do this, creating a new unified atmel ASoC architecture to replace the
previous at32 and at91 ones.

[This was contributed as a patch series for reviewability but has been
squashed down to a single commit to help preserve both the history and
bisectability.  A small bugfix from Jukka is included.]

Tested-by: default avatarJukka Hynninen <ext-jukka.hynninen@vaisala.com>
Signed-off-by: default avatarSedji Gaouaou <sedji.gaouaou@atmel.com>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent dc06102a

sound/soc/Kconfig

+1 −2
Original line number Original line Diff line number Diff line
@@ -23,8 +23,7 @@ config SND_SOC_AC97_BUS 
	bool

	bool





# All the supported Soc's

# All the supported Soc's

source "sound/soc/at32/Kconfig"

source "sound/soc/atmel/Kconfig"

source "sound/soc/at91/Kconfig"

source "sound/soc/au1x/Kconfig"

source "sound/soc/au1x/Kconfig"

source "sound/soc/pxa/Kconfig"

source "sound/soc/pxa/Kconfig"

source "sound/soc/s3c24xx/Kconfig"

source "sound/soc/s3c24xx/Kconfig"

sound/soc/Makefile

+1 −1
Original line number Original line Diff line number Diff line 
snd-soc-core-objs := soc-core.o soc-dapm.o

snd-soc-core-objs := soc-core.o soc-dapm.o





obj-$(CONFIG_SND_SOC)	+= snd-soc-core.o

obj-$(CONFIG_SND_SOC)	+= snd-soc-core.o

obj-$(CONFIG_SND_SOC)	+= codecs/ at32/ at91/ pxa/ s3c24xx/ sh/ fsl/ davinci/

obj-$(CONFIG_SND_SOC)	+= codecs/ atmel/ pxa/ s3c24xx/ sh/ fsl/ davinci/

obj-$(CONFIG_SND_SOC)	+= omap/ au1x/ blackfin/
 
obj-$(CONFIG_SND_SOC)	+= omap/ au1x/ blackfin/

sound/soc/at32/Makefile

deleted100644 → 0
+0 −11
Original line number Original line Diff line number Diff line 
# AT32 Platform Support

snd-soc-at32-objs := at32-pcm.o

snd-soc-at32-ssc-objs := at32-ssc.o



obj-$(CONFIG_SND_AT32_SOC) += snd-soc-at32.o

obj-$(CONFIG_SND_AT32_SOC_SSC) += snd-soc-at32-ssc.o



# AT32 Machine Support

snd-soc-playpaq-objs := playpaq_wm8510.o



obj-$(CONFIG_SND_AT32_SOC_PLAYPAQ) += snd-soc-playpaq.o

sound/soc/at32/at32-pcm.h

deleted100644 → 0
+0 −79
Original line number Original line Diff line number Diff line 
/* sound/soc/at32/at32-pcm.h

 * ASoC PCM interface for Atmel AT32 SoC

 *

 * Copyright (C) 2008 Long Range Systems

 *    Geoffrey Wossum <gwossum@acm.org>

 *

 * 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.

 */



#ifndef __SOUND_SOC_AT32_AT32_PCM_H

#define __SOUND_SOC_AT32_AT32_PCM_H __FILE__



#include <linux/atmel-ssc.h>





/*

 * Registers and status bits that are required by the PCM driver

 * TODO: Is ptcr really used?

 */

struct at32_pdc_regs {

	u32 xpr;		/* PDC RX/TX pointer */

	u32 xcr;		/* PDC RX/TX counter */

	u32 xnpr;		/* PDC next RX/TX pointer */

	u32 xncr;		/* PDC next RX/TX counter */

	u32 ptcr;		/* PDC transfer control */

};







/*

 * SSC mask info

 */

struct at32_ssc_mask {

	u32 ssc_enable;		/* SSC RX/TX enable */

	u32 ssc_disable;	/* SSC RX/TX disable */

	u32 ssc_endx;		/* SSC ENDTX or ENDRX */

	u32 ssc_endbuf;		/* SSC TXBUFF or RXBUFF */

	u32 pdc_enable;		/* PDC RX/TX enable */

	u32 pdc_disable;	/* PDC RX/TX disable */

};







/*

 * This structure, shared between the PCM driver and the interface,

 * contains all information required by the PCM driver to perform the

 * PDC DMA operation.  All fields except dma_intr_handler() are initialized

 * by the interface.  The dms_intr_handler() pointer is set by the PCM

 * driver and called by the interface SSC interrupt handler if it is

 * non-NULL.

 */

struct at32_pcm_dma_params {

	char *name;		/* stream identifier */

	int pdc_xfer_size;	/* PDC counter increment in bytes */

	struct ssc_device *ssc;	/* SSC device for stream */

	struct at32_pdc_regs *pdc;	/* PDC register info */

	struct at32_ssc_mask *mask;	/* SSC mask info */

	struct snd_pcm_substream *substream;

	void (*dma_intr_handler) (u32, struct snd_pcm_substream *);

};







/*

 * The AT32 ASoC platform driver

 */

extern struct snd_soc_platform at32_soc_platform;







/*

 * SSC register access (since ssc_writel() / ssc_readl() require literal name)

 */

#define ssc_readx(base, reg)            (__raw_readl((base) + (reg)))

#define ssc_writex(base, reg, value)    __raw_writel((value), (base) + (reg))



#endif /* __SOUND_SOC_AT32_AT32_PCM_H */

sound/soc/at32/at32-ssc.c

deleted100644 → 0
+0 −849

File deleted.

Preview size limit exceeded, changes collapsed.