Skip to content

L
linux
Commit 724339d7 authored by Linus Torvalds's avatar Linus Torvalds
Browse files
Options

Merge branch 'linus' of master.kernel.org:/pub/scm/linux/kernel/git/perex/alsa 

* 'linus' of master.kernel.org:/pub/scm/linux/kernel/git/perex/alsa:
  [ALSA] version 1.0.14rc2
  [ALSA] Fix a typo in __dev* changes in portman2x4.c
  [ALSA] Change AT91 PDC register defines for 2.6.20 kernel
  [ALSA] SoC codecs - fix Kconfig - depends -> depends on
  [ALSA] Fix __devinit and __devexit issues with sound drivers
  [ALSA] hda-codec - Patch for enabling LFE on more Dell laptops
  [ALSA] hda-codec - More fixes for Conexant HD Audio support
  [ALSA] usb-audio: add PCR-A PCM support
  [ALSA] emu10k1: fix typo
  [ALSA] usbaudio - remove urb->bandwidth reference
  [ALSA] ac97 - Fix silent output problem with Cx20551 codec
  [ALSA] hda-codec - Fix Oops with probing sigmatel codec chips
parents 414f827c ccf2c222
Show whitespace changes
Inline Side-by-side
Showing with 394 additions and 227 deletions
include/sound/emu10k1.h
View file @ 724339d7
...@@ -628,7 +628,7 @@ ...@@ -628,7 +628,7 @@
#define FXWC_SPDIFLEFT (1<<22) /* 0x00400000 */ #define FXWC_SPDIFLEFT (1<<22) /* 0x00400000 */
#define FXWC_SPDIFRIGHT (1<<23) /* 0x00800000 */ #define FXWC_SPDIFRIGHT (1<<23) /* 0x00800000 */
#define A_TBLSZ ` 0x43 /* Effects Tank Internal Table Size. Only low byte or register used */ #define A_TBLSZ 0x43 /* Effects Tank Internal Table Size. Only low byte or register used */
#define TCBS 0x44 /* Tank cache buffer size register */ #define TCBS 0x44 /* Tank cache buffer size register */
#define TCBS_MASK 0x00000007 /* Tank cache buffer size field */ #define TCBS_MASK 0x00000007 /* Tank cache buffer size field */
......
include/sound/version.h
View file @ 724339d7
/* include/version.h. Generated by alsa/ksync script. */ /* include/version.h. Generated by alsa/ksync script. */
#define CONFIG_SND_VERSION "1.0.14rc2" #define CONFIG_SND_VERSION "1.0.14rc2"
#define CONFIG_SND_DATE " (Fri Feb 09 13:50:10 2007 UTC)" #define CONFIG_SND_DATE " (Wed Feb 14 07:42:13 2007 UTC)"
sound/arm/pxa2xx-ac97.c
View file @ 724339d7
...@@ -305,7 +305,7 @@ static int pxa2xx_ac97_resume(struct platform_device *dev) ...@@ -305,7 +305,7 @@ static int pxa2xx_ac97_resume(struct platform_device *dev)
#define pxa2xx_ac97_resume NULL #define pxa2xx_ac97_resume NULL
#endif #endif
static int pxa2xx_ac97_probe(struct platform_device *dev) static int __devinit pxa2xx_ac97_probe(struct platform_device *dev)
{ {
struct snd_card *card; struct snd_card *card;
struct snd_ac97_bus *ac97_bus; struct snd_ac97_bus *ac97_bus;
...@@ -369,7 +369,7 @@ static int pxa2xx_ac97_probe(struct platform_device *dev) ...@@ -369,7 +369,7 @@ static int pxa2xx_ac97_probe(struct platform_device *dev)
return ret; return ret;
} }
static int pxa2xx_ac97_remove(struct platform_device *dev) static int __devexit pxa2xx_ac97_remove(struct platform_device *dev)
{ {
struct snd_card *card = platform_get_drvdata(dev); struct snd_card *card = platform_get_drvdata(dev);
...@@ -386,7 +386,7 @@ static int pxa2xx_ac97_remove(struct platform_device *dev) ...@@ -386,7 +386,7 @@ static int pxa2xx_ac97_remove(struct platform_device *dev)
static struct platform_driver pxa2xx_ac97_driver = { static struct platform_driver pxa2xx_ac97_driver = {
.probe = pxa2xx_ac97_probe, .probe = pxa2xx_ac97_probe,
.remove = pxa2xx_ac97_remove, .remove = __devexit_p(pxa2xx_ac97_remove),
.suspend = pxa2xx_ac97_suspend, .suspend = pxa2xx_ac97_suspend,
.resume = pxa2xx_ac97_resume, .resume = pxa2xx_ac97_resume,
.driver = { .driver = {
......
sound/drivers/dummy.c
View file @ 724339d7
...@@ -423,7 +423,8 @@ static struct snd_pcm_ops snd_card_dummy_capture_ops = { ...@@ -423,7 +423,8 @@ static struct snd_pcm_ops snd_card_dummy_capture_ops = {
.pointer = snd_card_dummy_pcm_pointer, .pointer = snd_card_dummy_pcm_pointer,
}; };
static int __init snd_card_dummy_pcm(struct snd_dummy *dummy, int device, int substreams) static int __devinit snd_card_dummy_pcm(struct snd_dummy *dummy, int device,
int substreams)
{ {
struct snd_pcm *pcm; struct snd_pcm *pcm;
int err; int err;
...@@ -562,7 +563,7 @@ DUMMY_VOLUME("CD Volume", 0, MIXER_ADDR_CD), ...@@ -562,7 +563,7 @@ DUMMY_VOLUME("CD Volume", 0, MIXER_ADDR_CD),
DUMMY_CAPSRC("CD Capture Switch", 0, MIXER_ADDR_CD) DUMMY_CAPSRC("CD Capture Switch", 0, MIXER_ADDR_CD)
}; };
static int __init snd_card_dummy_new_mixer(struct snd_dummy *dummy) static int __devinit snd_card_dummy_new_mixer(struct snd_dummy *dummy)
{ {
struct snd_card *card = dummy->card; struct snd_card *card = dummy->card;
unsigned int idx; unsigned int idx;
...@@ -579,7 +580,7 @@ static int __init snd_card_dummy_new_mixer(struct snd_dummy *dummy) ...@@ -579,7 +580,7 @@ static int __init snd_card_dummy_new_mixer(struct snd_dummy *dummy)
return 0; return 0;
} }
static int __init snd_dummy_probe(struct platform_device *devptr) static int __devinit snd_dummy_probe(struct platform_device *devptr)
{ {
struct snd_card *card; struct snd_card *card;
struct snd_dummy *dummy; struct snd_dummy *dummy;
...@@ -617,7 +618,7 @@ static int __init snd_dummy_probe(struct platform_device *devptr) ...@@ -617,7 +618,7 @@ static int __init snd_dummy_probe(struct platform_device *devptr)
return err; return err;
} }
static int snd_dummy_remove(struct platform_device *devptr) static int __devexit snd_dummy_remove(struct platform_device *devptr)
{ {
snd_card_free(platform_get_drvdata(devptr)); snd_card_free(platform_get_drvdata(devptr));
platform_set_drvdata(devptr, NULL); platform_set_drvdata(devptr, NULL);
...@@ -648,7 +649,7 @@ static int snd_dummy_resume(struct platform_device *pdev) ...@@ -648,7 +649,7 @@ static int snd_dummy_resume(struct platform_device *pdev)
static struct platform_driver snd_dummy_driver = { static struct platform_driver snd_dummy_driver = {
.probe = snd_dummy_probe, .probe = snd_dummy_probe,
.remove = snd_dummy_remove, .remove = __devexit_p(snd_dummy_remove),
#ifdef CONFIG_PM #ifdef CONFIG_PM
.suspend = snd_dummy_suspend, .suspend = snd_dummy_suspend,
.resume = snd_dummy_resume, .resume = snd_dummy_resume,
......
sound/drivers/mtpav.c
View file @ 724339d7
...@@ -583,7 +583,7 @@ static irqreturn_t snd_mtpav_irqh(int irq, void *dev_id) ...@@ -583,7 +583,7 @@ static irqreturn_t snd_mtpav_irqh(int irq, void *dev_id)
/* /*
* get ISA resources * get ISA resources
*/ */
static int __init snd_mtpav_get_ISA(struct mtpav * mcard) static int __devinit snd_mtpav_get_ISA(struct mtpav * mcard)
{ {
if ((mcard->res_port = request_region(port, 3, "MotuMTPAV MIDI")) == NULL) { if ((mcard->res_port = request_region(port, 3, "MotuMTPAV MIDI")) == NULL) {
snd_printk("MTVAP port 0x%lx is busy\n", port); snd_printk("MTVAP port 0x%lx is busy\n", port);
...@@ -619,7 +619,7 @@ static struct snd_rawmidi_ops snd_mtpav_input = { ...@@ -619,7 +619,7 @@ static struct snd_rawmidi_ops snd_mtpav_input = {
* get RAWMIDI resources * get RAWMIDI resources
*/ */
static void __init snd_mtpav_set_name(struct mtpav *chip, static void __devinit snd_mtpav_set_name(struct mtpav *chip,
struct snd_rawmidi_substream *substream) struct snd_rawmidi_substream *substream)
{ {
if (substream->number >= 0 && substream->number < chip->num_ports) if (substream->number >= 0 && substream->number < chip->num_ports)
...@@ -634,7 +634,7 @@ static void __init snd_mtpav_set_name(struct mtpav *chip, ...@@ -634,7 +634,7 @@ static void __init snd_mtpav_set_name(struct mtpav *chip,
strcpy(substream->name, "MTP broadcast"); strcpy(substream->name, "MTP broadcast");
} }
static int __init snd_mtpav_get_RAWMIDI(struct mtpav *mcard) static int __devinit snd_mtpav_get_RAWMIDI(struct mtpav *mcard)
{ {
int rval; int rval;
struct snd_rawmidi *rawmidi; struct snd_rawmidi *rawmidi;
...@@ -691,7 +691,7 @@ static void snd_mtpav_free(struct snd_card *card) ...@@ -691,7 +691,7 @@ static void snd_mtpav_free(struct snd_card *card)
/* /*
*/ */
static int __init snd_mtpav_probe(struct platform_device *dev) static int __devinit snd_mtpav_probe(struct platform_device *dev)
{ {
struct snd_card *card; struct snd_card *card;
int err; int err;
...@@ -745,7 +745,7 @@ static int __init snd_mtpav_probe(struct platform_device *dev) ...@@ -745,7 +745,7 @@ static int __init snd_mtpav_probe(struct platform_device *dev)
return err; return err;
} }
static int snd_mtpav_remove(struct platform_device *devptr) static int __devexit snd_mtpav_remove(struct platform_device *devptr)
{ {
snd_card_free(platform_get_drvdata(devptr)); snd_card_free(platform_get_drvdata(devptr));
platform_set_drvdata(devptr, NULL); platform_set_drvdata(devptr, NULL);
...@@ -756,7 +756,7 @@ static int snd_mtpav_remove(struct platform_device *devptr) ...@@ -756,7 +756,7 @@ static int snd_mtpav_remove(struct platform_device *devptr)
static struct platform_driver snd_mtpav_driver = { static struct platform_driver snd_mtpav_driver = {
.probe = snd_mtpav_probe, .probe = snd_mtpav_probe,
.remove = snd_mtpav_remove, .remove = __devexit_p(snd_mtpav_remove),
.driver = { .driver = {
.name = SND_MTPAV_DRIVER .name = SND_MTPAV_DRIVER
}, },
......
sound/drivers/mts64.c
View file @ 724339d7
...@@ -1026,7 +1026,7 @@ static int __devinit snd_mts64_probe(struct platform_device *pdev) ...@@ -1026,7 +1026,7 @@ static int __devinit snd_mts64_probe(struct platform_device *pdev)
return err; return err;
} }
static int snd_mts64_remove(struct platform_device *pdev) static int __devexit snd_mts64_remove(struct platform_device *pdev)
{ {
struct snd_card *card = platform_get_drvdata(pdev); struct snd_card *card = platform_get_drvdata(pdev);
...@@ -1039,7 +1039,7 @@ static int snd_mts64_remove(struct platform_device *pdev) ...@@ -1039,7 +1039,7 @@ static int snd_mts64_remove(struct platform_device *pdev)
static struct platform_driver snd_mts64_driver = { static struct platform_driver snd_mts64_driver = {
.probe = snd_mts64_probe, .probe = snd_mts64_probe,
.remove = snd_mts64_remove, .remove = __devexit_p(snd_mts64_remove),
.driver = { .driver = {
.name = PLATFORM_DRIVER .name = PLATFORM_DRIVER
} }
...@@ -1048,7 +1048,7 @@ static struct platform_driver snd_mts64_driver = { ...@@ -1048,7 +1048,7 @@ static struct platform_driver snd_mts64_driver = {
/********************************************************************* /*********************************************************************
* module init stuff * module init stuff
*********************************************************************/ *********************************************************************/
static void snd_mts64_unregister_all(void) static void __init_or_module snd_mts64_unregister_all(void)
{ {
int i; int i;
......
sound/drivers/portman2x4.c
View file @ 724339d7
...@@ -811,7 +811,7 @@ static int __devinit snd_portman_probe(struct platform_device *pdev) ...@@ -811,7 +811,7 @@ static int __devinit snd_portman_probe(struct platform_device *pdev)
return err; return err;
} }
static int snd_portman_remove(struct platform_device *pdev) static int __devexit snd_portman_remove(struct platform_device *pdev)
{ {
struct snd_card *card = platform_get_drvdata(pdev); struct snd_card *card = platform_get_drvdata(pdev);
...@@ -824,7 +824,7 @@ static int snd_portman_remove(struct platform_device *pdev) ...@@ -824,7 +824,7 @@ static int snd_portman_remove(struct platform_device *pdev)
static struct platform_driver snd_portman_driver = { static struct platform_driver snd_portman_driver = {
.probe = snd_portman_probe, .probe = snd_portman_probe,
.remove = snd_portman_remove, .remove = __devexit_p(snd_portman_remove),
.driver = { .driver = {
.name = PLATFORM_DRIVER .name = PLATFORM_DRIVER
} }
...@@ -833,7 +833,7 @@ static struct platform_driver snd_portman_driver = { ...@@ -833,7 +833,7 @@ static struct platform_driver snd_portman_driver = {
/********************************************************************* /*********************************************************************
* module init stuff * module init stuff
*********************************************************************/ *********************************************************************/
static void snd_portman_unregister_all(void) static void __init_or_module snd_portman_unregister_all(void)
{ {
int i; int i;
......
sound/drivers/serial-u16550.c
View file @ 724339d7
...@@ -327,7 +327,7 @@ static void snd_uart16550_buffer_timer(unsigned long data) ...@@ -327,7 +327,7 @@ static void snd_uart16550_buffer_timer(unsigned long data)
* return 0 if found * return 0 if found
* return negative error if not found * return negative error if not found
*/ */
static int __init snd_uart16550_detect(struct snd_uart16550 *uart) static int __devinit snd_uart16550_detect(struct snd_uart16550 *uart)
{ {
unsigned long io_base = uart->base; unsigned long io_base = uart->base;
int ok; int ok;
...@@ -781,7 +781,7 @@ static int snd_uart16550_dev_free(struct snd_device *device) ...@@ -781,7 +781,7 @@ static int snd_uart16550_dev_free(struct snd_device *device)
return snd_uart16550_free(uart); return snd_uart16550_free(uart);
} }
static int __init snd_uart16550_create(struct snd_card *card, static int __devinit snd_uart16550_create(struct snd_card *card,
unsigned long iobase, unsigned long iobase,
int irq, int irq,
unsigned int speed, unsigned int speed,
...@@ -860,7 +860,7 @@ static int __init snd_uart16550_create(struct snd_card *card, ...@@ -860,7 +860,7 @@ static int __init snd_uart16550_create(struct snd_card *card,
return 0; return 0;
} }
static void __init snd_uart16550_substreams(struct snd_rawmidi_str *stream) static void __devinit snd_uart16550_substreams(struct snd_rawmidi_str *stream)
{ {
struct snd_rawmidi_substream *substream; struct snd_rawmidi_substream *substream;
...@@ -869,7 +869,7 @@ static void __init snd_uart16550_substreams(struct snd_rawmidi_str *stream) ...@@ -869,7 +869,7 @@ static void __init snd_uart16550_substreams(struct snd_rawmidi_str *stream)
} }
} }
static int __init snd_uart16550_rmidi(struct snd_uart16550 *uart, int device, static int __devinit snd_uart16550_rmidi(struct snd_uart16550 *uart, int device,
int outs, int ins, int outs, int ins,
struct snd_rawmidi **rmidi) struct snd_rawmidi **rmidi)
{ {
...@@ -896,7 +896,7 @@ static int __init snd_uart16550_rmidi(struct snd_uart16550 *uart, int device, ...@@ -896,7 +896,7 @@ static int __init snd_uart16550_rmidi(struct snd_uart16550 *uart, int device,
return 0; return 0;
} }
static int __init snd_serial_probe(struct platform_device *devptr) static int __devinit snd_serial_probe(struct platform_device *devptr)
{ {
struct snd_card *card; struct snd_card *card;
struct snd_uart16550 *uart; struct snd_uart16550 *uart;
...@@ -981,7 +981,7 @@ static int __init snd_serial_probe(struct platform_device *devptr) ...@@ -981,7 +981,7 @@ static int __init snd_serial_probe(struct platform_device *devptr)
return err; return err;
} }
static int snd_serial_remove(struct platform_device *devptr) static int __devexit snd_serial_remove(struct platform_device *devptr)
{ {
snd_card_free(platform_get_drvdata(devptr)); snd_card_free(platform_get_drvdata(devptr));
platform_set_drvdata(devptr, NULL); platform_set_drvdata(devptr, NULL);
...@@ -992,7 +992,7 @@ static int snd_serial_remove(struct platform_device *devptr) ...@@ -992,7 +992,7 @@ static int snd_serial_remove(struct platform_device *devptr)
static struct platform_driver snd_serial_driver = { static struct platform_driver snd_serial_driver = {
.probe = snd_serial_probe, .probe = snd_serial_probe,
.remove = snd_serial_remove, .remove = __devexit_p( snd_serial_remove),
.driver = { .driver = {
.name = SND_SERIAL_DRIVER .name = SND_SERIAL_DRIVER
}, },
......
sound/drivers/virmidi.c
View file @ 724339d7
...@@ -84,7 +84,7 @@ struct snd_card_virmidi { ...@@ -84,7 +84,7 @@ struct snd_card_virmidi {
static struct platform_device *devices[SNDRV_CARDS]; static struct platform_device *devices[SNDRV_CARDS];
static int __init snd_virmidi_probe(struct platform_device *devptr) static int __devinit snd_virmidi_probe(struct platform_device *devptr)
{ {
struct snd_card *card; struct snd_card *card;
struct snd_card_virmidi *vmidi; struct snd_card_virmidi *vmidi;
...@@ -128,7 +128,7 @@ static int __init snd_virmidi_probe(struct platform_device *devptr) ...@@ -128,7 +128,7 @@ static int __init snd_virmidi_probe(struct platform_device *devptr)
return err; return err;
} }
static int snd_virmidi_remove(struct platform_device *devptr) static int __devexit snd_virmidi_remove(struct platform_device *devptr)
{ {
snd_card_free(platform_get_drvdata(devptr)); snd_card_free(platform_get_drvdata(devptr));
platform_set_drvdata(devptr, NULL); platform_set_drvdata(devptr, NULL);
...@@ -139,7 +139,7 @@ static int snd_virmidi_remove(struct platform_device *devptr) ...@@ -139,7 +139,7 @@ static int snd_virmidi_remove(struct platform_device *devptr)
static struct platform_driver snd_virmidi_driver = { static struct platform_driver snd_virmidi_driver = {
.probe = snd_virmidi_probe, .probe = snd_virmidi_probe,
.remove = snd_virmidi_remove, .remove = __devexit_p(snd_virmidi_remove),
.driver = { .driver = {
.name = SND_VIRMIDI_DRIVER .name = SND_VIRMIDI_DRIVER
}, },
......
sound/isa/ad1848/ad1848.c
View file @ 724339d7
...@@ -65,7 +65,7 @@ MODULE_PARM_DESC(thinkpad, "Enable only for the onboard CS4248 of IBM Thinkpad 3 ...@@ -65,7 +65,7 @@ MODULE_PARM_DESC(thinkpad, "Enable only for the onboard CS4248 of IBM Thinkpad 3
static struct platform_device *devices[SNDRV_CARDS]; static struct platform_device *devices[SNDRV_CARDS];
static int __init snd_ad1848_probe(struct platform_device *pdev) static int __devinit snd_ad1848_probe(struct platform_device *pdev)
{ {
int dev = pdev->id; int dev = pdev->id;
struct snd_card *card; struct snd_card *card;
......
sound/isa/cmi8330.c
View file @ 724339d7
...@@ -574,7 +574,7 @@ static int __devinit snd_cmi8330_nonpnp_probe(struct platform_device *pdev) ...@@ -574,7 +574,7 @@ static int __devinit snd_cmi8330_nonpnp_probe(struct platform_device *pdev)
return 0; return 0;
} }
static int snd_cmi8330_nonpnp_remove(struct platform_device *devptr) static int __devexit snd_cmi8330_nonpnp_remove(struct platform_device *devptr)
{ {
snd_card_free(platform_get_drvdata(devptr)); snd_card_free(platform_get_drvdata(devptr));
platform_set_drvdata(devptr, NULL); platform_set_drvdata(devptr, NULL);
...@@ -597,7 +597,7 @@ static int snd_cmi8330_nonpnp_resume(struct platform_device *dev) ...@@ -597,7 +597,7 @@ static int snd_cmi8330_nonpnp_resume(struct platform_device *dev)
static struct platform_driver snd_cmi8330_driver = { static struct platform_driver snd_cmi8330_driver = {
.probe = snd_cmi8330_nonpnp_probe, .probe = snd_cmi8330_nonpnp_probe,
.remove = snd_cmi8330_nonpnp_remove, .remove = __devexit_p(snd_cmi8330_nonpnp_remove),
#ifdef CONFIG_PM #ifdef CONFIG_PM
.suspend = snd_cmi8330_nonpnp_suspend, .suspend = snd_cmi8330_nonpnp_suspend,
.resume = snd_cmi8330_nonpnp_resume, .resume = snd_cmi8330_nonpnp_resume,
......
sound/isa/es1688/es1688.c
View file @ 724339d7
...@@ -73,7 +73,7 @@ static struct platform_device *devices[SNDRV_CARDS]; ...@@ -73,7 +73,7 @@ static struct platform_device *devices[SNDRV_CARDS];
#define PFX "es1688: " #define PFX "es1688: "
static int __init snd_es1688_probe(struct platform_device *pdev) static int __devinit snd_es1688_probe(struct platform_device *pdev)
{ {
int dev = pdev->id; int dev = pdev->id;
static int possible_irqs[] = {5, 9, 10, 7, -1}; static int possible_irqs[] = {5, 9, 10, 7, -1};
...@@ -171,7 +171,7 @@ static int __init snd_es1688_probe(struct platform_device *pdev) ...@@ -171,7 +171,7 @@ static int __init snd_es1688_probe(struct platform_device *pdev)
return err; return err;
} }
static int snd_es1688_remove(struct platform_device *devptr) static int __devexit snd_es1688_remove(struct platform_device *devptr)
{ {
snd_card_free(platform_get_drvdata(devptr)); snd_card_free(platform_get_drvdata(devptr));
platform_set_drvdata(devptr, NULL); platform_set_drvdata(devptr, NULL);
...@@ -182,7 +182,7 @@ static int snd_es1688_remove(struct platform_device *devptr) ...@@ -182,7 +182,7 @@ static int snd_es1688_remove(struct platform_device *devptr)
static struct platform_driver snd_es1688_driver = { static struct platform_driver snd_es1688_driver = {
.probe = snd_es1688_probe, .probe = snd_es1688_probe,
.remove = snd_es1688_remove, .remove = __devexit_p(snd_es1688_remove),
/* FIXME: suspend/resume */ /* FIXME: suspend/resume */
.driver = { .driver = {
.name = ES1688_DRIVER .name = ES1688_DRIVER
......
sound/isa/gus/gusclassic.c
View file @ 724339d7
...@@ -76,7 +76,7 @@ static struct platform_device *devices[SNDRV_CARDS]; ...@@ -76,7 +76,7 @@ static struct platform_device *devices[SNDRV_CARDS];
#define PFX "gusclassic: " #define PFX "gusclassic: "
static int __init snd_gusclassic_detect(struct snd_gus_card * gus) static int __devinit snd_gusclassic_detect(struct snd_gus_card * gus)
{ {
unsigned char d; unsigned char d;
...@@ -95,7 +95,7 @@ static int __init snd_gusclassic_detect(struct snd_gus_card * gus) ...@@ -95,7 +95,7 @@ static int __init snd_gusclassic_detect(struct snd_gus_card * gus)
return 0; return 0;
} }
static void __init snd_gusclassic_init(int dev, struct snd_gus_card * gus) static void __devinit snd_gusclassic_init(int dev, struct snd_gus_card * gus)
{ {
gus->equal_irq = 0; gus->equal_irq = 0;
gus->codec_flag = 0; gus->codec_flag = 0;
...@@ -103,7 +103,7 @@ static void __init snd_gusclassic_init(int dev, struct snd_gus_card * gus) ...@@ -103,7 +103,7 @@ static void __init snd_gusclassic_init(int dev, struct snd_gus_card * gus)
gus->joystick_dac = joystick_dac[dev]; gus->joystick_dac = joystick_dac[dev];
} }
static int __init snd_gusclassic_probe(struct platform_device *pdev) static int __devinit snd_gusclassic_probe(struct platform_device *pdev)
{ {
int dev = pdev->id; int dev = pdev->id;
static int possible_irqs[] = {5, 11, 12, 9, 7, 15, 3, 4, -1}; static int possible_irqs[] = {5, 11, 12, 9, 7, 15, 3, 4, -1};
...@@ -211,7 +211,7 @@ static int __init snd_gusclassic_probe(struct platform_device *pdev) ...@@ -211,7 +211,7 @@ static int __init snd_gusclassic_probe(struct platform_device *pdev)
return err; return err;
} }
static int snd_gusclassic_remove(struct platform_device *devptr) static int __devexit snd_gusclassic_remove(struct platform_device *devptr)
{ {
snd_card_free(platform_get_drvdata(devptr)); snd_card_free(platform_get_drvdata(devptr));
platform_set_drvdata(devptr, NULL); platform_set_drvdata(devptr, NULL);
...@@ -222,7 +222,7 @@ static int snd_gusclassic_remove(struct platform_device *devptr) ...@@ -222,7 +222,7 @@ static int snd_gusclassic_remove(struct platform_device *devptr)
static struct platform_driver snd_gusclassic_driver = { static struct platform_driver snd_gusclassic_driver = {
.probe = snd_gusclassic_probe, .probe = snd_gusclassic_probe,
.remove = snd_gusclassic_remove, .remove = __devexit_p(snd_gusclassic_remove),
/* FIXME: suspend/resume */ /* FIXME: suspend/resume */
.driver = { .driver = {
.name = GUSCLASSIC_DRIVER .name = GUSCLASSIC_DRIVER
......
sound/isa/gus/gusextreme.c
View file @ 724339d7
...@@ -92,7 +92,7 @@ static struct platform_device *devices[SNDRV_CARDS]; ...@@ -92,7 +92,7 @@ static struct platform_device *devices[SNDRV_CARDS];
#define PFX "gusextreme: " #define PFX "gusextreme: "
static int __init snd_gusextreme_detect(int dev, static int __devinit snd_gusextreme_detect(int dev,
struct snd_card *card, struct snd_card *card,
struct snd_gus_card * gus, struct snd_gus_card * gus,
struct snd_es1688 *es1688) struct snd_es1688 *es1688)
...@@ -142,12 +142,12 @@ static int __init snd_gusextreme_detect(int dev, ...@@ -142,12 +142,12 @@ static int __init snd_gusextreme_detect(int dev,
return 0; return 0;
} }
static void __init snd_gusextreme_init(int dev, struct snd_gus_card * gus) static void __devinit snd_gusextreme_init(int dev, struct snd_gus_card * gus)
{ {
gus->joystick_dac = joystick_dac[dev]; gus->joystick_dac = joystick_dac[dev];
} }
static int __init snd_gusextreme_mixer(struct snd_es1688 *chip) static int __devinit snd_gusextreme_mixer(struct snd_es1688 *chip)
{ {
struct snd_card *card = chip->card; struct snd_card *card = chip->card;
struct snd_ctl_elem_id id1, id2; struct snd_ctl_elem_id id1, id2;
...@@ -169,7 +169,7 @@ static int __init snd_gusextreme_mixer(struct snd_es1688 *chip) ...@@ -169,7 +169,7 @@ static int __init snd_gusextreme_mixer(struct snd_es1688 *chip)
return 0; return 0;
} }
static int __init snd_gusextreme_probe(struct platform_device *pdev) static int __devinit snd_gusextreme_probe(struct platform_device *pdev)
{ {
int dev = pdev->id; int dev = pdev->id;
static int possible_ess_irqs[] = {5, 9, 10, 7, -1}; static int possible_ess_irqs[] = {5, 9, 10, 7, -1};
...@@ -321,7 +321,7 @@ static int __init snd_gusextreme_probe(struct platform_device *pdev) ...@@ -321,7 +321,7 @@ static int __init snd_gusextreme_probe(struct platform_device *pdev)
return err; return err;
} }
static int snd_gusextreme_remove(struct platform_device *devptr) static int __devexit snd_gusextreme_remove(struct platform_device *devptr)
{ {
snd_card_free(platform_get_drvdata(devptr)); snd_card_free(platform_get_drvdata(devptr));
platform_set_drvdata(devptr, NULL); platform_set_drvdata(devptr, NULL);
...@@ -332,7 +332,7 @@ static int snd_gusextreme_remove(struct platform_device *devptr) ...@@ -332,7 +332,7 @@ static int snd_gusextreme_remove(struct platform_device *devptr)
static struct platform_driver snd_gusextreme_driver = { static struct platform_driver snd_gusextreme_driver = {
.probe = snd_gusextreme_probe, .probe = snd_gusextreme_probe,
.remove = snd_gusextreme_remove, .remove = __devexit_p(snd_gusextreme_remove),
/* FIXME: suspend/resume */ /* FIXME: suspend/resume */
.driver = { .driver = {
.name = GUSEXTREME_DRIVER .name = GUSEXTREME_DRIVER
......
sound/isa/gus/gusmax.c
View file @ 724339d7
...@@ -85,7 +85,7 @@ struct snd_gusmax { ...@@ -85,7 +85,7 @@ struct snd_gusmax {
#define PFX "gusmax: " #define PFX "gusmax: "
static int __init snd_gusmax_detect(struct snd_gus_card * gus) static int __devinit snd_gusmax_detect(struct snd_gus_card * gus)
{ {
unsigned char d; unsigned char d;
...@@ -127,7 +127,8 @@ static irqreturn_t snd_gusmax_interrupt(int irq, void *dev_id) ...@@ -127,7 +127,8 @@ static irqreturn_t snd_gusmax_interrupt(int irq, void *dev_id)
return IRQ_RETVAL(handled); return IRQ_RETVAL(handled);
} }
static void __init snd_gusmax_init(int dev, struct snd_card *card, struct snd_gus_card * gus) static void __devinit snd_gusmax_init(int dev, struct snd_card *card,
struct snd_gus_card * gus)
{ {
gus->equal_irq = 1; gus->equal_irq = 1;
gus->codec_flag = 1; gus->codec_flag = 1;
...@@ -145,7 +146,7 @@ static void __init snd_gusmax_init(int dev, struct snd_card *card, struct snd_gu ...@@ -145,7 +146,7 @@ static void __init snd_gusmax_init(int dev, struct snd_card *card, struct snd_gu
#define CS4231_PRIVATE( left, right, shift, mute ) \ #define CS4231_PRIVATE( left, right, shift, mute ) \
((left << 24)|(right << 16)|(shift<<8)|mute) ((left << 24)|(right << 16)|(shift<<8)|mute)
static int __init snd_gusmax_mixer(struct snd_cs4231 *chip) static int __devinit snd_gusmax_mixer(struct snd_cs4231 *chip)
{ {
struct snd_card *card = chip->card; struct snd_card *card = chip->card;
struct snd_ctl_elem_id id1, id2; struct snd_ctl_elem_id id1, id2;
...@@ -204,7 +205,7 @@ static void snd_gusmax_free(struct snd_card *card) ...@@ -204,7 +205,7 @@ static void snd_gusmax_free(struct snd_card *card)
free_irq(maxcard->irq, (void *)maxcard); free_irq(maxcard->irq, (void *)maxcard);
} }
static int __init snd_gusmax_probe(struct platform_device *pdev) static int __devinit snd_gusmax_probe(struct platform_device *pdev)
{ {
int dev = pdev->id; int dev = pdev->id;
static int possible_irqs[] = {5, 11, 12, 9, 7, 15, 3, -1}; static int possible_irqs[] = {5, 11, 12, 9, 7, 15, 3, -1};
...@@ -348,7 +349,7 @@ static int __init snd_gusmax_probe(struct platform_device *pdev) ...@@ -348,7 +349,7 @@ static int __init snd_gusmax_probe(struct platform_device *pdev)
return err; return err;
} }
static int snd_gusmax_remove(struct platform_device *devptr) static int __devexit snd_gusmax_remove(struct platform_device *devptr)
{ {
snd_card_free(platform_get_drvdata(devptr)); snd_card_free(platform_get_drvdata(devptr));
platform_set_drvdata(devptr, NULL); platform_set_drvdata(devptr, NULL);
...@@ -359,7 +360,7 @@ static int snd_gusmax_remove(struct platform_device *devptr) ...@@ -359,7 +360,7 @@ static int snd_gusmax_remove(struct platform_device *devptr)
static struct platform_driver snd_gusmax_driver = { static struct platform_driver snd_gusmax_driver = {
.probe = snd_gusmax_probe, .probe = snd_gusmax_probe,
.remove = snd_gusmax_remove, .remove = __devexit_p(snd_gusmax_remove),
/* FIXME: suspend/resume */ /* FIXME: suspend/resume */
.driver = { .driver = {
.name = GUSMAX_DRIVER .name = GUSMAX_DRIVER
......
sound/isa/opl3sa2.c
View file @ 724339d7
...@@ -919,7 +919,7 @@ static int __devinit snd_opl3sa2_nonpnp_probe(struct platform_device *pdev) ...@@ -919,7 +919,7 @@ static int __devinit snd_opl3sa2_nonpnp_probe(struct platform_device *pdev)
return 0; return 0;
} }
static int snd_opl3sa2_nonpnp_remove(struct platform_device *devptr) static int __devexit snd_opl3sa2_nonpnp_remove(struct platform_device *devptr)
{ {
snd_card_free(platform_get_drvdata(devptr)); snd_card_free(platform_get_drvdata(devptr));
platform_set_drvdata(devptr, NULL); platform_set_drvdata(devptr, NULL);
...@@ -942,7 +942,7 @@ static int snd_opl3sa2_nonpnp_resume(struct platform_device *dev) ...@@ -942,7 +942,7 @@ static int snd_opl3sa2_nonpnp_resume(struct platform_device *dev)
static struct platform_driver snd_opl3sa2_nonpnp_driver = { static struct platform_driver snd_opl3sa2_nonpnp_driver = {
.probe = snd_opl3sa2_nonpnp_probe, .probe = snd_opl3sa2_nonpnp_probe,
.remove = snd_opl3sa2_nonpnp_remove, .remove = __devexit( snd_opl3sa2_nonpnp_remove),
#ifdef CONFIG_PM #ifdef CONFIG_PM
.suspend = snd_opl3sa2_nonpnp_suspend, .suspend = snd_opl3sa2_nonpnp_suspend,
.resume = snd_opl3sa2_nonpnp_resume, .resume = snd_opl3sa2_nonpnp_resume,
......
sound/isa/sb/sb8.c
View file @ 724339d7
...@@ -83,7 +83,7 @@ static void snd_sb8_free(struct snd_card *card) ...@@ -83,7 +83,7 @@ static void snd_sb8_free(struct snd_card *card)
release_and_free_resource(acard->fm_res); release_and_free_resource(acard->fm_res);
} }
static int __init snd_sb8_probe(struct platform_device *pdev) static int __devinit snd_sb8_probe(struct platform_device *pdev)
{ {
int dev = pdev->id; int dev = pdev->id;
struct snd_sb *chip; struct snd_sb *chip;
...@@ -193,7 +193,7 @@ static int __init snd_sb8_probe(struct platform_device *pdev) ...@@ -193,7 +193,7 @@ static int __init snd_sb8_probe(struct platform_device *pdev)
return err; return err;
} }
static int snd_sb8_remove(struct platform_device *pdev) static int __devexit snd_sb8_remove(struct platform_device *pdev)
{ {
snd_card_free(platform_get_drvdata(pdev)); snd_card_free(platform_get_drvdata(pdev));
platform_set_drvdata(pdev, NULL); platform_set_drvdata(pdev, NULL);
...@@ -230,7 +230,7 @@ static int snd_sb8_resume(struct platform_device *dev) ...@@ -230,7 +230,7 @@ static int snd_sb8_resume(struct platform_device *dev)
static struct platform_driver snd_sb8_driver = { static struct platform_driver snd_sb8_driver = {
.probe = snd_sb8_probe, .probe = snd_sb8_probe,
.remove = snd_sb8_remove, .remove = __devexit_p(snd_sb8_remove),
#ifdef CONFIG_PM #ifdef CONFIG_PM
.suspend = snd_sb8_suspend, .suspend = snd_sb8_suspend,
.resume = snd_sb8_resume, .resume = snd_sb8_resume,
......
sound/pci/ac97/ac97_codec.c
View file @ 724339d7
...@@ -143,6 +143,7 @@ static const struct ac97_codec_id snd_ac97_codec_ids[] = { ...@@ -143,6 +143,7 @@ static const struct ac97_codec_id snd_ac97_codec_ids[] = {
{ 0x43525970, 0xfffffff8, "CS4202", NULL, NULL }, { 0x43525970, 0xfffffff8, "CS4202", NULL, NULL },
{ 0x43585421, 0xffffffff, "HSD11246", NULL, NULL }, // SmartMC II { 0x43585421, 0xffffffff, "HSD11246", NULL, NULL }, // SmartMC II
{ 0x43585428, 0xfffffff8, "Cx20468", patch_conexant, NULL }, // SmartAMC fixme: the mask might be different { 0x43585428, 0xfffffff8, "Cx20468", patch_conexant, NULL }, // SmartAMC fixme: the mask might be different
{ 0x43585431, 0xffffffff, "Cx20551", patch_cx20551, NULL },
{ 0x44543031, 0xfffffff0, "DT0398", NULL, NULL }, { 0x44543031, 0xfffffff0, "DT0398", NULL, NULL },
{ 0x454d4328, 0xffffffff, "EM28028", NULL, NULL }, // same as TR28028? { 0x454d4328, 0xffffffff, "EM28028", NULL, NULL }, // same as TR28028?
{ 0x45838308, 0xffffffff, "ESS1988", NULL, NULL }, { 0x45838308, 0xffffffff, "ESS1988", NULL, NULL },
......
sound/pci/ac97/ac97_patch.c
View file @ 724339d7
...@@ -1338,6 +1338,12 @@ int patch_conexant(struct snd_ac97 * ac97) ...@@ -1338,6 +1338,12 @@ int patch_conexant(struct snd_ac97 * ac97)
return 0; return 0;
} }
int patch_cx20551(struct snd_ac97 *ac97)
{
snd_ac97_update_bits(ac97, 0x5c, 0x01, 0x01);
return 0;
}
/* /*
* Analog Device AD18xx, AD19xx codecs * Analog Device AD18xx, AD19xx codecs
*/ */
......
sound/pci/ac97/ac97_patch.h
View file @ 724339d7
...@@ -39,6 +39,7 @@ int patch_sigmatel_stac9758(struct snd_ac97 * ac97); ...@@ -39,6 +39,7 @@ int patch_sigmatel_stac9758(struct snd_ac97 * ac97);
int patch_cirrus_cs4299(struct snd_ac97 * ac97); int patch_cirrus_cs4299(struct snd_ac97 * ac97);
int patch_cirrus_spdif(struct snd_ac97 * ac97); int patch_cirrus_spdif(struct snd_ac97 * ac97);
int patch_conexant(struct snd_ac97 * ac97); int patch_conexant(struct snd_ac97 * ac97);
int patch_cx20551(struct snd_ac97 * ac97);
int patch_ad1819(struct snd_ac97 * ac97); int patch_ad1819(struct snd_ac97 * ac97);
int patch_ad1881(struct snd_ac97 * ac97); int patch_ad1881(struct snd_ac97 * ac97);
int patch_ad1885(struct snd_ac97 * ac97); int patch_ad1885(struct snd_ac97 * ac97);
......
sound/pci/hda/patch_conexant.c
View file @ 724339d7
...@@ -57,6 +57,7 @@ struct conexant_spec { ...@@ -57,6 +57,7 @@ struct conexant_spec {
* dig_out_nid and hp_nid are optional * dig_out_nid and hp_nid are optional
*/ */
unsigned int cur_eapd; unsigned int cur_eapd;
unsigned int hp_present;
unsigned int need_dac_fix; unsigned int need_dac_fix;
/* capture */ /* capture */
...@@ -354,7 +355,7 @@ static struct hda_codec_ops conexant_patch_ops = { ...@@ -354,7 +355,7 @@ static struct hda_codec_ops conexant_patch_ops = {
* the private value = nid | (invert << 8) * the private value = nid | (invert << 8)
*/ */
static int conexant_eapd_info(struct snd_kcontrol *kcontrol, static int cxt_eapd_info(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_info *uinfo) struct snd_ctl_elem_info *uinfo)
{ {
uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN; uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
...@@ -364,7 +365,7 @@ static int conexant_eapd_info(struct snd_kcontrol *kcontrol, ...@@ -364,7 +365,7 @@ static int conexant_eapd_info(struct snd_kcontrol *kcontrol,
return 0; return 0;
} }
static int conexant_eapd_get(struct snd_kcontrol *kcontrol, static int cxt_eapd_get(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_value *ucontrol) struct snd_ctl_elem_value *ucontrol)
{ {
struct hda_codec *codec = snd_kcontrol_chip(kcontrol); struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
...@@ -375,9 +376,10 @@ static int conexant_eapd_get(struct snd_kcontrol *kcontrol, ...@@ -375,9 +376,10 @@ static int conexant_eapd_get(struct snd_kcontrol *kcontrol,
else else
ucontrol->value.integer.value[0] = spec->cur_eapd; ucontrol->value.integer.value[0] = spec->cur_eapd;
return 0; return 0;
} }
static int conexant_eapd_put(struct snd_kcontrol *kcontrol, static int cxt_eapd_put(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_value *ucontrol) struct snd_ctl_elem_value *ucontrol)
{ {
struct hda_codec *codec = snd_kcontrol_chip(kcontrol); struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
...@@ -385,11 +387,13 @@ static int conexant_eapd_put(struct snd_kcontrol *kcontrol, ...@@ -385,11 +387,13 @@ static int conexant_eapd_put(struct snd_kcontrol *kcontrol,
int invert = (kcontrol->private_value >> 8) & 1; int invert = (kcontrol->private_value >> 8) & 1;
hda_nid_t nid = kcontrol->private_value & 0xff; hda_nid_t nid = kcontrol->private_value & 0xff;
unsigned int eapd; unsigned int eapd;
eapd = ucontrol->value.integer.value[0]; eapd = ucontrol->value.integer.value[0];
if (invert) if (invert)
eapd = !eapd; eapd = !eapd;
if (eapd == spec->cur_eapd && !codec->in_resume) if (eapd == spec->cur_eapd && !codec->in_resume)
return 0; return 0;
spec->cur_eapd = eapd; spec->cur_eapd = eapd;
snd_hda_codec_write(codec, nid, snd_hda_codec_write(codec, nid,
0, AC_VERB_SET_EAPD_BTLENABLE, 0, AC_VERB_SET_EAPD_BTLENABLE,
...@@ -400,6 +404,15 @@ static int conexant_eapd_put(struct snd_kcontrol *kcontrol, ...@@ -400,6 +404,15 @@ static int conexant_eapd_put(struct snd_kcontrol *kcontrol,
/* controls for test mode */ /* controls for test mode */
#ifdef CONFIG_SND_DEBUG #ifdef CONFIG_SND_DEBUG
#define CXT_EAPD_SWITCH(xname, nid, mask) \
{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, .index = 0, \
.info = cxt_eapd_info, \
.get = cxt_eapd_get, \
.put = cxt_eapd_put, \
.private_value = nid | (mask<<16) }
static int conexant_ch_mode_info(struct snd_kcontrol *kcontrol, static int conexant_ch_mode_info(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_info *uinfo) struct snd_ctl_elem_info *uinfo)
{ {
...@@ -492,7 +505,7 @@ static int cxt_gpio_data_put(struct snd_kcontrol *kcontrol, ...@@ -492,7 +505,7 @@ static int cxt_gpio_data_put(struct snd_kcontrol *kcontrol,
.get = cxt_gpio_data_get, \ .get = cxt_gpio_data_get, \
.put = cxt_gpio_data_put, \ .put = cxt_gpio_data_put, \
.private_value = nid | (mask<<16) } .private_value = nid | (mask<<16) }
#if 0
static int cxt_spdif_ctrl_info(struct snd_kcontrol *kcontrol, static int cxt_spdif_ctrl_info(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_info *uinfo) struct snd_ctl_elem_info *uinfo)
{ {
...@@ -547,7 +560,7 @@ static int cxt_spdif_ctrl_put(struct snd_kcontrol *kcontrol, ...@@ -547,7 +560,7 @@ static int cxt_spdif_ctrl_put(struct snd_kcontrol *kcontrol,
.get = cxt_spdif_ctrl_get, \ .get = cxt_spdif_ctrl_get, \
.put = cxt_spdif_ctrl_put, \ .put = cxt_spdif_ctrl_put, \
.private_value = nid | (mask<<16) } .private_value = nid | (mask<<16) }
#endif
#endif /* CONFIG_SND_DEBUG */ #endif /* CONFIG_SND_DEBUG */
/* Conexant 5045 specific */ /* Conexant 5045 specific */
...@@ -564,7 +577,7 @@ static struct hda_channel_mode cxt5045_modes[1] = { ...@@ -564,7 +577,7 @@ static struct hda_channel_mode cxt5045_modes[1] = {
static struct hda_input_mux cxt5045_capture_source = { static struct hda_input_mux cxt5045_capture_source = {
.num_items = 2, .num_items = 2,
.items = { .items = {
{ "ExtMic", 0x1 }, { "IntMic", 0x1 },
{ "LineIn", 0x2 }, { "LineIn", 0x2 },
} }
}; };
...@@ -575,15 +588,20 @@ static int cxt5045_hp_master_sw_put(struct snd_kcontrol *kcontrol, ...@@ -575,15 +588,20 @@ static int cxt5045_hp_master_sw_put(struct snd_kcontrol *kcontrol,
{ {
struct hda_codec *codec = snd_kcontrol_chip(kcontrol); struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
struct conexant_spec *spec = codec->spec; struct conexant_spec *spec = codec->spec;
unsigned int bits;
if (!conexant_eapd_put(kcontrol, ucontrol)) if (!cxt_eapd_put(kcontrol, ucontrol))
return 0; return 0;
/* toggle HP mute appropriately */ /* toggle internal speakers mute depending of presence of
snd_hda_codec_amp_update(codec, 0x11, 0, HDA_OUTPUT, 0, * the headphone jack
0x80, spec->cur_eapd ? 0 : 0x80); */
snd_hda_codec_amp_update(codec, 0x11, 1, HDA_OUTPUT, 0, bits = (!spec->hp_present && spec->cur_eapd) ? 0 : 0x80;
0x80, spec->cur_eapd ? 0 : 0x80); snd_hda_codec_amp_update(codec, 0x10, 0, HDA_OUTPUT, 0, 0x80, bits);
snd_hda_codec_amp_update(codec, 0x10, 1, HDA_OUTPUT, 0, 0x80, bits);
bits = spec->cur_eapd ? 0 : 0x80;
snd_hda_codec_amp_update(codec, 0x11, 0, HDA_OUTPUT, 0, 0x80, bits);
snd_hda_codec_amp_update(codec, 0x11, 1, HDA_OUTPUT, 0, 0x80, bits);
return 1; return 1;
} }
...@@ -610,14 +628,13 @@ static int cxt5045_hp_master_vol_put(struct snd_kcontrol *kcontrol, ...@@ -610,14 +628,13 @@ static int cxt5045_hp_master_vol_put(struct snd_kcontrol *kcontrol,
/* mute internal speaker if HP is plugged */ /* mute internal speaker if HP is plugged */
static void cxt5045_hp_automute(struct hda_codec *codec) static void cxt5045_hp_automute(struct hda_codec *codec)
{ {
unsigned int present; struct conexant_spec *spec = codec->spec;
unsigned int bits = (spec->hp_present || !spec->cur_eapd) ? 0x80 : 0;
present = snd_hda_codec_read(codec, 0x11, 0, spec->hp_present = snd_hda_codec_read(codec, 0x11, 0,
AC_VERB_GET_PIN_SENSE, 0) & 0x80000000; AC_VERB_GET_PIN_SENSE, 0) & 0x80000000;
snd_hda_codec_amp_update(codec, 0x10, 0, HDA_OUTPUT, 0, snd_hda_codec_amp_update(codec, 0x10, 0, HDA_OUTPUT, 0, 0x80, bits);
0x80, present ? 0x80 : 0); snd_hda_codec_amp_update(codec, 0x10, 1, HDA_OUTPUT, 0, 0x80, bits);
snd_hda_codec_amp_update(codec, 0x10, 1, HDA_OUTPUT, 0,
0x80, present ? 0x80 : 0);
} }
/* unsolicited event for HP jack sensing */ /* unsolicited event for HP jack sensing */
...@@ -640,25 +657,27 @@ static struct snd_kcontrol_new cxt5045_mixers[] = { ...@@ -640,25 +657,27 @@ static struct snd_kcontrol_new cxt5045_mixers[] = {
.get = conexant_mux_enum_get, .get = conexant_mux_enum_get,
.put = conexant_mux_enum_put .put = conexant_mux_enum_put
}, },
HDA_CODEC_VOLUME("Mic Bypass Capture Volume", 0x17, 0x02, HDA_INPUT), HDA_CODEC_VOLUME("Int Mic Volume", 0x17, 0x01, HDA_INPUT),
HDA_CODEC_MUTE("Mic Bypass Capture Switch", 0x17, 0x02, HDA_INPUT), HDA_CODEC_MUTE("Int Mic Switch", 0x17, 0x01, HDA_INPUT),
HDA_CODEC_VOLUME("Capture Volume", 0x1a, 0x02, HDA_INPUT), HDA_CODEC_VOLUME("Ext Mic Volume", 0x17, 0x02, HDA_INPUT),
HDA_CODEC_MUTE("Capture Switch", 0x1a, 0x02, HDA_INPUT), HDA_CODEC_MUTE("Ext Mic Switch", 0x17, 0x02, HDA_INPUT),
HDA_CODEC_VOLUME("Capture Volume", 0x1a, 0x0, HDA_INPUT),
HDA_CODEC_MUTE("Capture Switch", 0x1a, 0x0, HDA_INPUT),
{ {
.iface = SNDRV_CTL_ELEM_IFACE_MIXER, .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
.name = "Master Playback Volume", .name = "Master Playback Volume",
.info = snd_hda_mixer_amp_volume_info, .info = snd_hda_mixer_amp_volume_info,
.get = snd_hda_mixer_amp_volume_get, .get = snd_hda_mixer_amp_volume_get,
.put = cxt5045_hp_master_vol_put, .put = cxt5045_hp_master_vol_put,
.private_value = HDA_COMPOSE_AMP_VAL(0x11, 3, 0, HDA_OUTPUT), .private_value = HDA_COMPOSE_AMP_VAL(0x10, 3, 0, HDA_OUTPUT),
}, },
{ {
.iface = SNDRV_CTL_ELEM_IFACE_MIXER, .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
.name = "Master Playback Switch", .name = "Master Playback Switch",
.info = conexant_eapd_info, .info = cxt_eapd_info,
.get = conexant_eapd_get, .get = cxt_eapd_get,
.put = cxt5045_hp_master_sw_put, .put = cxt5045_hp_master_sw_put,
.private_value = 0x11, .private_value = 0x10,
}, },
{} {}
...@@ -669,22 +688,26 @@ static struct hda_verb cxt5045_init_verbs[] = { ...@@ -669,22 +688,26 @@ static struct hda_verb cxt5045_init_verbs[] = {
{0x12, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN }, {0x12, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN },
{0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN|AC_PINCTL_VREF_50 }, {0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN|AC_PINCTL_VREF_50 },
/* HP, Amp */ /* HP, Amp */
{0x11, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT }, {0x11, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP },
{0x1A, AC_VERB_SET_CONNECT_SEL,0x01}, {0x17, AC_VERB_SET_CONNECT_SEL,0x01},
{0x1A, AC_VERB_SET_AMP_GAIN_MUTE, {0x17, AC_VERB_SET_AMP_GAIN_MUTE,
AC_AMP_SET_OUTPUT|AC_AMP_SET_RIGHT|AC_AMP_SET_LEFT|0x00}, AC_AMP_SET_OUTPUT|AC_AMP_SET_RIGHT|AC_AMP_SET_LEFT|0x01},
{0x1A, AC_VERB_SET_AMP_GAIN_MUTE, {0x17, AC_VERB_SET_AMP_GAIN_MUTE,
AC_AMP_SET_OUTPUT|AC_AMP_SET_RIGHT|AC_AMP_SET_LEFT|0x02},
{0x17, AC_VERB_SET_AMP_GAIN_MUTE,
AC_AMP_SET_OUTPUT|AC_AMP_SET_RIGHT|AC_AMP_SET_LEFT|0x03}, AC_AMP_SET_OUTPUT|AC_AMP_SET_RIGHT|AC_AMP_SET_LEFT|0x03},
/* Record selector: Front mic */
{0x14, AC_VERB_SET_CONNECT_SEL,0x03},
{0x17, AC_VERB_SET_AMP_GAIN_MUTE, {0x17, AC_VERB_SET_AMP_GAIN_MUTE,
AC_AMP_SET_OUTPUT|AC_AMP_SET_RIGHT|AC_AMP_SET_LEFT|0x04},
/* Record selector: Int mic */
{0x1a, AC_VERB_SET_CONNECT_SEL,0x0},
{0x1a, AC_VERB_SET_AMP_GAIN_MUTE,
AC_AMP_SET_INPUT|AC_AMP_SET_RIGHT|AC_AMP_SET_LEFT|0x17}, AC_AMP_SET_INPUT|AC_AMP_SET_RIGHT|AC_AMP_SET_LEFT|0x17},
/* SPDIF route: PCM */ /* SPDIF route: PCM */
{ 0x13, AC_VERB_SET_CONNECT_SEL, 0x0 }, { 0x13, AC_VERB_SET_CONNECT_SEL, 0x0 },
/* pin sensing on HP and Mic jacks */ /* pin sensing on HP and Mic jacks */
{0x11, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | CONEXANT_HP_EVENT}, {0x11, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | CONEXANT_HP_EVENT},
/* EAPD */ /* EAPD */
{0x10, AC_VERB_SET_EAPD_BTLENABLE, 0x0 }, /* default on */ {0x10, AC_VERB_SET_EAPD_BTLENABLE, 0x2 }, /* default on */
{ } /* end */ { } /* end */
}; };
...@@ -706,8 +729,6 @@ static struct hda_input_mux cxt5045_test_capture_source = { ...@@ -706,8 +729,6 @@ static struct hda_input_mux cxt5045_test_capture_source = {
static struct snd_kcontrol_new cxt5045_test_mixer[] = { static struct snd_kcontrol_new cxt5045_test_mixer[] = {
/* Output controls */ /* Output controls */
HDA_CODEC_VOLUME("OutAmp-1 Volume", 0x19, 0x00, HDA_OUTPUT),
HDA_CODEC_MUTE("OutAmp-1 Switch", 0x19,0x00, HDA_OUTPUT),
HDA_CODEC_VOLUME("Speaker Playback Volume", 0x10, 0x0, HDA_OUTPUT), HDA_CODEC_VOLUME("Speaker Playback Volume", 0x10, 0x0, HDA_OUTPUT),
HDA_CODEC_MUTE("Speaker Playback Switch", 0x10, 0x0, HDA_OUTPUT), HDA_CODEC_MUTE("Speaker Playback Switch", 0x10, 0x0, HDA_OUTPUT),
...@@ -715,6 +736,9 @@ static struct snd_kcontrol_new cxt5045_test_mixer[] = { ...@@ -715,6 +736,9 @@ static struct snd_kcontrol_new cxt5045_test_mixer[] = {
CXT_PIN_MODE("HP-OUT pin mode", 0x11, CXT_PIN_DIR_INOUT), CXT_PIN_MODE("HP-OUT pin mode", 0x11, CXT_PIN_DIR_INOUT),
CXT_PIN_MODE("LINE1 pin mode", 0x12, CXT_PIN_DIR_INOUT), CXT_PIN_MODE("LINE1 pin mode", 0x12, CXT_PIN_DIR_INOUT),
/* EAPD Switch Control */
CXT_EAPD_SWITCH("External Amplifier", 0x10, 0x0),
/* Loopback mixer controls */ /* Loopback mixer controls */
HDA_CODEC_VOLUME("MIC1 Playback Volume", 0x17, 0x01, HDA_INPUT), HDA_CODEC_VOLUME("MIC1 Playback Volume", 0x17, 0x01, HDA_INPUT),
HDA_CODEC_MUTE("MIC1 Playback Switch", 0x17, 0x01, HDA_INPUT), HDA_CODEC_MUTE("MIC1 Playback Switch", 0x17, 0x01, HDA_INPUT),
...@@ -725,17 +749,16 @@ static struct snd_kcontrol_new cxt5045_test_mixer[] = { ...@@ -725,17 +749,16 @@ static struct snd_kcontrol_new cxt5045_test_mixer[] = {
HDA_CODEC_VOLUME("CD Playback Volume", 0x17, 0x04, HDA_INPUT), HDA_CODEC_VOLUME("CD Playback Volume", 0x17, 0x04, HDA_INPUT),
HDA_CODEC_MUTE("CD Playback Switch", 0x17, 0x04, HDA_INPUT), HDA_CODEC_MUTE("CD Playback Switch", 0x17, 0x04, HDA_INPUT),
/* Controls for GPIO pins, assuming they exist and are configured as outputs */ HDA_CODEC_VOLUME("Capture-1 Volume", 0x17, 0x0, HDA_INPUT),
CXT_GPIO_DATA_SWITCH("GPIO pin 0", 0x01, 0x01), HDA_CODEC_MUTE("Capture-1 Switch", 0x17, 0x0, HDA_INPUT),
#if 0 /* limit this to one GPIO pin for now */ HDA_CODEC_VOLUME("Capture-2 Volume", 0x17, 0x1, HDA_INPUT),
CXT_GPIO_DATA_SWITCH("GPIO pin 1", 0x01, 0x02), HDA_CODEC_MUTE("Capture-2 Switch", 0x17, 0x1, HDA_INPUT),
CXT_GPIO_DATA_SWITCH("GPIO pin 2", 0x01, 0x04), HDA_CODEC_VOLUME("Capture-3 Volume", 0x17, 0x2, HDA_INPUT),
CXT_GPIO_DATA_SWITCH("GPIO pin 3", 0x01, 0x08), HDA_CODEC_MUTE("Capture-3 Switch", 0x17, 0x2, HDA_INPUT),
#endif HDA_CODEC_VOLUME("Capture-4 Volume", 0x17, 0x3, HDA_INPUT),
CXT_SPDIF_CTRL_SWITCH("SPDIF Playback Switch", 0x13, 0x01), HDA_CODEC_MUTE("Capture-4 Switch", 0x17, 0x3, HDA_INPUT),
HDA_CODEC_VOLUME("Capture-5 Volume", 0x17, 0x4, HDA_INPUT),
HDA_CODEC_VOLUME("Capture Volume", 0x17, 0x0, HDA_OUTPUT), HDA_CODEC_MUTE("Capture-5 Switch", 0x17, 0x4, HDA_INPUT),
HDA_CODEC_MUTE("Capture Switch", 0x17, 0x0, HDA_OUTPUT),
{ {
.iface = SNDRV_CTL_ELEM_IFACE_MIXER, .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
.name = "Input Source", .name = "Input Source",
...@@ -748,14 +771,9 @@ static struct snd_kcontrol_new cxt5045_test_mixer[] = { ...@@ -748,14 +771,9 @@ static struct snd_kcontrol_new cxt5045_test_mixer[] = {
}; };
static struct hda_verb cxt5045_test_init_verbs[] = { static struct hda_verb cxt5045_test_init_verbs[] = {
/* Enable all GPIOs as outputs with an initial value of 0 */
{0x01, AC_VERB_SET_GPIO_DIRECTION, 0x0f},
{0x01, AC_VERB_SET_GPIO_DATA, 0x00},
{0x01, AC_VERB_SET_GPIO_MASK, 0x0f},
/* Enable retasking pins as output, initially without power amp */ /* Enable retasking pins as output, initially without power amp */
{0x12, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT}, {0x12, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
{0x11, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT}, {0x11, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},
/* Disable digital (SPDIF) pins initially, but users can enable /* Disable digital (SPDIF) pins initially, but users can enable
* them via a mixer switch. In the case of SPDIF-out, this initverb * them via a mixer switch. In the case of SPDIF-out, this initverb
...@@ -823,6 +841,8 @@ static const char *cxt5045_models[CXT5045_MODELS] = { ...@@ -823,6 +841,8 @@ static const char *cxt5045_models[CXT5045_MODELS] = {
static struct snd_pci_quirk cxt5045_cfg_tbl[] = { static struct snd_pci_quirk cxt5045_cfg_tbl[] = {
SND_PCI_QUIRK(0x103c, 0x30b7, "HP DV6000Z", CXT5045_LAPTOP), SND_PCI_QUIRK(0x103c, 0x30b7, "HP DV6000Z", CXT5045_LAPTOP),
SND_PCI_QUIRK(0x103c, 0x30bb, "HP DV8000", CXT5045_LAPTOP),
SND_PCI_QUIRK(0x1734, 0x10ad, "Fujitsu Si1520", CXT5045_LAPTOP),
{} {}
}; };
...@@ -880,11 +900,11 @@ static int patch_cxt5045(struct hda_codec *codec) ...@@ -880,11 +900,11 @@ static int patch_cxt5045(struct hda_codec *codec)
/* Conexant 5047 specific */ /* Conexant 5047 specific */
#define CXT5047_SPDIF_OUT 0x11
static hda_nid_t cxt5047_dac_nids[1] = { 0x10 }; static hda_nid_t cxt5047_dac_nids[2] = { 0x10, 0x1c };
static hda_nid_t cxt5047_adc_nids[1] = { 0x12 }; static hda_nid_t cxt5047_adc_nids[1] = { 0x12 };
static hda_nid_t cxt5047_capsrc_nids[1] = { 0x1a }; static hda_nid_t cxt5047_capsrc_nids[1] = { 0x1a };
#define CXT5047_SPDIF_OUT 0x11
static struct hda_channel_mode cxt5047_modes[1] = { static struct hda_channel_mode cxt5047_modes[1] = {
{ 2, NULL }, { 2, NULL },
...@@ -893,15 +913,23 @@ static struct hda_channel_mode cxt5047_modes[1] = { ...@@ -893,15 +913,23 @@ static struct hda_channel_mode cxt5047_modes[1] = {
static struct hda_input_mux cxt5047_capture_source = { static struct hda_input_mux cxt5047_capture_source = {
.num_items = 2, .num_items = 2,
.items = { .items = {
{ "ExtMic", 0x1 }, { "ExtMic", 0x0 },
{ "IntMic", 0x2 }, { "IntMic", 0x1 },
} }
}; };
static struct hda_input_mux cxt5047_hp_capture_source = { static struct hda_input_mux cxt5047_hp_capture_source = {
.num_items = 1, .num_items = 1,
.items = { .items = {
{ "ExtMic", 0x1 }, { "ExtMic", 0x2 },
}
};
static struct hda_input_mux cxt5047_toshiba_capture_source = {
.num_items = 2,
.items = {
{ "ExtMic", 0x2 },
{ "Line-In", 0x1 },
} }
}; };
...@@ -911,20 +939,24 @@ static int cxt5047_hp_master_sw_put(struct snd_kcontrol *kcontrol, ...@@ -911,20 +939,24 @@ static int cxt5047_hp_master_sw_put(struct snd_kcontrol *kcontrol,
{ {
struct hda_codec *codec = snd_kcontrol_chip(kcontrol); struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
struct conexant_spec *spec = codec->spec; struct conexant_spec *spec = codec->spec;
unsigned int bits;
if (!conexant_eapd_put(kcontrol, ucontrol)) if (!cxt_eapd_put(kcontrol, ucontrol))
return 0; return 0;
/* toggle HP mute appropriately */ /* toggle internal speakers mute depending of presence of
snd_hda_codec_amp_update(codec, 0x13, 0, HDA_OUTPUT, 0, * the headphone jack
0x80, spec->cur_eapd ? 0 : 0x80); */
snd_hda_codec_amp_update(codec, 0x13, 1, HDA_OUTPUT, 0, bits = (!spec->hp_present && spec->cur_eapd) ? 0 : 0x80;
0x80, spec->cur_eapd ? 0 : 0x80); snd_hda_codec_amp_update(codec, 0x1d, 0, HDA_OUTPUT, 0, 0x80, bits);
snd_hda_codec_amp_update(codec, 0x1d, 1, HDA_OUTPUT, 0, 0x80, bits);
bits = spec->cur_eapd ? 0 : 0x80;
snd_hda_codec_amp_update(codec, 0x13, 0, HDA_OUTPUT, 0, 0x80, bits);
snd_hda_codec_amp_update(codec, 0x13, 1, HDA_OUTPUT, 0, 0x80, bits);
return 1; return 1;
} }
#if 0 /* bind volumes of both NID 0x13 (Headphones) and 0x1d (Speakers) */
/* bind volumes of both NID 0x13 and 0x1d */
static int cxt5047_hp_master_vol_put(struct snd_kcontrol *kcontrol, static int cxt5047_hp_master_vol_put(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_value *ucontrol) struct snd_ctl_elem_value *ucontrol)
{ {
...@@ -932,9 +964,9 @@ static int cxt5047_hp_master_vol_put(struct snd_kcontrol *kcontrol, ...@@ -932,9 +964,9 @@ static int cxt5047_hp_master_vol_put(struct snd_kcontrol *kcontrol,
long *valp = ucontrol->value.integer.value; long *valp = ucontrol->value.integer.value;
int change; int change;
change = snd_hda_codec_amp_update(codec, 0x1c, 0, HDA_OUTPUT, 0, change = snd_hda_codec_amp_update(codec, 0x1d, 0, HDA_OUTPUT, 0,
0x7f, valp[0] & 0x7f); 0x7f, valp[0] & 0x7f);
change |= snd_hda_codec_amp_update(codec, 0x1c, 1, HDA_OUTPUT, 0, change |= snd_hda_codec_amp_update(codec, 0x1d, 1, HDA_OUTPUT, 0,
0x7f, valp[1] & 0x7f); 0x7f, valp[1] & 0x7f);
snd_hda_codec_amp_update(codec, 0x13, 0, HDA_OUTPUT, 0, snd_hda_codec_amp_update(codec, 0x13, 0, HDA_OUTPUT, 0,
0x7f, valp[0] & 0x7f); 0x7f, valp[0] & 0x7f);
...@@ -942,19 +974,20 @@ static int cxt5047_hp_master_vol_put(struct snd_kcontrol *kcontrol, ...@@ -942,19 +974,20 @@ static int cxt5047_hp_master_vol_put(struct snd_kcontrol *kcontrol,
0x7f, valp[1] & 0x7f); 0x7f, valp[1] & 0x7f);
return change; return change;
} }
#endif
/* mute internal speaker if HP is plugged */ /* mute internal speaker if HP is plugged */
static void cxt5047_hp_automute(struct hda_codec *codec) static void cxt5047_hp_automute(struct hda_codec *codec)
{ {
unsigned int present; struct conexant_spec *spec = codec->spec;
unsigned int bits = spec->hp_present || !spec->cur_eapd ? 0x80 : 0;
present = snd_hda_codec_read(codec, 0x13, 0, spec->hp_present = snd_hda_codec_read(codec, 0x13, 0,
AC_VERB_GET_PIN_SENSE, 0) & 0x80000000; AC_VERB_GET_PIN_SENSE, 0) & 0x80000000;
snd_hda_codec_amp_update(codec, 0x1c, 0, HDA_OUTPUT, 0, snd_hda_codec_amp_update(codec, 0x1d, 0, HDA_OUTPUT, 0, 0x80, bits);
0x80, present ? 0x80 : 0); snd_hda_codec_amp_update(codec, 0x1d, 1, HDA_OUTPUT, 0, 0x80, bits);
snd_hda_codec_amp_update(codec, 0x1c, 1, HDA_OUTPUT, 0, /* Mute/Unmute PCM 2 for good measure - some systems need this */
0x80, present ? 0x80 : 0); snd_hda_codec_amp_update(codec, 0x1c, 0, HDA_OUTPUT, 0, 0x80, bits);
snd_hda_codec_amp_update(codec, 0x1c, 1, HDA_OUTPUT, 0, 0x80, bits);
} }
/* toggle input of built-in and mic jack appropriately */ /* toggle input of built-in and mic jack appropriately */
...@@ -1009,12 +1042,55 @@ static struct snd_kcontrol_new cxt5047_mixers[] = { ...@@ -1009,12 +1042,55 @@ static struct snd_kcontrol_new cxt5047_mixers[] = {
HDA_CODEC_MUTE("Capture Switch", 0x12, 0x03, HDA_INPUT), HDA_CODEC_MUTE("Capture Switch", 0x12, 0x03, HDA_INPUT),
HDA_CODEC_VOLUME("PCM Volume", 0x10, 0x00, HDA_OUTPUT), HDA_CODEC_VOLUME("PCM Volume", 0x10, 0x00, HDA_OUTPUT),
HDA_CODEC_MUTE("PCM Switch", 0x10, 0x00, HDA_OUTPUT), HDA_CODEC_MUTE("PCM Switch", 0x10, 0x00, HDA_OUTPUT),
HDA_CODEC_VOLUME("Master Playback Volume", 0x13, 0x00, HDA_OUTPUT), HDA_CODEC_VOLUME("PCM-2 Volume", 0x1c, 0x00, HDA_OUTPUT),
HDA_CODEC_MUTE("PCM-2 Switch", 0x1c, 0x00, HDA_OUTPUT),
{
.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
.name = "Master Playback Volume",
.info = snd_hda_mixer_amp_volume_info,
.get = snd_hda_mixer_amp_volume_get,
.put = cxt5047_hp_master_vol_put,
.private_value = HDA_COMPOSE_AMP_VAL(0x13, 3, 0, HDA_OUTPUT),
},
{
.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
.name = "Master Playback Switch",
.info = cxt_eapd_info,
.get = cxt_eapd_get,
.put = cxt5047_hp_master_sw_put,
.private_value = 0x13,
},
{}
};
static struct snd_kcontrol_new cxt5047_toshiba_mixers[] = {
{
.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
.name = "Capture Source",
.info = conexant_mux_enum_info,
.get = conexant_mux_enum_get,
.put = conexant_mux_enum_put
},
HDA_CODEC_VOLUME("Mic Bypass Capture Volume", 0x19, 0x02, HDA_INPUT),
HDA_CODEC_MUTE("Mic Bypass Capture Switch", 0x19, 0x02, HDA_INPUT),
HDA_CODEC_VOLUME("Capture Volume", 0x12, 0x03, HDA_INPUT),
HDA_CODEC_MUTE("Capture Switch", 0x12, 0x03, HDA_INPUT),
HDA_CODEC_VOLUME("PCM Volume", 0x10, 0x00, HDA_OUTPUT),
HDA_CODEC_MUTE("PCM Switch", 0x10, 0x00, HDA_OUTPUT),
{
.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
.name = "Master Playback Volume",
.info = snd_hda_mixer_amp_volume_info,
.get = snd_hda_mixer_amp_volume_get,
.put = cxt5047_hp_master_vol_put,
.private_value = HDA_COMPOSE_AMP_VAL(0x13, 3, 0, HDA_OUTPUT),
},
{ {
.iface = SNDRV_CTL_ELEM_IFACE_MIXER, .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
.name = "Master Playback Switch", .name = "Master Playback Switch",
.info = conexant_eapd_info, .info = cxt_eapd_info,
.get = conexant_eapd_get, .get = cxt_eapd_get,
.put = cxt5047_hp_master_sw_put, .put = cxt5047_hp_master_sw_put,
.private_value = 0x13, .private_value = 0x13,
}, },
...@@ -1040,8 +1116,8 @@ static struct snd_kcontrol_new cxt5047_hp_mixers[] = { ...@@ -1040,8 +1116,8 @@ static struct snd_kcontrol_new cxt5047_hp_mixers[] = {
{ {
.iface = SNDRV_CTL_ELEM_IFACE_MIXER, .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
.name = "Master Playback Switch", .name = "Master Playback Switch",
.info = conexant_eapd_info, .info = cxt_eapd_info,
.get = conexant_eapd_get, .get = cxt_eapd_get,
.put = cxt5047_hp_master_sw_put, .put = cxt5047_hp_master_sw_put,
.private_value = 0x13, .private_value = 0x13,
}, },
...@@ -1053,19 +1129,23 @@ static struct hda_verb cxt5047_init_verbs[] = { ...@@ -1053,19 +1129,23 @@ static struct hda_verb cxt5047_init_verbs[] = {
{0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN }, {0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN },
{0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN|AC_PINCTL_VREF_50 }, {0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN|AC_PINCTL_VREF_50 },
{0x17, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN|AC_PINCTL_VREF_50 }, {0x17, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN|AC_PINCTL_VREF_50 },
/* HP, Amp */ /* HP, Amp, Speaker */
{0x13, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT }, {0x13, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },
{0x1A, AC_VERB_SET_CONNECT_SEL,0x03}, {0x1A, AC_VERB_SET_CONNECT_SEL,0x00},
{0x1A, AC_VERB_SET_AMP_GAIN_MUTE, {0x1A, AC_VERB_SET_AMP_GAIN_MUTE,
AC_AMP_SET_OUTPUT|AC_AMP_SET_RIGHT|AC_AMP_SET_LEFT|0x00}, AC_AMP_SET_OUTPUT|AC_AMP_SET_RIGHT|AC_AMP_SET_LEFT|0x00},
{0x1A, AC_VERB_SET_AMP_GAIN_MUTE, {0x1A, AC_VERB_SET_AMP_GAIN_MUTE,
AC_AMP_SET_OUTPUT|AC_AMP_SET_RIGHT|AC_AMP_SET_LEFT|0x03}, AC_AMP_SET_OUTPUT|AC_AMP_SET_RIGHT|AC_AMP_SET_LEFT|0x03},
{0x1d, AC_VERB_SET_CONNECT_SEL,0x0},
/* Record selector: Front mic */ /* Record selector: Front mic */
{0x12, AC_VERB_SET_CONNECT_SEL,0x03}, {0x12, AC_VERB_SET_CONNECT_SEL,0x03},
{0x19, AC_VERB_SET_AMP_GAIN_MUTE, {0x19, AC_VERB_SET_AMP_GAIN_MUTE,
AC_AMP_SET_INPUT|AC_AMP_SET_RIGHT|AC_AMP_SET_LEFT|0x17}, AC_AMP_SET_INPUT|AC_AMP_SET_RIGHT|AC_AMP_SET_LEFT|0x17},
/* SPDIF route: PCM */ /* SPDIF route: PCM */
{ 0x18, AC_VERB_SET_CONNECT_SEL, 0x0 }, { 0x18, AC_VERB_SET_CONNECT_SEL, 0x0 },
/* Enable unsolicited events */
{0x13, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | CONEXANT_HP_EVENT},
{0x15, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | CONEXANT_MIC_EVENT},
{ } /* end */ { } /* end */
}; };
...@@ -1075,14 +1155,24 @@ static struct hda_verb cxt5047_toshiba_init_verbs[] = { ...@@ -1075,14 +1155,24 @@ static struct hda_verb cxt5047_toshiba_init_verbs[] = {
/* pin sensing on HP and Mic jacks */ /* pin sensing on HP and Mic jacks */
{0x13, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | CONEXANT_HP_EVENT}, {0x13, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | CONEXANT_HP_EVENT},
{0x15, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | CONEXANT_MIC_EVENT}, {0x15, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | CONEXANT_MIC_EVENT},
/* Speaker routing */
{0x1d, AC_VERB_SET_CONNECT_SEL,0x1},
/* Change default to ExtMic for recording */
{0x1a, AC_VERB_SET_CONNECT_SEL,0x2},
{} {}
}; };
/* configuration for HP Laptops */ /* configuration for HP Laptops */
static struct hda_verb cxt5047_hp_init_verbs[] = { static struct hda_verb cxt5047_hp_init_verbs[] = {
/* pin sensing on HP and Mic jacks */ /* pin sensing on HP jack */
{0x13, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | CONEXANT_HP_EVENT}, {0x13, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | CONEXANT_HP_EVENT},
{0x15, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | CONEXANT_MIC_EVENT}, /* Record selector: Ext Mic */
{0x12, AC_VERB_SET_CONNECT_SEL,0x03},
{0x1a, AC_VERB_SET_CONNECT_SEL,0x02},
{0x19, AC_VERB_SET_AMP_GAIN_MUTE,
AC_AMP_SET_INPUT|AC_AMP_SET_RIGHT|AC_AMP_SET_LEFT|0x17},
/* Speaker routing */
{0x1d, AC_VERB_SET_CONNECT_SEL,0x1},
{} {}
}; };
...@@ -1091,53 +1181,56 @@ static struct hda_verb cxt5047_hp_init_verbs[] = { ...@@ -1091,53 +1181,56 @@ static struct hda_verb cxt5047_hp_init_verbs[] = {
*/ */
#ifdef CONFIG_SND_DEBUG #ifdef CONFIG_SND_DEBUG
static struct hda_input_mux cxt5047_test_capture_source = { static struct hda_input_mux cxt5047_test_capture_source = {
.num_items = 5, .num_items = 4,
.items = { .items = {
{ "MIXER", 0x0 }, { "LINE1 pin", 0x0 },
{ "LINE1 pin", 0x1 }, { "MIC1 pin", 0x1 },
{ "MIC1 pin", 0x2 }, { "MIC2 pin", 0x2 },
{ "MIC2 pin", 0x3 }, { "CD pin", 0x3 },
{ "CD pin", 0x4 },
}, },
}; };
static struct snd_kcontrol_new cxt5047_test_mixer[] = { static struct snd_kcontrol_new cxt5047_test_mixer[] = {
/* Output only controls */ /* Output only controls */
HDA_CODEC_VOLUME("OutAmp-1 Volume", 0x10, 0x00, HDA_OUTPUT), HDA_CODEC_VOLUME("OutAmp-1 Volume", 0x10, 0x0, HDA_OUTPUT),
HDA_CODEC_MUTE("OutAmp-1 Switch", 0x10,0x00, HDA_OUTPUT), HDA_CODEC_MUTE("OutAmp-1 Switch", 0x10,0x0, HDA_OUTPUT),
HDA_CODEC_VOLUME("OutAmp-2 Volume", 0x1c, 0x00, HDA_OUTPUT), HDA_CODEC_VOLUME("OutAmp-2 Volume", 0x1c, 0x0, HDA_OUTPUT),
HDA_CODEC_MUTE("OutAmp-2 Switch", 0x1c, 0x00, HDA_OUTPUT), HDA_CODEC_MUTE("OutAmp-2 Switch", 0x1c, 0x0, HDA_OUTPUT),
HDA_CODEC_VOLUME("Speaker Playback Volume", 0x1d, 0x0, HDA_OUTPUT), HDA_CODEC_VOLUME("Speaker Playback Volume", 0x1d, 0x0, HDA_OUTPUT),
HDA_CODEC_MUTE("Speaker Playback Switch", 0x1d, 0x0, HDA_OUTPUT), HDA_CODEC_MUTE("Speaker Playback Switch", 0x1d, 0x0, HDA_OUTPUT),
HDA_CODEC_VOLUME("HeadPhone Playback Volume", 0x13, 0x0, HDA_OUTPUT), HDA_CODEC_VOLUME("HeadPhone Playback Volume", 0x13, 0x0, HDA_OUTPUT),
HDA_CODEC_MUTE("HeadPhone Playback Switch", 0x13, 0x0, HDA_OUTPUT), HDA_CODEC_MUTE("HeadPhone Playback Switch", 0x13, 0x0, HDA_OUTPUT),
HDA_CODEC_VOLUME("Line1-Out Playback Volume", 0x14, 0x0, HDA_OUTPUT),
HDA_CODEC_MUTE("Line1-Out Playback Switch", 0x14, 0x0, HDA_OUTPUT),
HDA_CODEC_VOLUME("Line2-Out Playback Volume", 0x15, 0x0, HDA_OUTPUT),
HDA_CODEC_MUTE("Line2-Out Playback Switch", 0x15, 0x0, HDA_OUTPUT),
/* Modes for retasking pin widgets */ /* Modes for retasking pin widgets */
CXT_PIN_MODE("LINE1 pin mode", 0x14, CXT_PIN_DIR_INOUT), CXT_PIN_MODE("LINE1 pin mode", 0x14, CXT_PIN_DIR_INOUT),
CXT_PIN_MODE("MIC1 pin mode", 0x15, CXT_PIN_DIR_INOUT), CXT_PIN_MODE("MIC1 pin mode", 0x15, CXT_PIN_DIR_INOUT),
/* Loopback mixer controls */ /* EAPD Switch Control */
HDA_CODEC_VOLUME("MIC1 Playback Volume", 0x19, 0x02, HDA_INPUT), CXT_EAPD_SWITCH("External Amplifier", 0x13, 0x0),
HDA_CODEC_MUTE("MIC1 Playback Switch", 0x19, 0x02, HDA_INPUT),
HDA_CODEC_VOLUME("MIC2 Playback Volume", 0x19, 0x03, HDA_INPUT),
HDA_CODEC_MUTE("MIC2 Playback Switch", 0x19, 0x03, HDA_INPUT),
HDA_CODEC_VOLUME("LINE Playback Volume", 0x19, 0x01, HDA_INPUT),
HDA_CODEC_MUTE("LINE Playback Switch", 0x19, 0x01, HDA_INPUT),
HDA_CODEC_VOLUME("CD Playback Volume", 0x19, 0x04, HDA_INPUT),
HDA_CODEC_MUTE("CD Playback Switch", 0x19, 0x04, HDA_INPUT),
#if 0 /* Loopback mixer controls */
/* Controls for GPIO pins, assuming they exist and are configured as outputs */ HDA_CODEC_VOLUME("MIC1 Playback Volume", 0x12, 0x01, HDA_INPUT),
CXT_GPIO_DATA_SWITCH("GPIO pin 0", 0x01, 0x01), HDA_CODEC_MUTE("MIC1 Playback Switch", 0x12, 0x01, HDA_INPUT),
CXT_GPIO_DATA_SWITCH("GPIO pin 1", 0x01, 0x02), HDA_CODEC_VOLUME("MIC2 Playback Volume", 0x12, 0x02, HDA_INPUT),
CXT_GPIO_DATA_SWITCH("GPIO pin 2", 0x01, 0x04), HDA_CODEC_MUTE("MIC2 Playback Switch", 0x12, 0x02, HDA_INPUT),
CXT_GPIO_DATA_SWITCH("GPIO pin 3", 0x01, 0x08), HDA_CODEC_VOLUME("LINE Playback Volume", 0x12, 0x0, HDA_INPUT),
#endif HDA_CODEC_MUTE("LINE Playback Switch", 0x12, 0x0, HDA_INPUT),
CXT_SPDIF_CTRL_SWITCH("SPDIF Playback Switch", 0x18, 0x01), HDA_CODEC_VOLUME("CD Playback Volume", 0x12, 0x04, HDA_INPUT),
HDA_CODEC_MUTE("CD Playback Switch", 0x12, 0x04, HDA_INPUT),
HDA_CODEC_VOLUME("Capture Volume", 0x19, 0x0, HDA_OUTPUT),
HDA_CODEC_MUTE("Capture Switch", 0x19, 0x0, HDA_OUTPUT), HDA_CODEC_VOLUME("Capture-1 Volume", 0x19, 0x0, HDA_INPUT),
HDA_CODEC_MUTE("Capture-1 Switch", 0x19, 0x0, HDA_INPUT),
HDA_CODEC_VOLUME("Capture-2 Volume", 0x19, 0x1, HDA_INPUT),
HDA_CODEC_MUTE("Capture-2 Switch", 0x19, 0x1, HDA_INPUT),
HDA_CODEC_VOLUME("Capture-3 Volume", 0x19, 0x2, HDA_INPUT),
HDA_CODEC_MUTE("Capture-3 Switch", 0x19, 0x2, HDA_INPUT),
HDA_CODEC_VOLUME("Capture-4 Volume", 0x19, 0x3, HDA_INPUT),
HDA_CODEC_MUTE("Capture-4 Switch", 0x19, 0x3, HDA_INPUT),
{ {
.iface = SNDRV_CTL_ELEM_IFACE_MIXER, .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
.name = "Input Source", .name = "Input Source",
...@@ -1145,16 +1238,18 @@ static struct snd_kcontrol_new cxt5047_test_mixer[] = { ...@@ -1145,16 +1238,18 @@ static struct snd_kcontrol_new cxt5047_test_mixer[] = {
.get = conexant_mux_enum_get, .get = conexant_mux_enum_get,
.put = conexant_mux_enum_put, .put = conexant_mux_enum_put,
}, },
/* Controls for GPIO pins, assuming they exist and are configured
* as outputs
*/
CXT_GPIO_DATA_SWITCH("GPIO pin 0", 0x01, 0x01),
CXT_GPIO_DATA_SWITCH("GPIO pin 1", 0x01, 0x02),
CXT_GPIO_DATA_SWITCH("GPIO pin 2", 0x01, 0x04),
CXT_GPIO_DATA_SWITCH("GPIO pin 3", 0x01, 0x08),
{ } /* end */ { } /* end */
}; };
static struct hda_verb cxt5047_test_init_verbs[] = { static struct hda_verb cxt5047_test_init_verbs[] = {
/* Enable all GPIOs as outputs with an initial value of 0 */
{0x01, AC_VERB_SET_GPIO_DIRECTION, 0x0f},
{0x01, AC_VERB_SET_GPIO_DATA, 0x00},
{0x01, AC_VERB_SET_GPIO_MASK, 0x0f},
/* Enable retasking pins as output, initially without power amp */ /* Enable retasking pins as output, initially without power amp */
{0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT}, {0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
{0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT}, {0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
...@@ -1215,7 +1310,6 @@ static int cxt5047_hp_init(struct hda_codec *codec) ...@@ -1215,7 +1310,6 @@ static int cxt5047_hp_init(struct hda_codec *codec)
{ {
conexant_init(codec); conexant_init(codec);
cxt5047_hp_automute(codec); cxt5047_hp_automute(codec);
cxt5047_hp_automic(codec);
return 0; return 0;
} }
...@@ -1242,6 +1336,7 @@ static const char *cxt5047_models[CXT5047_MODELS] = { ...@@ -1242,6 +1336,7 @@ static const char *cxt5047_models[CXT5047_MODELS] = {
static struct snd_pci_quirk cxt5047_cfg_tbl[] = { static struct snd_pci_quirk cxt5047_cfg_tbl[] = {
SND_PCI_QUIRK(0x103c, 0x30a0, "HP DV1000", CXT5047_LAPTOP), SND_PCI_QUIRK(0x103c, 0x30a0, "HP DV1000", CXT5047_LAPTOP),
SND_PCI_QUIRK(0x103c, 0x30b2, "HP DV2000T/DV3000T", CXT5047_LAPTOP), SND_PCI_QUIRK(0x103c, 0x30b2, "HP DV2000T/DV3000T", CXT5047_LAPTOP),
SND_PCI_QUIRK(0x103c, 0x30b5, "HP DV2000Z", CXT5047_LAPTOP),
SND_PCI_QUIRK(0x103c, 0x30a5, "HP DV5200T/DV8000T", CXT5047_LAPTOP_HP), SND_PCI_QUIRK(0x103c, 0x30a5, "HP DV5200T/DV8000T", CXT5047_LAPTOP_HP),
SND_PCI_QUIRK(0x1179, 0xff31, "Toshiba P100", CXT5047_LAPTOP_EAPD), SND_PCI_QUIRK(0x1179, 0xff31, "Toshiba P100", CXT5047_LAPTOP_EAPD),
{} {}
...@@ -1291,8 +1386,10 @@ static int patch_cxt5047(struct hda_codec *codec) ...@@ -1291,8 +1386,10 @@ static int patch_cxt5047(struct hda_codec *codec)
codec->patch_ops.init = cxt5047_hp_init; codec->patch_ops.init = cxt5047_hp_init;
break; break;
case CXT5047_LAPTOP_EAPD: case CXT5047_LAPTOP_EAPD:
spec->input_mux = &cxt5047_toshiba_capture_source;
spec->num_init_verbs = 2; spec->num_init_verbs = 2;
spec->init_verbs[1] = cxt5047_toshiba_init_verbs; spec->init_verbs[1] = cxt5047_toshiba_init_verbs;
spec->mixers[0] = cxt5047_toshiba_mixers;
break; break;
#ifdef CONFIG_SND_DEBUG #ifdef CONFIG_SND_DEBUG
case CXT5047_TEST: case CXT5047_TEST:
...@@ -1305,7 +1402,9 @@ static int patch_cxt5047(struct hda_codec *codec) ...@@ -1305,7 +1402,9 @@ static int patch_cxt5047(struct hda_codec *codec)
} }
struct hda_codec_preset snd_hda_preset_conexant[] = { struct hda_codec_preset snd_hda_preset_conexant[] = {
{ .id = 0x14f15045, .name = "CXT5045", .patch = patch_cxt5045 }, { .id = 0x14f15045, .name = "CX20549 (Venice)",
{ .id = 0x14f15047, .name = "CXT5047", .patch = patch_cxt5047 }, .patch = patch_cxt5045 },
{ .id = 0x14f15047, .name = "CX20551 (Waikiki)",
.patch = patch_cxt5047 },
{} /* terminator */ {} /* terminator */
}; };
sound/pci/hda/patch_sigmatel.c
View file @ 724339d7
...@@ -457,6 +457,10 @@ static struct snd_pci_quirk stac9200_cfg_tbl[] = { ...@@ -457,6 +457,10 @@ static struct snd_pci_quirk stac9200_cfg_tbl[] = {
"Dell Latitude 120L", STAC_REF), "Dell Latitude 120L", STAC_REF),
SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01cc, SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01cc,
"Dell Latitude D820", STAC_REF), "Dell Latitude D820", STAC_REF),
SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01cd,
"Dell Inspiron E1705/9400", STAC_REF),
SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01ce,
"Dell XPS M1710", STAC_REF),
{} /* terminator */ {} /* terminator */
}; };
...@@ -1800,6 +1804,7 @@ static int patch_stac925x(struct hda_codec *codec) ...@@ -1800,6 +1804,7 @@ static int patch_stac925x(struct hda_codec *codec)
spec->board_config = snd_hda_check_board_config(codec, STAC_925x_MODELS, spec->board_config = snd_hda_check_board_config(codec, STAC_925x_MODELS,
stac925x_models, stac925x_models,
stac925x_cfg_tbl); stac925x_cfg_tbl);
again:
if (spec->board_config < 0) { if (spec->board_config < 0) {
snd_printdd(KERN_INFO "hda_codec: Unknown model for STAC925x, using BIOS defaults\n"); snd_printdd(KERN_INFO "hda_codec: Unknown model for STAC925x, using BIOS defaults\n");
err = stac92xx_save_bios_config_regs(codec); err = stac92xx_save_bios_config_regs(codec);
...@@ -1825,6 +1830,15 @@ static int patch_stac925x(struct hda_codec *codec) ...@@ -1825,6 +1830,15 @@ static int patch_stac925x(struct hda_codec *codec)
spec->mixer = stac925x_mixer; spec->mixer = stac925x_mixer;
err = stac92xx_parse_auto_config(codec, 0x8, 0x7); err = stac92xx_parse_auto_config(codec, 0x8, 0x7);
if (!err) {
if (spec->board_config < 0) {
printk(KERN_WARNING "hda_codec: No auto-config is "
"available, default to model=ref\n");
spec->board_config = STAC_925x_REF;
goto again;
}
err = -EINVAL;
}
if (err < 0) { if (err < 0) {
stac92xx_free(codec); stac92xx_free(codec);
return err; return err;
...@@ -1850,6 +1864,7 @@ static int patch_stac922x(struct hda_codec *codec) ...@@ -1850,6 +1864,7 @@ static int patch_stac922x(struct hda_codec *codec)
spec->board_config = snd_hda_check_board_config(codec, STAC_922X_MODELS, spec->board_config = snd_hda_check_board_config(codec, STAC_922X_MODELS,
stac922x_models, stac922x_models,
stac922x_cfg_tbl); stac922x_cfg_tbl);
again:
if (spec->board_config < 0) { if (spec->board_config < 0) {
snd_printdd(KERN_INFO "hda_codec: Unknown model for STAC922x, " snd_printdd(KERN_INFO "hda_codec: Unknown model for STAC922x, "
"using BIOS defaults\n"); "using BIOS defaults\n");
...@@ -1875,6 +1890,15 @@ static int patch_stac922x(struct hda_codec *codec) ...@@ -1875,6 +1890,15 @@ static int patch_stac922x(struct hda_codec *codec)
spec->multiout.dac_nids = spec->dac_nids; spec->multiout.dac_nids = spec->dac_nids;
err = stac92xx_parse_auto_config(codec, 0x08, 0x09); err = stac92xx_parse_auto_config(codec, 0x08, 0x09);
if (!err) {
if (spec->board_config < 0) {
printk(KERN_WARNING "hda_codec: No auto-config is "
"available, default to model=ref\n");
spec->board_config = STAC_D945_REF;
goto again;
}
err = -EINVAL;
}
if (err < 0) { if (err < 0) {
stac92xx_free(codec); stac92xx_free(codec);
return err; return err;
...@@ -1903,6 +1927,7 @@ static int patch_stac927x(struct hda_codec *codec) ...@@ -1903,6 +1927,7 @@ static int patch_stac927x(struct hda_codec *codec)
spec->board_config = snd_hda_check_board_config(codec, STAC_927X_MODELS, spec->board_config = snd_hda_check_board_config(codec, STAC_927X_MODELS,
stac927x_models, stac927x_models,
stac927x_cfg_tbl); stac927x_cfg_tbl);
again:
if (spec->board_config < 0) { if (spec->board_config < 0) {
snd_printdd(KERN_INFO "hda_codec: Unknown model for STAC927x, using BIOS defaults\n"); snd_printdd(KERN_INFO "hda_codec: Unknown model for STAC927x, using BIOS defaults\n");
err = stac92xx_save_bios_config_regs(codec); err = stac92xx_save_bios_config_regs(codec);
...@@ -1945,6 +1970,15 @@ static int patch_stac927x(struct hda_codec *codec) ...@@ -1945,6 +1970,15 @@ static int patch_stac927x(struct hda_codec *codec)
spec->multiout.dac_nids = spec->dac_nids; spec->multiout.dac_nids = spec->dac_nids;
err = stac92xx_parse_auto_config(codec, 0x1e, 0x20); err = stac92xx_parse_auto_config(codec, 0x1e, 0x20);
if (!err) {
if (spec->board_config < 0) {
printk(KERN_WARNING "hda_codec: No auto-config is "
"available, default to model=ref\n");
spec->board_config = STAC_D965_REF;
goto again;
}
err = -EINVAL;
}
if (err < 0) { if (err < 0) {
stac92xx_free(codec); stac92xx_free(codec);
return err; return err;
...@@ -1970,6 +2004,7 @@ static int patch_stac9205(struct hda_codec *codec) ...@@ -1970,6 +2004,7 @@ static int patch_stac9205(struct hda_codec *codec)
spec->board_config = snd_hda_check_board_config(codec, STAC_9205_MODELS, spec->board_config = snd_hda_check_board_config(codec, STAC_9205_MODELS,
stac9205_models, stac9205_models,
stac9205_cfg_tbl); stac9205_cfg_tbl);
again:
if (spec->board_config < 0) { if (spec->board_config < 0) {
snd_printdd(KERN_INFO "hda_codec: Unknown model for STAC9205, using BIOS defaults\n"); snd_printdd(KERN_INFO "hda_codec: Unknown model for STAC9205, using BIOS defaults\n");
err = stac92xx_save_bios_config_regs(codec); err = stac92xx_save_bios_config_regs(codec);
...@@ -2008,6 +2043,15 @@ static int patch_stac9205(struct hda_codec *codec) ...@@ -2008,6 +2043,15 @@ static int patch_stac9205(struct hda_codec *codec)
AC_VERB_SET_GPIO_MASK, 0x00000001); AC_VERB_SET_GPIO_MASK, 0x00000001);
err = stac92xx_parse_auto_config(codec, 0x1f, 0x20); err = stac92xx_parse_auto_config(codec, 0x1f, 0x20);
if (!err) {
if (spec->board_config < 0) {
printk(KERN_WARNING "hda_codec: No auto-config is "
"available, default to model=ref\n");
spec->board_config = STAC_9205_REF;
goto again;
}
err = -EINVAL;
}
if (err < 0) { if (err < 0) {
stac92xx_free(codec); stac92xx_free(codec);
return err; return err;
......
sound/soc/at91/at91-i2s.c
View file @ 724339d7
...@@ -20,6 +20,8 @@ ...@@ -20,6 +20,8 @@
#include <linux/device.h> #include <linux/device.h>
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/clk.h> #include <linux/clk.h>
#include <linux/atmel_pdc.h>
#include <sound/driver.h> #include <sound/driver.h>
#include <sound/core.h> #include <sound/core.h>
#include <sound/pcm.h> #include <sound/pcm.h>
...@@ -29,7 +31,6 @@ ...@@ -29,7 +31,6 @@
#include <asm/arch/hardware.h> #include <asm/arch/hardware.h>
#include <asm/arch/at91_pmc.h> #include <asm/arch/at91_pmc.h>
#include <asm/arch/at91_ssc.h> #include <asm/arch/at91_ssc.h>
#include <asm/arch/at91_pdc.h>
#include "at91-pcm.h" #include "at91-pcm.h"
#include "at91-i2s.h" #include "at91-i2s.h"
...@@ -51,17 +52,17 @@ ...@@ -51,17 +52,17 @@
* SSC PDC registers required by the PCM DMA engine. * SSC PDC registers required by the PCM DMA engine.
*/ */
static struct at91_pdc_regs pdc_tx_reg = { static struct at91_pdc_regs pdc_tx_reg = {
.xpr = AT91_PDC_TPR, .xpr = ATMEL_PDC_TPR,
.xcr = AT91_PDC_TCR, .xcr = ATMEL_PDC_TCR,
.xnpr = AT91_PDC_TNPR, .xnpr = ATMEL_PDC_TNPR,
.xncr = AT91_PDC_TNCR, .xncr = ATMEL_PDC_TNCR,
}; };
static struct at91_pdc_regs pdc_rx_reg = { static struct at91_pdc_regs pdc_rx_reg = {
.xpr = AT91_PDC_RPR, .xpr = ATMEL_PDC_RPR,
.xcr = AT91_PDC_RCR, .xcr = ATMEL_PDC_RCR,
.xnpr = AT91_PDC_RNPR, .xnpr = ATMEL_PDC_RNPR,
.xncr = AT91_PDC_RNCR, .xncr = ATMEL_PDC_RNCR,
}; };
/* /*
...@@ -72,8 +73,8 @@ static struct at91_ssc_mask ssc_tx_mask = { ...@@ -72,8 +73,8 @@ static struct at91_ssc_mask ssc_tx_mask = {
.ssc_disable = AT91_SSC_TXDIS, .ssc_disable = AT91_SSC_TXDIS,
.ssc_endx = AT91_SSC_ENDTX, .ssc_endx = AT91_SSC_ENDTX,
.ssc_endbuf = AT91_SSC_TXBUFE, .ssc_endbuf = AT91_SSC_TXBUFE,
.pdc_enable = AT91_PDC_TXTEN, .pdc_enable = ATMEL_PDC_TXTEN,
.pdc_disable = AT91_PDC_TXTDIS, .pdc_disable = ATMEL_PDC_TXTDIS,
}; };
static struct at91_ssc_mask ssc_rx_mask = { static struct at91_ssc_mask ssc_rx_mask = {
...@@ -81,8 +82,8 @@ static struct at91_ssc_mask ssc_rx_mask = { ...@@ -81,8 +82,8 @@ static struct at91_ssc_mask ssc_rx_mask = {
.ssc_disable = AT91_SSC_RXDIS, .ssc_disable = AT91_SSC_RXDIS,
.ssc_endx = AT91_SSC_ENDRX, .ssc_endx = AT91_SSC_ENDRX,
.ssc_endbuf = AT91_SSC_RXBUFF, .ssc_endbuf = AT91_SSC_RXBUFF,
.pdc_enable = AT91_PDC_RXTEN, .pdc_enable = ATMEL_PDC_RXTEN,
.pdc_disable = AT91_PDC_RXTDIS, .pdc_disable = ATMEL_PDC_RXTDIS,
}; };
...@@ -508,14 +509,14 @@ static int at91_i2s_hw_params(struct snd_pcm_substream *substream, ...@@ -508,14 +509,14 @@ static int at91_i2s_hw_params(struct snd_pcm_substream *substream,
/* Reset the SSC and its PDC registers */ /* Reset the SSC and its PDC registers */
at91_ssc_write(ssc_p->ssc.base + AT91_SSC_CR, AT91_SSC_SWRST); at91_ssc_write(ssc_p->ssc.base + AT91_SSC_CR, AT91_SSC_SWRST);
at91_ssc_write(ssc_p->ssc.base + AT91_PDC_RPR, 0); at91_ssc_write(ssc_p->ssc.base + ATMEL_PDC_RPR, 0);
at91_ssc_write(ssc_p->ssc.base + AT91_PDC_RCR, 0); at91_ssc_write(ssc_p->ssc.base + ATMEL_PDC_RCR, 0);
at91_ssc_write(ssc_p->ssc.base + AT91_PDC_RNPR, 0); at91_ssc_write(ssc_p->ssc.base + ATMEL_PDC_RNPR, 0);
at91_ssc_write(ssc_p->ssc.base + AT91_PDC_RNCR, 0); at91_ssc_write(ssc_p->ssc.base + ATMEL_PDC_RNCR, 0);
at91_ssc_write(ssc_p->ssc.base + AT91_PDC_TPR, 0); at91_ssc_write(ssc_p->ssc.base + ATMEL_PDC_TPR, 0);
at91_ssc_write(ssc_p->ssc.base + AT91_PDC_TCR, 0); at91_ssc_write(ssc_p->ssc.base + ATMEL_PDC_TCR, 0);
at91_ssc_write(ssc_p->ssc.base + AT91_PDC_TNPR, 0); at91_ssc_write(ssc_p->ssc.base + ATMEL_PDC_TNPR, 0);
at91_ssc_write(ssc_p->ssc.base + AT91_PDC_TNCR, 0); at91_ssc_write(ssc_p->ssc.base + ATMEL_PDC_TNCR, 0);
if ((ret = request_irq(ssc_p->ssc.pid, at91_i2s_interrupt, if ((ret = request_irq(ssc_p->ssc.pid, at91_i2s_interrupt,
0, ssc_p->name, ssc_p)) < 0) { 0, ssc_p->name, ssc_p)) < 0) {
......
sound/soc/at91/at91-pcm.c
View file @ 724339d7
...@@ -21,6 +21,7 @@ ...@@ -21,6 +21,7 @@
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/dma-mapping.h> #include <linux/dma-mapping.h>
#include <linux/atmel_pdc.h>
#include <sound/driver.h> #include <sound/driver.h>
#include <sound/core.h> #include <sound/core.h>
...@@ -30,7 +31,6 @@ ...@@ -30,7 +31,6 @@
#include <asm/arch/hardware.h> #include <asm/arch/hardware.h>
#include <asm/arch/at91_ssc.h> #include <asm/arch/at91_ssc.h>
#include <asm/arch/at91_pdc.h>
#include "at91-pcm.h" #include "at91-pcm.h"
...@@ -83,7 +83,7 @@ static void at91_pcm_dma_irq(u32 ssc_sr, ...@@ -83,7 +83,7 @@ static void at91_pcm_dma_irq(u32 ssc_sr,
params->name, ssc_sr, count); params->name, ssc_sr, count);
/* re-start the PDC */ /* re-start the PDC */
at91_ssc_write(params->ssc_base + AT91_PDC_PTCR, params->mask->pdc_disable); at91_ssc_write(params->ssc_base + ATMEL_PDC_PTCR, params->mask->pdc_disable);
prtd->period_ptr += prtd->period_size; prtd->period_ptr += prtd->period_size;
if (prtd->period_ptr >= prtd->dma_buffer_end) { if (prtd->period_ptr >= prtd->dma_buffer_end) {
...@@ -94,7 +94,7 @@ static void at91_pcm_dma_irq(u32 ssc_sr, ...@@ -94,7 +94,7 @@ static void at91_pcm_dma_irq(u32 ssc_sr,
at91_ssc_write(params->ssc_base + params->pdc->xcr, at91_ssc_write(params->ssc_base + params->pdc->xcr,
prtd->period_size / params->pdc_xfer_size); prtd->period_size / params->pdc_xfer_size);
at91_ssc_write(params->ssc_base + AT91_PDC_PTCR, params->mask->pdc_enable); at91_ssc_write(params->ssc_base + ATMEL_PDC_PTCR, params->mask->pdc_enable);
} }
if (ssc_sr & params->mask->ssc_endx) { if (ssc_sr & params->mask->ssc_endx) {
...@@ -143,7 +143,7 @@ static int at91_pcm_hw_free(struct snd_pcm_substream *substream) ...@@ -143,7 +143,7 @@ static int at91_pcm_hw_free(struct snd_pcm_substream *substream)
struct at91_pcm_dma_params *params = prtd->params; struct at91_pcm_dma_params *params = prtd->params;
if (params != NULL) { if (params != NULL) {
at91_ssc_write(params->ssc_base + AT91_PDC_PTCR, params->mask->pdc_disable); at91_ssc_write(params->ssc_base + ATMEL_PDC_PTCR, params->mask->pdc_disable);
prtd->params->dma_intr_handler = NULL; prtd->params->dma_intr_handler = NULL;
} }
...@@ -158,7 +158,7 @@ static int at91_pcm_prepare(struct snd_pcm_substream *substream) ...@@ -158,7 +158,7 @@ static int at91_pcm_prepare(struct snd_pcm_substream *substream)
at91_ssc_write(params->ssc_base + AT91_SSC_IDR, at91_ssc_write(params->ssc_base + AT91_SSC_IDR,
params->mask->ssc_endx | params->mask->ssc_endbuf); params->mask->ssc_endx | params->mask->ssc_endbuf);
at91_ssc_write(params->ssc_base + AT91_PDC_PTCR, params->mask->pdc_disable); at91_ssc_write(params->ssc_base + ATMEL_PDC_PTCR, params->mask->pdc_disable);
return 0; return 0;
} }
...@@ -192,7 +192,7 @@ static int at91_pcm_trigger(struct snd_pcm_substream *substream, ...@@ -192,7 +192,7 @@ static int at91_pcm_trigger(struct snd_pcm_substream *substream,
at91_ssc_write(params->ssc_base + AT91_SSC_IER, at91_ssc_write(params->ssc_base + AT91_SSC_IER,
params->mask->ssc_endx | params->mask->ssc_endbuf); params->mask->ssc_endx | params->mask->ssc_endbuf);
at91_ssc_write(params->ssc_base + AT91_PDC_PTCR, params->mask->pdc_enable); at91_ssc_write(params->ssc_base + ATMEL_PDC_PTCR, params->mask->pdc_enable);
DBG("sr=%lx imr=%lx\n", at91_ssc_read(params->ssc_base + AT91_SSC_SR), DBG("sr=%lx imr=%lx\n", at91_ssc_read(params->ssc_base + AT91_SSC_SR),
at91_ssc_read(params->ssc_base + AT91_SSC_IER)); at91_ssc_read(params->ssc_base + AT91_SSC_IER));
...@@ -201,12 +201,12 @@ static int at91_pcm_trigger(struct snd_pcm_substream *substream, ...@@ -201,12 +201,12 @@ static int at91_pcm_trigger(struct snd_pcm_substream *substream,
case SNDRV_PCM_TRIGGER_STOP: case SNDRV_PCM_TRIGGER_STOP:
case SNDRV_PCM_TRIGGER_SUSPEND: case SNDRV_PCM_TRIGGER_SUSPEND:
case SNDRV_PCM_TRIGGER_PAUSE_PUSH: case SNDRV_PCM_TRIGGER_PAUSE_PUSH:
at91_ssc_write(params->ssc_base + AT91_PDC_PTCR, params->mask->pdc_disable); at91_ssc_write(params->ssc_base + ATMEL_PDC_PTCR, params->mask->pdc_disable);
break; break;
case SNDRV_PCM_TRIGGER_RESUME: case SNDRV_PCM_TRIGGER_RESUME:
case SNDRV_PCM_TRIGGER_PAUSE_RELEASE: case SNDRV_PCM_TRIGGER_PAUSE_RELEASE:
at91_ssc_write(params->ssc_base + AT91_PDC_PTCR, params->mask->pdc_enable); at91_ssc_write(params->ssc_base + ATMEL_PDC_PTCR, params->mask->pdc_enable);
break; break;
default: default:
...@@ -379,7 +379,7 @@ static int at91_pcm_suspend(struct platform_device *pdev, ...@@ -379,7 +379,7 @@ static int at91_pcm_suspend(struct platform_device *pdev,
/* disable the PDC and save the PDC registers */ /* disable the PDC and save the PDC registers */
at91_ssc_write(params->ssc_base + AT91_PDC_PTCR, params->mask->pdc_disable); at91_ssc_write(params->ssc_base + ATMEL_PDC_PTCR, params->mask->pdc_disable);
prtd->pdc_xpr_save = at91_ssc_read(params->ssc_base + params->pdc->xpr); prtd->pdc_xpr_save = at91_ssc_read(params->ssc_base + params->pdc->xpr);
prtd->pdc_xcr_save = at91_ssc_read(params->ssc_base + params->pdc->xcr); prtd->pdc_xcr_save = at91_ssc_read(params->ssc_base + params->pdc->xcr);
...@@ -408,7 +408,7 @@ static int at91_pcm_resume(struct platform_device *pdev, ...@@ -408,7 +408,7 @@ static int at91_pcm_resume(struct platform_device *pdev,
at91_ssc_write(params->ssc_base + params->pdc->xnpr, prtd->pdc_xnpr_save); at91_ssc_write(params->ssc_base + params->pdc->xnpr, prtd->pdc_xnpr_save);
at91_ssc_write(params->ssc_base + params->pdc->xncr, prtd->pdc_xncr_save); at91_ssc_write(params->ssc_base + params->pdc->xncr, prtd->pdc_xncr_save);
at91_ssc_write(params->ssc_base + AT91_PDC_PTCR, params->mask->pdc_enable); at91_ssc_write(params->ssc_base + ATMEL_PDC_PTCR, params->mask->pdc_enable);
return 0; return 0;
} }
#else #else
......
sound/soc/codecs/Kconfig
View file @ 724339d7
config SND_SOC_AC97_CODEC config SND_SOC_AC97_CODEC
tristate tristate
depends SND_SOC depends on SND_SOC
config SND_SOC_WM8731 config SND_SOC_WM8731
tristate tristate
depends SND_SOC depends on SND_SOC
config SND_SOC_WM8750 config SND_SOC_WM8750
tristate tristate
depends SND_SOC depends on SND_SOC
config SND_SOC_WM9712 config SND_SOC_WM9712
tristate tristate
depends SND_SOC depends on SND_SOC
sound/usb/usbaudio.c
View file @ 724339d7
...@@ -325,16 +325,6 @@ static int prepare_capture_urb(struct snd_usb_substream *subs, ...@@ -325,16 +325,6 @@ static int prepare_capture_urb(struct snd_usb_substream *subs,
} }
urb->transfer_buffer_length = offs; urb->transfer_buffer_length = offs;
urb->number_of_packets = ctx->packets; urb->number_of_packets = ctx->packets;
#if 0 // for check
if (! urb->bandwidth) {
int bustime;
bustime = usb_check_bandwidth(urb->dev, urb);
if (bustime < 0)
return bustime;
printk("urb %d: bandwidth = %d (packets = %d)\n", ctx->index, bustime, urb->number_of_packets);
usb_claim_bandwidth(urb->dev, urb, bustime, 1);
}
#endif // for check
return 0; return 0;
} }
......
sound/usb/usbquirks.h
View file @ 724339d7
...@@ -947,6 +947,29 @@ YAMAHA_DEVICE(0x7010, "UB99"), ...@@ -947,6 +947,29 @@ YAMAHA_DEVICE(0x7010, "UB99"),
} }
}, },
/* TODO: add Edirol M-100FX support */ /* TODO: add Edirol M-100FX support */
{
/* has ID 0x004e when not in "Advanced Driver" mode */
USB_DEVICE(0x0582, 0x004c),
.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
.vendor_name = "EDIROL",
.product_name = "PCR-A",
.ifnum = QUIRK_ANY_INTERFACE,
.type = QUIRK_COMPOSITE,
.data = (const struct snd_usb_audio_quirk[]) {
{
.ifnum = 1,
.type = QUIRK_AUDIO_STANDARD_INTERFACE
},
{
.ifnum = 2,
.type = QUIRK_AUDIO_STANDARD_INTERFACE
},
{
.ifnum = -1
}
}
}
},
{ {
/* has ID 0x004f when not in "Advanced Driver" mode */ /* has ID 0x004f when not in "Advanced Driver" mode */
USB_DEVICE(0x0582, 0x004d), USB_DEVICE(0x0582, 0x004d),
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7