Re: [RFC 11/11] ASoC: hda - enable ASoC Skylake HD audio driver

[Takashi Iwai <tiwai@suse.de>]

At Sun, 12 Apr 2015 18:06:18 +0530,
Subhransu S. Prusty wrote:
> 
> From: Jeeja KP <jeeja.kp@intel.com>
> 
> Add makefile and Kconfig to enable Skylake
> HD audio driver
> 
> Signed-off-by: Jeeja KP <jeeja.kp@intel.com>
> Signed-off-by: Subhransu S. Prusty <subhransu.s.prusty@intel.com>
> Signed-off-by: Vinod Koul <vinod.koul@intel.com>
> ---
>  sound/soc/Kconfig      |  3 ++-
>  sound/soc/Makefile     |  1 +
>  sound/soc/hda/Kconfig  | 29 +++++++++++++++++++++++++++++
>  sound/soc/hda/Makefile |  6 ++++++
>  4 files changed, 38 insertions(+), 1 deletion(-)
>  create mode 100644 sound/soc/hda/Kconfig
>  create mode 100644 sound/soc/hda/Makefile
> 
> diff --git a/sound/soc/Kconfig b/sound/soc/Kconfig
> index dcc79aa..1baa2a4 100644
> --- a/sound/soc/Kconfig
> +++ b/sound/soc/Kconfig
> @@ -14,7 +14,7 @@ menuconfig SND_SOC
>  
>  	  If you want ASoC support, you should say Y here and also to the
>  	  specific driver for your SoC platform below.
> -	  
> +
>  	  ASoC provides power efficient ALSA support for embedded battery powered
>  	  SoC based systems like PDA's, Phones and Personal Media Players.
>  
> @@ -40,6 +40,7 @@ source "sound/soc/cirrus/Kconfig"
>  source "sound/soc/davinci/Kconfig"
>  source "sound/soc/dwc/Kconfig"
>  source "sound/soc/fsl/Kconfig"
> +source "sound/soc/hda/Kconfig"
>  source "sound/soc/jz4740/Kconfig"
>  source "sound/soc/nuc900/Kconfig"
>  source "sound/soc/omap/Kconfig"
> diff --git a/sound/soc/Makefile b/sound/soc/Makefile
> index 5b3c8f6..3269d19 100644
> --- a/sound/soc/Makefile
> +++ b/sound/soc/Makefile
> @@ -21,6 +21,7 @@ obj-$(CONFIG_SND_SOC)	+= cirrus/
>  obj-$(CONFIG_SND_SOC)	+= davinci/
>  obj-$(CONFIG_SND_SOC)	+= dwc/
>  obj-$(CONFIG_SND_SOC)	+= fsl/
> +obj-$(CONFIG_SND_SOC)	+= hda/
>  obj-$(CONFIG_SND_SOC)	+= jz4740/
>  obj-$(CONFIG_SND_SOC)	+= intel/
>  obj-$(CONFIG_SND_SOC)	+= mxs/
> diff --git a/sound/soc/hda/Kconfig b/sound/soc/hda/Kconfig
> new file mode 100644
> index 0000000..1711126
> --- /dev/null
> +++ b/sound/soc/hda/Kconfig
> @@ -0,0 +1,29 @@
> +menu "SKL-HD-Audio"
> +
> +config SND_SOC_HDA
> +        tristate
> +        select SND_HDA_CORE
> +
> +if SND_SOC_HDA
> +
> +config SND_HDA_PREALLOC_SIZE

The symbol conflicts.


Takashi