Skip to contentSkip to conversation

ASoC updates for 2.6.30

PATCH New Mark Brown 2 participants 6 messages Jan 16, 2009

Subsystems (6)
lore
Share & tools
lore

Mark Brown

author
#0 lore raw

The following changes since commit c0106d72b8d71696dbe9dc80e2c77d4ac63f7531:
Takashi Iwai (1):
Merge branch 'topic/asoc' into next/asoc

are available in the git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6.git for-2.6.30

Ben Nizette (1):
ASoC: atmel_pcm: Remove non-existant header

Hugo Villeneuve (1):
ASoC: DaVinci: Fix SFFSDR compilation error.

Ian Molton (3):
ASoC: Driver for the WM9705 AC97 codec.
ASoC: machine driver for Toshiba e750
ASoC: machine driver for Toshiba e800

Mark Brown (1):

      Merge branch 'for-2.6.29' into for-2.6.30
 arch/arm/mach-pxa/e750.c                      |    5 +
 arch/arm/mach-pxa/include/mach/eseries-gpio.h |   10 +
 sound/soc/atmel/atmel-pcm.c                   |    2 -
 sound/soc/codecs/Kconfig                      |    4 +
 sound/soc/codecs/Makefile                     |    3 +
 sound/soc/codecs/wm9705.c                     |  410 +++++++++++++++++++++++++
 sound/soc/codecs/wm9705.h                     |   14 +
 sound/soc/davinci/davinci-sffsdr.c            |   20 +-
 sound/soc/pxa/Kconfig                         |    9 +
 sound/soc/pxa/Makefile                        |    2 +
 sound/soc/pxa/e750_wm9705.c                   |  189 ++++++++++++
 sound/soc/pxa/e800_wm9712.c                   |  116 ++++++-
 12 files changed, 765 insertions(+), 19 deletions(-)
 create mode 100644 sound/soc/codecs/wm9705.c
 create mode 100644 sound/soc/codecs/wm9705.h
 create mode 100644 sound/soc/pxa/e750_wm9705.c
author
#1 lore raw

PATCH 1/4 ASoC: DaVinci: Fix SFFSDR compilation error.

From: Hugo Villeneuve <[email protected]>

Remove dependency on sffsdr_fpga_set_codec_fs() when the SFFSDR FPGA module is not selected.

---
 sound/soc/davinci/davinci-sffsdr.c |   20 +++++++++++++++++---
 1 files changed, 17 insertions(+), 3 deletions(-)
sound/soc/davinci/davinci-sffsdr.c +17 -3
index 4935d1b..50baef1 100644
@@ -25,7 +25,9 @@
 
 #include <asm/dma.h>
 #include <asm/mach-types.h>
+#ifdef CONFIG_SFFSDR_FPGA
 #include <asm/plat-sffsdr/sffsdr-fpga.h>
+#endif
 
 #include <mach/mcbsp.h>
 #include <mach/edma.h>
@@ -43,6 +45,17 @@ static int sffsdr_hw_params(struct snd_pcm_substream *substream,
 	int fs;
 	int ret = 0;
 
+	/* Fsref can be 32000, 44100 or 48000. */
+	fs = params_rate(params);
+
+#ifndef CONFIG_SFFSDR_FPGA
+	/* Without the FPGA module, the Fs is fixed at 44100 Hz */
+	if (fs != 44100) {
+		pr_debug("warning: only 44.1 kHz is supported without SFFSDR FPGA module\n");
+		return -EINVAL;
+	}
+#endif
+
 	/* Set cpu DAI configuration:
 	 * CLKX and CLKR are the inputs for the Sample Rate Generator.
 	 * FSX and FSR are outputs, driven by the sample Rate Generator. */
@@ -53,12 +66,13 @@ static int sffsdr_hw_params(struct snd_pcm_substream *substream,
 	if (ret < 0)
 		return ret;
 
-	/* Fsref can be 32000, 44100 or 48000. */
-	fs = params_rate(params);
-
 	pr_debug("sffsdr_hw_params: rate = %d Hz\n", fs);
 
+#ifndef CONFIG_SFFSDR_FPGA
+	return 0;
+#else
 	return sffsdr_fpga_set_codec_fs(fs);
+#endif
 }
 
 static struct snd_soc_ops sffsdr_ops = {
Signature · 1 line
1.5.6.5
author
#2 lore raw

PATCH 2/4 ASoC: Driver for the WM9705 AC97 codec.

From: Ian Molton <[email protected]>

This driver adds support for the wm9705 ac97 codec. The driver supports audio input and output.

---
 sound/soc/codecs/Kconfig  |    4 +
 sound/soc/codecs/Makefile |    3 +
 sound/soc/codecs/wm9705.c |  410 +++++++++++++++++++++++++++++++++++++++++++++
 sound/soc/codecs/wm9705.h |   14 ++
 4 files changed, 431 insertions(+), 0 deletions(-)
 create mode 100644 sound/soc/codecs/wm9705.c
 create mode 100644 sound/soc/codecs/wm9705.h
sound/soc/codecs/Kconfig +4 -0
index d0e0d69..cb5fcd6 100644
@@ -34,6 +34,7 @@ config SND_SOC_ALL_CODECS
 	select SND_SOC_WM8903 if I2C
 	select SND_SOC_WM8971 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_WM9713 if SND_SOC_AC97_BUS
         help
@@ -144,6 +145,9 @@ config SND_SOC_WM8971
 config SND_SOC_WM8990
 	tristate
 
+config SND_SOC_WM9705
+	tristate
+
 config SND_SOC_WM9712
 	tristate
 
sound/soc/codecs/Makefile +3 -0
index c4ddc9a..3664cdc 100644
@@ -23,6 +23,7 @@ snd-soc-wm8900-objs := wm8900.o
 snd-soc-wm8903-objs := wm8903.o
 snd-soc-wm8971-objs := wm8971.o
 snd-soc-wm8990-objs := wm8990.o
+snd-soc-wm9705-objs := wm9705.o
 snd-soc-wm9712-objs := wm9712.o
 snd-soc-wm9713-objs := wm9713.o
 
@@ -51,5 +52,7 @@ obj-$(CONFIG_SND_SOC_WM8900)	+= snd-soc-wm8900.o
 obj-$(CONFIG_SND_SOC_WM8903)	+= snd-soc-wm8903.o
 obj-$(CONFIG_SND_SOC_WM8971)	+= snd-soc-wm8971.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_WM9713)	+= snd-soc-wm9713.o
sound/soc/codecs/wm9705.c new file +410 -0

410 lines not on this page · raw message

sound/soc/codecs/wm9705.h new file +14 -0
new file mode 100644
index 0000000..d380f11
@@ -0,0 +1,14 @@
+/*
+ * 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
Signature · 1 line
1.5.6.5
author
#3 lore raw

PATCH 3/4 ASoC: machine driver for Toshiba e750

From: Ian Molton <[email protected]>

This patch adds support for the wm9705 ac97 codec as used in the Toshiba e750 PDA. It includes support for powering up / down the external headphone and speaker amplifiers on this machine.

---
 arch/arm/mach-pxa/e750.c                      |    5 +
 arch/arm/mach-pxa/include/mach/eseries-gpio.h |    5 +
 sound/soc/pxa/Kconfig                         |    9 ++
 sound/soc/pxa/Makefile                        |    2 +
 sound/soc/pxa/e750_wm9705.c                   |  189 +++++++++++++++++++++++++
 5 files changed, 210 insertions(+), 0 deletions(-)
 create mode 100644 sound/soc/pxa/e750_wm9705.c
arch/arm/mach-pxa/e750.c +5 -0
index be1ab8e..665066f 100644
@@ -133,6 +133,11 @@ static unsigned long e750_pin_config[] __initdata = {
 	/* IrDA */
 	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 */
 	GPIO8_GPIO,   /* CD0 */
 	GPIO44_GPIO,  /* CD1 */
arch/arm/mach-pxa/include/mach/eseries-gpio.h +5 -0
index efbd2aa..02b28e0 100644
@@ -45,6 +45,11 @@
 /* e7xx IrDA power control */
 #define GPIO_E7XX_IR_OFF         38
 
+/* e750 audio control GPIOs */
+#define GPIO_E750_HP_AMP_OFF      4
+#define GPIO_E750_SPK_AMP_OFF     7
+#define GPIO_E750_HP_DETECT      37
+
 /* ASIC related GPIOs */
 #define GPIO_ESERIES_TMIO_IRQ        5
 #define GPIO_ESERIES_TMIO_PCLR      19
sound/soc/pxa/Kconfig +9 -0
index f82e106..b9b1a3f 100644
@@ -61,6 +61,15 @@ config SND_PXA2XX_SOC_TOSA
 	  Say Y if you want to add support for SoC audio on Sharp
 	  Zaurus SL-C6000x models (Tosa).
 
+config SND_PXA2XX_SOC_E750
+	tristate "SoC AC97 Audio support for e750"
+	depends on SND_PXA2XX_SOC && MACH_E750
+	select SND_SOC_WM9705
+	select SND_PXA2XX_SOC_AC97
+	help
+	  Say Y if you want to add support for SoC audio on the
+	  toshiba e750 PDA
+
 config SND_PXA2XX_SOC_E800
 	tristate "SoC AC97 Audio support for e800"
 	depends on SND_PXA2XX_SOC && MACH_E800
sound/soc/pxa/Makefile +2 -0
index 08a9f27..c7d4cce 100644
@@ -13,6 +13,7 @@ obj-$(CONFIG_SND_PXA_SOC_SSP) += snd-soc-pxa-ssp.o
 snd-soc-corgi-objs := corgi.o
 snd-soc-poodle-objs := poodle.o
 snd-soc-tosa-objs := tosa.o
+snd-soc-e750-objs := e750_wm9705.o
 snd-soc-e800-objs := e800_wm9712.o
 snd-soc-spitz-objs := spitz.o
 snd-soc-em-x270-objs := em-x270.o
@@ -22,6 +23,7 @@ snd-soc-zylonite-objs := zylonite.o
 obj-$(CONFIG_SND_PXA2XX_SOC_CORGI) += snd-soc-corgi.o
 obj-$(CONFIG_SND_PXA2XX_SOC_POODLE) += snd-soc-poodle.o
 obj-$(CONFIG_SND_PXA2XX_SOC_TOSA) += snd-soc-tosa.o
+obj-$(CONFIG_SND_PXA2XX_SOC_E750) += snd-soc-e750.o
 obj-$(CONFIG_SND_PXA2XX_SOC_E800) += snd-soc-e800.o
 obj-$(CONFIG_SND_PXA2XX_SOC_SPITZ) += snd-soc-spitz.o
 obj-$(CONFIG_SND_PXA2XX_SOC_EM_X270) += snd-soc-em-x270.o
sound/soc/pxa/e750_wm9705.c new file +189 -0

189 lines not on this page · raw message

Signature · 1 line
1.5.6.5
author
#4 lore raw

PATCH 4/4 ASoC: machine driver for Toshiba e800

From: Ian Molton <[email protected]>

This patch adds support for the wm9712 ac97 codec as used in the Toshiba e800 PDA. It includes support for powering up / down the external headphone and speaker amplifiers on this machine.

---
 arch/arm/mach-pxa/include/mach/eseries-gpio.h |    5 +
 sound/soc/pxa/e800_wm9712.c                   |  116 ++++++++++++++++++++++---
 2 files changed, 107 insertions(+), 14 deletions(-)
arch/arm/mach-pxa/include/mach/eseries-gpio.h +5 -0
index 02b28e0..6d6e4d8 100644
@@ -50,6 +50,11 @@
 #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 */
 #define GPIO_ESERIES_TMIO_IRQ        5
 #define GPIO_ESERIES_TMIO_PCLR      19
sound/soc/pxa/e800_wm9712.c +102 -14

165 lines not on this page · raw message

Signature · 1 line
1.5.6.5
#5 lore raw
In reply to Mark Brown

At Fri, 16 Jan 2009 17:13:47 +0000,

Quoted 8 lines · Mark Brown

The following changes since commit c0106d72b8d71696dbe9dc80e2c77d4ac63f7531:
Takashi Iwai (1):
Merge branch 'topic/asoc' into next/asoc

are available in the git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6.git for-2.6.30

Thanks, pulled in.

Takashi