diff options
| -rw-r--r-- | sound/soc/Kconfig | 1 | ||||
| -rw-r--r-- | sound/soc/Makefile | 1 | ||||
| -rw-r--r-- | sound/soc/mxs/Kconfig | 20 | ||||
| -rw-r--r-- | sound/soc/mxs/Makefile | 10 |
4 files changed, 32 insertions, 0 deletions
diff --git a/sound/soc/Kconfig b/sound/soc/Kconfig index 8224db5f0434..47d07ce4e867 100644 --- a/sound/soc/Kconfig +++ b/sound/soc/Kconfig | |||
| @@ -51,6 +51,7 @@ source "sound/soc/nuc900/Kconfig" | |||
| 51 | source "sound/soc/omap/Kconfig" | 51 | source "sound/soc/omap/Kconfig" |
| 52 | source "sound/soc/kirkwood/Kconfig" | 52 | source "sound/soc/kirkwood/Kconfig" |
| 53 | source "sound/soc/mid-x86/Kconfig" | 53 | source "sound/soc/mid-x86/Kconfig" |
| 54 | source "sound/soc/mxs/Kconfig" | ||
| 54 | source "sound/soc/pxa/Kconfig" | 55 | source "sound/soc/pxa/Kconfig" |
| 55 | source "sound/soc/samsung/Kconfig" | 56 | source "sound/soc/samsung/Kconfig" |
| 56 | source "sound/soc/s6000/Kconfig" | 57 | source "sound/soc/s6000/Kconfig" |
diff --git a/sound/soc/Makefile b/sound/soc/Makefile index 4f913876f332..9ea8ac827adc 100644 --- a/sound/soc/Makefile +++ b/sound/soc/Makefile | |||
| @@ -12,6 +12,7 @@ obj-$(CONFIG_SND_SOC) += fsl/ | |||
| 12 | obj-$(CONFIG_SND_SOC) += imx/ | 12 | obj-$(CONFIG_SND_SOC) += imx/ |
| 13 | obj-$(CONFIG_SND_SOC) += jz4740/ | 13 | obj-$(CONFIG_SND_SOC) += jz4740/ |
| 14 | obj-$(CONFIG_SND_SOC) += mid-x86/ | 14 | obj-$(CONFIG_SND_SOC) += mid-x86/ |
| 15 | obj-$(CONFIG_SND_SOC) += mxs/ | ||
| 15 | obj-$(CONFIG_SND_SOC) += nuc900/ | 16 | obj-$(CONFIG_SND_SOC) += nuc900/ |
| 16 | obj-$(CONFIG_SND_SOC) += omap/ | 17 | obj-$(CONFIG_SND_SOC) += omap/ |
| 17 | obj-$(CONFIG_SND_SOC) += kirkwood/ | 18 | obj-$(CONFIG_SND_SOC) += kirkwood/ |
diff --git a/sound/soc/mxs/Kconfig b/sound/soc/mxs/Kconfig new file mode 100644 index 000000000000..e4ba8d5f25fa --- /dev/null +++ b/sound/soc/mxs/Kconfig | |||
| @@ -0,0 +1,20 @@ | |||
| 1 | menuconfig SND_MXS_SOC | ||
| 2 | tristate "SoC Audio for Freescale MXS CPUs" | ||
| 3 | depends on ARCH_MXS | ||
| 4 | select SND_PCM | ||
| 5 | help | ||
| 6 | Say Y or M if you want to add support for codecs attached to | ||
| 7 | the MXS SAIF interface. | ||
| 8 | |||
| 9 | |||
| 10 | if SND_MXS_SOC | ||
| 11 | |||
| 12 | config SND_SOC_MXS_SGTL5000 | ||
| 13 | tristate "SoC Audio support for i.MX boards with sgtl5000" | ||
| 14 | depends on I2C | ||
| 15 | select SND_SOC_SGTL5000 | ||
| 16 | help | ||
| 17 | Say Y if you want to add support for SoC audio on an MXS board with | ||
| 18 | a sgtl5000 codec. | ||
| 19 | |||
| 20 | endif # SND_MXS_SOC | ||
diff --git a/sound/soc/mxs/Makefile b/sound/soc/mxs/Makefile new file mode 100644 index 000000000000..565b5b51e8b7 --- /dev/null +++ b/sound/soc/mxs/Makefile | |||
| @@ -0,0 +1,10 @@ | |||
| 1 | # MXS Platform Support | ||
| 2 | snd-soc-mxs-objs := mxs-saif.o | ||
| 3 | snd-soc-mxs-pcm-objs := mxs-pcm.o | ||
| 4 | |||
| 5 | obj-$(CONFIG_SND_MXS_SOC) += snd-soc-mxs.o snd-soc-mxs-pcm.o | ||
| 6 | |||
| 7 | # i.MX Machine Support | ||
| 8 | snd-soc-mxs-sgtl5000-objs := mxs-sgtl5000.o | ||
| 9 | |||
| 10 | obj-$(CONFIG_SND_SOC_MXS_SGTL5000) += snd-soc-mxs-sgtl5000.o | ||