ALSA: hda - Move HD-audio Kconfig items to sound/pci/hda/Kconfig

Signed-off-by: Takashi Iwai <tiwai@suse.de>

2 files changed, 140 insertions, 145 deletions

diff --git a/sound/pci/Kconfig b/sound/pci/Kconfig
index cc6cf89c32e6..caebf296b62b 100644
--- a/sound/pci/Kconfig
+++ b/sound/pci/Kconfig
@@ -497,151 +497,7 @@ config SND_FM801_TEA575X
         depends on SND_FM801_TEA575X_BOOL
         default SND_FM801
 
-config SND_HDA_INTEL
-        tristate "Intel HD Audio"
-        select SND_PCM
-        select SND_VMASTER
-        select SND_JACK if INPUT=y || INPUT=SND
-        help
-          Say Y here to include support for Intel "High Definition
-          Audio" (Azalia) motherboard devices.
-
-          To compile this driver as a module, choose M here: the module
-          will be called snd-hda-intel.
-
-config SND_HDA_HWDEP
-        bool "Build hwdep interface for HD-audio driver"
-        depends on SND_HDA_INTEL
-        select SND_HWDEP
-        help
-          Say Y here to build a hwdep interface for HD-audio driver.
-          This interface can be used for out-of-band communication
-          with codecs for debugging purposes.
-
-config SND_HDA_RECONFIG
-        bool "Allow dynamic codec reconfiguration (EXPERIMENTAL)"
-        depends on SND_HDA_HWDEP && EXPERIMENTAL
-        help
-          Say Y here to enable the HD-audio codec re-configuration feature.
-          This adds the sysfs interfaces to allow user to clear the whole
-          codec configuration, change the codec setup, add extra verbs,
-          and re-configure the codec dynamically.
-
-config SND_HDA_INPUT_BEEP
-        bool "Support digital beep via input layer"
-        depends on SND_HDA_INTEL
-        depends on INPUT=y || INPUT=SND_HDA_INTEL
-        help
-          Say Y here to build a digital beep interface for HD-audio
-          driver. This interface is used to generate digital beeps.
-
-config SND_HDA_CODEC_REALTEK
-        bool "Build Realtek HD-audio codec support"
-        depends on SND_HDA_INTEL
-        default y
-        help
-          Say Y here to include Realtek HD-audio codec support in
-          snd-hda-intel driver, such as ALC880.
-
-config SND_HDA_CODEC_ANALOG
-        bool "Build Analog Device HD-audio codec support"
-        depends on SND_HDA_INTEL
-        default y
-        help
-          Say Y here to include Analog Device HD-audio codec support in
-          snd-hda-intel driver, such as AD1986A.
-
-config SND_HDA_CODEC_SIGMATEL
-        bool "Build IDT/Sigmatel HD-audio codec support"
-        depends on SND_HDA_INTEL
-        default y
-        help
-          Say Y here to include IDT (Sigmatel) HD-audio codec support in
-          snd-hda-intel driver, such as STAC9200.
-
-config SND_HDA_CODEC_VIA
-        bool "Build VIA HD-audio codec support"
-        depends on SND_HDA_INTEL
-        default y
-        help
-          Say Y here to include VIA HD-audio codec support in
-          snd-hda-intel driver, such as VT1708.
-
-config SND_HDA_CODEC_ATIHDMI
-        bool "Build ATI HDMI HD-audio codec support"
-        depends on SND_HDA_INTEL
-        default y
-        help
-          Say Y here to include ATI HDMI HD-audio codec support in
-          snd-hda-intel driver, such as ATI RS600 HDMI.
-
-config SND_HDA_CODEC_NVHDMI
-        bool "Build NVIDIA HDMI HD-audio codec support"
-        depends on SND_HDA_INTEL
-        default y
-        help
-          Say Y here to include NVIDIA HDMI HD-audio codec support in
-          snd-hda-intel driver, such as NVIDIA MCP78 HDMI.
-
-config SND_HDA_CODEC_INTELHDMI
-        bool "Build INTEL HDMI HD-audio codec support"
-        depends on SND_HDA_INTEL
-        default y
-        help
-          Say Y here to include INTEL HDMI HD-audio codec support in
-          snd-hda-intel driver, such as Eaglelake integrated HDMI.
-
-config SND_HDA_ELD
-        def_bool y
-        depends on SND_HDA_CODEC_INTELHDMI
-
-config SND_HDA_CODEC_CONEXANT
-        bool "Build Conexant HD-audio codec support"
-        depends on SND_HDA_INTEL
-        default y
-        help
-          Say Y here to include Conexant HD-audio codec support in
-          snd-hda-intel driver, such as CX20549.
-
-config SND_HDA_CODEC_CMEDIA
-        bool "Build C-Media HD-audio codec support"
-        depends on SND_HDA_INTEL
-        default y
-        help
-          Say Y here to include C-Media HD-audio codec support in
-          snd-hda-intel driver, such as CMI9880.
-
-config SND_HDA_CODEC_SI3054
-        bool "Build Silicon Labs 3054 HD-modem codec support"
-        depends on SND_HDA_INTEL
-        default y
-        help
-          Say Y here to include Silicon Labs 3054 HD-modem codec
-          (and compatibles) support in snd-hda-intel driver.
-
-config SND_HDA_GENERIC
-        bool "Enable generic HD-audio codec parser"
-        depends on SND_HDA_INTEL
-        default y
-        help
-          Say Y here to enable the generic HD-audio codec parser
-          in snd-hda-intel driver.
-
-config SND_HDA_POWER_SAVE
-        bool "Aggressive power-saving on HD-audio"
-        depends on SND_HDA_INTEL && EXPERIMENTAL
-        help
-          Say Y here to enable more aggressive power-saving mode on
-          HD-audio driver.  The power-saving timeout can be configured
-          via power_save option or over sysfs on-the-fly.
-
-config SND_HDA_POWER_SAVE_DEFAULT
-        int "Default time-out for HD-audio power-save mode"
-        depends on SND_HDA_POWER_SAVE
-        default 0
-        help
-          The default time-out value in seconds for HD-audio automatic
-          power-save mode.  0 means to disable the power-save mode.
+source "sound/pci/hda/Kconfig"
 
 config SND_HDSP
         tristate "RME Hammerfall DSP Audio"
diff --git a/sound/pci/hda/Kconfig b/sound/pci/hda/Kconfig
new file mode 100644
index 000000000000..7c60f1a45a8d
--- /dev/null
+++ b/sound/pci/hda/Kconfig
@@ -0,0 +1,139 @@
+menuconfig SND_HDA_INTEL
+        tristate "Intel HD Audio"
+        select SND_PCM
+        select SND_VMASTER
+        select SND_JACK if INPUT=y || INPUT=SND
+        help
+          Say Y here to include support for Intel "High Definition
+          Audio" (Azalia) and its compatible devices.
+
+          This option enables the HD-audio controller.  Don't forget
+          to choose the appropriate codec options below.
+
+          To compile this driver as a module, choose M here: the module
+          will be called snd-hda-intel.
+
+if SND_HDA_INTEL
+
+config SND_HDA_HWDEP
+        bool "Build hwdep interface for HD-audio driver"
+        select SND_HWDEP
+        help
+          Say Y here to build a hwdep interface for HD-audio driver.
+          This interface can be used for out-of-band communication
+          with codecs for debugging purposes.
+
+config SND_HDA_RECONFIG
+        bool "Allow dynamic codec reconfiguration (EXPERIMENTAL)"
+        depends on SND_HDA_HWDEP && EXPERIMENTAL
+        help
+          Say Y here to enable the HD-audio codec re-configuration feature.
+          This adds the sysfs interfaces to allow user to clear the whole
+          codec configuration, change the codec setup, add extra verbs,
+          and re-configure the codec dynamically.
+
+config SND_HDA_INPUT_BEEP
+        bool "Support digital beep via input layer"
+        depends on INPUT=y || INPUT=SND_HDA_INTEL
+        help
+          Say Y here to build a digital beep interface for HD-audio
+          driver. This interface is used to generate digital beeps.
+
+config SND_HDA_CODEC_REALTEK
+        bool "Build Realtek HD-audio codec support"
+        default y
+        help
+          Say Y here to include Realtek HD-audio codec support in
+          snd-hda-intel driver, such as ALC880.
+
+config SND_HDA_CODEC_ANALOG
+        bool "Build Analog Device HD-audio codec support"
+        default y
+        help
+          Say Y here to include Analog Device HD-audio codec support in
+          snd-hda-intel driver, such as AD1986A.
+
+config SND_HDA_CODEC_SIGMATEL
+        bool "Build IDT/Sigmatel HD-audio codec support"
+        default y
+        help
+          Say Y here to include IDT (Sigmatel) HD-audio codec support in
+          snd-hda-intel driver, such as STAC9200.
+
+config SND_HDA_CODEC_VIA
+        bool "Build VIA HD-audio codec support"
+        default y
+        help
+          Say Y here to include VIA HD-audio codec support in
+          snd-hda-intel driver, such as VT1708.
+
+config SND_HDA_CODEC_ATIHDMI
+        bool "Build ATI HDMI HD-audio codec support"
+        default y
+        help
+          Say Y here to include ATI HDMI HD-audio codec support in
+          snd-hda-intel driver, such as ATI RS600 HDMI.
+
+config SND_HDA_CODEC_NVHDMI
+        bool "Build NVIDIA HDMI HD-audio codec support"
+        default y
+        help
+          Say Y here to include NVIDIA HDMI HD-audio codec support in
+          snd-hda-intel driver, such as NVIDIA MCP78 HDMI.
+
+config SND_HDA_CODEC_INTELHDMI
+        bool "Build INTEL HDMI HD-audio codec support"
+        default y
+        help
+          Say Y here to include INTEL HDMI HD-audio codec support in
+          snd-hda-intel driver, such as Eaglelake integrated HDMI.
+
+config SND_HDA_ELD
+        def_bool y
+        depends on SND_HDA_CODEC_INTELHDMI
+
+config SND_HDA_CODEC_CONEXANT
+        bool "Build Conexant HD-audio codec support"
+        default y
+        help
+          Say Y here to include Conexant HD-audio codec support in
+          snd-hda-intel driver, such as CX20549.
+
+config SND_HDA_CODEC_CMEDIA
+        bool "Build C-Media HD-audio codec support"
+        default y
+        help
+          Say Y here to include C-Media HD-audio codec support in
+          snd-hda-intel driver, such as CMI9880.
+
+config SND_HDA_CODEC_SI3054
+        bool "Build Silicon Labs 3054 HD-modem codec support"
+        default y
+        help
+          Say Y here to include Silicon Labs 3054 HD-modem codec
+          (and compatibles) support in snd-hda-intel driver.
+
+config SND_HDA_GENERIC
+        bool "Enable generic HD-audio codec parser"
+        default y
+        help
+          Say Y here to enable the generic HD-audio codec parser
+          in snd-hda-intel driver.
+
+config SND_HDA_POWER_SAVE
+        bool "Aggressive power-saving on HD-audio"
+        depends on EXPERIMENTAL
+        help
+          Say Y here to enable more aggressive power-saving mode on
+          HD-audio driver.  The power-saving timeout can be configured
+          via power_save option or over sysfs on-the-fly.
+
+config SND_HDA_POWER_SAVE_DEFAULT
+        int "Default time-out for HD-audio power-save mode"
+        depends on SND_HDA_POWER_SAVE
+        default 0
+        help
+          The default time-out value in seconds for HD-audio automatic
+          power-save mode.  0 means to disable the power-save mode.
+
+endif