Skip to contentSkip to conversation

ASoC: support pxa168 ssp in ASoC

PATCH New Haojian Zhuang 1 participant 1 message Mar 17, 2010

Subsystems (6)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ASoC: support pxa168 ssp in ASoC

Support pxa168 ssp in ASoC. The SSP bit clock mechanism is totally different from pxa2xx series.

---
 arch/arm/mach-mmp/include/mach/regs-mpmu.h |   48 ++++++
 sound/soc/pxa/Kconfig                      |    6 +-
 sound/soc/pxa/Makefile                     |    2 +
 sound/soc/pxa/pxa-ssp.h                    |    1 +
 sound/soc/pxa/pxa168-ssp.c                 |  233 ++++++++++++++++++++++++++++
 sound/soc/pxa/pxa168-ssp.h                 |   27 ++++
 6 files changed, 316 insertions(+), 1 deletions(-)
 create mode 100644 arch/arm/mach-mmp/include/mach/regs-mpmu.h
 create mode 100644 sound/soc/pxa/pxa168-ssp.c
 create mode 100644 sound/soc/pxa/pxa168-ssp.h
(quoted diff) +0 -0

b/arch/arm/mach-mmp/include/mach/regs-mpmu.h
new file mode 100644
index 0000000..0d57236

arch/arm/mach-mmp/include/mach/regs-mpmu.h new file +48 -0

48 lines not on this page · raw message

sound/soc/pxa/Kconfig +5 -1
index 7be1d5f..286d52a 100644
@@ -1,6 +1,6 @@
 config SND_PXA2XX_SOC
 	tristate "SoC Audio for the Intel PXA2xx chip"
-	depends on ARCH_PXA
+	depends on ARCH_PXA || ARCH_MMP
 	select SND_PXA2XX_LIB
 	help
 	  Say Y or M if you want to add support for codecs attached to
@@ -25,6 +25,10 @@ config SND_PXA2XX_SOC_SSP
 	tristate
 	select PXA_SSP
 
+config SND_PXA168_SOC_SSP
+	tristate
+	select PXA_SSP
+
 config SND_PXA2XX_SOC_CORGI
 	tristate "SoC Audio support for Sharp Zaurus SL-C7x0"
 	depends on SND_PXA2XX_SOC && PXA_SHARP_C7xx
sound/soc/pxa/Makefile +2 -0
index 33c1579..a74e6c9 100644
@@ -3,11 +3,13 @@ snd-soc-pxa2xx-objs := pxa2xx-pcm.o
 snd-soc-pxa2xx-ac97-objs := pxa2xx-ac97.o
 snd-soc-pxa2xx-i2s-objs := pxa2xx-i2s.o
 snd-soc-pxa2xx-ssp-objs := pxa-ssp.o pxa2xx-ssp.o
+snd-soc-pxa168-ssp-objs := pxa-ssp.o pxa168-ssp.o
 
 obj-$(CONFIG_SND_PXA2XX_SOC) += snd-soc-pxa2xx.o
 obj-$(CONFIG_SND_PXA2XX_SOC_AC97) += snd-soc-pxa2xx-ac97.o
 obj-$(CONFIG_SND_PXA2XX_SOC_I2S) += snd-soc-pxa2xx-i2s.o
 obj-$(CONFIG_SND_PXA2XX_SOC_SSP) += snd-soc-pxa2xx-ssp.o
+obj-$(CONFIG_SND_PXA168_SOC_SSP) += snd-soc-pxa168-ssp.o
 
 # PXA Machine Support
 snd-soc-corgi-objs := corgi.o
sound/soc/pxa/pxa-ssp.h +1 -0
index af4a09b..852660a 100644
@@ -15,6 +15,7 @@
 struct ssp_priv {
 	struct ssp_device	*ssp;
 	unsigned int		sysclk;
+	unsigned int		sysclk_idx;
 	int			dai_fmt;
 #ifdef CONFIG_PM
 	uint32_t		cr0;
sound/soc/pxa/pxa168-ssp.c new file +233 -0

233 lines not on this page · raw message

sound/soc/pxa/pxa168-ssp.h new file +27 -0
new file mode 100644
index 0000000..c7e23c7
@@ -0,0 +1,27 @@
+/*
+ * ASoC PXA168 SSP port support
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#ifndef _PXA168_SSP_H
+#define _PXA168_SSP_H
+
+/* pxa DAI SSP IDs */
+#define PXA168_DAI_SSP1			0
+#define PXA168_DAI_SSP2			1
+#define PXA168_DAI_SSP3			2
+#define PXA168_DAI_SSP4			3
+#define PXA168_DAI_SSP5			4
+
+/* PXA168 SSP SYSCLK source */
+#define PXA168_ASYSCLK_MASTER		0	/* ASYSCLK master -- pxa168 */
+#define PXA168_ASYSCLK_SLAVE		1	/* ASYSCLK slave -- pxa168 */
+
+extern struct snd_soc_dai pxa168_ssp_dai[];
+
+extern int pxa168_query_mclk(struct snd_pcm_substream *substream,
+			     struct snd_pcm_hw_params *params);
+#endif
Signature · 1 line
1.5.6.5