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

Commit 158c1529 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge branch 'topic/atmel' into for-linus

parents b5c78489 6c7578bb

include/sound/atmel-abdac.h

0 → 100644
+23 −0
Original line number Original line Diff line number Diff line 
/*

 * Driver for the Atmel Audio Bitstream DAC (ABDAC)

 *

 * Copyright (C) 2009 Atmel 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.

 */

#ifndef __INCLUDE_SOUND_ATMEL_ABDAC_H

#define __INCLUDE_SOUND_ATMEL_ABDAC_H



#include <linux/dw_dmac.h>



/**

 * struct atmel_abdac_pdata - board specific ABDAC configuration

 * @dws: DMA slave interface to use for sound playback.

 */

struct atmel_abdac_pdata {

	struct dw_dma_slave	dws;

};



#endif /* __INCLUDE_SOUND_ATMEL_ABDAC_H */

include/sound/atmel-ac97c.h

0 → 100644
+40 −0
Original line number Original line Diff line number Diff line 
/*

 * Driver for the Atmel AC97C controller

 *

 * Copyright (C) 2005-2009 Atmel 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.

 */

#ifndef __INCLUDE_SOUND_ATMEL_AC97C_H

#define __INCLUDE_SOUND_ATMEL_AC97C_H



#include <linux/dw_dmac.h>



#define AC97C_CAPTURE	0x01

#define AC97C_PLAYBACK	0x02

#define AC97C_BOTH	(AC97C_CAPTURE | AC97C_PLAYBACK)



/**

 * struct atmel_ac97c_pdata - board specific AC97C configuration

 * @rx_dws: DMA slave interface to use for sound capture.

 * @tx_dws: DMA slave interface to use for sound playback.

 * @reset_pin: GPIO pin wired to the reset input on the external AC97 codec,

 *             optional to use, set to -ENODEV if not in use. AC97 layer will

 *             try to do a software reset of the external codec anyway.

 * @flags: Flags for which directions should be enabled.

 *

 * If the user do not want to use a DMA channel for playback or capture, i.e.

 * only one feature is required on the board. The slave for playback or capture

 * can be set to NULL. The AC97C driver will take use of this when setting up

 * the sound streams.

 */

struct ac97c_platform_data {

	struct dw_dma_slave	rx_dws;

	struct dw_dma_slave	tx_dws;

	unsigned int 		flags;

	int			reset_pin;

};



#endif /* __INCLUDE_SOUND_ATMEL_AC97C_H */

sound/Kconfig

+2 −0
Original line number Original line Diff line number Diff line
@@ -60,6 +60,8 @@ source "sound/aoa/Kconfig" 




source "sound/arm/Kconfig"

source "sound/arm/Kconfig"





source "sound/atmel/Kconfig"



source "sound/spi/Kconfig"

source "sound/spi/Kconfig"





source "sound/mips/Kconfig"

source "sound/mips/Kconfig"

sound/Makefile

+1 −1
Original line number Original line Diff line number Diff line
@@ -6,7 +6,7 @@ obj-$(CONFIG_SOUND_PRIME) += sound_firmware.o 
obj-$(CONFIG_SOUND_PRIME) += oss/

obj-$(CONFIG_SOUND_PRIME) += oss/

obj-$(CONFIG_DMASOUND) += oss/

obj-$(CONFIG_DMASOUND) += oss/

obj-$(CONFIG_SND) += core/ i2c/ drivers/ isa/ pci/ ppc/ arm/ sh/ synth/ usb/ \

obj-$(CONFIG_SND) += core/ i2c/ drivers/ isa/ pci/ ppc/ arm/ sh/ synth/ usb/ \

	sparc/ spi/ parisc/ pcmcia/ mips/ soc/

	sparc/ spi/ parisc/ pcmcia/ mips/ soc/ atmel/

obj-$(CONFIG_SND_AOA) += aoa/

obj-$(CONFIG_SND_AOA) += aoa/





# This one must be compilable even if sound is configured out

# This one must be compilable even if sound is configured out

sound/atmel/Kconfig

0 → 100644
+19 −0
Original line number Original line Diff line number Diff line 
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).



config SND_ATMEL_AC97C

	tristate "Atmel AC97 Controller (AC97C) driver"

	select SND_PCM

	select SND_AC97_CODEC

	depends on DW_DMAC && AVR32

	help

	  ALSA sound driver for the Atmel AC97 controller.



endmenu