1 files changed, 18 insertions, 9 deletions

diff --git a/sound/soc/fsl/Kconfig b/sound/soc/fsl/Kconfig
index 8cb65ccad35f..d754d34d68a6 100644
--- a/sound/soc/fsl/Kconfig
+++ b/sound/soc/fsl/Kconfig
@@ -1,27 +1,36 @@
-config SND_SOC_OF_SIMPLE
-        tristate
-        
 config SND_MPC52xx_DMA
         tristate
 
-# ASoC platform support for the Freescale MPC8610 SOC.  This compiles drivers
-# for the SSI and the Elo DMA controller.  You will still need to select
-# a platform driver and a codec driver.
-config SND_SOC_MPC8610
+# ASoC platform support for the Freescale PowerPC SOCs that have an SSI and
+# an Elo DMA controller, such as the MPC8610 and P1022.  You will still need to
+# select a platform driver and a codec driver.
+config SND_SOC_POWERPC_SSI
         tristate
-        depends on MPC8610
+        depends on FSL_SOC
 
 config SND_SOC_MPC8610_HPCD
         tristate "ALSA SoC support for the Freescale MPC8610 HPCD board"
         # I2C is necessary for the CS4270 driver
         depends on MPC8610_HPCD && I2C
-        select SND_SOC_MPC8610
+        select SND_SOC_POWERPC_SSI
         select SND_SOC_CS4270
         select SND_SOC_CS4270_VD33_ERRATA
         default y if MPC8610_HPCD
         help
           Say Y if you want to enable audio on the Freescale MPC8610 HPCD.
 
+config SND_SOC_P1022_DS
+        tristate "ALSA SoC support for the Freescale P1022 DS board"
+        # I2C is necessary for the WM8776 driver
+        depends on P1022_DS && I2C
+        select SND_SOC_POWERPC_SSI
+        select SND_SOC_WM8776
+        default y if P1022_DS
+        help
+          Say Y if you want to enable audio on the Freescale P1022 DS board.
+          This will also include the Wolfson Microelectronics WM8776 codec
+          driver.
+
 config SND_SOC_MPC5200_I2S
         tristate "Freescale MPC5200 PSC in I2S mode driver"
         depends on PPC_MPC52xx && PPC_BESTCOMM