[RFC 4/4] ASoC SST: Add makefiles and kconfigs changes

[RFC 4/4] ASoC SST: Add makefiles and kconfigs changes

[Koul, Vinod]

From: Vinod Koul <vinod.koul@intel.com>

This patch adds the makefile and kconfig changes for mid asoc driver which are introduced in 3 preceeding patches

Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Signed-off-by: Harsha Priya <priya.harsha@intel.com>
---
 sound/soc/Kconfig          |    1 +
 sound/soc/Makefile         |    1 +
 sound/soc/codecs/Kconfig   |    5 ++++-
 sound/soc/codecs/Makefile  |    3 +++
 sound/soc/mid-x86/Kconfig  |   20 ++++++++++++++++++++
 sound/soc/mid-x86/Makefile |    9 +++++++++
 6 files changed, 38 insertions(+), 1 deletions(-)
 create mode 100644 sound/soc/mid-x86/Kconfig
 create mode 100644 sound/soc/mid-x86/Makefile

diff --git a/sound/soc/Kconfig b/sound/soc/Kconfig
index a3efc52..0e966a6 100644
--- a/sound/soc/Kconfig
+++ b/sound/soc/Kconfig
@@ -55,6 +55,7 @@ source "sound/soc/samsung/Kconfig"
 source "sound/soc/s6000/Kconfig"
 source "sound/soc/sh/Kconfig"
 source "sound/soc/txx9/Kconfig"
+source "sound/soc/mid-x86/Kconfig"
 
 # Supported codecs
 source "sound/soc/codecs/Kconfig"
diff --git a/sound/soc/Makefile b/sound/soc/Makefile
index ce913bf..92d7551 100644
--- a/sound/soc/Makefile
+++ b/sound/soc/Makefile
@@ -18,3 +18,4 @@ obj-$(CONFIG_SND_SOC)	+= samsung/
 obj-$(CONFIG_SND_SOC)	+= s6000/
 obj-$(CONFIG_SND_SOC)	+= sh/
 obj-$(CONFIG_SND_SOC)	+= txx9/
+obj-$(CONFIG_SND_SOC)	+= mid-x86/
diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig
index 054191e..2a12bcc 100644
--- a/sound/soc/codecs/Kconfig
+++ b/sound/soc/codecs/Kconfig
@@ -84,7 +84,8 @@ config SND_SOC_ALL_CODECS
 	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
+        select SND_SOC_MSIC if INTEL_SCU_IPC
+	help
           Normally ASoC codec drivers are only built if a machine driver which
           uses them is also built since they are only usable with a machine
           driver.  Selecting this option will allow these drivers to be built
@@ -321,6 +322,8 @@ config SND_SOC_WM9712
 
 config SND_SOC_WM9713
 	tristate
+config SND_SOC_MSIC
+	tristate
 
 # Amp
 config SND_SOC_MAX9877
diff --git a/sound/soc/codecs/Makefile b/sound/soc/codecs/Makefile
index 6a1e17b..07cedc0 100644
--- a/sound/soc/codecs/Makefile
+++ b/sound/soc/codecs/Makefile
@@ -1,3 +1,4 @@
+EXTRA_CFLAGS += -DDEBUG
 snd-soc-88pm860x-objs := 88pm860x-codec.o
 snd-soc-ac97-objs := ac97.o
 snd-soc-ad1836-objs := ad1836.o
@@ -69,6 +70,7 @@ snd-soc-wm9712-objs := wm9712.o
 snd-soc-wm9713-objs := wm9713.o
 snd-soc-wm-hubs-objs := wm_hubs.o
 snd-soc-jz4740-codec-objs := jz4740.o
+snd-soc-msic-objs := msic.o
 
 # Amp
 snd-soc-max9877-objs := max9877.o
@@ -147,6 +149,7 @@ 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
 obj-$(CONFIG_SND_SOC_WM_HUBS)	+= snd-soc-wm-hubs.o
+obj-$(CONFIG_SND_SOC_MSIC) +=snd-soc-msic.o
 
 # Amp
 obj-$(CONFIG_SND_SOC_MAX9877)	+= snd-soc-max9877.o
diff --git a/sound/soc/mid-x86/Kconfig b/sound/soc/mid-x86/Kconfig
new file mode 100644
index 0000000..a61e53d
--- /dev/null
+++ b/sound/soc/mid-x86/Kconfig
@@ -0,0 +1,20 @@
+#config SND_MID_PLATFORM
+#	tristate "SoC Platform Audio driver for Intel MID chips"
+#	default y
+#	help
+#	  Say Y if you want to add support for SoC platform driver for Intel MID
+
+
+config SND_MID_PLATFORM
+	tristate
+	depends on SND_INTEL_SST
+
+config SND_MID_MACHINE
+	tristate "SOC Machine Audio driver for Intel MID chips"
+	select SND_SOC_MSIC
+	select SND_MID_PLATFORM
+	default n
+	help
+	  Say Y if you want to add support for SoC machine driver for Intel MID
+
+
diff --git a/sound/soc/mid-x86/Makefile b/sound/soc/mid-x86/Makefile
new file mode 100644
index 0000000..206c63e
--- /dev/null
+++ b/sound/soc/mid-x86/Makefile
@@ -0,0 +1,9 @@
+EXTRA_CFLAGS += -DDEBUG
+
+# MID Platform Support
+snd-soc-mid-platform-objs := mid_platform.o mid_platform_pvt.o
+# MID Machine Support
+snd-soc-mid-machine-objs := mid_machine.o mid_machine_pvt.o
+
+obj-$(CONFIG_SND_MID_PLATFORM) += snd-soc-mid-platform.o
+obj-$(CONFIG_SND_MID_MACHINE) += snd-soc-mid-machine.o
-- 
1.7.2.3

Re: [RFC 4/4] ASoC SST: Add makefiles and kconfigs changes

[Mark Brown]

On Tue, Dec 28, 2010 at 05:41:55PM +0530,  Koul, Vinod wrote:

> @@ -55,6 +55,7 @@ source "sound/soc/samsung/Kconfig"
>  source "sound/soc/s6000/Kconfig"
>  source "sound/soc/sh/Kconfig"
>  source "sound/soc/txx9/Kconfig"
> +source "sound/soc/mid-x86/Kconfig"

Here and elsewhere keep the lists sorted.

>  	select SND_SOC_WM9713 if SND_SOC_AC97_BUS
> -        help
> +        select SND_SOC_MSIC if INTEL_SCU_IPC
> +	help

Random indentation change as well as the sorting issue here.

>            Normally ASoC codec drivers are only built if a machine driver which
>            uses them is also built since they are only usable with a machine
>            driver.  Selecting this option will allow these drivers to be built
> @@ -321,6 +322,8 @@ config SND_SOC_WM9712
>  
>  config SND_SOC_WM9713
>  	tristate
> +config SND_SOC_MSIC
> +	tristate
>  

Sorting and a missing blank line.

> index 6a1e17b..07cedc0 100644
> --- a/sound/soc/codecs/Makefile
> +++ b/sound/soc/codecs/Makefile
> @@ -1,3 +1,4 @@
> +EXTRA_CFLAGS += -DDEBUG
>  snd-soc-88pm860x-objs := 88pm860x-codec.o

This shouldn't be here.

> @@ -0,0 +1,20 @@
> +#config SND_MID_PLATFORM
> +#	tristate "SoC Platform Audio driver for Intel MID chips"
> +#	default y
> +#	help
> +#	  Say Y if you want to add support for SoC platform driver for Intel MID

Remove this if you're not going to use it.

> +config SND_MID_MACHINE
> +	tristate "SOC Machine Audio driver for Intel MID chips"
> +	select SND_SOC_MSIC
> +	select SND_MID_PLATFORM
> +	default n
> +	help
> +	  Say Y if you want to add support for SoC machine driver for Intel MID

No need to specify default n, it is the default.

> +++ b/sound/soc/mid-x86/Makefile
> @@ -0,0 +1,9 @@
> +EXTRA_CFLAGS += -DDEBUG

Omit this too.