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

Commit c6774bcd authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge branch 'topic/asoc' into for-linus

parents 6b4e9012 2e2211a3

sound/soc/blackfin/Kconfig

+6 −1
Original line number Diff line number Diff line
@@ -105,13 +105,18 @@ config SND_BF5XX_RESET_GPIO_NUM 
	  Set the correct GPIO for RESET the sound chip.



config SND_BF5XX_SOC_AD1980

	tristate "SoC AD1980/1 Audio support for BF5xx"

	tristate "SoC AD1980/1 Audio support for BF5xx (Obsolete)"

	depends on SND_BF5XX_AC97

	select SND_BF5XX_SOC_AC97

	select SND_SOC_AD1980

	help

	  Say Y if you want to add support for SoC audio on BF5xx STAMP/EZKIT.



	  Warning:

	  Because Analog Devices Inc. discontinued the ad1980 sound chip since

	  Sep. 2009, this ad1980 driver is not maintained, tested and supported

	  by ADI now.



config SND_BF5XX_SOC_SPORT

	tristate

sound/soc/blackfin/bf5xx-ad1980.c

+9 −1
Original line number Diff line number Diff line
@@ -26,6 +26,14 @@ 
 * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA

 */



/*

 * WARNING:

 *

 * Because Analog Devices Inc. discontinued the ad1980 sound chip since

 * Sep. 2009, this ad1980 driver is not maintained, tested and supported

 * by ADI now.

 */



#include <linux/module.h>

#include <linux/moduleparam.h>

#include <linux/device.h>
@@ -109,5 +117,5 @@ module_exit(bf5xx_board_exit); 


/* Module information */

MODULE_AUTHOR("Cliff Cai");

MODULE_DESCRIPTION("ALSA SoC AD1980/1 BF5xx board");

MODULE_DESCRIPTION("ALSA SoC AD1980/1 BF5xx board (Obsolete)");

MODULE_LICENSE("GPL");

sound/soc/codecs/ad1980.c

+9 −1
Original line number Diff line number Diff line
@@ -11,6 +11,14 @@ 
 *  option) any later version.

 */



/*

 * WARNING:

 *

 * Because Analog Devices Inc. discontinued the ad1980 sound chip since

 * Sep. 2009, this ad1980 driver is not maintained, tested and supported

 * by ADI now.

 */



#include <linux/init.h>

#include <linux/slab.h>

#include <linux/module.h>
@@ -298,6 +306,6 @@ struct snd_soc_codec_device soc_codec_dev_ad1980 = { 
};

EXPORT_SYMBOL_GPL(soc_codec_dev_ad1980);



MODULE_DESCRIPTION("ASoC ad1980 driver");

MODULE_DESCRIPTION("ASoC ad1980 driver (Obsolete)");

MODULE_AUTHOR("Roy Huang, Cliff Cai");

MODULE_LICENSE("GPL");

sound/soc/codecs/ad1980.h

+6 −0
Original line number Diff line number Diff line 
/*

 * ad1980.h  --  ad1980 Soc Audio driver

 *

 * WARNING:

 *

 * Because Analog Devices Inc. discontinued the ad1980 sound chip since

 * Sep. 2009, this ad1980 driver is not maintained, tested and supported

 * by ADI now.

 */



#ifndef _AD1980_H

sound/soc/codecs/wm8580.c

+3 −3
Original line number Diff line number Diff line
@@ -269,9 +269,9 @@ SOC_DOUBLE("DAC2 Invert Switch", WM8580_DAC_CONTROL4, 2, 3, 1, 0), 
SOC_DOUBLE("DAC3 Invert Switch", WM8580_DAC_CONTROL4,  4, 5, 1, 0),



SOC_SINGLE("DAC ZC Switch", WM8580_DAC_CONTROL5, 5, 1, 0),

SOC_SINGLE("DAC1 Switch", WM8580_DAC_CONTROL5, 0, 1, 0),

SOC_SINGLE("DAC2 Switch", WM8580_DAC_CONTROL5, 1, 1, 0),

SOC_SINGLE("DAC3 Switch", WM8580_DAC_CONTROL5, 2, 1, 0),

SOC_SINGLE("DAC1 Switch", WM8580_DAC_CONTROL5, 0, 1, 1),

SOC_SINGLE("DAC2 Switch", WM8580_DAC_CONTROL5, 1, 1, 1),

SOC_SINGLE("DAC3 Switch", WM8580_DAC_CONTROL5, 2, 1, 1),



SOC_DOUBLE("ADC Mute Switch", WM8580_ADC_CONTROL1, 0, 1, 1, 0),

SOC_SINGLE("ADC High-Pass Filter Switch", WM8580_ADC_CONTROL1, 4, 1, 0),