Commit b5c78489 authored by Takashi Iwai's avatar Takashi Iwai

Merge branch 'topic/asoc' into for-linus

parents ff4fc365 1f218695
...@@ -116,6 +116,9 @@ SOC_DAPM_SINGLE("HiFi Playback Switch", WM8731_APANA, 4, 1, 0), ...@@ -116,6 +116,9 @@ SOC_DAPM_SINGLE("HiFi Playback Switch", WM8731_APANA, 4, 1, 0),
SND_SOC_DAPM_MIXER("Output Mixer", WM8731_PWR, 4, 1, wm8731_output_mixer_controls, SND_SOC_DAPM_MIXER("Output Mixer", WM8731_PWR, 4, 1, wm8731_output_mixer_controls,
ARRAY_SIZE(wm8731_output_mixer_controls)), ARRAY_SIZE(wm8731_output_mixer_controls)),
If you dont want the mixer elements prefixed with the name of the mixer widget,
you can use SND_SOC_DAPM_MIXER_NAMED_CTL instead. the parameters are the same
as for SND_SOC_DAPM_MIXER.
2.3 Platform/Machine domain Widgets 2.3 Platform/Machine domain Widgets
----------------------------------- -----------------------------------
......
...@@ -135,6 +135,11 @@ static unsigned long e740_pin_config[] __initdata = { ...@@ -135,6 +135,11 @@ static unsigned long e740_pin_config[] __initdata = {
/* IrDA */ /* IrDA */
GPIO38_GPIO | MFP_LPM_DRIVE_HIGH, GPIO38_GPIO | MFP_LPM_DRIVE_HIGH,
/* Audio power control */
GPIO16_GPIO, /* AC97 codec AVDD2 supply (analogue power) */
GPIO40_GPIO, /* Mic amp power */
GPIO41_GPIO, /* Headphone amp power */
/* PC Card */ /* PC Card */
GPIO8_GPIO, /* CD0 */ GPIO8_GPIO, /* CD0 */
GPIO44_GPIO, /* CD1 */ GPIO44_GPIO, /* CD1 */
......
...@@ -133,6 +133,11 @@ static unsigned long e750_pin_config[] __initdata = { ...@@ -133,6 +133,11 @@ static unsigned long e750_pin_config[] __initdata = {
/* IrDA */ /* IrDA */
GPIO38_GPIO | MFP_LPM_DRIVE_HIGH, GPIO38_GPIO | MFP_LPM_DRIVE_HIGH,
/* Audio power control */
GPIO4_GPIO, /* Headphone amp power */
GPIO7_GPIO, /* Speaker amp power */
GPIO37_GPIO, /* Headphone detect */
/* PC Card */ /* PC Card */
GPIO8_GPIO, /* CD0 */ GPIO8_GPIO, /* CD0 */
GPIO44_GPIO, /* CD1 */ GPIO44_GPIO, /* CD1 */
......
...@@ -153,6 +153,13 @@ static unsigned long h5000_pin_config[] __initdata = { ...@@ -153,6 +153,13 @@ static unsigned long h5000_pin_config[] __initdata = {
GPIO23_SSP1_SCLK, GPIO23_SSP1_SCLK,
GPIO25_SSP1_TXD, GPIO25_SSP1_TXD,
GPIO26_SSP1_RXD, GPIO26_SSP1_RXD,
/* I2S */
GPIO28_I2S_BITCLK_OUT,
GPIO29_I2S_SDATA_IN,
GPIO30_I2S_SDATA_OUT,
GPIO31_I2S_SYNC,
GPIO32_I2S_SYSCLK,
}; };
/* /*
......
...@@ -45,6 +45,21 @@ ...@@ -45,6 +45,21 @@
/* e7xx IrDA power control */ /* e7xx IrDA power control */
#define GPIO_E7XX_IR_OFF 38 #define GPIO_E7XX_IR_OFF 38
/* e740 audio control GPIOs */
#define GPIO_E740_WM9705_nAVDD2 16
#define GPIO_E740_MIC_ON 40
#define GPIO_E740_AMP_ON 41
/* e750 audio control GPIOs */
#define GPIO_E750_HP_AMP_OFF 4
#define GPIO_E750_SPK_AMP_OFF 7
#define GPIO_E750_HP_DETECT 37
/* e800 audio control GPIOs */
#define GPIO_E800_HP_DETECT 81
#define GPIO_E800_HP_AMP_OFF 82
#define GPIO_E800_SPK_AMP_ON 83
/* ASIC related GPIOs */ /* ASIC related GPIOs */
#define GPIO_ESERIES_TMIO_IRQ 5 #define GPIO_ESERIES_TMIO_IRQ 5
#define GPIO_ESERIES_TMIO_PCLR 19 #define GPIO_ESERIES_TMIO_PCLR 19
......
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
#define SSCR0_TUM (1 << 23) /* Transmit FIFO underrun interrupt mask */ #define SSCR0_TUM (1 << 23) /* Transmit FIFO underrun interrupt mask */
#define SSCR0_FRDC (0x07000000) /* Frame rate divider control (mask) */ #define SSCR0_FRDC (0x07000000) /* Frame rate divider control (mask) */
#define SSCR0_SlotsPerFrm(x) (((x) - 1) << 24) /* Time slots per frame [1..8] */ #define SSCR0_SlotsPerFrm(x) (((x) - 1) << 24) /* Time slots per frame [1..8] */
#define SSCR0_ADC (1 << 30) /* Audio clock select */ #define SSCR0_ACS (1 << 30) /* Audio clock select */
#define SSCR0_MOD (1 << 31) /* Mode (normal or network) */ #define SSCR0_MOD (1 << 31) /* Mode (normal or network) */
#endif #endif
...@@ -109,6 +109,11 @@ ...@@ -109,6 +109,11 @@
#define SSSR_TINT (1 << 19) /* Receiver Time-out Interrupt */ #define SSSR_TINT (1 << 19) /* Receiver Time-out Interrupt */
#define SSSR_PINT (1 << 18) /* Peripheral Trailing Byte Interrupt */ #define SSSR_PINT (1 << 18) /* Peripheral Trailing Byte Interrupt */
#if defined(CONFIG_PXA3xx)
#define SSPSP_EDMYSTOP(x) ((x) << 28) /* Extended Dummy Stop */
#define SSPSP_EDMYSTRT(x) ((x) << 26) /* Extended Dummy Start */
#endif
#define SSPSP_FSRT (1 << 25) /* Frame Sync Relative Timing */ #define SSPSP_FSRT (1 << 25) /* Frame Sync Relative Timing */
#define SSPSP_DMYSTOP(x) ((x) << 23) /* Dummy Stop */ #define SSPSP_DMYSTOP(x) ((x) << 23) /* Dummy Stop */
#define SSPSP_SFRMWDTH(x) ((x) << 16) /* Serial Frame Width */ #define SSPSP_SFRMWDTH(x) ((x) << 16) /* Serial Frame Width */
......
...@@ -105,6 +105,12 @@ static unsigned long spitz_pin_config[] __initdata = { ...@@ -105,6 +105,12 @@ static unsigned long spitz_pin_config[] __initdata = {
GPIO57_nIOIS16, GPIO57_nIOIS16,
GPIO104_PSKTSEL, GPIO104_PSKTSEL,
/* I2S */
GPIO28_I2S_BITCLK_OUT,
GPIO29_I2S_SDATA_IN,
GPIO30_I2S_SDATA_OUT,
GPIO31_I2S_SYNC,
/* MMC */ /* MMC */
GPIO32_MMC_CLK, GPIO32_MMC_CLK,
GPIO112_MMC_CMD, GPIO112_MMC_CMD,
......
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
#include <mach/regs-mem.h> #include <mach/regs-mem.h>
#include <mach/regs-lcd.h> #include <mach/regs-lcd.h>
#include <mach/regs-sdi.h> #include <mach/regs-sdi.h>
#include <asm/plat-s3c24xx/regs-iis.h> #include <plat/regs-iis.h>
#include <plat/regs-spi.h> #include <plat/regs-spi.h>
static struct s3c24xx_dma_map __initdata s3c2410_dma_mappings[] = { static struct s3c24xx_dma_map __initdata s3c2410_dma_mappings[] = {
......
...@@ -29,8 +29,8 @@ ...@@ -29,8 +29,8 @@
#include <mach/regs-mem.h> #include <mach/regs-mem.h>
#include <mach/regs-lcd.h> #include <mach/regs-lcd.h>
#include <mach/regs-sdi.h> #include <mach/regs-sdi.h>
#include <asm/plat-s3c24xx/regs-s3c2412-iis.h> #include <plat/regs-s3c2412-iis.h>
#include <asm/plat-s3c24xx/regs-iis.h> #include <plat/regs-iis.h>
#include <plat/regs-spi.h> #include <plat/regs-spi.h>
#define MAP(x) { (x)| DMA_CH_VALID, (x)| DMA_CH_VALID, (x)| DMA_CH_VALID, (x)| DMA_CH_VALID } #define MAP(x) { (x)| DMA_CH_VALID, (x)| DMA_CH_VALID, (x)| DMA_CH_VALID, (x)| DMA_CH_VALID }
......
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
#include <mach/regs-mem.h> #include <mach/regs-mem.h>
#include <mach/regs-lcd.h> #include <mach/regs-lcd.h>
#include <mach/regs-sdi.h> #include <mach/regs-sdi.h>
#include <asm/plat-s3c24xx/regs-iis.h> #include <plat/regs-iis.h>
#include <plat/regs-spi.h> #include <plat/regs-spi.h>
static struct s3c24xx_dma_map __initdata s3c2440_dma_mappings[] = { static struct s3c24xx_dma_map __initdata s3c2440_dma_mappings[] = {
......
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
#include <mach/regs-mem.h> #include <mach/regs-mem.h>
#include <mach/regs-lcd.h> #include <mach/regs-lcd.h>
#include <mach/regs-sdi.h> #include <mach/regs-sdi.h>
#include <asm/plat-s3c24xx/regs-iis.h> #include <plat/regs-iis.h>
#include <plat/regs-spi.h> #include <plat/regs-spi.h>
#define MAP(x) { \ #define MAP(x) { \
......
...@@ -33,6 +33,9 @@ ...@@ -33,6 +33,9 @@
#define S3C2412_IISCON_RXDMA_ACTIVE (1 << 1) #define S3C2412_IISCON_RXDMA_ACTIVE (1 << 1)
#define S3C2412_IISCON_IIS_ACTIVE (1 << 0) #define S3C2412_IISCON_IIS_ACTIVE (1 << 0)
#define S3C64XX_IISMOD_IMS_PCLK (0 << 10)
#define S3C64XX_IISMOD_IMS_SYSMUX (1 << 10)
#define S3C2412_IISMOD_MASTER_INTERNAL (0 << 10) #define S3C2412_IISMOD_MASTER_INTERNAL (0 << 10)
#define S3C2412_IISMOD_MASTER_EXTERNAL (1 << 10) #define S3C2412_IISMOD_MASTER_EXTERNAL (1 << 10)
#define S3C2412_IISMOD_SLAVE (2 << 10) #define S3C2412_IISMOD_SLAVE (2 << 10)
...@@ -44,8 +47,8 @@ ...@@ -44,8 +47,8 @@
#define S3C2412_IISMOD_LR_LLOW (0 << 7) #define S3C2412_IISMOD_LR_LLOW (0 << 7)
#define S3C2412_IISMOD_LR_RLOW (1 << 7) #define S3C2412_IISMOD_LR_RLOW (1 << 7)
#define S3C2412_IISMOD_SDF_IIS (0 << 5) #define S3C2412_IISMOD_SDF_IIS (0 << 5)
#define S3C2412_IISMOD_SDF_MSB (0 << 5) #define S3C2412_IISMOD_SDF_MSB (1 << 5)
#define S3C2412_IISMOD_SDF_LSB (0 << 5) #define S3C2412_IISMOD_SDF_LSB (2 << 5)
#define S3C2412_IISMOD_SDF_MASK (3 << 5) #define S3C2412_IISMOD_SDF_MASK (3 << 5)
#define S3C2412_IISMOD_RCLK_256FS (0 << 3) #define S3C2412_IISMOD_RCLK_256FS (0 << 3)
#define S3C2412_IISMOD_RCLK_512FS (1 << 3) #define S3C2412_IISMOD_RCLK_512FS (1 << 3)
......
...@@ -490,6 +490,7 @@ ...@@ -490,6 +490,7 @@
/* /*
* R231 (0xE7) - Jack Status * R231 (0xE7) - Jack Status
*/ */
#define WM8350_JACK_L_LVL 0x0800
#define WM8350_JACK_R_LVL 0x0400 #define WM8350_JACK_R_LVL 0x0400
/* /*
......
...@@ -1181,6 +1181,7 @@ ...@@ -1181,6 +1181,7 @@
#define WM8400_FLL_OUTDIV_SHIFT 0 /* FLL_OUTDIV - [2:0] */ #define WM8400_FLL_OUTDIV_SHIFT 0 /* FLL_OUTDIV - [2:0] */
#define WM8400_FLL_OUTDIV_WIDTH 3 /* FLL_OUTDIV - [2:0] */ #define WM8400_FLL_OUTDIV_WIDTH 3 /* FLL_OUTDIV - [2:0] */
struct wm8400;
void wm8400_reset_codec_reg_cache(struct wm8400 *wm8400); void wm8400_reset_codec_reg_cache(struct wm8400 *wm8400);
#endif #endif
...@@ -42,4 +42,19 @@ extern int pxa2xx_ac97_hw_resume(void); ...@@ -42,4 +42,19 @@ extern int pxa2xx_ac97_hw_resume(void);
extern int pxa2xx_ac97_hw_probe(struct platform_device *dev); extern int pxa2xx_ac97_hw_probe(struct platform_device *dev);
extern void pxa2xx_ac97_hw_remove(struct platform_device *dev); extern void pxa2xx_ac97_hw_remove(struct platform_device *dev);
/* AC97 platform_data */
/**
* struct pxa2xx_ac97_platform_data - pxa ac97 platform data
* @reset_gpio: AC97 reset gpio (normally gpio113 or gpio95)
* a -1 value means no gpio will be used for reset
*
* Platform data should only be specified for pxa27x CPUs where a silicon bug
* prevents correct operation of the reset line. If not specified, the default
* behaviour is to consider gpio 113 as the AC97 reset line, which is the
* default on most boards.
*/
struct pxa2xx_ac97_platform_data {
int reset_gpio;
};
#endif #endif
...@@ -203,7 +203,7 @@ struct snd_soc_dai { ...@@ -203,7 +203,7 @@ struct snd_soc_dai {
int (*resume)(struct snd_soc_dai *dai); int (*resume)(struct snd_soc_dai *dai);
/* ops */ /* ops */
struct snd_soc_dai_ops ops; struct snd_soc_dai_ops *ops;
/* DAI capabilities */ /* DAI capabilities */
struct snd_soc_pcm_stream capture; struct snd_soc_pcm_stream capture;
......
...@@ -76,6 +76,11 @@ ...@@ -76,6 +76,11 @@
wcontrols, wncontrols)\ wcontrols, wncontrols)\
{ .id = snd_soc_dapm_mixer, .name = wname, .reg = wreg, .shift = wshift, \ { .id = snd_soc_dapm_mixer, .name = wname, .reg = wreg, .shift = wshift, \
.invert = winvert, .kcontrols = wcontrols, .num_kcontrols = wncontrols} .invert = winvert, .kcontrols = wcontrols, .num_kcontrols = wncontrols}
#define SND_SOC_DAPM_MIXER_NAMED_CTL(wname, wreg, wshift, winvert, \
wcontrols, wncontrols)\
{ .id = snd_soc_dapm_mixer_named_ctl, .name = wname, .reg = wreg, \
.shift = wshift, .invert = winvert, .kcontrols = wcontrols, \
.num_kcontrols = wncontrols}
#define SND_SOC_DAPM_MICBIAS(wname, wreg, wshift, winvert) \ #define SND_SOC_DAPM_MICBIAS(wname, wreg, wshift, winvert) \
{ .id = snd_soc_dapm_micbias, .name = wname, .reg = wreg, .shift = wshift, \ { .id = snd_soc_dapm_micbias, .name = wname, .reg = wreg, .shift = wshift, \
.invert = winvert, .kcontrols = NULL, .num_kcontrols = 0} .invert = winvert, .kcontrols = NULL, .num_kcontrols = 0}
...@@ -101,6 +106,11 @@ ...@@ -101,6 +106,11 @@
{ .id = snd_soc_dapm_mixer, .name = wname, .reg = wreg, .shift = wshift, \ { .id = snd_soc_dapm_mixer, .name = wname, .reg = wreg, .shift = wshift, \
.invert = winvert, .kcontrols = wcontrols, .num_kcontrols = wncontrols, \ .invert = winvert, .kcontrols = wcontrols, .num_kcontrols = wncontrols, \
.event = wevent, .event_flags = wflags} .event = wevent, .event_flags = wflags}
#define SND_SOC_DAPM_MIXER_NAMED_CTL_E(wname, wreg, wshift, winvert, \
wcontrols, wncontrols, wevent, wflags) \
{ .id = snd_soc_dapm_mixer, .name = wname, .reg = wreg, .shift = wshift, \
.invert = winvert, .kcontrols = wcontrols, \
.num_kcontrols = wncontrols, .event = wevent, .event_flags = wflags}
#define SND_SOC_DAPM_MICBIAS_E(wname, wreg, wshift, winvert, wevent, wflags) \ #define SND_SOC_DAPM_MICBIAS_E(wname, wreg, wshift, winvert, wevent, wflags) \
{ .id = snd_soc_dapm_micbias, .name = wname, .reg = wreg, .shift = wshift, \ { .id = snd_soc_dapm_micbias, .name = wname, .reg = wreg, .shift = wshift, \
.invert = winvert, .kcontrols = NULL, .num_kcontrols = 0, \ .invert = winvert, .kcontrols = NULL, .num_kcontrols = 0, \
...@@ -182,6 +192,12 @@ ...@@ -182,6 +192,12 @@
.get = snd_soc_dapm_get_value_enum_double, \ .get = snd_soc_dapm_get_value_enum_double, \
.put = snd_soc_dapm_put_value_enum_double, \ .put = snd_soc_dapm_put_value_enum_double, \
.private_value = (unsigned long)&xenum } .private_value = (unsigned long)&xenum }
#define SOC_DAPM_PIN_SWITCH(xname) \
{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname " Switch", \
.info = snd_soc_dapm_info_pin_switch, \
.get = snd_soc_dapm_get_pin_switch, \
.put = snd_soc_dapm_put_pin_switch, \
.private_value = (unsigned long)xname }
/* dapm stream operations */ /* dapm stream operations */
#define SND_SOC_DAPM_STREAM_NOP 0x0 #define SND_SOC_DAPM_STREAM_NOP 0x0
...@@ -228,6 +244,12 @@ int snd_soc_dapm_get_value_enum_double(struct snd_kcontrol *kcontrol, ...@@ -228,6 +244,12 @@ int snd_soc_dapm_get_value_enum_double(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_value *ucontrol); struct snd_ctl_elem_value *ucontrol);
int snd_soc_dapm_put_value_enum_double(struct snd_kcontrol *kcontrol, int snd_soc_dapm_put_value_enum_double(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_value *ucontrol); struct snd_ctl_elem_value *ucontrol);
int snd_soc_dapm_info_pin_switch(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_info *uinfo);
int snd_soc_dapm_get_pin_switch(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_value *uncontrol);
int snd_soc_dapm_put_pin_switch(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_value *uncontrol);
int snd_soc_dapm_new_control(struct snd_soc_codec *codec, int snd_soc_dapm_new_control(struct snd_soc_codec *codec,
const struct snd_soc_dapm_widget *widget); const struct snd_soc_dapm_widget *widget);
int snd_soc_dapm_new_controls(struct snd_soc_codec *codec, int snd_soc_dapm_new_controls(struct snd_soc_codec *codec,
...@@ -250,10 +272,10 @@ int snd_soc_dapm_set_bias_level(struct snd_soc_device *socdev, ...@@ -250,10 +272,10 @@ int snd_soc_dapm_set_bias_level(struct snd_soc_device *socdev,
int snd_soc_dapm_sys_add(struct device *dev); int snd_soc_dapm_sys_add(struct device *dev);
/* dapm audio pin control and status */ /* dapm audio pin control and status */
int snd_soc_dapm_enable_pin(struct snd_soc_codec *codec, char *pin); int snd_soc_dapm_enable_pin(struct snd_soc_codec *codec, const char *pin);
int snd_soc_dapm_disable_pin(struct snd_soc_codec *codec, char *pin); int snd_soc_dapm_disable_pin(struct snd_soc_codec *codec, const char *pin);
int snd_soc_dapm_nc_pin(struct snd_soc_codec *codec, char *pin); int snd_soc_dapm_nc_pin(struct snd_soc_codec *codec, const char *pin);
int snd_soc_dapm_get_pin_status(struct snd_soc_codec *codec, char *pin); int snd_soc_dapm_get_pin_status(struct snd_soc_codec *codec, const char *pin);
int snd_soc_dapm_sync(struct snd_soc_codec *codec); int snd_soc_dapm_sync(struct snd_soc_codec *codec);
/* dapm widget types */ /* dapm widget types */
...@@ -263,6 +285,7 @@ enum snd_soc_dapm_type { ...@@ -263,6 +285,7 @@ enum snd_soc_dapm_type {
snd_soc_dapm_mux, /* selects 1 analog signal from many inputs */ snd_soc_dapm_mux, /* selects 1 analog signal from many inputs */
snd_soc_dapm_value_mux, /* selects 1 analog signal from many inputs */ snd_soc_dapm_value_mux, /* selects 1 analog signal from many inputs */
snd_soc_dapm_mixer, /* mixes several analog signals together */ snd_soc_dapm_mixer, /* mixes several analog signals together */
snd_soc_dapm_mixer_named_ctl, /* mixer with named controls */
snd_soc_dapm_pga, /* programmable gain/attenuation (volume) */ snd_soc_dapm_pga, /* programmable gain/attenuation (volume) */
snd_soc_dapm_adc, /* analog to digital converter */ snd_soc_dapm_adc, /* analog to digital converter */
snd_soc_dapm_dac, /* digital to analog converter */ snd_soc_dapm_dac, /* digital to analog converter */
......
...@@ -16,6 +16,8 @@ ...@@ -16,6 +16,8 @@
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/types.h> #include <linux/types.h>
#include <linux/workqueue.h> #include <linux/workqueue.h>
#include <linux/interrupt.h>
#include <linux/kernel.h>
#include <sound/core.h> #include <sound/core.h>
#include <sound/pcm.h> #include <sound/pcm.h>
#include <sound/control.h> #include <sound/control.h>
...@@ -154,6 +156,8 @@ enum snd_soc_bias_level { ...@@ -154,6 +156,8 @@ enum snd_soc_bias_level {
SND_SOC_BIAS_OFF, SND_SOC_BIAS_OFF,
}; };
struct snd_jack;
struct snd_soc_card;
struct snd_soc_device; struct snd_soc_device;
struct snd_soc_pcm_stream; struct snd_soc_pcm_stream;
struct snd_soc_ops; struct snd_soc_ops;
...@@ -164,6 +168,11 @@ struct snd_soc_platform; ...@@ -164,6 +168,11 @@ struct snd_soc_platform;
struct snd_soc_codec; struct snd_soc_codec;
struct soc_enum; struct soc_enum;
struct snd_soc_ac97_ops; struct snd_soc_ac97_ops;
struct snd_soc_jack;
struct snd_soc_jack_pin;
#ifdef CONFIG_GPIOLIB
struct snd_soc_jack_gpio;
#endif
typedef int (*hw_write_t)(void *,const char* ,int); typedef int (*hw_write_t)(void *,const char* ,int);
typedef int (*hw_read_t)(void *,char* ,int); typedef int (*hw_read_t)(void *,char* ,int);
...@@ -184,6 +193,19 @@ int snd_soc_init_card(struct snd_soc_device *socdev); ...@@ -184,6 +193,19 @@ int snd_soc_init_card(struct snd_soc_device *socdev);
int snd_soc_set_runtime_hwparams(struct snd_pcm_substream *substream, int snd_soc_set_runtime_hwparams(struct snd_pcm_substream *substream,
const struct snd_pcm_hardware *hw); const struct snd_pcm_hardware *hw);
/* Jack reporting */
int snd_soc_jack_new(struct snd_soc_card *card, const char *id, int type,
struct snd_soc_jack *jack);
void snd_soc_jack_report(struct snd_soc_jack *jack, int status, int mask);
int snd_soc_jack_add_pins(struct snd_soc_jack *jack, int count,
struct snd_soc_jack_pin *pins);
#ifdef CONFIG_GPIOLIB
int snd_soc_jack_add_gpios(struct snd_soc_jack *jack, int count,
struct snd_soc_jack_gpio *gpios);
void snd_soc_jack_free_gpios(struct snd_soc_jack *jack, int count,
struct snd_soc_jack_gpio *gpios);
#endif
/* codec IO */ /* codec IO */
#define snd_soc_read(codec, reg) codec->read(codec, reg) #define snd_soc_read(codec, reg) codec->read(codec, reg)
#define snd_soc_write(codec, reg, value) codec->write(codec, reg, value) #define snd_soc_write(codec, reg, value) codec->write(codec, reg, value)
...@@ -203,6 +225,8 @@ void snd_soc_free_ac97_codec(struct snd_soc_codec *codec); ...@@ -203,6 +225,8 @@ void snd_soc_free_ac97_codec(struct snd_soc_codec *codec);
*/ */
struct snd_kcontrol *snd_soc_cnew(const struct snd_kcontrol_new *_template, struct snd_kcontrol *snd_soc_cnew(const struct snd_kcontrol_new *_template,
void *data, char *long_name); void *data, char *long_name);
int snd_soc_add_controls(struct snd_soc_codec *codec,
const struct snd_kcontrol_new *controls, int num_controls);
int snd_soc_info_enum_double(struct snd_kcontrol *kcontrol, int snd_soc_info_enum_double(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_info *uinfo); struct snd_ctl_elem_info *uinfo);
int snd_soc_info_enum_ext(struct snd_kcontrol *kcontrol, int snd_soc_info_enum_ext(struct snd_kcontrol *kcontrol,
...@@ -237,6 +261,48 @@ int snd_soc_get_volsw_s8(struct snd_kcontrol *kcontrol, ...@@ -237,6 +261,48 @@ int snd_soc_get_volsw_s8(struct snd_kcontrol *kcontrol,
int snd_soc_put_volsw_s8(struct snd_kcontrol *kcontrol, int snd_soc_put_volsw_s8(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_value *ucontrol); struct snd_ctl_elem_value *ucontrol);
/**
* struct snd_soc_jack_pin - Describes a pin to update based on jack detection
*
* @pin: name of the pin to update
* @mask: bits to check for in reported jack status
* @invert: if non-zero then pin is enabled when status is not reported
*/
struct snd_soc_jack_pin {
struct list_head list;
const char *pin;
int mask;
bool invert;
};
/**
* struct snd_soc_jack_gpio - Describes a gpio pin for jack detection
*
* @gpio: gpio number
* @name: gpio name
* @report: value to report when jack detected
* @invert: report presence in low state
* @debouce_time: debouce time in ms
*/
#ifdef CONFIG_GPIOLIB
struct snd_soc_jack_gpio {
unsigned int gpio;
const char *name;
int report;
int invert;
int debounce_time;
struct snd_soc_jack *jack;
struct work_struct work;
};
#endif
struct snd_soc_jack {
struct snd_jack *jack;
struct snd_soc_card *card;
struct list_head pins;
int status;
};
/* SoC PCM stream information */ /* SoC PCM stream information */
struct snd_soc_pcm_stream { struct snd_soc_pcm_stream {
char *stream_name; char *stream_name;
...@@ -384,6 +450,8 @@ struct snd_soc_card { ...@@ -384,6 +450,8 @@ struct snd_soc_card {
struct snd_soc_device *socdev; struct snd_soc_device *socdev;
struct snd_soc_codec *codec;
struct snd_soc_platform *platform; struct snd_soc_platform *platform;
struct delayed_work delayed_work; struct delayed_work delayed_work;
struct work_struct deferred_resume_work; struct work_struct deferred_resume_work;
...@@ -393,7 +461,6 @@ struct snd_soc_card { ...@@ -393,7 +461,6 @@ struct snd_soc_card {
struct snd_soc_device { struct snd_soc_device {
struct device *dev; struct device *dev;
struct snd_soc_card *card; struct snd_soc_card *card;
struct snd_soc_codec *codec;
struct snd_soc_codec_device *codec_dev; struct snd_soc_codec_device *codec_dev;
void *codec_data; void *codec_data;
}; };
......
...@@ -31,6 +31,7 @@ static DECLARE_WAIT_QUEUE_HEAD(gsr_wq); ...@@ -31,6 +31,7 @@ static DECLARE_WAIT_QUEUE_HEAD(gsr_wq);
static volatile long gsr_bits; static volatile long gsr_bits;
static struct clk *ac97_clk; static struct clk *ac97_clk;
static struct clk *ac97conf_clk; static struct clk *ac97conf_clk;
static int reset_gpio;
/* /*
* Beware PXA27x bugs: * Beware PXA27x bugs:
...@@ -42,6 +43,45 @@ static struct clk *ac97conf_clk; ...@@ -42,6 +43,45 @@ static struct clk *ac97conf_clk;
* 1 jiffy timeout if interrupt never comes). * 1 jiffy timeout if interrupt never comes).
*/ */
enum {
RESETGPIO_FORCE_HIGH,
RESETGPIO_FORCE_LOW,
RESETGPIO_NORMAL_ALTFUNC
};
/**
* set_resetgpio_mode - computes and sets the AC97_RESET gpio mode on PXA
* @mode: chosen action
*
* As the PXA27x CPUs suffer from a AC97 bug, a manual control of the reset line
* must be done to insure proper work of AC97 reset line. This function
* computes the correct gpio_mode for further use by reset functions, and
* applied the change through pxa_gpio_mode.
*/
static void set_resetgpio_mode(int resetgpio_action)
{
int mode = 0;
if (reset_gpio)
switch (resetgpio_action) {
case RESETGPIO_NORMAL_ALTFUNC:
if (reset_gpio == 113)
mode = 113 | GPIO_OUT | GPIO_DFLT_LOW;
if (reset_gpio == 95)
mode = 95 | GPIO_ALT_FN_1_OUT;
break;
case RESETGPIO_FORCE_LOW:
mode = reset_gpio | GPIO_OUT | GPIO_DFLT_LOW;
break;
case RESETGPIO_FORCE_HIGH:
mode = reset_gpio | GPIO_OUT | GPIO_DFLT_HIGH;
break;
};
if (mode)
pxa_gpio_mode(mode);
}
unsigned short pxa2xx_ac97_read(struct snd_ac97 *ac97, unsigned short reg) unsigned short pxa2xx_ac97_read(struct snd_ac97 *ac97, unsigned short reg)
{ {
unsigned short val = -1; unsigned short val = -1;
...@@ -137,10 +177,10 @@ static inline void pxa_ac97_warm_pxa27x(void) ...@@ -137,10 +177,10 @@ static inline void pxa_ac97_warm_pxa27x(void)
/* warm reset broken on Bulverde, /* warm reset broken on Bulverde,
so manually keep AC97 reset high */ so manually keep AC97 reset high */
pxa_gpio_mode(113 | GPIO_OUT | GPIO_DFLT_HIGH); set_resetgpio_mode(RESETGPIO_FORCE_HIGH);
udelay(10); udelay(10);
GCR |= GCR_WARM_RST; GCR |= GCR_WARM_RST;
pxa_gpio_mode(113 | GPIO_ALT_FN_2_OUT); set_resetgpio_mode(RESETGPIO_NORMAL_ALTFUNC);
udelay(500); udelay(500);
} }
...@@ -308,8 +348,8 @@ int pxa2xx_ac97_hw_resume(void) ...@@ -308,8 +348,8 @@ int pxa2xx_ac97_hw_resume(void)
pxa_gpio_mode(GPIO29_SDATA_IN_AC97_MD); pxa_gpio_mode(GPIO29_SDATA_IN_AC97_MD);
} }
if (cpu_is_pxa27x()) { if (cpu_is_pxa27x()) {
/* Use GPIO 113 as AC97 Reset on Bulverde */ /* Use GPIO 113 or 95 as AC97 Reset on Bulverde */
pxa_gpio_mode(113 | GPIO_ALT_FN_2_OUT); set_resetgpio_mode(RESETGPIO_NORMAL_ALTFUNC);
} }
clk_enable(ac97_clk); clk_enable(ac97_clk);
return 0; return 0;
...@@ -320,6 +360,27 @@ EXPORT_SYMBOL_GPL(pxa2xx_ac97_hw_resume); ...@@ -320,6 +360,27 @@ EXPORT_SYMBOL_GPL(pxa2xx_ac97_hw_resume);
int __devinit pxa2xx_ac97_hw_probe(struct platform_device *dev) int __devinit pxa2xx_ac97_hw_probe(struct platform_device *dev)
{ {
int ret; int ret;
struct pxa2xx_ac97_platform_data *pdata = dev->dev.platform_data;
if (pdata) {
switch (pdata->reset_gpio) {
case 95:
case 113:
reset_gpio = pdata->reset_gpio;
break;
case 0:
reset_gpio = 113;
break;
case -1:
break;
default:
dev_err(&dev->dev, "Invalid reset GPIO %d\n",
pdata->reset_gpio);
}
} else {
if (cpu_is_pxa27x())
reset_gpio = 113;
}
if (cpu_is_pxa25x() || cpu_is_pxa27x()) { if (cpu_is_pxa25x() || cpu_is_pxa27x()) {
pxa_gpio_mode(GPIO31_SYNC_AC97_MD); pxa_gpio_mode(GPIO31_SYNC_AC97_MD);
...@@ -330,7 +391,7 @@ int __devinit pxa2xx_ac97_hw_probe(struct platform_device *dev) ...@@ -330,7 +391,7 @@ int __devinit pxa2xx_ac97_hw_probe(struct platform_device *dev)
if (cpu_is_pxa27x()) { if (cpu_is_pxa27x()) {
/* Use GPIO 113 as AC97 Reset on Bulverde */ /* Use GPIO 113 as AC97 Reset on Bulverde */
pxa_gpio_mode(113 | GPIO_ALT_FN_2_OUT); set_resetgpio_mode(RESETGPIO_NORMAL_ALTFUNC);
ac97conf_clk = clk_get(&dev->dev, "AC97CONFCLK"); ac97conf_clk = clk_get(&dev->dev, "AC97CONFCLK");
if (IS_ERR(ac97conf_clk)) { if (IS_ERR(ac97conf_clk)) {
ret = PTR_ERR(ac97conf_clk); ret = PTR_ERR(ac97conf_clk);
......
...@@ -6,6 +6,7 @@ menuconfig SND_SOC ...@@ -6,6 +6,7 @@ menuconfig SND_SOC
tristate "ALSA for SoC audio support" tristate "ALSA for SoC audio support"
select SND_PCM select SND_PCM
select AC97_BUS if SND_SOC_AC97_BUS select AC97_BUS if SND_SOC_AC97_BUS
select SND_JACK if INPUT=y || INPUT=SND
---help--- ---help---
If you want ASoC support, you should say Y here and also to the If you want ASoC support, you should say Y here and also to the
......
snd-soc-core-objs := soc-core.o soc-dapm.o snd-soc-core-objs := soc-core.o soc-dapm.o soc-jack.o
obj-$(CONFIG_SND_SOC) += snd-soc-core.o obj-$(CONFIG_SND_SOC) += snd-soc-core.o
obj-$(CONFIG_SND_SOC) += codecs/ obj-$(CONFIG_SND_SOC) += codecs/
......
...@@ -347,7 +347,7 @@ static int atmel_pcm_mmap(struct snd_pcm_substream *substream, ...@@ -347,7 +347,7 @@ static int atmel_pcm_mmap(struct snd_pcm_substream *substream,
vma->vm_end - vma->vm_start, vma->vm_page_prot); vma->vm_end - vma->vm_start, vma->vm_page_prot);
} }
struct snd_pcm_ops atmel_pcm_ops = { static struct snd_pcm_ops atmel_pcm_ops = {
.open = atmel_pcm_open, .open = atmel_pcm_open,
.close = atmel_pcm_close, .close = atmel_pcm_close,
.ioctl = snd_pcm_lib_ioctl, .ioctl = snd_pcm_lib_ioctl,
......
...@@ -697,6 +697,15 @@ static int atmel_ssc_resume(struct snd_soc_dai *cpu_dai) ...@@ -697,6 +697,15 @@ static int atmel_ssc_resume(struct snd_soc_dai *cpu_dai)
#define ATMEL_SSC_FORMATS (SNDRV_PCM_FMTBIT_S8 | SNDRV_PCM_FMTBIT_S16_LE |\ #define ATMEL_SSC_FORMATS (SNDRV_PCM_FMTBIT_S8 | SNDRV_PCM_FMTBIT_S16_LE |\
SNDRV_PCM_FMTBIT_S24_LE | SNDRV_PCM_FMTBIT_S32_LE) SNDRV_PCM_FMTBIT_S24_LE | SNDRV_PCM_FMTBIT_S32_LE)
static struct snd_soc_dai_ops atmel_ssc_dai_ops = {
.startup = atmel_ssc_startup,
.shutdown = atmel_ssc_shutdown,
.prepare = atmel_ssc_prepare,
.hw_params = atmel_ssc_hw_params,
.set_fmt = atmel_ssc_set_dai_fmt,
.set_clkdiv = atmel_ssc_set_dai_clkdiv,
};
struct snd_soc_dai atmel_ssc_dai[NUM_SSC_DEVICES] = { struct snd_soc_dai atmel_ssc_dai[NUM_SSC_DEVICES] = {
{ .name = "atmel-ssc0", { .name = "atmel-ssc0",
.id = 0, .id = 0,
...@@ -712,13 +721,7 @@ struct snd_soc_dai atmel_ssc_dai[NUM_SSC_DEVICES] = { ...@@ -712,13 +721,7 @@ struct snd_soc_dai atmel_ssc_dai[NUM_SSC_DEVICES] = {
.channels_max = 2, .channels_max = 2,
.rates = ATMEL_SSC_RATES, .rates = ATMEL_SSC_RATES,
.formats = ATMEL_SSC_FORMATS,}, .formats = ATMEL_SSC_FORMATS,},
.ops = { .ops = &atmel_ssc_dai_ops,
.startup = atmel_ssc_startup,
.shutdown = atmel_ssc_shutdown,
.prepare = atmel_ssc_prepare,
.hw_params = atmel_ssc_hw_params,
.set_fmt = atmel_ssc_set_dai_fmt,
.set_clkdiv = atmel_ssc_set_dai_clkdiv,},
.private_data = &ssc_info[0], .private_data = &ssc_info[0],
}, },
#if NUM_SSC_DEVICES == 3 #if NUM_SSC_DEVICES == 3
...@@ -736,13 +739,7 @@ struct snd_soc_dai atmel_ssc_dai[NUM_SSC_DEVICES] = { ...@@ -736,13 +739,7 @@ struct snd_soc_dai atmel_ssc_dai[NUM_SSC_DEVICES] = {
.channels_max = 2, .channels_max = 2,
.rates = ATMEL_SSC_RATES, .rates = ATMEL_SSC_RATES,
.formats = ATMEL_SSC_FORMATS,}, .formats = ATMEL_SSC_FORMATS,},
.ops = { .ops = &atmel_ssc_dai_ops,
.startup = atmel_ssc_startup,
.shutdown = atmel_ssc_shutdown,
.prepare = atmel_ssc_prepare,
.hw_params = atmel_ssc_hw_params,
.set_fmt = atmel_ssc_set_dai_fmt,
.set_clkdiv = atmel_ssc_set_dai_clkdiv,},
.private_data = &ssc_info[1], .private_data = &ssc_info[1],
}, },
{ .name = "atmel-ssc2", { .name = "atmel-ssc2",
...@@ -759,13 +756,7 @@ struct snd_soc_dai atmel_ssc_dai[NUM_SSC_DEVICES] = { ...@@ -759,13 +756,7 @@ struct snd_soc_dai atmel_ssc_dai[NUM_SSC_DEVICES] = {
.channels_max = 2, .channels_max = 2,
.rates = ATMEL_SSC_RATES, .rates = ATMEL_SSC_RATES,
.formats = ATMEL_SSC_FORMATS,}, .formats = ATMEL_SSC_FORMATS,},
.ops = { .ops = &atmel_ssc_dai_ops,
.startup = atmel_ssc_startup,
.shutdown = atmel_ssc_shutdown,
.prepare = atmel_ssc_prepare,
.hw_params = atmel_ssc_hw_params,
.set_fmt = atmel_ssc_set_dai_fmt,
.set_clkdiv = atmel_ssc_set_dai_clkdiv,},
.private_data = &ssc_info[2], .private_data = &ssc_info[2],
}, },
#endif #endif
......
...@@ -164,38 +164,38 @@ static int playpaq_wm8510_hw_params(struct snd_pcm_substream *substream, ...@@ -164,38 +164,38 @@ static int playpaq_wm8510_hw_params(struct snd_pcm_substream *substream,
*/ */
switch (params_rate(params)) { switch (params_rate(params)) {
case 48000: case 48000:
pll_out = 12288000; pll_out = 24576000;
mclk_div = WM8510_MCLKDIV_1; mclk_div = WM8510_MCLKDIV_2;
bclk = WM8510_BCLKDIV_8; bclk = WM8510_BCLKDIV_8;
break; break;
case 44100: case 44100:
pll_out = 11289600; pll_out = 22579200;
mclk_div = WM8510_MCLKDIV_1; mclk_div = WM8510_MCLKDIV_2;
bclk = WM8510_BCLKDIV_8; bclk = WM8510_BCLKDIV_8;
break; break;
case 22050: case 22050:
pll_out = 11289600; pll_out = 22579200;
mclk_div = WM8510_MCLKDIV_2; mclk_div = WM8510_MCLKDIV_4;
bclk = WM8510_BCLKDIV_8; bclk = WM8510_BCLKDIV_8;
break; break;
case 16000: case 16000:
pll_out = 12288000; pll_out = 24576000;
mclk_div = WM8510_MCLKDIV_3; mclk_div = WM8510_MCLKDIV_6;
bclk = WM8510_BCLKDIV_8; bclk = WM8510_BCLKDIV_8;
break; break;
case 11025: case 11025:
pll_out = 11289600; pll_out = 22579200;
mclk_div = WM8510_MCLKDIV_4; mclk_div = WM8510_MCLKDIV_8;
bclk = WM8510_BCLKDIV_8; bclk = WM8510_BCLKDIV_8;
break; break;
case 8000: case 8000:
pll_out = 12288000; pll_out = 24576000;
mclk_div = WM8510_MCLKDIV_6; mclk_div = WM8510_MCLKDIV_12;
bclk = WM8510_BCLKDIV_8; bclk = WM8510_BCLKDIV_8;
break; break;
......
...@@ -36,6 +36,7 @@ ...@@ -36,6 +36,7 @@
#include <linux/timer.h> #include <linux/timer.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/i2c.h>
#include <linux/atmel-ssc.h> #include <linux/atmel-ssc.h>
...@@ -45,6 +46,7 @@ ...@@ -45,6 +46,7 @@
#include <sound/soc.h> #include <sound/soc.h>
#include <sound/soc-dapm.h> #include <sound/soc-dapm.h>
#include <asm/mach-types.h>
#include <mach/hardware.h> #include <mach/hardware.h>
#include <mach/gpio.h> #include <mach/gpio.h>
...@@ -52,6 +54,9 @@ ...@@ -52,6 +54,9 @@
#include "atmel-pcm.h" #include "atmel-pcm.h"
#include "atmel_ssc_dai.h" #include "atmel_ssc_dai.h"
#define MCLK_RATE 12000000
static struct clk *mclk;
static int at91sam9g20ek_startup(struct snd_pcm_substream *substream) static int at91sam9g20ek_startup(struct snd_pcm_substream *substream)
{ {
...@@ -59,11 +64,12 @@ static int at91sam9g20ek_startup(struct snd_pcm_substream *substream) ...@@ -59,11 +64,12 @@ static int at91sam9g20ek_startup(struct snd_pcm_substream *substream)
struct snd_soc_dai *codec_dai = rtd->dai->codec_dai; struct snd_soc_dai *codec_dai = rtd->dai->codec_dai;
int ret; int ret;
/* codec system clock is supplied by PCK0, set to 12MHz */
ret = snd_soc_dai_set_sysclk(codec_dai, WM8731_SYSCLK, ret = snd_soc_dai_set_sysclk(codec_dai, WM8731_SYSCLK,
12000000, SND_SOC_CLOCK_IN); MCLK_RATE, SND_SOC_CLOCK_IN);
if (ret < 0) if (ret < 0) {
clk_disable(mclk);
return ret; return ret;
}
return 0; return 0;
} }
...@@ -189,6 +195,31 @@ static struct snd_soc_ops at91sam9g20ek_ops = { ...@@ -189,6 +195,31 @@ static struct snd_soc_ops at91sam9g20ek_ops = {
.shutdown = at91sam9g20ek_shutdown, .shutdown = at91sam9g20ek_shutdown,
}; };
static int at91sam9g20ek_set_bias_level(struct snd_soc_card *card,
enum snd_soc_bias_level level)
{
static int mclk_on;
int ret = 0;
switch (level) {
case SND_SOC_BIAS_ON:
case SND_SOC_BIAS_PREPARE:
if (!mclk_on)
ret = clk_enable(mclk);
if (ret == 0)
mclk_on = 1;
break;
case SND_SOC_BIAS_OFF:
case SND_SOC_BIAS_STANDBY:
if (mclk_on)
clk_disable(mclk);
mclk_on = 0;
break;
}
return ret;
}
static const struct snd_soc_dapm_widget at91sam9g20ek_dapm_widgets[] = { static const struct snd_soc_dapm_widget at91sam9g20ek_dapm_widgets[] = {
SND_SOC_DAPM_MIC("Int Mic", NULL), SND_SOC_DAPM_MIC("Int Mic", NULL),
...@@ -243,21 +274,48 @@ static struct snd_soc_dai_link at91sam9g20ek_dai = { ...@@ -243,21 +274,48 @@ static struct snd_soc_dai_link at91sam9g20ek_dai = {
}; };
static struct snd_soc_card snd_soc_at91sam9g20ek = { static struct snd_soc_card snd_soc_at91sam9g20ek = {
.name = "WM8731", .name = "AT91SAMG20-EK",
.platform = &atmel_soc_platform, .platform = &atmel_soc_platform,
.dai_link = &at91sam9g20ek_dai, .dai_link = &at91sam9g20ek_dai,
.num_links = 1, .num_links = 1,
.set_bias_level = at91sam9g20ek_set_bias_level,
}; };
static struct wm8731_setup_data at91sam9g20ek_wm8731_setup = { /*
.i2c_bus = 0, * FIXME: This is a temporary bodge to avoid cross-tree merge issues.
.i2c_address = 0x1b, * New drivers should register the wm8731 I2C device in the machine
}; * setup code (under arch/arm for ARM systems).
*/
static int wm8731_i2c_register(void)
{
struct i2c_board_info info;
struct i2c_adapter *adapter;
struct i2c_client *client;
memset(&info, 0, sizeof(struct i2c_board_info));
info.addr = 0x1b;
strlcpy(info.type, "wm8731", I2C_NAME_SIZE);
adapter = i2c_get_adapter(0);
if (!adapter) {
printk(KERN_ERR "can't get i2c adapter 0\n");
return -ENODEV;
}
client = i2c_new_device(adapter, &info);
i2c_put_adapter(adapter);
if (!client) {
printk(KERN_ERR "can't add i2c device at 0x%x\n",
(unsigned int)info.addr);
return -ENODEV;
}
return 0;
}
static struct snd_soc_device at91sam9g20ek_snd_devdata = { static struct snd_soc_device at91sam9g20ek_snd_devdata = {
.card = &snd_soc_at91sam9g20ek, .card = &snd_soc_at91sam9g20ek,
.codec_dev = &soc_codec_dev_wm8731, .codec_dev = &soc_codec_dev_wm8731,
.codec_data = &at91sam9g20ek_wm8731_setup,
}; };
static struct platform_device *at91sam9g20ek_snd_device; static struct platform_device *at91sam9g20ek_snd_device;
...@@ -266,23 +324,56 @@ static int __init at91sam9g20ek_init(void) ...@@ -266,23 +324,56 @@ static int __init at91sam9g20ek_init(void)
{ {
struct atmel_ssc_info *ssc_p = at91sam9g20ek_dai.cpu_dai->private_data; struct atmel_ssc_info *ssc_p = at91sam9g20ek_dai.cpu_dai->private_data;
struct ssc_device *ssc = NULL; struct ssc_device *ssc = NULL;
struct clk *pllb;
int ret; int ret;
if (!machine_is_at91sam9g20ek())
return -ENODEV;
/*
* Codec MCLK is supplied by PCK0 - set it up.
*/
mclk = clk_get(NULL, "pck0");
if (IS_ERR(mclk)) {
printk(KERN_ERR "ASoC: Failed to get MCLK\n");
ret = PTR_ERR(mclk);
goto err;
}
pllb = clk_get(NULL, "pllb");
if (IS_ERR(mclk)) {
printk(KERN_ERR "ASoC: Failed to get PLLB\n");
ret = PTR_ERR(mclk);
goto err_mclk;
}
ret = clk_set_parent(mclk, pllb);
clk_put(pllb);
if (ret != 0) {
printk(KERN_ERR "ASoC: Failed to set MCLK parent\n");
goto err_mclk;
}
clk_set_rate(mclk, MCLK_RATE);
/* /*
* Request SSC device * Request SSC device
*/ */
ssc = ssc_request(0); ssc = ssc_request(0);
if (IS_ERR(ssc)) { if (IS_ERR(ssc)) {
printk(KERN_ERR "ASoC: Failed to request SSC 0\n");
ret = PTR_ERR(ssc); ret = PTR_ERR(ssc);
ssc = NULL; ssc = NULL;
goto err_ssc; goto err_ssc;
} }
ssc_p->ssc = ssc; ssc_p->ssc = ssc;
ret = wm8731_i2c_register();
if (ret != 0)
goto err_ssc;
at91sam9g20ek_snd_device = platform_device_alloc("soc-audio", -1); at91sam9g20ek_snd_device = platform_device_alloc("soc-audio", -1);
if (!at91sam9g20ek_snd_device) { if (!at91sam9g20ek_snd_device) {
printk(KERN_DEBUG printk(KERN_ERR "ASoC: Platform device allocation failed\n");
"platform device allocation failed\n");
ret = -ENOMEM; ret = -ENOMEM;
} }
...@@ -292,14 +383,19 @@ static int __init at91sam9g20ek_init(void) ...@@ -292,14 +383,19 @@ static int __init at91sam9g20ek_init(void)
ret = platform_device_add(at91sam9g20ek_snd_device); ret = platform_device_add(at91sam9g20ek_snd_device);
if (ret) { if (ret) {
printk(KERN_DEBUG printk(KERN_ERR "ASoC: Platform device allocation failed\n");
"platform device allocation failed\n");
platform_device_put(at91sam9g20ek_snd_device); platform_device_put(at91sam9g20ek_snd_device);
} }
return ret; return ret;
err_ssc: err_ssc:
ssc_free(ssc);
ssc_p->ssc = NULL;
err_mclk:
clk_put(mclk);
mclk = NULL;
err:
return ret; return ret;
} }
...@@ -317,6 +413,8 @@ static void __exit at91sam9g20ek_exit(void) ...@@ -317,6 +413,8 @@ static void __exit at91sam9g20ek_exit(void)
platform_device_unregister(at91sam9g20ek_snd_device); platform_device_unregister(at91sam9g20ek_snd_device);
at91sam9g20ek_snd_device = NULL; at91sam9g20ek_snd_device = NULL;
clk_put(mclk);
mclk = NULL;
} }
module_init(at91sam9g20ek_init); module_init(at91sam9g20ek_init);
......
...@@ -305,7 +305,7 @@ static int au1xpsc_pcm_close(struct snd_pcm_substream *substream) ...@@ -305,7 +305,7 @@ static int au1xpsc_pcm_close(struct snd_pcm_substream *substream)
return 0; return 0;
} }
struct snd_pcm_ops au1xpsc_pcm_ops = { static struct snd_pcm_ops au1xpsc_pcm_ops = {
.open = au1xpsc_pcm_open, .open = au1xpsc_pcm_open,
.close = au1xpsc_pcm_close, .close = au1xpsc_pcm_close,
.ioctl = snd_pcm_lib_ioctl, .ioctl = snd_pcm_lib_ioctl,
......
...@@ -342,6 +342,11 @@ static int au1xpsc_ac97_resume(struct snd_soc_dai *dai) ...@@ -342,6 +342,11 @@ static int au1xpsc_ac97_resume(struct snd_soc_dai *dai)
return 0; return 0;
} }
static struct snd_soc_dai_ops au1xpsc_ac97_dai_ops = {
.trigger = au1xpsc_ac97_trigger,
.hw_params = au1xpsc_ac97_hw_params,
};
struct snd_soc_dai au1xpsc_ac97_dai = { struct snd_soc_dai au1xpsc_ac97_dai = {
.name = "au1xpsc_ac97", .name = "au1xpsc_ac97",
.ac97_control = 1, .ac97_control = 1,
...@@ -361,10 +366,7 @@ struct snd_soc_dai au1xpsc_ac97_dai = { ...@@ -361,10 +366,7 @@ struct snd_soc_dai au1xpsc_ac97_dai = {
.channels_min = 2, .channels_min = 2,
.channels_max = 2, .channels_max = 2,
}, },
.ops = { .ops = &au1xpsc_ac97_dai_ops,
.trigger = au1xpsc_ac97_trigger,
.hw_params = au1xpsc_ac97_hw_params,
},
}; };
EXPORT_SYMBOL_GPL(au1xpsc_ac97_dai); EXPORT_SYMBOL_GPL(au1xpsc_ac97_dai);
......
...@@ -367,6 +367,12 @@ static int au1xpsc_i2s_resume(struct snd_soc_dai *cpu_dai) ...@@ -367,6 +367,12 @@ static int au1xpsc_i2s_resume(struct snd_soc_dai *cpu_dai)
return 0; return 0;
} }
static struct snd_soc_dai_ops au1xpsc_i2s_dai_ops = {
.trigger = au1xpsc_i2s_trigger,
.hw_params = au1xpsc_i2s_hw_params,
.set_fmt = au1xpsc_i2s_set_fmt,
};
struct snd_soc_dai au1xpsc_i2s_dai = { struct snd_soc_dai au1xpsc_i2s_dai = {
.name = "au1xpsc_i2s", .name = "au1xpsc_i2s",
.probe = au1xpsc_i2s_probe, .probe = au1xpsc_i2s_probe,
...@@ -385,11 +391,7 @@ struct snd_soc_dai au1xpsc_i2s_dai = { ...@@ -385,11 +391,7 @@ struct snd_soc_dai au1xpsc_i2s_dai = {
.channels_min = 2, .channels_min = 2,
.channels_max = 8, /* 2 without external help */ .channels_max = 8, /* 2 without external help */
}, },
.ops = { .ops = &au1xpsc_i2s_dai_ops,
.trigger = au1xpsc_i2s_trigger,
.hw_params = au1xpsc_i2s_hw_params,
.set_fmt = au1xpsc_i2s_set_fmt,
},
}; };
EXPORT_SYMBOL(au1xpsc_i2s_dai); EXPORT_SYMBOL(au1xpsc_i2s_dai);
......
...@@ -297,7 +297,7 @@ static int bf5xx_pcm_copy(struct snd_pcm_substream *substream, int channel, ...@@ -297,7 +297,7 @@ static int bf5xx_pcm_copy(struct snd_pcm_substream *substream, int channel,
} }
#endif #endif
struct snd_pcm_ops bf5xx_pcm_ac97_ops = { static struct snd_pcm_ops bf5xx_pcm_ac97_ops = {
.open = bf5xx_pcm_open, .open = bf5xx_pcm_open,
.ioctl = snd_pcm_lib_ioctl, .ioctl = snd_pcm_lib_ioctl,
.hw_params = bf5xx_pcm_hw_params, .hw_params = bf5xx_pcm_hw_params,
......
...@@ -31,72 +31,46 @@ ...@@ -31,72 +31,46 @@
#include "bf5xx-sport.h" #include "bf5xx-sport.h"
#include "bf5xx-ac97.h" #include "bf5xx-ac97.h"
#if defined(CONFIG_BF54x)
#define PIN_REQ_SPORT_0 {P_SPORT0_TFS, P_SPORT0_DTPRI, P_SPORT0_TSCLK, \
P_SPORT0_RFS, P_SPORT0_DRPRI, P_SPORT0_RSCLK, 0}
#define PIN_REQ_SPORT_1 {P_SPORT1_TFS, P_SPORT1_DTPRI, P_SPORT1_TSCLK, \
P_SPORT1_RFS, P_SPORT1_DRPRI, P_SPORT1_RSCLK, 0}
#define PIN_REQ_SPORT_2 {P_SPORT2_TFS, P_SPORT2_DTPRI, P_SPORT2_TSCLK, \
P_SPORT2_RFS, P_SPORT2_DRPRI, P_SPORT2_RSCLK, 0}
#define PIN_REQ_SPORT_3 {P_SPORT3_TFS, P_SPORT3_DTPRI, P_SPORT3_TSCLK, \
P_SPORT3_RFS, P_SPORT3_DRPRI, P_SPORT3_RSCLK, 0}
#else
#define PIN_REQ_SPORT_0 {P_SPORT0_DTPRI, P_SPORT0_TSCLK, P_SPORT0_RFS, \
P_SPORT0_DRPRI, P_SPORT0_RSCLK, 0}
#define PIN_REQ_SPORT_1 {P_SPORT1_DTPRI, P_SPORT1_TSCLK, P_SPORT1_RFS, \
P_SPORT1_DRPRI, P_SPORT1_RSCLK, 0}
#endif
static int *cmd_count; static int *cmd_count;
static int sport_num = CONFIG_SND_BF5XX_SPORT_NUM; static int sport_num = CONFIG_SND_BF5XX_SPORT_NUM;
#define SPORT_REQ(x) \
[x] = {P_SPORT##x##_TFS, P_SPORT##x##_DTPRI, P_SPORT##x##_TSCLK, \
P_SPORT##x##_RFS, P_SPORT##x##_DRPRI, P_SPORT##x##_RSCLK, 0}
static u16 sport_req[][7] = { static u16 sport_req[][7] = {
PIN_REQ_SPORT_0, #ifdef SPORT0_TCR1
#ifdef PIN_REQ_SPORT_1 SPORT_REQ(0),
PIN_REQ_SPORT_1, #endif
#ifdef SPORT1_TCR1
SPORT_REQ(1),
#endif #endif
#ifdef PIN_REQ_SPORT_2 #ifdef SPORT2_TCR1
PIN_REQ_SPORT_2, SPORT_REQ(2),
#endif #endif
#ifdef PIN_REQ_SPORT_3 #ifdef SPORT3_TCR1
PIN_REQ_SPORT_3, SPORT_REQ(3),
#endif #endif
}; };
#define SPORT_PARAMS(x) \
[x] = { \
.dma_rx_chan = CH_SPORT##x##_RX, \
.dma_tx_chan = CH_SPORT##x##_TX, \
.err_irq = IRQ_SPORT##x##_ERROR, \
.regs = (struct sport_register *)SPORT##x##_TCR1, \
}
static struct sport_param sport_params[4] = { static struct sport_param sport_params[4] = {
{ #ifdef SPORT0_TCR1
.dma_rx_chan = CH_SPORT0_RX, SPORT_PARAMS(0),
.dma_tx_chan = CH_SPORT0_TX,
.err_irq = IRQ_SPORT0_ERROR,
.regs = (struct sport_register *)SPORT0_TCR1,
},
#ifdef PIN_REQ_SPORT_1
{
.dma_rx_chan = CH_SPORT1_RX,
.dma_tx_chan = CH_SPORT1_TX,
.err_irq = IRQ_SPORT1_ERROR,
.regs = (struct sport_register *)SPORT1_TCR1,
},
#endif #endif
#ifdef PIN_REQ_SPORT_2 #ifdef SPORT1_TCR1
{ SPORT_PARAMS(1),
.dma_rx_chan = CH_SPORT2_RX,
.dma_tx_chan = CH_SPORT2_TX,
.err_irq = IRQ_SPORT2_ERROR,
.regs = (struct sport_register *)SPORT2_TCR1,
},
#endif #endif
#ifdef PIN_REQ_SPORT_3 #ifdef SPORT2_TCR1
{ SPORT_PARAMS(2),
.dma_rx_chan = CH_SPORT3_RX, #endif
.dma_tx_chan = CH_SPORT3_TX, #ifdef SPORT3_TCR1
.err_irq = IRQ_SPORT3_ERROR, SPORT_PARAMS(3),
.regs = (struct sport_register *)SPORT3_TCR1,
}
#endif #endif
}; };
...@@ -332,11 +306,11 @@ static int bf5xx_ac97_probe(struct platform_device *pdev, ...@@ -332,11 +306,11 @@ static int bf5xx_ac97_probe(struct platform_device *pdev,
if (cmd_count == NULL) if (cmd_count == NULL)
return -ENOMEM; return -ENOMEM;
if (peripheral_request_list(&sport_req[sport_num][0], "soc-audio")) { if (peripheral_request_list(sport_req[sport_num], "soc-audio")) {
pr_err("Requesting Peripherals failed\n"); pr_err("Requesting Peripherals failed\n");
ret = -EFAULT; ret = -EFAULT;
goto peripheral_err; goto peripheral_err;
} }
#ifdef CONFIG_SND_BF5XX_HAVE_COLD_RESET #ifdef CONFIG_SND_BF5XX_HAVE_COLD_RESET
/* Request PB3 as reset pin */ /* Request PB3 as reset pin */
...@@ -383,9 +357,9 @@ static int bf5xx_ac97_probe(struct platform_device *pdev, ...@@ -383,9 +357,9 @@ static int bf5xx_ac97_probe(struct platform_device *pdev,
sport_err: sport_err:
#ifdef CONFIG_SND_BF5XX_HAVE_COLD_RESET #ifdef CONFIG_SND_BF5XX_HAVE_COLD_RESET
gpio_free(CONFIG_SND_BF5XX_RESET_GPIO_NUM); gpio_free(CONFIG_SND_BF5XX_RESET_GPIO_NUM);
#endif
gpio_err: gpio_err:
peripheral_free_list(&sport_req[sport_num][0]); #endif
peripheral_free_list(sport_req[sport_num]);
peripheral_err: peripheral_err:
free_page((unsigned long)cmd_count); free_page((unsigned long)cmd_count);
cmd_count = NULL; cmd_count = NULL;
...@@ -398,7 +372,7 @@ static void bf5xx_ac97_remove(struct platform_device *pdev, ...@@ -398,7 +372,7 @@ static void bf5xx_ac97_remove(struct platform_device *pdev,
{ {
free_page((unsigned long)cmd_count); free_page((unsigned long)cmd_count);
cmd_count = NULL; cmd_count = NULL;
peripheral_free_list(&sport_req[sport_num][0]); peripheral_free_list(sport_req[sport_num]);
#ifdef CONFIG_SND_BF5XX_HAVE_COLD_RESET #ifdef CONFIG_SND_BF5XX_HAVE_COLD_RESET
gpio_free(CONFIG_SND_BF5XX_RESET_GPIO_NUM); gpio_free(CONFIG_SND_BF5XX_RESET_GPIO_NUM);
#endif #endif
......
...@@ -114,7 +114,7 @@ static int snd_ad73311_configure(void) ...@@ -114,7 +114,7 @@ static int snd_ad73311_configure(void)
SSYNC(); SSYNC();
/* When TUVF is set, the data is already send out */ /* When TUVF is set, the data is already send out */
while (!(status & TUVF) && count++ < 10000) { while (!(status & TUVF) && ++count < 10000) {
udelay(1); udelay(1);
status = bfin_read_SPORT_STAT(); status = bfin_read_SPORT_STAT();
SSYNC(); SSYNC();
...@@ -123,7 +123,7 @@ static int snd_ad73311_configure(void) ...@@ -123,7 +123,7 @@ static int snd_ad73311_configure(void)
SSYNC(); SSYNC();
local_irq_enable(); local_irq_enable();
if (count == 10000) { if (count >= 10000) {
printk(KERN_ERR "ad73311: failed to configure codec\n"); printk(KERN_ERR "ad73311: failed to configure codec\n");
return -1; return -1;
} }
......
...@@ -184,7 +184,7 @@ static int bf5xx_pcm_mmap(struct snd_pcm_substream *substream, ...@@ -184,7 +184,7 @@ static int bf5xx_pcm_mmap(struct snd_pcm_substream *substream,
return 0 ; return 0 ;
} }
struct snd_pcm_ops bf5xx_pcm_i2s_ops = { static struct snd_pcm_ops bf5xx_pcm_i2s_ops = {
.open = bf5xx_pcm_open, .open = bf5xx_pcm_open,
.ioctl = snd_pcm_lib_ioctl, .ioctl = snd_pcm_lib_ioctl,
.hw_params = bf5xx_pcm_hw_params, .hw_params = bf5xx_pcm_hw_params,
......
...@@ -287,6 +287,13 @@ static int bf5xx_i2s_resume(struct platform_device *pdev, ...@@ -287,6 +287,13 @@ static int bf5xx_i2s_resume(struct platform_device *pdev,
#define BF5XX_I2S_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S24_LE |\ #define BF5XX_I2S_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S24_LE |\
SNDRV_PCM_FMTBIT_S32_LE) SNDRV_PCM_FMTBIT_S32_LE)
static struct snd_soc_dai_ops bf5xx_i2s_dai_ops = {
.startup = bf5xx_i2s_startup,
.shutdown = bf5xx_i2s_shutdown,
.hw_params = bf5xx_i2s_hw_params,
.set_fmt = bf5xx_i2s_set_dai_fmt,
};
struct snd_soc_dai bf5xx_i2s_dai = { struct snd_soc_dai bf5xx_i2s_dai = {
.name = "bf5xx-i2s", .name = "bf5xx-i2s",
.id = 0, .id = 0,
...@@ -304,12 +311,7 @@ struct snd_soc_dai bf5xx_i2s_dai = { ...@@ -304,12 +311,7 @@ struct snd_soc_dai bf5xx_i2s_dai = {
.channels_max = 2, .channels_max = 2,
.rates = BF5XX_I2S_RATES, .rates = BF5XX_I2S_RATES,
.formats = BF5XX_I2S_FORMATS,}, .formats = BF5XX_I2S_FORMATS,},
.ops = { .ops = &bf5xx_i2s_dai_ops,
.startup = bf5xx_i2s_startup,
.shutdown = bf5xx_i2s_shutdown,
.hw_params = bf5xx_i2s_hw_params,
.set_fmt = bf5xx_i2s_set_dai_fmt,
},
}; };
EXPORT_SYMBOL_GPL(bf5xx_i2s_dai); EXPORT_SYMBOL_GPL(bf5xx_i2s_dai);
......
...@@ -133,7 +133,7 @@ static void setup_desc(struct dmasg *desc, void *buf, int fragcount, ...@@ -133,7 +133,7 @@ static void setup_desc(struct dmasg *desc, void *buf, int fragcount,
int i; int i;
for (i = 0; i < fragcount; ++i) { for (i = 0; i < fragcount; ++i) {
desc[i].next_desc_addr = (unsigned long)&(desc[i + 1]); desc[i].next_desc_addr = &(desc[i + 1]);
desc[i].start_addr = (unsigned long)buf + i*fragsize; desc[i].start_addr = (unsigned long)buf + i*fragsize;
desc[i].cfg = cfg; desc[i].cfg = cfg;
desc[i].x_count = x_count; desc[i].x_count = x_count;
...@@ -143,12 +143,12 @@ static void setup_desc(struct dmasg *desc, void *buf, int fragcount, ...@@ -143,12 +143,12 @@ static void setup_desc(struct dmasg *desc, void *buf, int fragcount,
} }
/* make circular */ /* make circular */
desc[fragcount-1].next_desc_addr = (unsigned long)desc; desc[fragcount-1].next_desc_addr = desc;
pr_debug("setup desc: desc0=%p, next0=%lx, desc1=%p," pr_debug("setup desc: desc0=%p, next0=%p, desc1=%p,"
"next1=%lx\nx_count=%x,y_count=%x,addr=0x%lx,cfs=0x%x\n", "next1=%p\nx_count=%x,y_count=%x,addr=0x%lx,cfs=0x%x\n",
&(desc[0]), desc[0].next_desc_addr, desc, desc[0].next_desc_addr,
&(desc[1]), desc[1].next_desc_addr, desc+1, desc[1].next_desc_addr,
desc[0].x_count, desc[0].y_count, desc[0].x_count, desc[0].y_count,
desc[0].start_addr, desc[0].cfg); desc[0].start_addr, desc[0].cfg);
} }
...@@ -184,22 +184,20 @@ static inline int sport_hook_rx_dummy(struct sport_device *sport) ...@@ -184,22 +184,20 @@ static inline int sport_hook_rx_dummy(struct sport_device *sport)
BUG_ON(sport->curr_rx_desc == sport->dummy_rx_desc); BUG_ON(sport->curr_rx_desc == sport->dummy_rx_desc);
/* Maybe the dummy buffer descriptor ring is damaged */ /* Maybe the dummy buffer descriptor ring is damaged */
sport->dummy_rx_desc->next_desc_addr = \ sport->dummy_rx_desc->next_desc_addr = sport->dummy_rx_desc + 1;
(unsigned long)(sport->dummy_rx_desc+1);
local_irq_save(flags); local_irq_save(flags);
desc = (struct dmasg *)get_dma_next_desc_ptr(sport->dma_rx_chan); desc = get_dma_next_desc_ptr(sport->dma_rx_chan);
/* Copy the descriptor which will be damaged to backup */ /* Copy the descriptor which will be damaged to backup */
temp_desc = *desc; temp_desc = *desc;
desc->x_count = 0xa; desc->x_count = 0xa;
desc->y_count = 0; desc->y_count = 0;
desc->next_desc_addr = (unsigned long)(sport->dummy_rx_desc); desc->next_desc_addr = sport->dummy_rx_desc;
local_irq_restore(flags); local_irq_restore(flags);
/* Waiting for dummy buffer descriptor is already hooked*/ /* Waiting for dummy buffer descriptor is already hooked*/
while ((get_dma_curr_desc_ptr(sport->dma_rx_chan) - while ((get_dma_curr_desc_ptr(sport->dma_rx_chan) -
sizeof(struct dmasg)) != sizeof(struct dmasg)) != sport->dummy_rx_desc)
(unsigned long)sport->dummy_rx_desc) continue;
;
sport->curr_rx_desc = sport->dummy_rx_desc; sport->curr_rx_desc = sport->dummy_rx_desc;
/* Restore the damaged descriptor */ /* Restore the damaged descriptor */
*desc = temp_desc; *desc = temp_desc;
...@@ -210,14 +208,12 @@ static inline int sport_hook_rx_dummy(struct sport_device *sport) ...@@ -210,14 +208,12 @@ static inline int sport_hook_rx_dummy(struct sport_device *sport)
static inline int sport_rx_dma_start(struct sport_device *sport, int dummy) static inline int sport_rx_dma_start(struct sport_device *sport, int dummy)
{ {
if (dummy) { if (dummy) {
sport->dummy_rx_desc->next_desc_addr = \ sport->dummy_rx_desc->next_desc_addr = sport->dummy_rx_desc;
(unsigned long) sport->dummy_rx_desc;
sport->curr_rx_desc = sport->dummy_rx_desc; sport->curr_rx_desc = sport->dummy_rx_desc;
} else } else
sport->curr_rx_desc = sport->dma_rx_desc; sport->curr_rx_desc = sport->dma_rx_desc;
set_dma_next_desc_addr(sport->dma_rx_chan, \ set_dma_next_desc_addr(sport->dma_rx_chan, sport->curr_rx_desc);
(unsigned long)(sport->curr_rx_desc));
set_dma_x_count(sport->dma_rx_chan, 0); set_dma_x_count(sport->dma_rx_chan, 0);
set_dma_x_modify(sport->dma_rx_chan, 0); set_dma_x_modify(sport->dma_rx_chan, 0);
set_dma_config(sport->dma_rx_chan, (DMAFLOW_LARGE | NDSIZE_9 | \ set_dma_config(sport->dma_rx_chan, (DMAFLOW_LARGE | NDSIZE_9 | \
...@@ -231,14 +227,12 @@ static inline int sport_rx_dma_start(struct sport_device *sport, int dummy) ...@@ -231,14 +227,12 @@ static inline int sport_rx_dma_start(struct sport_device *sport, int dummy)
static inline int sport_tx_dma_start(struct sport_device *sport, int dummy) static inline int sport_tx_dma_start(struct sport_device *sport, int dummy)
{ {
if (dummy) { if (dummy) {
sport->dummy_tx_desc->next_desc_addr = \ sport->dummy_tx_desc->next_desc_addr = sport->dummy_tx_desc;
(unsigned long) sport->dummy_tx_desc;
sport->curr_tx_desc = sport->dummy_tx_desc; sport->curr_tx_desc = sport->dummy_tx_desc;
} else } else
sport->curr_tx_desc = sport->dma_tx_desc; sport->curr_tx_desc = sport->dma_tx_desc;
set_dma_next_desc_addr(sport->dma_tx_chan, \ set_dma_next_desc_addr(sport->dma_tx_chan, sport->curr_tx_desc);
(unsigned long)(sport->curr_tx_desc));
set_dma_x_count(sport->dma_tx_chan, 0); set_dma_x_count(sport->dma_tx_chan, 0);
set_dma_x_modify(sport->dma_tx_chan, 0); set_dma_x_modify(sport->dma_tx_chan, 0);
set_dma_config(sport->dma_tx_chan, set_dma_config(sport->dma_tx_chan,
...@@ -261,11 +255,9 @@ int sport_rx_start(struct sport_device *sport) ...@@ -261,11 +255,9 @@ int sport_rx_start(struct sport_device *sport)
BUG_ON(sport->curr_rx_desc != sport->dummy_rx_desc); BUG_ON(sport->curr_rx_desc != sport->dummy_rx_desc);
local_irq_save(flags); local_irq_save(flags);
while ((get_dma_curr_desc_ptr(sport->dma_rx_chan) - while ((get_dma_curr_desc_ptr(sport->dma_rx_chan) -
sizeof(struct dmasg)) != sizeof(struct dmasg)) != sport->dummy_rx_desc)
(unsigned long)sport->dummy_rx_desc) continue;
; sport->dummy_rx_desc->next_desc_addr = sport->dma_rx_desc;
sport->dummy_rx_desc->next_desc_addr =
(unsigned long)(sport->dma_rx_desc);
local_irq_restore(flags); local_irq_restore(flags);
sport->curr_rx_desc = sport->dma_rx_desc; sport->curr_rx_desc = sport->dma_rx_desc;
} else { } else {
...@@ -310,23 +302,21 @@ static inline int sport_hook_tx_dummy(struct sport_device *sport) ...@@ -310,23 +302,21 @@ static inline int sport_hook_tx_dummy(struct sport_device *sport)
BUG_ON(sport->dummy_tx_desc == NULL); BUG_ON(sport->dummy_tx_desc == NULL);
BUG_ON(sport->curr_tx_desc == sport->dummy_tx_desc); BUG_ON(sport->curr_tx_desc == sport->dummy_tx_desc);
sport->dummy_tx_desc->next_desc_addr = \ sport->dummy_tx_desc->next_desc_addr = sport->dummy_tx_desc + 1;
(unsigned long)(sport->dummy_tx_desc+1);
/* Shorten the time on last normal descriptor */ /* Shorten the time on last normal descriptor */
local_irq_save(flags); local_irq_save(flags);
desc = (struct dmasg *)get_dma_next_desc_ptr(sport->dma_tx_chan); desc = get_dma_next_desc_ptr(sport->dma_tx_chan);
/* Store the descriptor which will be damaged */ /* Store the descriptor which will be damaged */
temp_desc = *desc; temp_desc = *desc;
desc->x_count = 0xa; desc->x_count = 0xa;
desc->y_count = 0; desc->y_count = 0;
desc->next_desc_addr = (unsigned long)(sport->dummy_tx_desc); desc->next_desc_addr = sport->dummy_tx_desc;
local_irq_restore(flags); local_irq_restore(flags);
/* Waiting for dummy buffer descriptor is already hooked*/ /* Waiting for dummy buffer descriptor is already hooked*/
while ((get_dma_curr_desc_ptr(sport->dma_tx_chan) - \ while ((get_dma_curr_desc_ptr(sport->dma_tx_chan) - \
sizeof(struct dmasg)) != \ sizeof(struct dmasg)) != sport->dummy_tx_desc)
(unsigned long)sport->dummy_tx_desc) continue;
;
sport->curr_tx_desc = sport->dummy_tx_desc; sport->curr_tx_desc = sport->dummy_tx_desc;
/* Restore the damaged descriptor */ /* Restore the damaged descriptor */
*desc = temp_desc; *desc = temp_desc;
...@@ -347,11 +337,9 @@ int sport_tx_start(struct sport_device *sport) ...@@ -347,11 +337,9 @@ int sport_tx_start(struct sport_device *sport)
/* Hook the normal buffer descriptor */ /* Hook the normal buffer descriptor */
local_irq_save(flags); local_irq_save(flags);
while ((get_dma_curr_desc_ptr(sport->dma_tx_chan) - while ((get_dma_curr_desc_ptr(sport->dma_tx_chan) -
sizeof(struct dmasg)) != sizeof(struct dmasg)) != sport->dummy_tx_desc)
(unsigned long)sport->dummy_tx_desc) continue;
; sport->dummy_tx_desc->next_desc_addr = sport->dma_tx_desc;
sport->dummy_tx_desc->next_desc_addr =
(unsigned long)(sport->dma_tx_desc);
local_irq_restore(flags); local_irq_restore(flags);
sport->curr_tx_desc = sport->dma_tx_desc; sport->curr_tx_desc = sport->dma_tx_desc;
} else { } else {
...@@ -536,19 +524,17 @@ static int sport_config_rx_dummy(struct sport_device *sport) ...@@ -536,19 +524,17 @@ static int sport_config_rx_dummy(struct sport_device *sport)
unsigned config; unsigned config;
pr_debug("%s entered\n", __func__); pr_debug("%s entered\n", __func__);
#if L1_DATA_A_LENGTH != 0 if (L1_DATA_A_LENGTH)
desc = (struct dmasg *) l1_data_sram_alloc(2 * sizeof(*desc)); desc = l1_data_sram_zalloc(2 * sizeof(*desc));
#else else {
{
dma_addr_t addr; dma_addr_t addr;
desc = dma_alloc_coherent(NULL, 2 * sizeof(*desc), &addr, 0); desc = dma_alloc_coherent(NULL, 2 * sizeof(*desc), &addr, 0);
memset(desc, 0, 2 * sizeof(*desc));
} }
#endif
if (desc == NULL) { if (desc == NULL) {
pr_err("Failed to allocate memory for dummy rx desc\n"); pr_err("Failed to allocate memory for dummy rx desc\n");
return -ENOMEM; return -ENOMEM;
} }
memset(desc, 0, 2 * sizeof(*desc));
sport->dummy_rx_desc = desc; sport->dummy_rx_desc = desc;
desc->start_addr = (unsigned long)sport->dummy_buf; desc->start_addr = (unsigned long)sport->dummy_buf;
config = DMAFLOW_LARGE | NDSIZE_9 | compute_wdsize(sport->wdsize) config = DMAFLOW_LARGE | NDSIZE_9 | compute_wdsize(sport->wdsize)
...@@ -559,8 +545,8 @@ static int sport_config_rx_dummy(struct sport_device *sport) ...@@ -559,8 +545,8 @@ static int sport_config_rx_dummy(struct sport_device *sport)
desc->y_count = 0; desc->y_count = 0;
desc->y_modify = 0; desc->y_modify = 0;
memcpy(desc+1, desc, sizeof(*desc)); memcpy(desc+1, desc, sizeof(*desc));
desc->next_desc_addr = (unsigned long)(desc+1); desc->next_desc_addr = desc + 1;
desc[1].next_desc_addr = (unsigned long)desc; desc[1].next_desc_addr = desc;
return 0; return 0;
} }
...@@ -571,19 +557,17 @@ static int sport_config_tx_dummy(struct sport_device *sport) ...@@ -571,19 +557,17 @@ static int sport_config_tx_dummy(struct sport_device *sport)
pr_debug("%s entered\n", __func__); pr_debug("%s entered\n", __func__);
#if L1_DATA_A_LENGTH != 0 if (L1_DATA_A_LENGTH)
desc = (struct dmasg *) l1_data_sram_alloc(2 * sizeof(*desc)); desc = l1_data_sram_zalloc(2 * sizeof(*desc));
#else else {
{
dma_addr_t addr; dma_addr_t addr;
desc = dma_alloc_coherent(NULL, 2 * sizeof(*desc), &addr, 0); desc = dma_alloc_coherent(NULL, 2 * sizeof(*desc), &addr, 0);
memset(desc, 0, 2 * sizeof(*desc));
} }
#endif
if (!desc) { if (!desc) {
pr_err("Failed to allocate memory for dummy tx desc\n"); pr_err("Failed to allocate memory for dummy tx desc\n");
return -ENOMEM; return -ENOMEM;
} }
memset(desc, 0, 2 * sizeof(*desc));
sport->dummy_tx_desc = desc; sport->dummy_tx_desc = desc;
desc->start_addr = (unsigned long)sport->dummy_buf + \ desc->start_addr = (unsigned long)sport->dummy_buf + \
sport->dummy_count; sport->dummy_count;
...@@ -595,8 +579,8 @@ static int sport_config_tx_dummy(struct sport_device *sport) ...@@ -595,8 +579,8 @@ static int sport_config_tx_dummy(struct sport_device *sport)
desc->y_count = 0; desc->y_count = 0;
desc->y_modify = 0; desc->y_modify = 0;
memcpy(desc+1, desc, sizeof(*desc)); memcpy(desc+1, desc, sizeof(*desc));
desc->next_desc_addr = (unsigned long)(desc+1); desc->next_desc_addr = desc + 1;
desc[1].next_desc_addr = (unsigned long)desc; desc[1].next_desc_addr = desc;
return 0; return 0;
} }
...@@ -872,17 +856,15 @@ struct sport_device *sport_init(struct sport_param *param, unsigned wdsize, ...@@ -872,17 +856,15 @@ struct sport_device *sport_init(struct sport_param *param, unsigned wdsize,
sport->wdsize = wdsize; sport->wdsize = wdsize;
sport->dummy_count = dummy_count; sport->dummy_count = dummy_count;
#if L1_DATA_A_LENGTH != 0 if (L1_DATA_A_LENGTH)
sport->dummy_buf = l1_data_sram_alloc(dummy_count * 2); sport->dummy_buf = l1_data_sram_zalloc(dummy_count * 2);
#else else
sport->dummy_buf = kmalloc(dummy_count * 2, GFP_KERNEL); sport->dummy_buf = kzalloc(dummy_count * 2, GFP_KERNEL);
#endif
if (sport->dummy_buf == NULL) { if (sport->dummy_buf == NULL) {
pr_err("Failed to allocate dummy buffer\n"); pr_err("Failed to allocate dummy buffer\n");
goto __error; goto __error;
} }
memset(sport->dummy_buf, 0, dummy_count * 2);
ret = sport_config_rx_dummy(sport); ret = sport_config_rx_dummy(sport);
if (ret) { if (ret) {
pr_err("Failed to config rx dummy ring\n"); pr_err("Failed to config rx dummy ring\n");
...@@ -939,6 +921,7 @@ void sport_done(struct sport_device *sport) ...@@ -939,6 +921,7 @@ void sport_done(struct sport_device *sport)
sport = NULL; sport = NULL;
} }
EXPORT_SYMBOL(sport_done); EXPORT_SYMBOL(sport_done);
/* /*
* It is only used to send several bytes when dma is not enabled * It is only used to send several bytes when dma is not enabled
* sport controller is configured but not enabled. * sport controller is configured but not enabled.
...@@ -1029,4 +1012,3 @@ EXPORT_SYMBOL(sport_send_and_recv); ...@@ -1029,4 +1012,3 @@ EXPORT_SYMBOL(sport_send_and_recv);
MODULE_AUTHOR("Roy Huang"); MODULE_AUTHOR("Roy Huang");
MODULE_DESCRIPTION("SPORT driver for ADI Blackfin"); MODULE_DESCRIPTION("SPORT driver for ADI Blackfin");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
...@@ -10,9 +10,11 @@ config SND_SOC_I2C_AND_SPI ...@@ -10,9 +10,11 @@ config SND_SOC_I2C_AND_SPI
config SND_SOC_ALL_CODECS config SND_SOC_ALL_CODECS
tristate "Build all ASoC CODEC drivers" tristate "Build all ASoC CODEC drivers"
select SND_SOC_L3
select SND_SOC_AC97_CODEC if SND_SOC_AC97_BUS select SND_SOC_AC97_CODEC if SND_SOC_AC97_BUS
select SND_SOC_AD1980 if SND_SOC_AC97_BUS select SND_SOC_AD1980 if SND_SOC_AC97_BUS
select SND_SOC_AD73311 if I2C select SND_SOC_AD73311 if I2C
select SND_SOC_AK4104 if SPI_MASTER
select SND_SOC_AK4535 if I2C select SND_SOC_AK4535 if I2C
select SND_SOC_CS4270 if I2C select SND_SOC_CS4270 if I2C
select SND_SOC_PCM3008 select SND_SOC_PCM3008
...@@ -24,6 +26,7 @@ config SND_SOC_ALL_CODECS ...@@ -24,6 +26,7 @@ config SND_SOC_ALL_CODECS
select SND_SOC_UDA134X select SND_SOC_UDA134X
select SND_SOC_UDA1380 if I2C select SND_SOC_UDA1380 if I2C
select SND_SOC_WM8350 if MFD_WM8350 select SND_SOC_WM8350 if MFD_WM8350
select SND_SOC_WM8400 if MFD_WM8400
select SND_SOC_WM8510 if SND_SOC_I2C_AND_SPI select SND_SOC_WM8510 if SND_SOC_I2C_AND_SPI
select SND_SOC_WM8580 if I2C select SND_SOC_WM8580 if I2C
select SND_SOC_WM8728 if SND_SOC_I2C_AND_SPI select SND_SOC_WM8728 if SND_SOC_I2C_AND_SPI
...@@ -34,6 +37,7 @@ config SND_SOC_ALL_CODECS ...@@ -34,6 +37,7 @@ config SND_SOC_ALL_CODECS
select SND_SOC_WM8903 if I2C select SND_SOC_WM8903 if I2C
select SND_SOC_WM8971 if I2C select SND_SOC_WM8971 if I2C
select SND_SOC_WM8990 if I2C select SND_SOC_WM8990 if I2C
select SND_SOC_WM9705 if SND_SOC_AC97_BUS
select SND_SOC_WM9712 if SND_SOC_AC97_BUS select SND_SOC_WM9712 if SND_SOC_AC97_BUS
select SND_SOC_WM9713 if SND_SOC_AC97_BUS select SND_SOC_WM9713 if SND_SOC_AC97_BUS
help help
...@@ -58,6 +62,9 @@ config SND_SOC_AD1980 ...@@ -58,6 +62,9 @@ config SND_SOC_AD1980
config SND_SOC_AD73311 config SND_SOC_AD73311
tristate tristate
config SND_SOC_AK4104
tristate
config SND_SOC_AK4535 config SND_SOC_AK4535
tristate tristate
...@@ -65,12 +72,6 @@ config SND_SOC_AK4535 ...@@ -65,12 +72,6 @@ config SND_SOC_AK4535
config SND_SOC_CS4270 config SND_SOC_CS4270
tristate tristate
# Cirrus Logic CS4270 Codec Hardware Mute Support
# Select if you have external muting circuitry attached to your CS4270.
config SND_SOC_CS4270_HWMUTE
bool
depends on SND_SOC_CS4270
# Cirrus Logic CS4270 Codec VD = 3.3V Errata # Cirrus Logic CS4270 Codec VD = 3.3V Errata
# Select if you are affected by the errata where the part will not function # Select if you are affected by the errata where the part will not function
# if MCLK divide-by-1.5 is selected and VD is set to 3.3V. The driver will # if MCLK divide-by-1.5 is selected and VD is set to 3.3V. The driver will
...@@ -90,7 +91,6 @@ config SND_SOC_SSM2602 ...@@ -90,7 +91,6 @@ config SND_SOC_SSM2602
config SND_SOC_TLV320AIC23 config SND_SOC_TLV320AIC23
tristate tristate
depends on I2C
config SND_SOC_TLV320AIC26 config SND_SOC_TLV320AIC26
tristate "TI TLV320AIC26 Codec support" if SND_SOC_OF_SIMPLE tristate "TI TLV320AIC26 Codec support" if SND_SOC_OF_SIMPLE
...@@ -98,15 +98,12 @@ config SND_SOC_TLV320AIC26 ...@@ -98,15 +98,12 @@ config SND_SOC_TLV320AIC26
config SND_SOC_TLV320AIC3X config SND_SOC_TLV320AIC3X
tristate tristate
depends on I2C
config SND_SOC_TWL4030 config SND_SOC_TWL4030
tristate tristate
depends on TWL4030_CORE
config SND_SOC_UDA134X config SND_SOC_UDA134X
tristate tristate
select SND_SOC_L3
config SND_SOC_UDA1380 config SND_SOC_UDA1380
tristate tristate
...@@ -114,6 +111,9 @@ config SND_SOC_UDA1380 ...@@ -114,6 +111,9 @@ config SND_SOC_UDA1380
config SND_SOC_WM8350 config SND_SOC_WM8350
tristate tristate
config SND_SOC_WM8400
tristate
config SND_SOC_WM8510 config SND_SOC_WM8510
tristate tristate
...@@ -144,6 +144,9 @@ config SND_SOC_WM8971 ...@@ -144,6 +144,9 @@ config SND_SOC_WM8971
config SND_SOC_WM8990 config SND_SOC_WM8990
tristate tristate
config SND_SOC_WM9705
tristate
config SND_SOC_WM9712 config SND_SOC_WM9712
tristate tristate
......
snd-soc-ac97-objs := ac97.o snd-soc-ac97-objs := ac97.o
snd-soc-ad1980-objs := ad1980.o snd-soc-ad1980-objs := ad1980.o
snd-soc-ad73311-objs := ad73311.o snd-soc-ad73311-objs := ad73311.o
snd-soc-ak4104-objs := ak4104.o
snd-soc-ak4535-objs := ak4535.o snd-soc-ak4535-objs := ak4535.o
snd-soc-cs4270-objs := cs4270.o snd-soc-cs4270-objs := cs4270.o
snd-soc-l3-objs := l3.o snd-soc-l3-objs := l3.o
...@@ -13,6 +14,7 @@ snd-soc-twl4030-objs := twl4030.o ...@@ -13,6 +14,7 @@ snd-soc-twl4030-objs := twl4030.o
snd-soc-uda134x-objs := uda134x.o snd-soc-uda134x-objs := uda134x.o
snd-soc-uda1380-objs := uda1380.o snd-soc-uda1380-objs := uda1380.o
snd-soc-wm8350-objs := wm8350.o snd-soc-wm8350-objs := wm8350.o
snd-soc-wm8400-objs := wm8400.o
snd-soc-wm8510-objs := wm8510.o snd-soc-wm8510-objs := wm8510.o
snd-soc-wm8580-objs := wm8580.o snd-soc-wm8580-objs := wm8580.o
snd-soc-wm8728-objs := wm8728.o snd-soc-wm8728-objs := wm8728.o
...@@ -23,12 +25,14 @@ snd-soc-wm8900-objs := wm8900.o ...@@ -23,12 +25,14 @@ snd-soc-wm8900-objs := wm8900.o
snd-soc-wm8903-objs := wm8903.o snd-soc-wm8903-objs := wm8903.o
snd-soc-wm8971-objs := wm8971.o snd-soc-wm8971-objs := wm8971.o
snd-soc-wm8990-objs := wm8990.o snd-soc-wm8990-objs := wm8990.o
snd-soc-wm9705-objs := wm9705.o
snd-soc-wm9712-objs := wm9712.o snd-soc-wm9712-objs := wm9712.o
snd-soc-wm9713-objs := wm9713.o snd-soc-wm9713-objs := wm9713.o
obj-$(CONFIG_SND_SOC_AC97_CODEC) += snd-soc-ac97.o obj-$(CONFIG_SND_SOC_AC97_CODEC) += snd-soc-ac97.o
obj-$(CONFIG_SND_SOC_AD1980) += snd-soc-ad1980.o obj-$(CONFIG_SND_SOC_AD1980) += snd-soc-ad1980.o
obj-$(CONFIG_SND_SOC_AD73311) += snd-soc-ad73311.o obj-$(CONFIG_SND_SOC_AD73311) += snd-soc-ad73311.o
obj-$(CONFIG_SND_SOC_AK4104) += snd-soc-ak4104.o
obj-$(CONFIG_SND_SOC_AK4535) += snd-soc-ak4535.o obj-$(CONFIG_SND_SOC_AK4535) += snd-soc-ak4535.o
obj-$(CONFIG_SND_SOC_CS4270) += snd-soc-cs4270.o obj-$(CONFIG_SND_SOC_CS4270) += snd-soc-cs4270.o
obj-$(CONFIG_SND_SOC_L3) += snd-soc-l3.o obj-$(CONFIG_SND_SOC_L3) += snd-soc-l3.o
...@@ -41,6 +45,7 @@ obj-$(CONFIG_SND_SOC_TWL4030) += snd-soc-twl4030.o ...@@ -41,6 +45,7 @@ obj-$(CONFIG_SND_SOC_TWL4030) += snd-soc-twl4030.o
obj-$(CONFIG_SND_SOC_UDA134X) += snd-soc-uda134x.o obj-$(CONFIG_SND_SOC_UDA134X) += snd-soc-uda134x.o
obj-$(CONFIG_SND_SOC_UDA1380) += snd-soc-uda1380.o obj-$(CONFIG_SND_SOC_UDA1380) += snd-soc-uda1380.o
obj-$(CONFIG_SND_SOC_WM8350) += snd-soc-wm8350.o obj-$(CONFIG_SND_SOC_WM8350) += snd-soc-wm8350.o
obj-$(CONFIG_SND_SOC_WM8400) += snd-soc-wm8400.o
obj-$(CONFIG_SND_SOC_WM8510) += snd-soc-wm8510.o obj-$(CONFIG_SND_SOC_WM8510) += snd-soc-wm8510.o
obj-$(CONFIG_SND_SOC_WM8580) += snd-soc-wm8580.o obj-$(CONFIG_SND_SOC_WM8580) += snd-soc-wm8580.o
obj-$(CONFIG_SND_SOC_WM8728) += snd-soc-wm8728.o obj-$(CONFIG_SND_SOC_WM8728) += snd-soc-wm8728.o
...@@ -51,5 +56,7 @@ obj-$(CONFIG_SND_SOC_WM8900) += snd-soc-wm8900.o ...@@ -51,5 +56,7 @@ obj-$(CONFIG_SND_SOC_WM8900) += snd-soc-wm8900.o
obj-$(CONFIG_SND_SOC_WM8903) += snd-soc-wm8903.o obj-$(CONFIG_SND_SOC_WM8903) += snd-soc-wm8903.o
obj-$(CONFIG_SND_SOC_WM8971) += snd-soc-wm8971.o obj-$(CONFIG_SND_SOC_WM8971) += snd-soc-wm8971.o
obj-$(CONFIG_SND_SOC_WM8990) += snd-soc-wm8990.o obj-$(CONFIG_SND_SOC_WM8990) += snd-soc-wm8990.o
obj-$(CONFIG_SND_SOC_WM8991) += snd-soc-wm8991.o
obj-$(CONFIG_SND_SOC_WM9705) += snd-soc-wm9705.o
obj-$(CONFIG_SND_SOC_WM9712) += snd-soc-wm9712.o obj-$(CONFIG_SND_SOC_WM9712) += snd-soc-wm9712.o
obj-$(CONFIG_SND_SOC_WM9713) += snd-soc-wm9713.o obj-$(CONFIG_SND_SOC_WM9713) += snd-soc-wm9713.o
...@@ -30,7 +30,7 @@ static int ac97_prepare(struct snd_pcm_substream *substream, ...@@ -30,7 +30,7 @@ static int ac97_prepare(struct snd_pcm_substream *substream,
struct snd_pcm_runtime *runtime = substream->runtime; struct snd_pcm_runtime *runtime = substream->runtime;
struct snd_soc_pcm_runtime *rtd = substream->private_data; struct snd_soc_pcm_runtime *rtd = substream->private_data;
struct snd_soc_device *socdev = rtd->socdev; struct snd_soc_device *socdev = rtd->socdev;
struct snd_soc_codec *codec = socdev->codec; struct snd_soc_codec *codec = socdev->card->codec;
int reg = (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) ? int reg = (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) ?
AC97_PCM_FRONT_DAC_RATE : AC97_PCM_LR_ADC_RATE; AC97_PCM_FRONT_DAC_RATE : AC97_PCM_LR_ADC_RATE;
...@@ -41,6 +41,10 @@ static int ac97_prepare(struct snd_pcm_substream *substream, ...@@ -41,6 +41,10 @@ static int ac97_prepare(struct snd_pcm_substream *substream,
SNDRV_PCM_RATE_22050 | SNDRV_PCM_RATE_44100 |\ SNDRV_PCM_RATE_22050 | SNDRV_PCM_RATE_44100 |\
SNDRV_PCM_RATE_48000) SNDRV_PCM_RATE_48000)
static struct snd_soc_dai_ops ac97_dai_ops = {
.prepare = ac97_prepare,
};
struct snd_soc_dai ac97_dai = { struct snd_soc_dai ac97_dai = {
.name = "AC97 HiFi", .name = "AC97 HiFi",
.ac97_control = 1, .ac97_control = 1,
...@@ -56,8 +60,7 @@ struct snd_soc_dai ac97_dai = { ...@@ -56,8 +60,7 @@ struct snd_soc_dai ac97_dai = {
.channels_max = 2, .channels_max = 2,
.rates = STD_AC97_RATES, .rates = STD_AC97_RATES,
.formats = SNDRV_PCM_FMTBIT_S16_LE,}, .formats = SNDRV_PCM_FMTBIT_S16_LE,},
.ops = { .ops = &ac97_dai_ops,
.prepare = ac97_prepare,},
}; };
EXPORT_SYMBOL_GPL(ac97_dai); EXPORT_SYMBOL_GPL(ac97_dai);
...@@ -84,10 +87,10 @@ static int ac97_soc_probe(struct platform_device *pdev) ...@@ -84,10 +87,10 @@ static int ac97_soc_probe(struct platform_device *pdev)
printk(KERN_INFO "AC97 SoC Audio Codec %s\n", AC97_VERSION); printk(KERN_INFO "AC97 SoC Audio Codec %s\n", AC97_VERSION);
socdev->codec = kzalloc(sizeof(struct snd_soc_codec), GFP_KERNEL); socdev->card->codec = kzalloc(sizeof(struct snd_soc_codec), GFP_KERNEL);
if (!socdev->codec) if (!socdev->card->codec)
return -ENOMEM; return -ENOMEM;
codec = socdev->codec; codec = socdev->card->codec;
mutex_init(&codec->mutex); mutex_init(&codec->mutex);
codec->name = "AC97"; codec->name = "AC97";
...@@ -123,23 +126,21 @@ static int ac97_soc_probe(struct platform_device *pdev) ...@@ -123,23 +126,21 @@ static int ac97_soc_probe(struct platform_device *pdev)
snd_soc_free_pcms(socdev); snd_soc_free_pcms(socdev);
err: err:
kfree(socdev->codec->reg_cache); kfree(socdev->card->codec);
kfree(socdev->codec); socdev->card->codec = NULL;
socdev->codec = NULL;
return ret; return ret;
} }
static int ac97_soc_remove(struct platform_device *pdev) static int ac97_soc_remove(struct platform_device *pdev)
{ {
struct snd_soc_device *socdev = platform_get_drvdata(pdev); struct snd_soc_device *socdev = platform_get_drvdata(pdev);
struct snd_soc_codec *codec = socdev->codec; struct snd_soc_codec *codec = socdev->card->codec;
if (!codec) if (!codec)
return 0; return 0;
snd_soc_free_pcms(socdev); snd_soc_free_pcms(socdev);
kfree(socdev->codec->reg_cache); kfree(socdev->card->codec);
kfree(socdev->codec);
return 0; return 0;
} }
...@@ -149,7 +150,7 @@ static int ac97_soc_suspend(struct platform_device *pdev, pm_message_t msg) ...@@ -149,7 +150,7 @@ static int ac97_soc_suspend(struct platform_device *pdev, pm_message_t msg)
{ {
struct snd_soc_device *socdev = platform_get_drvdata(pdev); struct snd_soc_device *socdev = platform_get_drvdata(pdev);
snd_ac97_suspend(socdev->codec->ac97); snd_ac97_suspend(socdev->card->codec->ac97);
return 0; return 0;
} }
...@@ -158,7 +159,7 @@ static int ac97_soc_resume(struct platform_device *pdev) ...@@ -158,7 +159,7 @@ static int ac97_soc_resume(struct platform_device *pdev)
{ {
struct snd_soc_device *socdev = platform_get_drvdata(pdev); struct snd_soc_device *socdev = platform_get_drvdata(pdev);
snd_ac97_resume(socdev->codec->ac97); snd_ac97_resume(socdev->card->codec->ac97);
return 0; return 0;
} }
......
...@@ -93,20 +93,6 @@ SOC_ENUM("Capture Source", ad1980_cap_src), ...@@ -93,20 +93,6 @@ SOC_ENUM("Capture Source", ad1980_cap_src),
SOC_SINGLE("Mic Boost Switch", AC97_MIC, 6, 1, 0), SOC_SINGLE("Mic Boost Switch", AC97_MIC, 6, 1, 0),
}; };
/* add non dapm controls */
static int ad1980_add_controls(struct snd_soc_codec *codec)
{
int err, i;
for (i = 0; i < ARRAY_SIZE(ad1980_snd_ac97_controls); i++) {
err = snd_ctl_add(codec->card, snd_soc_cnew(
&ad1980_snd_ac97_controls[i], codec, NULL));
if (err < 0)
return err;
}
return 0;
}
static unsigned int ac97_read(struct snd_soc_codec *codec, static unsigned int ac97_read(struct snd_soc_codec *codec,
unsigned int reg) unsigned int reg)
{ {
...@@ -123,7 +109,7 @@ static unsigned int ac97_read(struct snd_soc_codec *codec, ...@@ -123,7 +109,7 @@ static unsigned int ac97_read(struct snd_soc_codec *codec,
default: default:
reg = reg >> 1; reg = reg >> 1;
if (reg >= (ARRAY_SIZE(ad1980_reg))) if (reg >= ARRAY_SIZE(ad1980_reg))
return -EINVAL; return -EINVAL;
return cache[reg]; return cache[reg];
...@@ -137,7 +123,7 @@ static int ac97_write(struct snd_soc_codec *codec, unsigned int reg, ...@@ -137,7 +123,7 @@ static int ac97_write(struct snd_soc_codec *codec, unsigned int reg,
soc_ac97_ops.write(codec->ac97, reg, val); soc_ac97_ops.write(codec->ac97, reg, val);
reg = reg >> 1; reg = reg >> 1;
if (reg < (ARRAY_SIZE(ad1980_reg))) if (reg < ARRAY_SIZE(ad1980_reg))
cache[reg] = val; cache[reg] = val;
return 0; return 0;
...@@ -200,10 +186,10 @@ static int ad1980_soc_probe(struct platform_device *pdev) ...@@ -200,10 +186,10 @@ static int ad1980_soc_probe(struct platform_device *pdev)
printk(KERN_INFO "AD1980 SoC Audio Codec\n"); printk(KERN_INFO "AD1980 SoC Audio Codec\n");
socdev->codec = kzalloc(sizeof(struct snd_soc_codec), GFP_KERNEL); socdev->card->codec = kzalloc(sizeof(struct snd_soc_codec), GFP_KERNEL);
if (socdev->codec == NULL) if (socdev->card->codec == NULL)
return -ENOMEM; return -ENOMEM;
codec = socdev->codec; codec = socdev->card->codec;
mutex_init(&codec->mutex); mutex_init(&codec->mutex);
codec->reg_cache = codec->reg_cache =
...@@ -269,7 +255,8 @@ static int ad1980_soc_probe(struct platform_device *pdev) ...@@ -269,7 +255,8 @@ static int ad1980_soc_probe(struct platform_device *pdev)
ext_status = ac97_read(codec, AC97_EXTENDED_STATUS); ext_status = ac97_read(codec, AC97_EXTENDED_STATUS);
ac97_write(codec, AC97_EXTENDED_STATUS, ext_status&~0x3800); ac97_write(codec, AC97_EXTENDED_STATUS, ext_status&~0x3800);
ad1980_add_controls(codec); snd_soc_add_controls(codec, ad1980_snd_ac97_controls,
ARRAY_SIZE(ad1980_snd_ac97_controls));
ret = snd_soc_init_card(socdev); ret = snd_soc_init_card(socdev);
if (ret < 0) { if (ret < 0) {
printk(KERN_ERR "ad1980: failed to register card\n"); printk(KERN_ERR "ad1980: failed to register card\n");
...@@ -288,15 +275,15 @@ static int ad1980_soc_probe(struct platform_device *pdev) ...@@ -288,15 +275,15 @@ static int ad1980_soc_probe(struct platform_device *pdev)
kfree(codec->reg_cache); kfree(codec->reg_cache);
cache_err: cache_err:
kfree(socdev->codec); kfree(socdev->card->codec);
socdev->codec = NULL; socdev->card->codec = NULL;
return ret; return ret;
} }
static int ad1980_soc_remove(struct platform_device *pdev) static int ad1980_soc_remove(struct platform_device *pdev)
{ {
struct snd_soc_device *socdev = platform_get_drvdata(pdev); struct snd_soc_device *socdev = platform_get_drvdata(pdev);
struct snd_soc_codec *codec = socdev->codec; struct snd_soc_codec *codec = socdev->card->codec;
if (codec == NULL) if (codec == NULL)
return 0; return 0;
......
...@@ -53,7 +53,7 @@ static int ad73311_soc_probe(struct platform_device *pdev) ...@@ -53,7 +53,7 @@ static int ad73311_soc_probe(struct platform_device *pdev)
codec->owner = THIS_MODULE; codec->owner = THIS_MODULE;
codec->dai = &ad73311_dai; codec->dai = &ad73311_dai;
codec->num_dai = 1; codec->num_dai = 1;
socdev->codec = codec; socdev->card->codec = codec;
INIT_LIST_HEAD(&codec->dapm_widgets); INIT_LIST_HEAD(&codec->dapm_widgets);
INIT_LIST_HEAD(&codec->dapm_paths); INIT_LIST_HEAD(&codec->dapm_paths);
...@@ -75,15 +75,15 @@ static int ad73311_soc_probe(struct platform_device *pdev) ...@@ -75,15 +75,15 @@ static int ad73311_soc_probe(struct platform_device *pdev)
register_err: register_err:
snd_soc_free_pcms(socdev); snd_soc_free_pcms(socdev);
pcm_err: pcm_err:
kfree(socdev->codec); kfree(socdev->card->codec);
socdev->codec = NULL; socdev->card->codec = NULL;
return ret; return ret;
} }
static int ad73311_soc_remove(struct platform_device *pdev) static int ad73311_soc_remove(struct platform_device *pdev)
{ {
struct snd_soc_device *socdev = platform_get_drvdata(pdev); struct snd_soc_device *socdev = platform_get_drvdata(pdev);
struct snd_soc_codec *codec = socdev->codec; struct snd_soc_codec *codec = socdev->card->codec;
if (codec == NULL) if (codec == NULL)
return 0; return 0;
......
...@@ -70,7 +70,7 @@ ...@@ -70,7 +70,7 @@
#define REGD_IGS(x) (x & 0x7) #define REGD_IGS(x) (x & 0x7)
#define REGD_RMOD (1 << 3) #define REGD_RMOD (1 << 3)
#define REGD_OGS(x) ((x & 0x7) << 4) #define REGD_OGS(x) ((x & 0x7) << 4)
#define REGD_MUTE (x << 7) #define REGD_MUTE (1 << 7)
/* Control register E */ /* Control register E */
#define CTRL_REG_E (4 << 8) #define CTRL_REG_E (4 << 8)
......
/*
* AK4104 ALSA SoC (ASoC) driver
*
* Copyright (c) 2009 Daniel Mack <daniel@caiaq.de>
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
* Free Software Foundation; either version 2 of the License, or (at your
* option) any later version.
*/
#include <linux/module.h>
#include <sound/core.h>
#include <sound/soc.h>
#include <sound/initval.h>
#include <linux/spi/spi.h>
#include <sound/asoundef.h>
#include "ak4104.h"
/* AK4104 registers addresses */
#define AK4104_REG_CONTROL1 0x00
#define AK4104_REG_RESERVED 0x01
#define AK4104_REG_CONTROL2 0x02
#define AK4104_REG_TX 0x03
#define AK4104_REG_CHN_STATUS(x) ((x) + 0x04)
#define AK4104_NUM_REGS 10
#define AK4104_REG_MASK 0x1f
#define AK4104_READ 0xc0
#define AK4104_WRITE 0xe0
#define AK4104_RESERVED_VAL 0x5b
/* Bit masks for AK4104 registers */
#define AK4104_CONTROL1_RSTN (1 << 0)
#define AK4104_CONTROL1_PW (1 << 1)
#define AK4104_CONTROL1_DIF0 (1 << 2)
#define AK4104_CONTROL1_DIF1 (1 << 3)
#define AK4104_CONTROL2_SEL0 (1 << 0)
#define AK4104_CONTROL2_SEL1 (1 << 1)
#define AK4104_CONTROL2_MODE (1 << 2)
#define AK4104_TX_TXE (1 << 0)
#define AK4104_TX_V (1 << 1)
#define DRV_NAME "ak4104"
struct ak4104_private {
struct snd_soc_codec codec;
u8 reg_cache[AK4104_NUM_REGS];
};
static int ak4104_fill_cache(struct snd_soc_codec *codec)
{
int i;
u8 *reg_cache = codec->reg_cache;
struct spi_device *spi = codec->control_data;
for (i = 0; i < codec->reg_cache_size; i++) {
int ret = spi_w8r8(spi, i | AK4104_READ);
if (ret < 0) {
dev_err(&spi->dev, "SPI write failure\n");
return ret;
}
reg_cache[i] = ret;
}
return 0;
}
static unsigned int ak4104_read_reg_cache(struct snd_soc_codec *codec,
unsigned int reg)
{
u8 *reg_cache = codec->reg_cache;
if (reg >= codec->reg_cache_size)
return -EINVAL;
return reg_cache[reg];
}
static int ak4104_spi_write(struct snd_soc_codec *codec, unsigned int reg,
unsigned int value)
{
u8 *cache = codec->reg_cache;
struct spi_device *spi = codec->control_data;
if (reg >= codec->reg_cache_size)
return -EINVAL;
reg &= AK4104_REG_MASK;
reg |= AK4104_WRITE;
/* only write to the hardware if value has changed */
if (cache[reg] != value) {
u8 tmp[2] = { reg, value };
if (spi_write(spi, tmp, sizeof(tmp))) {
dev_err(&spi->dev, "SPI write failed\n");
return -EIO;
}
cache[reg] = value;
}
return 0;
}
static int ak4104_set_dai_fmt(struct snd_soc_dai *codec_dai,
unsigned int format)
{
struct snd_soc_codec *codec = codec_dai->codec;
int val = 0;
val = ak4104_read_reg_cache(codec, AK4104_REG_CONTROL1);
if (val < 0)
return val;
val &= ~(AK4104_CONTROL1_DIF0 | AK4104_CONTROL1_DIF1);
/* set DAI format */
switch (format & SND_SOC_DAIFMT_FORMAT_MASK) {
case SND_SOC_DAIFMT_RIGHT_J:
break;
case SND_SOC_DAIFMT_LEFT_J:
val |= AK4104_CONTROL1_DIF0;
break;
case SND_SOC_DAIFMT_I2S:
val |= AK4104_CONTROL1_DIF0 | AK4104_CONTROL1_DIF1;
break;
default:
dev_err(codec->dev, "invalid dai format\n");
return -EINVAL;
}
/* This device can only be slave */
if ((format & SND_SOC_DAIFMT_MASTER_MASK) != SND_SOC_DAIFMT_CBS_CFS)
return -EINVAL;
return ak4104_spi_write(codec, AK4104_REG_CONTROL1, val);
}
static int ak4104_hw_params(struct snd_pcm_substream *substream,
struct snd_pcm_hw_params *params,
struct snd_soc_dai *dai)
{
struct snd_soc_pcm_runtime *rtd = substream->private_data;
struct snd_soc_device *socdev = rtd->socdev;
struct snd_soc_codec *codec = socdev->card->codec;
int val = 0;
/* set the IEC958 bits: consumer mode, no copyright bit */
val |= IEC958_AES0_CON_NOT_COPYRIGHT;
ak4104_spi_write(codec, AK4104_REG_CHN_STATUS(0), val);
val = 0;
switch (params_rate(params)) {
case 44100:
val |= IEC958_AES3_CON_FS_44100;
break;
case 48000:
val |= IEC958_AES3_CON_FS_48000;
break;
case 32000:
val |= IEC958_AES3_CON_FS_32000;
break;
default:
dev_err(codec->dev, "unsupported sampling rate\n");
return -EINVAL;
}
return ak4104_spi_write(codec, AK4104_REG_CHN_STATUS(3), val);
}
static struct snd_soc_dai_ops ak4101_dai_ops = {
.hw_params = ak4104_hw_params,
.set_fmt = ak4104_set_dai_fmt,
};
struct snd_soc_dai ak4104_dai = {
.name = DRV_NAME,
.playback = {
.stream_name = "Playback",
.channels_min = 2,
.channels_max = 2,
.rates = SNDRV_PCM_RATE_44100 |
SNDRV_PCM_RATE_48000 |
SNDRV_PCM_RATE_32000,
.formats = SNDRV_PCM_FMTBIT_S16_LE |
SNDRV_PCM_FMTBIT_S24_3LE |
SNDRV_PCM_FMTBIT_S24_LE
},
.ops = &ak4101_dai_ops,
};
static struct snd_soc_codec *ak4104_codec;
static int ak4104_spi_probe(struct spi_device *spi)
{
struct snd_soc_codec *codec;
struct ak4104_private *ak4104;
int ret, val;
spi->bits_per_word = 8;
spi->mode = SPI_MODE_0;
ret = spi_setup(spi);
if (ret < 0)
return ret;
ak4104 = kzalloc(sizeof(struct ak4104_private), GFP_KERNEL);
if (!ak4104) {
dev_err(&spi->dev, "could not allocate codec\n");
return -ENOMEM;
}
codec = &ak4104->codec;
mutex_init(&codec->mutex);
INIT_LIST_HEAD(&codec->dapm_widgets);
INIT_LIST_HEAD(&codec->dapm_paths);
codec->dev = &spi->dev;
codec->name = DRV_NAME;
codec->owner = THIS_MODULE;
codec->dai = &ak4104_dai;
codec->num_dai = 1;
codec->private_data = ak4104;
codec->control_data = spi;
codec->reg_cache = ak4104->reg_cache;
codec->reg_cache_size = AK4104_NUM_REGS;
/* read all regs and fill the cache */
ret = ak4104_fill_cache(codec);
if (ret < 0) {
dev_err(&spi->dev, "failed to fill register cache\n");
return ret;
}
/* read the 'reserved' register - according to the datasheet, it
* should contain 0x5b. Not a good way to verify the presence of
* the device, but there is no hardware ID register. */
if (ak4104_read_reg_cache(codec, AK4104_REG_RESERVED) !=
AK4104_RESERVED_VAL) {
ret = -ENODEV;
goto error_free_codec;
}
/* set power-up and non-reset bits */
val = ak4104_read_reg_cache(codec, AK4104_REG_CONTROL1);
val |= AK4104_CONTROL1_PW | AK4104_CONTROL1_RSTN;
ret = ak4104_spi_write(codec, AK4104_REG_CONTROL1, val);
if (ret < 0)
goto error_free_codec;
/* enable transmitter */
val = ak4104_read_reg_cache(codec, AK4104_REG_TX);
val |= AK4104_TX_TXE;
ret = ak4104_spi_write(codec, AK4104_REG_TX, val);
if (ret < 0)
goto error_free_codec;
ak4104_codec = codec;
ret = snd_soc_register_dai(&ak4104_dai);
if (ret < 0) {
dev_err(&spi->dev, "failed to register DAI\n");
goto error_free_codec;
}
spi_set_drvdata(spi, ak4104);
dev_info(&spi->dev, "SPI device initialized\n");
return 0;
error_free_codec:
kfree(ak4104);
ak4104_dai.dev = NULL;
return ret;
}
static int __devexit ak4104_spi_remove(struct spi_device *spi)
{
int ret, val;
struct ak4104_private *ak4104 = spi_get_drvdata(spi);
val = ak4104_read_reg_cache(&ak4104->codec, AK4104_REG_CONTROL1);
if (val < 0)
return val;
/* clear power-up and non-reset bits */
val &= ~(AK4104_CONTROL1_PW | AK4104_CONTROL1_RSTN);
ret = ak4104_spi_write(&ak4104->codec, AK4104_REG_CONTROL1, val);
if (ret < 0)
return ret;
ak4104_codec = NULL;
kfree(ak4104);
return 0;
}
static int ak4104_probe(struct platform_device *pdev)
{
struct snd_soc_device *socdev = platform_get_drvdata(pdev);
struct snd_soc_codec *codec = ak4104_codec;
int ret;
/* Connect the codec to the socdev. snd_soc_new_pcms() needs this. */
socdev->card->codec = codec;
/* Register PCMs */
ret = snd_soc_new_pcms(socdev, SNDRV_DEFAULT_IDX1, SNDRV_DEFAULT_STR1);
if (ret < 0) {
dev_err(codec->dev, "failed to create pcms\n");
return ret;
}
/* Register the socdev */
ret = snd_soc_init_card(socdev);
if (ret < 0) {
dev_err(codec->dev, "failed to register card\n");
snd_soc_free_pcms(socdev);
return ret;
}
return 0;
}
static int ak4104_remove(struct platform_device *pdev)
{
struct snd_soc_device *socdev = platform_get_drvdata(pdev);
snd_soc_free_pcms(socdev);
return 0;
};
struct snd_soc_codec_device soc_codec_device_ak4104 = {
.probe = ak4104_probe,
.remove = ak4104_remove
};
EXPORT_SYMBOL_GPL(soc_codec_device_ak4104);
static struct spi_driver ak4104_spi_driver = {
.driver = {
.name = DRV_NAME,
.owner = THIS_MODULE,
},
.probe = ak4104_spi_probe,
.remove = __devexit_p(ak4104_spi_remove),
};
static int __init ak4104_init(void)
{
pr_info("Asahi Kasei AK4104 ALSA SoC Codec Driver\n");
return spi_register_driver(&ak4104_spi_driver);
}
module_init(ak4104_init);
static void __exit ak4104_exit(void)
{
spi_unregister_driver(&ak4104_spi_driver);
}
module_exit(ak4104_exit);
MODULE_AUTHOR("Daniel Mack <daniel@caiaq.de>");
MODULE_DESCRIPTION("Asahi Kasei AK4104 ALSA SoC driver");
MODULE_LICENSE("GPL");
#ifndef _AK4104_H
#define _AK4104_H
extern struct snd_soc_dai ak4104_dai;
extern struct snd_soc_codec_device soc_codec_device_ak4104;
#endif
...@@ -155,21 +155,6 @@ static const struct snd_kcontrol_new ak4535_snd_controls[] = { ...@@ -155,21 +155,6 @@ static const struct snd_kcontrol_new ak4535_snd_controls[] = {
SOC_SINGLE("Mic Sidetone Volume", AK4535_VOL, 4, 7, 0), SOC_SINGLE("Mic Sidetone Volume", AK4535_VOL, 4, 7, 0),
}; };
/* add non dapm controls */
static int ak4535_add_controls(struct snd_soc_codec *codec)
{
int err, i;
for (i = 0; i < ARRAY_SIZE(ak4535_snd_controls); i++) {
err = snd_ctl_add(codec->card,
snd_soc_cnew(&ak4535_snd_controls[i], codec, NULL));
if (err < 0)
return err;
}
return 0;
}
/* Mono 1 Mixer */ /* Mono 1 Mixer */
static const struct snd_kcontrol_new ak4535_mono1_mixer_controls[] = { static const struct snd_kcontrol_new ak4535_mono1_mixer_controls[] = {
SOC_DAPM_SINGLE("Mic Sidetone Switch", AK4535_SIG1, 4, 1, 0), SOC_DAPM_SINGLE("Mic Sidetone Switch", AK4535_SIG1, 4, 1, 0),
...@@ -344,7 +329,7 @@ static int ak4535_hw_params(struct snd_pcm_substream *substream, ...@@ -344,7 +329,7 @@ static int ak4535_hw_params(struct snd_pcm_substream *substream,
{ {
struct snd_soc_pcm_runtime *rtd = substream->private_data; struct snd_soc_pcm_runtime *rtd = substream->private_data;
struct snd_soc_device *socdev = rtd->socdev; struct snd_soc_device *socdev = rtd->socdev;
struct snd_soc_codec *codec = socdev->codec; struct snd_soc_codec *codec = socdev->card->codec;
struct ak4535_priv *ak4535 = codec->private_data; struct ak4535_priv *ak4535 = codec->private_data;
u8 mode2 = ak4535_read_reg_cache(codec, AK4535_MODE2) & ~(0x3 << 5); u8 mode2 = ak4535_read_reg_cache(codec, AK4535_MODE2) & ~(0x3 << 5);
int rate = params_rate(params), fs = 256; int rate = params_rate(params), fs = 256;
...@@ -436,6 +421,13 @@ static int ak4535_set_bias_level(struct snd_soc_codec *codec, ...@@ -436,6 +421,13 @@ static int ak4535_set_bias_level(struct snd_soc_codec *codec,
SNDRV_PCM_RATE_16000 | SNDRV_PCM_RATE_22050 |\ SNDRV_PCM_RATE_16000 | SNDRV_PCM_RATE_22050 |\
SNDRV_PCM_RATE_44100 | SNDRV_PCM_RATE_48000) SNDRV_PCM_RATE_44100 | SNDRV_PCM_RATE_48000)
static struct snd_soc_dai_ops ak4535_dai_ops = {
.hw_params = ak4535_hw_params,
.set_fmt = ak4535_set_dai_fmt,
.digital_mute = ak4535_mute,
.set_sysclk = ak4535_set_dai_sysclk,
};
struct snd_soc_dai ak4535_dai = { struct snd_soc_dai ak4535_dai = {
.name = "AK4535", .name = "AK4535",
.playback = { .playback = {
...@@ -450,19 +442,14 @@ struct snd_soc_dai ak4535_dai = { ...@@ -450,19 +442,14 @@ struct snd_soc_dai ak4535_dai = {
.channels_max = 2, .channels_max = 2,
.rates = AK4535_RATES, .rates = AK4535_RATES,
.formats = SNDRV_PCM_FMTBIT_S16_LE,}, .formats = SNDRV_PCM_FMTBIT_S16_LE,},
.ops = { .ops = &ak4535_dai_ops,
.hw_params = ak4535_hw_params,
.set_fmt = ak4535_set_dai_fmt,
.digital_mute = ak4535_mute,
.set_sysclk = ak4535_set_dai_sysclk,
},
}; };
EXPORT_SYMBOL_GPL(ak4535_dai); EXPORT_SYMBOL_GPL(ak4535_dai);
static int ak4535_suspend(struct platform_device *pdev, pm_message_t state) static int ak4535_suspend(struct platform_device *pdev, pm_message_t state)
{ {
struct snd_soc_device *socdev = platform_get_drvdata(pdev); struct snd_soc_device *socdev = platform_get_drvdata(pdev);
struct snd_soc_codec *codec = socdev->codec; struct snd_soc_codec *codec = socdev->card->codec;
ak4535_set_bias_level(codec, SND_SOC_BIAS_OFF); ak4535_set_bias_level(codec, SND_SOC_BIAS_OFF);
return 0; return 0;
...@@ -471,7 +458,7 @@ static int ak4535_suspend(struct platform_device *pdev, pm_message_t state) ...@@ -471,7 +458,7 @@ static int ak4535_suspend(struct platform_device *pdev, pm_message_t state)
static int ak4535_resume(struct platform_device *pdev) static int ak4535_resume(struct platform_device *pdev)
{ {
struct snd_soc_device *socdev = platform_get_drvdata(pdev); struct snd_soc_device *socdev = platform_get_drvdata(pdev);
struct snd_soc_codec *codec = socdev->codec; struct snd_soc_codec *codec = socdev->card->codec;
ak4535_sync(codec); ak4535_sync(codec);
ak4535_set_bias_level(codec, SND_SOC_BIAS_STANDBY); ak4535_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
ak4535_set_bias_level(codec, codec->suspend_bias_level); ak4535_set_bias_level(codec, codec->suspend_bias_level);
...@@ -484,7 +471,7 @@ static int ak4535_resume(struct platform_device *pdev) ...@@ -484,7 +471,7 @@ static int ak4535_resume(struct platform_device *pdev)
*/ */
static int ak4535_init(struct snd_soc_device *socdev) static int ak4535_init(struct snd_soc_device *socdev)
{ {
struct snd_soc_codec *codec = socdev->codec; struct snd_soc_codec *codec = socdev->card->codec;
int ret = 0; int ret = 0;
codec->name = "AK4535"; codec->name = "AK4535";
...@@ -510,7 +497,8 @@ static int ak4535_init(struct snd_soc_device *socdev) ...@@ -510,7 +497,8 @@ static int ak4535_init(struct snd_soc_device *socdev)
/* power on device */ /* power on device */
ak4535_set_bias_level(codec, SND_SOC_BIAS_STANDBY); ak4535_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
ak4535_add_controls(codec); snd_soc_add_controls(codec, ak4535_snd_controls,
ARRAY_SIZE(ak4535_snd_controls));
ak4535_add_widgets(codec); ak4535_add_widgets(codec);
ret = snd_soc_init_card(socdev); ret = snd_soc_init_card(socdev);
if (ret < 0) { if (ret < 0) {
...@@ -537,7 +525,7 @@ static int ak4535_i2c_probe(struct i2c_client *i2c, ...@@ -537,7 +525,7 @@ static int ak4535_i2c_probe(struct i2c_client *i2c,
const struct i2c_device_id *id) const struct i2c_device_id *id)
{ {
struct snd_soc_device *socdev = ak4535_socdev; struct snd_soc_device *socdev = ak4535_socdev;
struct snd_soc_codec *codec = socdev->codec; struct snd_soc_codec *codec = socdev->card->codec;
int ret; int ret;
i2c_set_clientdata(i2c, codec); i2c_set_clientdata(i2c, codec);
...@@ -636,7 +624,7 @@ static int ak4535_probe(struct platform_device *pdev) ...@@ -636,7 +624,7 @@ static int ak4535_probe(struct platform_device *pdev)
} }
codec->private_data = ak4535; codec->private_data = ak4535;
socdev->codec = codec; socdev->card->codec = codec;
mutex_init(&codec->mutex); mutex_init(&codec->mutex);
INIT_LIST_HEAD(&codec->dapm_widgets); INIT_LIST_HEAD(&codec->dapm_widgets);
INIT_LIST_HEAD(&codec->dapm_paths); INIT_LIST_HEAD(&codec->dapm_paths);
...@@ -663,7 +651,7 @@ static int ak4535_probe(struct platform_device *pdev) ...@@ -663,7 +651,7 @@ static int ak4535_probe(struct platform_device *pdev)
static int ak4535_remove(struct platform_device *pdev) static int ak4535_remove(struct platform_device *pdev)
{ {
struct snd_soc_device *socdev = platform_get_drvdata(pdev); struct snd_soc_device *socdev = platform_get_drvdata(pdev);
struct snd_soc_codec *codec = socdev->codec; struct snd_soc_codec *codec = socdev->card->codec;
if (codec->control_data) if (codec->control_data)
ak4535_set_bias_level(codec, SND_SOC_BIAS_OFF); ak4535_set_bias_level(codec, SND_SOC_BIAS_OFF);
......
This diff is collapsed.
...@@ -67,11 +67,11 @@ static int pcm3008_soc_probe(struct platform_device *pdev) ...@@ -67,11 +67,11 @@ static int pcm3008_soc_probe(struct platform_device *pdev)
printk(KERN_INFO "PCM3008 SoC Audio Codec %s\n", PCM3008_VERSION); printk(KERN_INFO "PCM3008 SoC Audio Codec %s\n", PCM3008_VERSION);
socdev->codec = kzalloc(sizeof(struct snd_soc_codec), GFP_KERNEL); socdev->card->codec = kzalloc(sizeof(struct snd_soc_codec), GFP_KERNEL);
if (!socdev->codec) if (!socdev->card->codec)
return -ENOMEM; return -ENOMEM;
codec = socdev->codec; codec = socdev->card->codec;
mutex_init(&codec->mutex); mutex_init(&codec->mutex);
codec->name = "PCM3008"; codec->name = "PCM3008";
...@@ -139,7 +139,7 @@ static int pcm3008_soc_probe(struct platform_device *pdev) ...@@ -139,7 +139,7 @@ static int pcm3008_soc_probe(struct platform_device *pdev)
card_err: card_err:
snd_soc_free_pcms(socdev); snd_soc_free_pcms(socdev);
pcm_err: pcm_err:
kfree(socdev->codec); kfree(socdev->card->codec);
return ret; return ret;
} }
...@@ -147,7 +147,7 @@ static int pcm3008_soc_probe(struct platform_device *pdev) ...@@ -147,7 +147,7 @@ static int pcm3008_soc_probe(struct platform_device *pdev)
static int pcm3008_soc_remove(struct platform_device *pdev) static int pcm3008_soc_remove(struct platform_device *pdev)
{ {
struct snd_soc_device *socdev = platform_get_drvdata(pdev); struct snd_soc_device *socdev = platform_get_drvdata(pdev);
struct snd_soc_codec *codec = socdev->codec; struct snd_soc_codec *codec = socdev->card->codec;
struct pcm3008_setup_data *setup = socdev->codec_data; struct pcm3008_setup_data *setup = socdev->codec_data;
if (!codec) if (!codec)
...@@ -155,7 +155,7 @@ static int pcm3008_soc_remove(struct platform_device *pdev) ...@@ -155,7 +155,7 @@ static int pcm3008_soc_remove(struct platform_device *pdev)
pcm3008_gpio_free(setup); pcm3008_gpio_free(setup);
snd_soc_free_pcms(socdev); snd_soc_free_pcms(socdev);
kfree(socdev->codec); kfree(socdev->card->codec);
return 0; return 0;
} }
......
...@@ -151,21 +151,6 @@ SOC_ENUM("Capture Source", ssm2602_enum[0]), ...@@ -151,21 +151,6 @@ SOC_ENUM("Capture Source", ssm2602_enum[0]),
SOC_ENUM("Playback De-emphasis", ssm2602_enum[1]), SOC_ENUM("Playback De-emphasis", ssm2602_enum[1]),
}; };
/* add non dapm controls */
static int ssm2602_add_controls(struct snd_soc_codec *codec)
{
int err, i;
for (i = 0; i < ARRAY_SIZE(ssm2602_snd_controls); i++) {
err = snd_ctl_add(codec->card,
snd_soc_cnew(&ssm2602_snd_controls[i], codec, NULL));
if (err < 0)
return err;
}
return 0;
}
/* Output Mixer */ /* Output Mixer */
static const struct snd_kcontrol_new ssm2602_output_mixer_controls[] = { static const struct snd_kcontrol_new ssm2602_output_mixer_controls[] = {
SOC_DAPM_SINGLE("Line Bypass Switch", SSM2602_APANA, 3, 1, 0), SOC_DAPM_SINGLE("Line Bypass Switch", SSM2602_APANA, 3, 1, 0),
...@@ -291,7 +276,7 @@ static int ssm2602_hw_params(struct snd_pcm_substream *substream, ...@@ -291,7 +276,7 @@ static int ssm2602_hw_params(struct snd_pcm_substream *substream,
u16 srate; u16 srate;
struct snd_soc_pcm_runtime *rtd = substream->private_data; struct snd_soc_pcm_runtime *rtd = substream->private_data;
struct snd_soc_device *socdev = rtd->socdev; struct snd_soc_device *socdev = rtd->socdev;
struct snd_soc_codec *codec = socdev->codec; struct snd_soc_codec *codec = socdev->card->codec;
struct ssm2602_priv *ssm2602 = codec->private_data; struct ssm2602_priv *ssm2602 = codec->private_data;
struct i2c_client *i2c = codec->control_data; struct i2c_client *i2c = codec->control_data;
u16 iface = ssm2602_read_reg_cache(codec, SSM2602_IFACE) & 0xfff3; u16 iface = ssm2602_read_reg_cache(codec, SSM2602_IFACE) & 0xfff3;
...@@ -336,7 +321,7 @@ static int ssm2602_startup(struct snd_pcm_substream *substream, ...@@ -336,7 +321,7 @@ static int ssm2602_startup(struct snd_pcm_substream *substream,
{ {
struct snd_soc_pcm_runtime *rtd = substream->private_data; struct snd_soc_pcm_runtime *rtd = substream->private_data;
struct snd_soc_device *socdev = rtd->socdev; struct snd_soc_device *socdev = rtd->socdev;
struct snd_soc_codec *codec = socdev->codec; struct snd_soc_codec *codec = socdev->card->codec;
struct ssm2602_priv *ssm2602 = codec->private_data; struct ssm2602_priv *ssm2602 = codec->private_data;
struct i2c_client *i2c = codec->control_data; struct i2c_client *i2c = codec->control_data;
struct snd_pcm_runtime *master_runtime; struct snd_pcm_runtime *master_runtime;
...@@ -373,7 +358,7 @@ static int ssm2602_pcm_prepare(struct snd_pcm_substream *substream, ...@@ -373,7 +358,7 @@ static int ssm2602_pcm_prepare(struct snd_pcm_substream *substream,
{ {
struct snd_soc_pcm_runtime *rtd = substream->private_data; struct snd_soc_pcm_runtime *rtd = substream->private_data;
struct snd_soc_device *socdev = rtd->socdev; struct snd_soc_device *socdev = rtd->socdev;
struct snd_soc_codec *codec = socdev->codec; struct snd_soc_codec *codec = socdev->card->codec;
/* set active */ /* set active */
ssm2602_write(codec, SSM2602_ACTIVE, ACTIVE_ACTIVATE_CODEC); ssm2602_write(codec, SSM2602_ACTIVE, ACTIVE_ACTIVATE_CODEC);
...@@ -385,7 +370,7 @@ static void ssm2602_shutdown(struct snd_pcm_substream *substream, ...@@ -385,7 +370,7 @@ static void ssm2602_shutdown(struct snd_pcm_substream *substream,
{ {
struct snd_soc_pcm_runtime *rtd = substream->private_data; struct snd_soc_pcm_runtime *rtd = substream->private_data;
struct snd_soc_device *socdev = rtd->socdev; struct snd_soc_device *socdev = rtd->socdev;
struct snd_soc_codec *codec = socdev->codec; struct snd_soc_codec *codec = socdev->card->codec;
struct ssm2602_priv *ssm2602 = codec->private_data; struct ssm2602_priv *ssm2602 = codec->private_data;
/* deactivate */ /* deactivate */
if (!codec->active) if (!codec->active)
...@@ -521,6 +506,16 @@ static int ssm2602_set_bias_level(struct snd_soc_codec *codec, ...@@ -521,6 +506,16 @@ static int ssm2602_set_bias_level(struct snd_soc_codec *codec,
#define SSM2602_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S20_3LE |\ #define SSM2602_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S20_3LE |\
SNDRV_PCM_FMTBIT_S24_LE | SNDRV_PCM_FMTBIT_S32_LE) SNDRV_PCM_FMTBIT_S24_LE | SNDRV_PCM_FMTBIT_S32_LE)
static struct snd_soc_dai_ops ssm2602_dai_ops = {
.startup = ssm2602_startup,
.prepare = ssm2602_pcm_prepare,
.hw_params = ssm2602_hw_params,
.shutdown = ssm2602_shutdown,
.digital_mute = ssm2602_mute,
.set_sysclk = ssm2602_set_dai_sysclk,
.set_fmt = ssm2602_set_dai_fmt,
};
struct snd_soc_dai ssm2602_dai = { struct snd_soc_dai ssm2602_dai = {
.name = "SSM2602", .name = "SSM2602",
.playback = { .playback = {
...@@ -535,22 +530,14 @@ struct snd_soc_dai ssm2602_dai = { ...@@ -535,22 +530,14 @@ struct snd_soc_dai ssm2602_dai = {
.channels_max = 2, .channels_max = 2,
.rates = SSM2602_RATES, .rates = SSM2602_RATES,
.formats = SSM2602_FORMATS,}, .formats = SSM2602_FORMATS,},
.ops = { .ops = &ssm2602_dai_ops,
.startup = ssm2602_startup,
.prepare = ssm2602_pcm_prepare,
.hw_params = ssm2602_hw_params,
.shutdown = ssm2602_shutdown,
.digital_mute = ssm2602_mute,
.set_sysclk = ssm2602_set_dai_sysclk,
.set_fmt = ssm2602_set_dai_fmt,
}
}; };
EXPORT_SYMBOL_GPL(ssm2602_dai); EXPORT_SYMBOL_GPL(ssm2602_dai);
static int ssm2602_suspend(struct platform_device *pdev, pm_message_t state) static int ssm2602_suspend(struct platform_device *pdev, pm_message_t state)
{ {
struct snd_soc_device *socdev = platform_get_drvdata(pdev); struct snd_soc_device *socdev = platform_get_drvdata(pdev);
struct snd_soc_codec *codec = socdev->codec; struct snd_soc_codec *codec = socdev->card->codec;
ssm2602_set_bias_level(codec, SND_SOC_BIAS_OFF); ssm2602_set_bias_level(codec, SND_SOC_BIAS_OFF);
return 0; return 0;
...@@ -559,7 +546,7 @@ static int ssm2602_suspend(struct platform_device *pdev, pm_message_t state) ...@@ -559,7 +546,7 @@ static int ssm2602_suspend(struct platform_device *pdev, pm_message_t state)
static int ssm2602_resume(struct platform_device *pdev) static int ssm2602_resume(struct platform_device *pdev)
{ {
struct snd_soc_device *socdev = platform_get_drvdata(pdev); struct snd_soc_device *socdev = platform_get_drvdata(pdev);
struct snd_soc_codec *codec = socdev->codec; struct snd_soc_codec *codec = socdev->card->codec;
int i; int i;
u8 data[2]; u8 data[2];
u16 *cache = codec->reg_cache; u16 *cache = codec->reg_cache;
...@@ -581,7 +568,7 @@ static int ssm2602_resume(struct platform_device *pdev) ...@@ -581,7 +568,7 @@ static int ssm2602_resume(struct platform_device *pdev)
*/ */
static int ssm2602_init(struct snd_soc_device *socdev) static int ssm2602_init(struct snd_soc_device *socdev)
{ {
struct snd_soc_codec *codec = socdev->codec; struct snd_soc_codec *codec = socdev->card->codec;
int reg, ret = 0; int reg, ret = 0;
codec->name = "SSM2602"; codec->name = "SSM2602";
...@@ -622,7 +609,8 @@ static int ssm2602_init(struct snd_soc_device *socdev) ...@@ -622,7 +609,8 @@ static int ssm2602_init(struct snd_soc_device *socdev)
APANA_ENABLE_MIC_BOOST); APANA_ENABLE_MIC_BOOST);
ssm2602_write(codec, SSM2602_PWR, 0); ssm2602_write(codec, SSM2602_PWR, 0);
ssm2602_add_controls(codec); snd_soc_add_controls(codec, ssm2602_snd_controls,
ARRAY_SIZE(ssm2602_snd_controls));
ssm2602_add_widgets(codec); ssm2602_add_widgets(codec);
ret = snd_soc_init_card(socdev); ret = snd_soc_init_card(socdev);
if (ret < 0) { if (ret < 0) {
...@@ -653,7 +641,7 @@ static int ssm2602_i2c_probe(struct i2c_client *i2c, ...@@ -653,7 +641,7 @@ static int ssm2602_i2c_probe(struct i2c_client *i2c,
const struct i2c_device_id *id) const struct i2c_device_id *id)
{ {
struct snd_soc_device *socdev = ssm2602_socdev; struct snd_soc_device *socdev = ssm2602_socdev;
struct snd_soc_codec *codec = socdev->codec; struct snd_soc_codec *codec = socdev->card->codec;
int ret; int ret;
i2c_set_clientdata(i2c, codec); i2c_set_clientdata(i2c, codec);
...@@ -747,7 +735,7 @@ static int ssm2602_probe(struct platform_device *pdev) ...@@ -747,7 +735,7 @@ static int ssm2602_probe(struct platform_device *pdev)
} }
codec->private_data = ssm2602; codec->private_data = ssm2602;
socdev->codec = codec; socdev->card->codec = codec;
mutex_init(&codec->mutex); mutex_init(&codec->mutex);
INIT_LIST_HEAD(&codec->dapm_widgets); INIT_LIST_HEAD(&codec->dapm_widgets);
INIT_LIST_HEAD(&codec->dapm_paths); INIT_LIST_HEAD(&codec->dapm_paths);
...@@ -768,7 +756,7 @@ static int ssm2602_probe(struct platform_device *pdev) ...@@ -768,7 +756,7 @@ static int ssm2602_probe(struct platform_device *pdev)
static int ssm2602_remove(struct platform_device *pdev) static int ssm2602_remove(struct platform_device *pdev)
{ {
struct snd_soc_device *socdev = platform_get_drvdata(pdev); struct snd_soc_device *socdev = platform_get_drvdata(pdev);
struct snd_soc_codec *codec = socdev->codec; struct snd_soc_codec *codec = socdev->card->codec;
if (codec->control_data) if (codec->control_data)
ssm2602_set_bias_level(codec, SND_SOC_BIAS_OFF); ssm2602_set_bias_level(codec, SND_SOC_BIAS_OFF);
......
...@@ -183,24 +183,6 @@ static const struct snd_kcontrol_new tlv320aic23_snd_controls[] = { ...@@ -183,24 +183,6 @@ static const struct snd_kcontrol_new tlv320aic23_snd_controls[] = {
SOC_ENUM("Playback De-emphasis", tlv320aic23_deemph), SOC_ENUM("Playback De-emphasis", tlv320aic23_deemph),
}; };
/* add non dapm controls */
static int tlv320aic23_add_controls(struct snd_soc_codec *codec)
{
int err, i;
for (i = 0; i < ARRAY_SIZE(tlv320aic23_snd_controls); i++) {
err = snd_ctl_add(codec->card,
snd_soc_cnew(&tlv320aic23_snd_controls[i],
codec, NULL));
if (err < 0)
return err;
}
return 0;
}
/* PGA Mixer controls for Line and Mic switch */ /* PGA Mixer controls for Line and Mic switch */
static const struct snd_kcontrol_new tlv320aic23_output_mixer_controls[] = { static const struct snd_kcontrol_new tlv320aic23_output_mixer_controls[] = {
SOC_DAPM_SINGLE("Line Bypass Switch", TLV320AIC23_ANLG, 3, 1, 0), SOC_DAPM_SINGLE("Line Bypass Switch", TLV320AIC23_ANLG, 3, 1, 0),
...@@ -423,7 +405,7 @@ static int tlv320aic23_hw_params(struct snd_pcm_substream *substream, ...@@ -423,7 +405,7 @@ static int tlv320aic23_hw_params(struct snd_pcm_substream *substream,
{ {
struct snd_soc_pcm_runtime *rtd = substream->private_data; struct snd_soc_pcm_runtime *rtd = substream->private_data;
struct snd_soc_device *socdev = rtd->socdev; struct snd_soc_device *socdev = rtd->socdev;
struct snd_soc_codec *codec = socdev->codec; struct snd_soc_codec *codec = socdev->card->codec;
u16 iface_reg; u16 iface_reg;
int ret; int ret;
struct aic23 *aic23 = container_of(codec, struct aic23, codec); struct aic23 *aic23 = container_of(codec, struct aic23, codec);
...@@ -471,7 +453,7 @@ static int tlv320aic23_pcm_prepare(struct snd_pcm_substream *substream, ...@@ -471,7 +453,7 @@ static int tlv320aic23_pcm_prepare(struct snd_pcm_substream *substream,
{ {
struct snd_soc_pcm_runtime *rtd = substream->private_data; struct snd_soc_pcm_runtime *rtd = substream->private_data;
struct snd_soc_device *socdev = rtd->socdev; struct snd_soc_device *socdev = rtd->socdev;
struct snd_soc_codec *codec = socdev->codec; struct snd_soc_codec *codec = socdev->card->codec;
/* set active */ /* set active */
tlv320aic23_write(codec, TLV320AIC23_ACTIVE, 0x0001); tlv320aic23_write(codec, TLV320AIC23_ACTIVE, 0x0001);
...@@ -484,7 +466,7 @@ static void tlv320aic23_shutdown(struct snd_pcm_substream *substream, ...@@ -484,7 +466,7 @@ static void tlv320aic23_shutdown(struct snd_pcm_substream *substream,
{ {
struct snd_soc_pcm_runtime *rtd = substream->private_data; struct snd_soc_pcm_runtime *rtd = substream->private_data;
struct snd_soc_device *socdev = rtd->socdev; struct snd_soc_device *socdev = rtd->socdev;
struct snd_soc_codec *codec = socdev->codec; struct snd_soc_codec *codec = socdev->card->codec;
struct aic23 *aic23 = container_of(codec, struct aic23, codec); struct aic23 *aic23 = container_of(codec, struct aic23, codec);
/* deactivate */ /* deactivate */
...@@ -598,6 +580,15 @@ static int tlv320aic23_set_bias_level(struct snd_soc_codec *codec, ...@@ -598,6 +580,15 @@ static int tlv320aic23_set_bias_level(struct snd_soc_codec *codec,
#define AIC23_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S20_3LE | \ #define AIC23_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S20_3LE | \
SNDRV_PCM_FMTBIT_S24_3LE | SNDRV_PCM_FMTBIT_S32_LE) SNDRV_PCM_FMTBIT_S24_3LE | SNDRV_PCM_FMTBIT_S32_LE)
static struct snd_soc_dai_ops tlv320aic23_dai_ops = {
.prepare = tlv320aic23_pcm_prepare,
.hw_params = tlv320aic23_hw_params,
.shutdown = tlv320aic23_shutdown,
.digital_mute = tlv320aic23_mute,
.set_fmt = tlv320aic23_set_dai_fmt,
.set_sysclk = tlv320aic23_set_dai_sysclk,
};
struct snd_soc_dai tlv320aic23_dai = { struct snd_soc_dai tlv320aic23_dai = {
.name = "tlv320aic23", .name = "tlv320aic23",
.playback = { .playback = {
...@@ -612,14 +603,7 @@ struct snd_soc_dai tlv320aic23_dai = { ...@@ -612,14 +603,7 @@ struct snd_soc_dai tlv320aic23_dai = {
.channels_max = 2, .channels_max = 2,
.rates = AIC23_RATES, .rates = AIC23_RATES,
.formats = AIC23_FORMATS,}, .formats = AIC23_FORMATS,},
.ops = { .ops = &tlv320aic23_dai_ops,
.prepare = tlv320aic23_pcm_prepare,
.hw_params = tlv320aic23_hw_params,
.shutdown = tlv320aic23_shutdown,
.digital_mute = tlv320aic23_mute,
.set_fmt = tlv320aic23_set_dai_fmt,
.set_sysclk = tlv320aic23_set_dai_sysclk,
}
}; };
EXPORT_SYMBOL_GPL(tlv320aic23_dai); EXPORT_SYMBOL_GPL(tlv320aic23_dai);
...@@ -627,7 +611,7 @@ static int tlv320aic23_suspend(struct platform_device *pdev, ...@@ -627,7 +611,7 @@ static int tlv320aic23_suspend(struct platform_device *pdev,
pm_message_t state) pm_message_t state)
{ {
struct snd_soc_device *socdev = platform_get_drvdata(pdev); struct snd_soc_device *socdev = platform_get_drvdata(pdev);
struct snd_soc_codec *codec = socdev->codec; struct snd_soc_codec *codec = socdev->card->codec;
tlv320aic23_write(codec, TLV320AIC23_ACTIVE, 0x0); tlv320aic23_write(codec, TLV320AIC23_ACTIVE, 0x0);
tlv320aic23_set_bias_level(codec, SND_SOC_BIAS_OFF); tlv320aic23_set_bias_level(codec, SND_SOC_BIAS_OFF);
...@@ -638,7 +622,7 @@ static int tlv320aic23_suspend(struct platform_device *pdev, ...@@ -638,7 +622,7 @@ static int tlv320aic23_suspend(struct platform_device *pdev,
static int tlv320aic23_resume(struct platform_device *pdev) static int tlv320aic23_resume(struct platform_device *pdev)
{ {
struct snd_soc_device *socdev = platform_get_drvdata(pdev); struct snd_soc_device *socdev = platform_get_drvdata(pdev);
struct snd_soc_codec *codec = socdev->codec; struct snd_soc_codec *codec = socdev->card->codec;
int i; int i;
u16 reg; u16 reg;
...@@ -660,7 +644,7 @@ static int tlv320aic23_resume(struct platform_device *pdev) ...@@ -660,7 +644,7 @@ static int tlv320aic23_resume(struct platform_device *pdev)
*/ */
static int tlv320aic23_init(struct snd_soc_device *socdev) static int tlv320aic23_init(struct snd_soc_device *socdev)
{ {
struct snd_soc_codec *codec = socdev->codec; struct snd_soc_codec *codec = socdev->card->codec;
int ret = 0; int ret = 0;
u16 reg; u16 reg;
...@@ -718,7 +702,8 @@ static int tlv320aic23_init(struct snd_soc_device *socdev) ...@@ -718,7 +702,8 @@ static int tlv320aic23_init(struct snd_soc_device *socdev)
tlv320aic23_write(codec, TLV320AIC23_ACTIVE, 0x1); tlv320aic23_write(codec, TLV320AIC23_ACTIVE, 0x1);
tlv320aic23_add_controls(codec); snd_soc_add_controls(codec, tlv320aic23_snd_controls,
ARRAY_SIZE(tlv320aic23_snd_controls));
tlv320aic23_add_widgets(codec); tlv320aic23_add_widgets(codec);
ret = snd_soc_init_card(socdev); ret = snd_soc_init_card(socdev);
if (ret < 0) { if (ret < 0) {
...@@ -746,7 +731,7 @@ static int tlv320aic23_codec_probe(struct i2c_client *i2c, ...@@ -746,7 +731,7 @@ static int tlv320aic23_codec_probe(struct i2c_client *i2c,
const struct i2c_device_id *i2c_id) const struct i2c_device_id *i2c_id)
{ {
struct snd_soc_device *socdev = tlv320aic23_socdev; struct snd_soc_device *socdev = tlv320aic23_socdev;
struct snd_soc_codec *codec = socdev->codec; struct snd_soc_codec *codec = socdev->card->codec;
int ret; int ret;
if (!i2c_check_functionality(i2c->adapter, I2C_FUNC_SMBUS_BYTE_DATA)) if (!i2c_check_functionality(i2c->adapter, I2C_FUNC_SMBUS_BYTE_DATA))
...@@ -804,7 +789,7 @@ static int tlv320aic23_probe(struct platform_device *pdev) ...@@ -804,7 +789,7 @@ static int tlv320aic23_probe(struct platform_device *pdev)
if (aic23 == NULL) if (aic23 == NULL)
return -ENOMEM; return -ENOMEM;
codec = &aic23->codec; codec = &aic23->codec;
socdev->codec = codec; socdev->card->codec = codec;
mutex_init(&codec->mutex); mutex_init(&codec->mutex);
INIT_LIST_HEAD(&codec->dapm_widgets); INIT_LIST_HEAD(&codec->dapm_widgets);
INIT_LIST_HEAD(&codec->dapm_paths); INIT_LIST_HEAD(&codec->dapm_paths);
...@@ -823,7 +808,7 @@ static int tlv320aic23_probe(struct platform_device *pdev) ...@@ -823,7 +808,7 @@ static int tlv320aic23_probe(struct platform_device *pdev)
static int tlv320aic23_remove(struct platform_device *pdev) static int tlv320aic23_remove(struct platform_device *pdev)
{ {
struct snd_soc_device *socdev = platform_get_drvdata(pdev); struct snd_soc_device *socdev = platform_get_drvdata(pdev);
struct snd_soc_codec *codec = socdev->codec; struct snd_soc_codec *codec = socdev->card->codec;
struct aic23 *aic23 = container_of(codec, struct aic23, codec); struct aic23 *aic23 = container_of(codec, struct aic23, codec);
if (codec->control_data) if (codec->control_data)
......
...@@ -130,7 +130,7 @@ static int aic26_hw_params(struct snd_pcm_substream *substream, ...@@ -130,7 +130,7 @@ static int aic26_hw_params(struct snd_pcm_substream *substream,
{ {
struct snd_soc_pcm_runtime *rtd = substream->private_data; struct snd_soc_pcm_runtime *rtd = substream->private_data;
struct snd_soc_device *socdev = rtd->socdev; struct snd_soc_device *socdev = rtd->socdev;
struct snd_soc_codec *codec = socdev->codec; struct snd_soc_codec *codec = socdev->card->codec;
struct aic26 *aic26 = codec->private_data; struct aic26 *aic26 = codec->private_data;
int fsref, divisor, wlen, pval, jval, dval, qval; int fsref, divisor, wlen, pval, jval, dval, qval;
u16 reg; u16 reg;
...@@ -270,6 +270,13 @@ static int aic26_set_fmt(struct snd_soc_dai *codec_dai, unsigned int fmt) ...@@ -270,6 +270,13 @@ static int aic26_set_fmt(struct snd_soc_dai *codec_dai, unsigned int fmt)
#define AIC26_FORMATS (SNDRV_PCM_FMTBIT_S8 | SNDRV_PCM_FMTBIT_S16_BE |\ #define AIC26_FORMATS (SNDRV_PCM_FMTBIT_S8 | SNDRV_PCM_FMTBIT_S16_BE |\
SNDRV_PCM_FMTBIT_S24_BE | SNDRV_PCM_FMTBIT_S32_BE) SNDRV_PCM_FMTBIT_S24_BE | SNDRV_PCM_FMTBIT_S32_BE)
static struct snd_soc_dai_ops aic26_dai_ops = {
.hw_params = aic26_hw_params,
.digital_mute = aic26_mute,
.set_sysclk = aic26_set_sysclk,
.set_fmt = aic26_set_fmt,
};
struct snd_soc_dai aic26_dai = { struct snd_soc_dai aic26_dai = {
.name = "tlv320aic26", .name = "tlv320aic26",
.playback = { .playback = {
...@@ -286,12 +293,7 @@ struct snd_soc_dai aic26_dai = { ...@@ -286,12 +293,7 @@ struct snd_soc_dai aic26_dai = {
.rates = AIC26_RATES, .rates = AIC26_RATES,
.formats = AIC26_FORMATS, .formats = AIC26_FORMATS,
}, },
.ops = { .ops = &aic26_dai_ops,
.hw_params = aic26_hw_params,
.digital_mute = aic26_mute,
.set_sysclk = aic26_set_sysclk,
.set_fmt = aic26_set_fmt,
},
}; };
EXPORT_SYMBOL_GPL(aic26_dai); EXPORT_SYMBOL_GPL(aic26_dai);
...@@ -322,9 +324,8 @@ static int aic26_probe(struct platform_device *pdev) ...@@ -322,9 +324,8 @@ static int aic26_probe(struct platform_device *pdev)
{ {
struct snd_soc_device *socdev = platform_get_drvdata(pdev); struct snd_soc_device *socdev = platform_get_drvdata(pdev);
struct snd_soc_codec *codec; struct snd_soc_codec *codec;
struct snd_kcontrol *kcontrol;
struct aic26 *aic26; struct aic26 *aic26;
int i, ret, err; int ret, err;
dev_info(&pdev->dev, "Probing AIC26 SoC CODEC driver\n"); dev_info(&pdev->dev, "Probing AIC26 SoC CODEC driver\n");
dev_dbg(&pdev->dev, "socdev=%p\n", socdev); dev_dbg(&pdev->dev, "socdev=%p\n", socdev);
...@@ -338,7 +339,7 @@ static int aic26_probe(struct platform_device *pdev) ...@@ -338,7 +339,7 @@ static int aic26_probe(struct platform_device *pdev)
return -ENODEV; return -ENODEV;
} }
codec = &aic26->codec; codec = &aic26->codec;
socdev->codec = codec; socdev->card->codec = codec;
dev_dbg(&pdev->dev, "Registering PCMs, dev=%p, socdev->dev=%p\n", dev_dbg(&pdev->dev, "Registering PCMs, dev=%p, socdev->dev=%p\n",
&pdev->dev, socdev->dev); &pdev->dev, socdev->dev);
...@@ -351,11 +352,9 @@ static int aic26_probe(struct platform_device *pdev) ...@@ -351,11 +352,9 @@ static int aic26_probe(struct platform_device *pdev)
/* register controls */ /* register controls */
dev_dbg(&pdev->dev, "Registering controls\n"); dev_dbg(&pdev->dev, "Registering controls\n");
for (i = 0; i < ARRAY_SIZE(aic26_snd_controls); i++) { err = snd_soc_add_controls(codec, aic26_snd_controls,
kcontrol = snd_soc_cnew(&aic26_snd_controls[i], codec, NULL); ARRAY_SIZE(aic26_snd_controls));
err = snd_ctl_add(codec->card, kcontrol); WARN_ON(err < 0);
WARN_ON(err < 0);
}
/* CODEC is setup, we can register the card now */ /* CODEC is setup, we can register the card now */
dev_dbg(&pdev->dev, "Registering card\n"); dev_dbg(&pdev->dev, "Registering card\n");
......
This diff is collapsed.
This diff is collapsed.
...@@ -170,6 +170,9 @@ ...@@ -170,6 +170,9 @@
#define TWL4030_CLK256FS_EN 0x02 #define TWL4030_CLK256FS_EN 0x02
#define TWL4030_AIF_EN 0x01 #define TWL4030_AIF_EN 0x01
/* EAR_CTL (0x21) */
#define TWL4030_EAR_GAIN 0x30
/* HS_GAIN_SET (0x23) Fields */ /* HS_GAIN_SET (0x23) Fields */
#define TWL4030_HSR_GAIN 0x0C #define TWL4030_HSR_GAIN 0x0C
...@@ -198,6 +201,18 @@ ...@@ -198,6 +201,18 @@
#define TWL4030_RAMP_DELAY_2581MS 0x1C #define TWL4030_RAMP_DELAY_2581MS 0x1C
#define TWL4030_RAMP_EN 0x02 #define TWL4030_RAMP_EN 0x02
/* PREDL_CTL (0x25) */
#define TWL4030_PREDL_GAIN 0x30
/* PREDR_CTL (0x26) */
#define TWL4030_PREDR_GAIN 0x30
/* PRECKL_CTL (0x27) */
#define TWL4030_PRECKL_GAIN 0x30
/* PRECKR_CTL (0x28) */
#define TWL4030_PRECKR_GAIN 0x30
/* HFL_CTL (0x29, 0x2A) Fields */ /* HFL_CTL (0x29, 0x2A) Fields */
#define TWL4030_HF_CTL_HB_EN 0x04 #define TWL4030_HF_CTL_HB_EN 0x04
#define TWL4030_HF_CTL_LOOP_EN 0x08 #define TWL4030_HF_CTL_LOOP_EN 0x08
......
...@@ -173,7 +173,7 @@ static int uda134x_startup(struct snd_pcm_substream *substream, ...@@ -173,7 +173,7 @@ static int uda134x_startup(struct snd_pcm_substream *substream,
{ {
struct snd_soc_pcm_runtime *rtd = substream->private_data; struct snd_soc_pcm_runtime *rtd = substream->private_data;
struct snd_soc_device *socdev = rtd->socdev; struct snd_soc_device *socdev = rtd->socdev;
struct snd_soc_codec *codec = socdev->codec; struct snd_soc_codec *codec = socdev->card->codec;
struct uda134x_priv *uda134x = codec->private_data; struct uda134x_priv *uda134x = codec->private_data;
struct snd_pcm_runtime *master_runtime; struct snd_pcm_runtime *master_runtime;
...@@ -206,7 +206,7 @@ static void uda134x_shutdown(struct snd_pcm_substream *substream, ...@@ -206,7 +206,7 @@ static void uda134x_shutdown(struct snd_pcm_substream *substream,
{ {
struct snd_soc_pcm_runtime *rtd = substream->private_data; struct snd_soc_pcm_runtime *rtd = substream->private_data;
struct snd_soc_device *socdev = rtd->socdev; struct snd_soc_device *socdev = rtd->socdev;
struct snd_soc_codec *codec = socdev->codec; struct snd_soc_codec *codec = socdev->card->codec;
struct uda134x_priv *uda134x = codec->private_data; struct uda134x_priv *uda134x = codec->private_data;
if (uda134x->master_substream == substream) if (uda134x->master_substream == substream)
...@@ -221,7 +221,7 @@ static int uda134x_hw_params(struct snd_pcm_substream *substream, ...@@ -221,7 +221,7 @@ static int uda134x_hw_params(struct snd_pcm_substream *substream,
{ {
struct snd_soc_pcm_runtime *rtd = substream->private_data; struct snd_soc_pcm_runtime *rtd = substream->private_data;
struct snd_soc_device *socdev = rtd->socdev; struct snd_soc_device *socdev = rtd->socdev;
struct snd_soc_codec *codec = socdev->codec; struct snd_soc_codec *codec = socdev->card->codec;
struct uda134x_priv *uda134x = codec->private_data; struct uda134x_priv *uda134x = codec->private_data;
u8 hw_params; u8 hw_params;
...@@ -431,38 +431,14 @@ SOC_ENUM("PCM Playback De-emphasis", uda134x_mixer_enum[1]), ...@@ -431,38 +431,14 @@ SOC_ENUM("PCM Playback De-emphasis", uda134x_mixer_enum[1]),
SOC_SINGLE("DC Filter Enable Switch", UDA134X_STATUS0, 0, 1, 0), SOC_SINGLE("DC Filter Enable Switch", UDA134X_STATUS0, 0, 1, 0),
}; };
static int uda134x_add_controls(struct snd_soc_codec *codec) static struct snd_soc_dai_ops uda134x_dai_ops = {
{ .startup = uda134x_startup,
int err, i, n; .shutdown = uda134x_shutdown,
const struct snd_kcontrol_new *ctrls; .hw_params = uda134x_hw_params,
struct uda134x_platform_data *pd = codec->control_data; .digital_mute = uda134x_mute,
.set_sysclk = uda134x_set_dai_sysclk,
switch (pd->model) { .set_fmt = uda134x_set_dai_fmt,
case UDA134X_UDA1340: };
case UDA134X_UDA1344:
n = ARRAY_SIZE(uda1340_snd_controls);
ctrls = uda1340_snd_controls;
break;
case UDA134X_UDA1341:
n = ARRAY_SIZE(uda1341_snd_controls);
ctrls = uda1341_snd_controls;
break;
default:
printk(KERN_ERR "%s unkown codec type: %d",
__func__, pd->model);
return -EINVAL;
}
for (i = 0; i < n; i++) {
err = snd_ctl_add(codec->card,
snd_soc_cnew(&ctrls[i],
codec, NULL));
if (err < 0)
return err;
}
return 0;
}
struct snd_soc_dai uda134x_dai = { struct snd_soc_dai uda134x_dai = {
.name = "UDA134X", .name = "UDA134X",
...@@ -483,14 +459,7 @@ struct snd_soc_dai uda134x_dai = { ...@@ -483,14 +459,7 @@ struct snd_soc_dai uda134x_dai = {
.formats = UDA134X_FORMATS, .formats = UDA134X_FORMATS,
}, },
/* pcm operations */ /* pcm operations */
.ops = { .ops = &uda134x_dai_ops,
.startup = uda134x_startup,
.shutdown = uda134x_shutdown,
.hw_params = uda134x_hw_params,
.digital_mute = uda134x_mute,
.set_sysclk = uda134x_set_dai_sysclk,
.set_fmt = uda134x_set_dai_fmt,
}
}; };
EXPORT_SYMBOL(uda134x_dai); EXPORT_SYMBOL(uda134x_dai);
...@@ -525,11 +494,11 @@ static int uda134x_soc_probe(struct platform_device *pdev) ...@@ -525,11 +494,11 @@ static int uda134x_soc_probe(struct platform_device *pdev)
return -EINVAL; return -EINVAL;
} }
socdev->codec = kzalloc(sizeof(struct snd_soc_codec), GFP_KERNEL); socdev->card->codec = kzalloc(sizeof(struct snd_soc_codec), GFP_KERNEL);
if (socdev->codec == NULL) if (socdev->card->codec == NULL)
return ret; return ret;
codec = socdev->codec; codec = socdev->card->codec;
uda134x = kzalloc(sizeof(struct uda134x_priv), GFP_KERNEL); uda134x = kzalloc(sizeof(struct uda134x_priv), GFP_KERNEL);
if (uda134x == NULL) if (uda134x == NULL)
...@@ -572,7 +541,22 @@ static int uda134x_soc_probe(struct platform_device *pdev) ...@@ -572,7 +541,22 @@ static int uda134x_soc_probe(struct platform_device *pdev)
goto pcm_err; goto pcm_err;
} }
ret = uda134x_add_controls(codec); switch (pd->model) {
case UDA134X_UDA1340:
case UDA134X_UDA1344:
ret = snd_soc_add_controls(codec, uda1340_snd_controls,
ARRAY_SIZE(uda1340_snd_controls));
break;
case UDA134X_UDA1341:
ret = snd_soc_add_controls(codec, uda1341_snd_controls,
ARRAY_SIZE(uda1341_snd_controls));
break;
default:
printk(KERN_ERR "%s unkown codec type: %d",
__func__, pd->model);
return -EINVAL;
}
if (ret < 0) { if (ret < 0) {
printk(KERN_ERR "UDA134X: failed to register controls\n"); printk(KERN_ERR "UDA134X: failed to register controls\n");
goto pcm_err; goto pcm_err;
...@@ -602,7 +586,7 @@ static int uda134x_soc_probe(struct platform_device *pdev) ...@@ -602,7 +586,7 @@ static int uda134x_soc_probe(struct platform_device *pdev)
static int uda134x_soc_remove(struct platform_device *pdev) static int uda134x_soc_remove(struct platform_device *pdev)
{ {
struct snd_soc_device *socdev = platform_get_drvdata(pdev); struct snd_soc_device *socdev = platform_get_drvdata(pdev);
struct snd_soc_codec *codec = socdev->codec; struct snd_soc_codec *codec = socdev->card->codec;
uda134x_set_bias_level(codec, SND_SOC_BIAS_STANDBY); uda134x_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
uda134x_set_bias_level(codec, SND_SOC_BIAS_OFF); uda134x_set_bias_level(codec, SND_SOC_BIAS_OFF);
...@@ -622,7 +606,7 @@ static int uda134x_soc_suspend(struct platform_device *pdev, ...@@ -622,7 +606,7 @@ static int uda134x_soc_suspend(struct platform_device *pdev,
pm_message_t state) pm_message_t state)
{ {
struct snd_soc_device *socdev = platform_get_drvdata(pdev); struct snd_soc_device *socdev = platform_get_drvdata(pdev);
struct snd_soc_codec *codec = socdev->codec; struct snd_soc_codec *codec = socdev->card->codec;
uda134x_set_bias_level(codec, SND_SOC_BIAS_STANDBY); uda134x_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
uda134x_set_bias_level(codec, SND_SOC_BIAS_OFF); uda134x_set_bias_level(codec, SND_SOC_BIAS_OFF);
...@@ -632,7 +616,7 @@ static int uda134x_soc_suspend(struct platform_device *pdev, ...@@ -632,7 +616,7 @@ static int uda134x_soc_suspend(struct platform_device *pdev,
static int uda134x_soc_resume(struct platform_device *pdev) static int uda134x_soc_resume(struct platform_device *pdev)
{ {
struct snd_soc_device *socdev = platform_get_drvdata(pdev); struct snd_soc_device *socdev = platform_get_drvdata(pdev);
struct snd_soc_codec *codec = socdev->codec; struct snd_soc_codec *codec = socdev->card->codec;
uda134x_set_bias_level(codec, SND_SOC_BIAS_PREPARE); uda134x_set_bias_level(codec, SND_SOC_BIAS_PREPARE);
uda134x_set_bias_level(codec, SND_SOC_BIAS_ON); uda134x_set_bias_level(codec, SND_SOC_BIAS_ON);
......
This diff is collapsed.
...@@ -51,10 +51,17 @@ struct wm8350_output { ...@@ -51,10 +51,17 @@ struct wm8350_output {
u16 mute; u16 mute;
}; };
struct wm8350_jack_data {
struct snd_soc_jack *jack;
int report;
};
struct wm8350_data { struct wm8350_data {
struct snd_soc_codec codec; struct snd_soc_codec codec;
struct wm8350_output out1; struct wm8350_output out1;
struct wm8350_output out2; struct wm8350_output out2;
struct wm8350_jack_data hpl;
struct wm8350_jack_data hpr;
struct regulator_bulk_data supplies[ARRAY_SIZE(supply_names)]; struct regulator_bulk_data supplies[ARRAY_SIZE(supply_names)];
}; };
...@@ -775,21 +782,6 @@ static const struct snd_soc_dapm_route audio_map[] = { ...@@ -775,21 +782,6 @@ static const struct snd_soc_dapm_route audio_map[] = {
{"Beep", NULL, "IN3R PGA"}, {"Beep", NULL, "IN3R PGA"},
}; };
static int wm8350_add_controls(struct snd_soc_codec *codec)
{
int err, i;
for (i = 0; i < ARRAY_SIZE(wm8350_snd_controls); i++) {
err = snd_ctl_add(codec->card,
snd_soc_cnew(&wm8350_snd_controls[i],
codec, NULL));
if (err < 0)
return err;
}
return 0;
}
static int wm8350_add_widgets(struct snd_soc_codec *codec) static int wm8350_add_widgets(struct snd_soc_codec *codec)
{ {
int ret; int ret;
...@@ -1309,7 +1301,7 @@ static int wm8350_set_bias_level(struct snd_soc_codec *codec, ...@@ -1309,7 +1301,7 @@ static int wm8350_set_bias_level(struct snd_soc_codec *codec,
static int wm8350_suspend(struct platform_device *pdev, pm_message_t state) static int wm8350_suspend(struct platform_device *pdev, pm_message_t state)
{ {
struct snd_soc_device *socdev = platform_get_drvdata(pdev); struct snd_soc_device *socdev = platform_get_drvdata(pdev);
struct snd_soc_codec *codec = socdev->codec; struct snd_soc_codec *codec = socdev->card->codec;
wm8350_set_bias_level(codec, SND_SOC_BIAS_OFF); wm8350_set_bias_level(codec, SND_SOC_BIAS_OFF);
return 0; return 0;
...@@ -1318,7 +1310,7 @@ static int wm8350_suspend(struct platform_device *pdev, pm_message_t state) ...@@ -1318,7 +1310,7 @@ static int wm8350_suspend(struct platform_device *pdev, pm_message_t state)
static int wm8350_resume(struct platform_device *pdev) static int wm8350_resume(struct platform_device *pdev)
{ {
struct snd_soc_device *socdev = platform_get_drvdata(pdev); struct snd_soc_device *socdev = platform_get_drvdata(pdev);
struct snd_soc_codec *codec = socdev->codec; struct snd_soc_codec *codec = socdev->card->codec;
wm8350_set_bias_level(codec, SND_SOC_BIAS_STANDBY); wm8350_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
...@@ -1328,6 +1320,95 @@ static int wm8350_resume(struct platform_device *pdev) ...@@ -1328,6 +1320,95 @@ static int wm8350_resume(struct platform_device *pdev)
return 0; return 0;
} }
static void wm8350_hp_jack_handler(struct wm8350 *wm8350, int irq, void *data)
{
struct wm8350_data *priv = data;
u16 reg;
int report;
int mask;
struct wm8350_jack_data *jack = NULL;
switch (irq) {
case WM8350_IRQ_CODEC_JCK_DET_L:
jack = &priv->hpl;
mask = WM8350_JACK_L_LVL;
break;
case WM8350_IRQ_CODEC_JCK_DET_R:
jack = &priv->hpr;
mask = WM8350_JACK_R_LVL;
break;
default:
BUG();
}
if (!jack->jack) {
dev_warn(wm8350->dev, "Jack interrupt called with no jack\n");
return;
}
/* Debounce */
msleep(200);
reg = wm8350_reg_read(wm8350, WM8350_JACK_PIN_STATUS);
if (reg & mask)
report = jack->report;
else
report = 0;
snd_soc_jack_report(jack->jack, report, jack->report);
}
/**
* wm8350_hp_jack_detect - Enable headphone jack detection.
*
* @codec: WM8350 codec
* @which: left or right jack detect signal
* @jack: jack to report detection events on
* @report: value to report
*
* Enables the headphone jack detection of the WM8350.
*/
int wm8350_hp_jack_detect(struct snd_soc_codec *codec, enum wm8350_jack which,
struct snd_soc_jack *jack, int report)
{
struct wm8350_data *priv = codec->private_data;
struct wm8350 *wm8350 = codec->control_data;
int irq;
int ena;
switch (which) {
case WM8350_JDL:
priv->hpl.jack = jack;
priv->hpl.report = report;
irq = WM8350_IRQ_CODEC_JCK_DET_L;
ena = WM8350_JDL_ENA;
break;
case WM8350_JDR:
priv->hpr.jack = jack;
priv->hpr.report = report;
irq = WM8350_IRQ_CODEC_JCK_DET_R;
ena = WM8350_JDR_ENA;
break;
default:
return -EINVAL;
}
wm8350_set_bits(wm8350, WM8350_POWER_MGMT_4, WM8350_TOCLK_ENA);
wm8350_set_bits(wm8350, WM8350_JACK_DETECT, ena);
/* Sync status */
wm8350_hp_jack_handler(wm8350, irq, priv);
wm8350_unmask_irq(wm8350, irq);
return 0;
}
EXPORT_SYMBOL_GPL(wm8350_hp_jack_detect);
static struct snd_soc_codec *wm8350_codec; static struct snd_soc_codec *wm8350_codec;
static int wm8350_probe(struct platform_device *pdev) static int wm8350_probe(struct platform_device *pdev)
...@@ -1342,8 +1423,8 @@ static int wm8350_probe(struct platform_device *pdev) ...@@ -1342,8 +1423,8 @@ static int wm8350_probe(struct platform_device *pdev)
BUG_ON(!wm8350_codec); BUG_ON(!wm8350_codec);
socdev->codec = wm8350_codec; socdev->card->codec = wm8350_codec;
codec = socdev->codec; codec = socdev->card->codec;
wm8350 = codec->control_data; wm8350 = codec->control_data;
priv = codec->private_data; priv = codec->private_data;
...@@ -1381,13 +1462,21 @@ static int wm8350_probe(struct platform_device *pdev) ...@@ -1381,13 +1462,21 @@ static int wm8350_probe(struct platform_device *pdev)
wm8350_set_bits(wm8350, WM8350_ROUT2_VOLUME, wm8350_set_bits(wm8350, WM8350_ROUT2_VOLUME,
WM8350_OUT2_VU | WM8350_OUT2R_MUTE); WM8350_OUT2_VU | WM8350_OUT2R_MUTE);
wm8350_mask_irq(wm8350, WM8350_IRQ_CODEC_JCK_DET_L);
wm8350_mask_irq(wm8350, WM8350_IRQ_CODEC_JCK_DET_R);
wm8350_register_irq(wm8350, WM8350_IRQ_CODEC_JCK_DET_L,
wm8350_hp_jack_handler, priv);
wm8350_register_irq(wm8350, WM8350_IRQ_CODEC_JCK_DET_R,
wm8350_hp_jack_handler, priv);
ret = snd_soc_new_pcms(socdev, SNDRV_DEFAULT_IDX1, SNDRV_DEFAULT_STR1); ret = snd_soc_new_pcms(socdev, SNDRV_DEFAULT_IDX1, SNDRV_DEFAULT_STR1);
if (ret < 0) { if (ret < 0) {
dev_err(&pdev->dev, "failed to create pcms\n"); dev_err(&pdev->dev, "failed to create pcms\n");
return ret; return ret;
} }
wm8350_add_controls(codec); snd_soc_add_controls(codec, wm8350_snd_controls,
ARRAY_SIZE(wm8350_snd_controls));
wm8350_add_widgets(codec); wm8350_add_widgets(codec);
wm8350_set_bias_level(codec, SND_SOC_BIAS_STANDBY); wm8350_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
...@@ -1409,10 +1498,23 @@ static int wm8350_probe(struct platform_device *pdev) ...@@ -1409,10 +1498,23 @@ static int wm8350_probe(struct platform_device *pdev)
static int wm8350_remove(struct platform_device *pdev) static int wm8350_remove(struct platform_device *pdev)
{ {
struct snd_soc_device *socdev = platform_get_drvdata(pdev); struct snd_soc_device *socdev = platform_get_drvdata(pdev);
struct snd_soc_codec *codec = socdev->codec; struct snd_soc_codec *codec = socdev->card->codec;
struct wm8350 *wm8350 = codec->control_data; struct wm8350 *wm8350 = codec->control_data;
struct wm8350_data *priv = codec->private_data;
int ret; int ret;
wm8350_clear_bits(wm8350, WM8350_JACK_DETECT,
WM8350_JDL_ENA | WM8350_JDR_ENA);
wm8350_clear_bits(wm8350, WM8350_POWER_MGMT_4, WM8350_TOCLK_ENA);
wm8350_mask_irq(wm8350, WM8350_IRQ_CODEC_JCK_DET_L);
wm8350_mask_irq(wm8350, WM8350_IRQ_CODEC_JCK_DET_R);
wm8350_free_irq(wm8350, WM8350_IRQ_CODEC_JCK_DET_L);
wm8350_free_irq(wm8350, WM8350_IRQ_CODEC_JCK_DET_R);
priv->hpl.jack = NULL;
priv->hpr.jack = NULL;
/* cancel any work waiting to be queued. */ /* cancel any work waiting to be queued. */
ret = cancel_delayed_work(&codec->delayed_work); ret = cancel_delayed_work(&codec->delayed_work);
...@@ -1436,6 +1538,16 @@ static int wm8350_remove(struct platform_device *pdev) ...@@ -1436,6 +1538,16 @@ static int wm8350_remove(struct platform_device *pdev)
SNDRV_PCM_FMTBIT_S20_3LE |\ SNDRV_PCM_FMTBIT_S20_3LE |\
SNDRV_PCM_FMTBIT_S24_LE) SNDRV_PCM_FMTBIT_S24_LE)
static struct snd_soc_dai_ops wm8350_dai_ops = {
.hw_params = wm8350_pcm_hw_params,
.digital_mute = wm8350_mute,
.trigger = wm8350_pcm_trigger,
.set_fmt = wm8350_set_dai_fmt,
.set_sysclk = wm8350_set_dai_sysclk,
.set_pll = wm8350_set_fll,
.set_clkdiv = wm8350_set_clkdiv,
};
struct snd_soc_dai wm8350_dai = { struct snd_soc_dai wm8350_dai = {
.name = "WM8350", .name = "WM8350",
.playback = { .playback = {
...@@ -1452,15 +1564,7 @@ struct snd_soc_dai wm8350_dai = { ...@@ -1452,15 +1564,7 @@ struct snd_soc_dai wm8350_dai = {
.rates = WM8350_RATES, .rates = WM8350_RATES,
.formats = WM8350_FORMATS, .formats = WM8350_FORMATS,
}, },
.ops = { .ops = &wm8350_dai_ops,
.hw_params = wm8350_pcm_hw_params,
.digital_mute = wm8350_mute,
.trigger = wm8350_pcm_trigger,
.set_fmt = wm8350_set_dai_fmt,
.set_sysclk = wm8350_set_dai_sysclk,
.set_pll = wm8350_set_fll,
.set_clkdiv = wm8350_set_clkdiv,
},
}; };
EXPORT_SYMBOL_GPL(wm8350_dai); EXPORT_SYMBOL_GPL(wm8350_dai);
...@@ -1472,7 +1576,7 @@ struct snd_soc_codec_device soc_codec_dev_wm8350 = { ...@@ -1472,7 +1576,7 @@ struct snd_soc_codec_device soc_codec_dev_wm8350 = {
}; };
EXPORT_SYMBOL_GPL(soc_codec_dev_wm8350); EXPORT_SYMBOL_GPL(soc_codec_dev_wm8350);
static int wm8350_codec_probe(struct platform_device *pdev) static __devinit int wm8350_codec_probe(struct platform_device *pdev)
{ {
struct wm8350 *wm8350 = platform_get_drvdata(pdev); struct wm8350 *wm8350 = platform_get_drvdata(pdev);
struct wm8350_data *priv; struct wm8350_data *priv;
......
...@@ -17,4 +17,12 @@ ...@@ -17,4 +17,12 @@
extern struct snd_soc_dai wm8350_dai; extern struct snd_soc_dai wm8350_dai;
extern struct snd_soc_codec_device soc_codec_dev_wm8350; extern struct snd_soc_codec_device soc_codec_dev_wm8350;
enum wm8350_jack {
WM8350_JDL = 1,
WM8350_JDR = 2,
};
int wm8350_hp_jack_detect(struct snd_soc_codec *codec, enum wm8350_jack which,
struct snd_soc_jack *jack, int report);
#endif #endif
This diff is collapsed.
/*
* wm8400.h -- audio driver for WM8400
*
* Copyright 2008 Wolfson Microelectronics PLC.
* Author: Mark Brown <broonie@opensource.wolfsonmicro.com>
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
* Free Software Foundation; either version 2 of the License, or (at your
* option) any later version.
*
*/
#ifndef _WM8400_CODEC_H
#define _WM8400_CODEC_H
#define WM8400_MCLK_DIV 0
#define WM8400_DACCLK_DIV 1
#define WM8400_ADCCLK_DIV 2
#define WM8400_BCLK_DIV 3
#define WM8400_MCLK_DIV_1 0x400
#define WM8400_MCLK_DIV_2 0x800
#define WM8400_DAC_CLKDIV_1 0x00
#define WM8400_DAC_CLKDIV_1_5 0x04
#define WM8400_DAC_CLKDIV_2 0x08
#define WM8400_DAC_CLKDIV_3 0x0c
#define WM8400_DAC_CLKDIV_4 0x10
#define WM8400_DAC_CLKDIV_5_5 0x14
#define WM8400_DAC_CLKDIV_6 0x18
#define WM8400_ADC_CLKDIV_1 0x00
#define WM8400_ADC_CLKDIV_1_5 0x20
#define WM8400_ADC_CLKDIV_2 0x40
#define WM8400_ADC_CLKDIV_3 0x60
#define WM8400_ADC_CLKDIV_4 0x80
#define WM8400_ADC_CLKDIV_5_5 0xa0
#define WM8400_ADC_CLKDIV_6 0xc0
#define WM8400_BCLK_DIV_1 (0x0 << 1)
#define WM8400_BCLK_DIV_1_5 (0x1 << 1)
#define WM8400_BCLK_DIV_2 (0x2 << 1)
#define WM8400_BCLK_DIV_3 (0x3 << 1)
#define WM8400_BCLK_DIV_4 (0x4 << 1)
#define WM8400_BCLK_DIV_5_5 (0x5 << 1)
#define WM8400_BCLK_DIV_6 (0x6 << 1)
#define WM8400_BCLK_DIV_8 (0x7 << 1)
#define WM8400_BCLK_DIV_11 (0x8 << 1)
#define WM8400_BCLK_DIV_12 (0x9 << 1)
#define WM8400_BCLK_DIV_16 (0xA << 1)
#define WM8400_BCLK_DIV_22 (0xB << 1)
#define WM8400_BCLK_DIV_24 (0xC << 1)
#define WM8400_BCLK_DIV_32 (0xD << 1)
#define WM8400_BCLK_DIV_44 (0xE << 1)
#define WM8400_BCLK_DIV_48 (0xF << 1)
extern struct snd_soc_dai wm8400_dai;
extern struct snd_soc_codec_device soc_codec_dev_wm8400;
#endif
This diff is collapsed.
This diff is collapsed.
...@@ -28,11 +28,6 @@ ...@@ -28,11 +28,6 @@
#define WM8580_CLKSRC_OSC 4 #define WM8580_CLKSRC_OSC 4
#define WM8580_CLKSRC_NONE 5 #define WM8580_CLKSRC_NONE 5
struct wm8580_setup_data {
int i2c_bus;
unsigned short i2c_address;
};
#define WM8580_DAI_PAIFRX 0 #define WM8580_DAI_PAIFRX 0
#define WM8580_DAI_PAIFTX 1 #define WM8580_DAI_PAIFTX 1
......
This diff is collapsed.
This diff is collapsed.
...@@ -34,12 +34,6 @@ ...@@ -34,12 +34,6 @@
#define WM8731_SYSCLK 0 #define WM8731_SYSCLK 0
#define WM8731_DAI 0 #define WM8731_DAI 0
struct wm8731_setup_data {
int spi;
int i2c_bus;
unsigned short i2c_address;
};
extern struct snd_soc_dai wm8731_dai; extern struct snd_soc_dai wm8731_dai;
extern struct snd_soc_codec_device soc_codec_dev_wm8731; extern struct snd_soc_codec_device soc_codec_dev_wm8731;
......
This diff is collapsed.
This diff is collapsed.
...@@ -77,12 +77,6 @@ ...@@ -77,12 +77,6 @@
#define WM8753_BIASCTL 0x3d #define WM8753_BIASCTL 0x3d
#define WM8753_ADCTL2 0x3f #define WM8753_ADCTL2 0x3f
struct wm8753_setup_data {
int spi;
int i2c_bus;
unsigned short i2c_address;
};
#define WM8753_PLL1 0 #define WM8753_PLL1 0
#define WM8753_PLL2 1 #define WM8753_PLL2 1
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
/*
* wm9705.h -- WM9705 Soc Audio driver
*/
#ifndef _WM9705_H
#define _WM9705_H
#define WM9705_DAI_AC97_HIFI 0
#define WM9705_DAI_AC97_AUX 1
extern struct snd_soc_dai wm9705_dai[2];
extern struct snd_soc_codec_device soc_codec_dev_wm9705;
#endif
This diff is collapsed.
This diff is collapsed.
...@@ -20,7 +20,7 @@ config SND_DAVINCI_SOC_EVM ...@@ -20,7 +20,7 @@ config SND_DAVINCI_SOC_EVM
config SND_DAVINCI_SOC_SFFSDR config SND_DAVINCI_SOC_SFFSDR
tristate "SoC Audio support for SFFSDR" tristate "SoC Audio support for SFFSDR"
depends on SND_DAVINCI_SOC && MACH_DAVINCI_SFFSDR depends on SND_DAVINCI_SOC && MACH_SFFSDR
select SND_DAVINCI_SOC_I2S select SND_DAVINCI_SOC_I2S
select SND_SOC_PCM3008 select SND_SOC_PCM3008
select SFFSDR_FPGA select SFFSDR_FPGA
......
This diff is collapsed.
This diff is collapsed.
...@@ -286,7 +286,7 @@ static int davinci_pcm_mmap(struct snd_pcm_substream *substream, ...@@ -286,7 +286,7 @@ static int davinci_pcm_mmap(struct snd_pcm_substream *substream,
runtime->dma_bytes); runtime->dma_bytes);
} }
struct snd_pcm_ops davinci_pcm_ops = { static struct snd_pcm_ops davinci_pcm_ops = {
.open = davinci_pcm_open, .open = davinci_pcm_open,
.close = davinci_pcm_close, .close = davinci_pcm_close,
.ioctl = snd_pcm_lib_ioctl, .ioctl = snd_pcm_lib_ioctl,
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment