* [PATCH v2 0/9] ASoC: Intel: Kconfig+acpi fixes
@ 2018-01-03 16:50 ` Pierre-Louis Bossart
0 siblings, 0 replies; 38+ messages in thread
From: Pierre-Louis Bossart @ 2018-01-03 16:50 UTC (permalink / raw)
To: alsa-devel
Cc: tiwai, broonie, torvalds, vinod.koul, liam.r.girdwood,
andriy.shevchenko, arnd, linux-kernel, Pierre-Louis Bossart
The first patch solves issues reported by 0day with non-ACPI platforms
The second patch implements what Linus, Takashi and Mark
requested: a top-level selector defaulting to 'y' to easily filter all
other options and with no impact on code generation. There should be no
functionality change and will avoid breaking audio for people using
make oldnoconfig.
The rest of the patch series does a more in-depth cleanup. It was tested
on Baytrail/Cherrytrail/Skylake platforms with no regressions
observed and no reports of any compilation issues with 0-day or
randconfig.
The 5th patch is really the most important one, there were nested
configs which made no sense to me. I don't know the history which led
to such complicated stuff but simpler is better.
Patches 6..7 are just clean-ups of the machine driver configs,
for some reason there is no consistency in the settings so I tried to
apply common sense and use the same rules. At Andy Shevchenko's suggestion,
I also replaced the broken dependency on X86_INTEL_LPSS by MFD_INTEL_LPSS
for Skylake+ machines. No regressions were identified with this change.
Patch 9 is new in this series and are just cosmetic changes (comments
and text simplification).
Thanks to Vinod Koul for his contributions and comments.
Changes since v1:
fixed more 0-day warnings for e.g. s390 non-ACPI compilation
fixed use of depends
fixed use of CONFIG_
fixed indentations as needed
simplified text and comments
Changes since RFCv2:
Moved machine drivers to submenu
Dropped SND_SOC_INTEL_COMMON since it was not needed
Added more comments for if/endif
Simplified text for options (dropped "ASoC Intel driver....")
Fixed one 0-day warning
Changes since initial RFC:
Removed default n
Added help text for HASWELL, BAYTRAIL (legacy) and SKYLAKE options
Made top level machine driver selection dependent on INTEL_SST_TOPLEVEL.
Added help text for PCI and HIFI2 platforms
Replaced X86_INTEL_LPSS by MFD_INTEL_LPSS for Skylake+ devices
Fixed a couple of indentation issues
Pierre-Louis Bossart (8):
ASoC: acpi: add missing includes for non-ACPI platforms
ASoC: Intel: Fix Kconfig with top-level selector
ASoC: Intel: Kconfig: Simplify-clarify ACPI/PCI dependencies
ASoC: Intel: document what Kconfig options do
ASoC: Intel: Fix nested/unnecessary Kconfig dependencies
ASoC: Intel: boards: align Kconfig dependencies for Haswell/Broadwell
ASoC: Intel: boards: align Kconfig configurations for HiFi2
ASoC: Intel: boards: align/fix SKL/BXT/KBL Kconfigs
Vinod Koul (1):
ASoC: Intel: kconfig: add some comments for if symbols
include/sound/soc-acpi-intel-match.h | 1 +
include/sound/soc-acpi.h | 1 +
sound/soc/intel/Kconfig | 116 +++++++++++++++------
sound/soc/intel/Makefile | 2 +-
sound/soc/intel/boards/Kconfig | 191 ++++++++++++++++++-----------------
5 files changed, 186 insertions(+), 125 deletions(-)
--
2.14.1
^ permalink raw reply [flat|nested] 38+ messages in thread
* [PATCH v2 0/9] ASoC: Intel: Kconfig+acpi fixes
@ 2018-01-03 16:50 ` Pierre-Louis Bossart
0 siblings, 0 replies; 38+ messages in thread
From: Pierre-Louis Bossart @ 2018-01-03 16:50 UTC (permalink / raw)
To: alsa-devel
Cc: arnd, tiwai, linux-kernel, Pierre-Louis Bossart, liam.r.girdwood,
vinod.koul, broonie, andriy.shevchenko, torvalds
The first patch solves issues reported by 0day with non-ACPI platforms
The second patch implements what Linus, Takashi and Mark
requested: a top-level selector defaulting to 'y' to easily filter all
other options and with no impact on code generation. There should be no
functionality change and will avoid breaking audio for people using
make oldnoconfig.
The rest of the patch series does a more in-depth cleanup. It was tested
on Baytrail/Cherrytrail/Skylake platforms with no regressions
observed and no reports of any compilation issues with 0-day or
randconfig.
The 5th patch is really the most important one, there were nested
configs which made no sense to me. I don't know the history which led
to such complicated stuff but simpler is better.
Patches 6..7 are just clean-ups of the machine driver configs,
for some reason there is no consistency in the settings so I tried to
apply common sense and use the same rules. At Andy Shevchenko's suggestion,
I also replaced the broken dependency on X86_INTEL_LPSS by MFD_INTEL_LPSS
for Skylake+ machines. No regressions were identified with this change.
Patch 9 is new in this series and are just cosmetic changes (comments
and text simplification).
Thanks to Vinod Koul for his contributions and comments.
Changes since v1:
fixed more 0-day warnings for e.g. s390 non-ACPI compilation
fixed use of depends
fixed use of CONFIG_
fixed indentations as needed
simplified text and comments
Changes since RFCv2:
Moved machine drivers to submenu
Dropped SND_SOC_INTEL_COMMON since it was not needed
Added more comments for if/endif
Simplified text for options (dropped "ASoC Intel driver....")
Fixed one 0-day warning
Changes since initial RFC:
Removed default n
Added help text for HASWELL, BAYTRAIL (legacy) and SKYLAKE options
Made top level machine driver selection dependent on INTEL_SST_TOPLEVEL.
Added help text for PCI and HIFI2 platforms
Replaced X86_INTEL_LPSS by MFD_INTEL_LPSS for Skylake+ devices
Fixed a couple of indentation issues
Pierre-Louis Bossart (8):
ASoC: acpi: add missing includes for non-ACPI platforms
ASoC: Intel: Fix Kconfig with top-level selector
ASoC: Intel: Kconfig: Simplify-clarify ACPI/PCI dependencies
ASoC: Intel: document what Kconfig options do
ASoC: Intel: Fix nested/unnecessary Kconfig dependencies
ASoC: Intel: boards: align Kconfig dependencies for Haswell/Broadwell
ASoC: Intel: boards: align Kconfig configurations for HiFi2
ASoC: Intel: boards: align/fix SKL/BXT/KBL Kconfigs
Vinod Koul (1):
ASoC: Intel: kconfig: add some comments for if symbols
include/sound/soc-acpi-intel-match.h | 1 +
include/sound/soc-acpi.h | 1 +
sound/soc/intel/Kconfig | 116 +++++++++++++++------
sound/soc/intel/Makefile | 2 +-
sound/soc/intel/boards/Kconfig | 191 ++++++++++++++++++-----------------
5 files changed, 186 insertions(+), 125 deletions(-)
--
2.14.1
^ permalink raw reply [flat|nested] 38+ messages in thread
* [PATCH v2 1/9] ASoC: acpi: add missing includes for non-ACPI platforms
2018-01-03 16:50 ` Pierre-Louis Bossart
@ 2018-01-03 16:50 ` Pierre-Louis Bossart
-1 siblings, 0 replies; 38+ messages in thread
From: Pierre-Louis Bossart @ 2018-01-03 16:50 UTC (permalink / raw)
To: alsa-devel
Cc: tiwai, broonie, torvalds, vinod.koul, liam.r.girdwood,
andriy.shevchenko, arnd, linux-kernel, Pierre-Louis Bossart
0-day reports compilation issues with non-ACPI platforms.
In file included from sound/soc/soc-acpi.c:17:0:
>> include/sound/soc-acpi.h:36:46: error: 'ACPI_ID_LEN' undeclared here (not in a function); did you mean 'ACPI_FILE'?
snd_soc_acpi_find_name_from_hid(const u8 hid[ACPI_ID_LEN])
sound/soc/soc-acpi.c: At top level:
>> sound/soc/soc-acpi.c:174:16: error: expected declaration specifiers or '...' before string constant
MODULE_LICENSE("GPL v2");
Add missing include files.
Fixes: 7feb2f786a46 ("ASoC: move ACPI common code out of Intel/sst tree")
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
---
include/sound/soc-acpi-intel-match.h | 1 +
include/sound/soc-acpi.h | 1 +
2 files changed, 2 insertions(+)
diff --git a/include/sound/soc-acpi-intel-match.h b/include/sound/soc-acpi-intel-match.h
index 1a9191cd4bb3..9da6388c20a1 100644
--- a/include/sound/soc-acpi-intel-match.h
+++ b/include/sound/soc-acpi-intel-match.h
@@ -16,6 +16,7 @@
#ifndef __LINUX_SND_SOC_ACPI_INTEL_MATCH_H
#define __LINUX_SND_SOC_ACPI_INTEL_MATCH_H
+#include <linux/module.h>
#include <linux/stddef.h>
#include <linux/acpi.h>
diff --git a/include/sound/soc-acpi.h b/include/sound/soc-acpi.h
index a7d8d335b043..a93436089bf5 100644
--- a/include/sound/soc-acpi.h
+++ b/include/sound/soc-acpi.h
@@ -17,6 +17,7 @@
#include <linux/stddef.h>
#include <linux/acpi.h>
+#include <linux/mod_devicetable.h>
struct snd_soc_acpi_package_context {
char *name; /* package name */
--
2.14.1
^ permalink raw reply related [flat|nested] 38+ messages in thread
* [PATCH v2 1/9] ASoC: acpi: add missing includes for non-ACPI platforms
@ 2018-01-03 16:50 ` Pierre-Louis Bossart
0 siblings, 0 replies; 38+ messages in thread
From: Pierre-Louis Bossart @ 2018-01-03 16:50 UTC (permalink / raw)
To: alsa-devel
Cc: arnd, tiwai, linux-kernel, Pierre-Louis Bossart, liam.r.girdwood,
vinod.koul, broonie, andriy.shevchenko, torvalds
0-day reports compilation issues with non-ACPI platforms.
In file included from sound/soc/soc-acpi.c:17:0:
>> include/sound/soc-acpi.h:36:46: error: 'ACPI_ID_LEN' undeclared here (not in a function); did you mean 'ACPI_FILE'?
snd_soc_acpi_find_name_from_hid(const u8 hid[ACPI_ID_LEN])
sound/soc/soc-acpi.c: At top level:
>> sound/soc/soc-acpi.c:174:16: error: expected declaration specifiers or '...' before string constant
MODULE_LICENSE("GPL v2");
Add missing include files.
Fixes: 7feb2f786a46 ("ASoC: move ACPI common code out of Intel/sst tree")
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
---
include/sound/soc-acpi-intel-match.h | 1 +
include/sound/soc-acpi.h | 1 +
2 files changed, 2 insertions(+)
diff --git a/include/sound/soc-acpi-intel-match.h b/include/sound/soc-acpi-intel-match.h
index 1a9191cd4bb3..9da6388c20a1 100644
--- a/include/sound/soc-acpi-intel-match.h
+++ b/include/sound/soc-acpi-intel-match.h
@@ -16,6 +16,7 @@
#ifndef __LINUX_SND_SOC_ACPI_INTEL_MATCH_H
#define __LINUX_SND_SOC_ACPI_INTEL_MATCH_H
+#include <linux/module.h>
#include <linux/stddef.h>
#include <linux/acpi.h>
diff --git a/include/sound/soc-acpi.h b/include/sound/soc-acpi.h
index a7d8d335b043..a93436089bf5 100644
--- a/include/sound/soc-acpi.h
+++ b/include/sound/soc-acpi.h
@@ -17,6 +17,7 @@
#include <linux/stddef.h>
#include <linux/acpi.h>
+#include <linux/mod_devicetable.h>
struct snd_soc_acpi_package_context {
char *name; /* package name */
--
2.14.1
^ permalink raw reply related [flat|nested] 38+ messages in thread
* [PATCH v2 2/9] ASoC: Intel: Fix Kconfig with top-level selector
2018-01-03 16:50 ` Pierre-Louis Bossart
(?)
(?)
@ 2018-01-03 16:50 ` Pierre-Louis Bossart
2018-01-08 16:22 ` Mark Brown
-1 siblings, 1 reply; 38+ messages in thread
From: Pierre-Louis Bossart @ 2018-01-03 16:50 UTC (permalink / raw)
To: alsa-devel
Cc: tiwai, broonie, torvalds, vinod.koul, liam.r.girdwood,
andriy.shevchenko, arnd, linux-kernel, Pierre-Louis Bossart
Follow network example suggested by Linus, move Intel definitions
in if/endif block and clarify in help text which options distro
configurations should enable - everything except legacy Baytrail stuff and
NOCODEC (test only)
To avoid user confusion, machine drivers are handled with a submenu made
dependent on this top-level selector.
There should be no functionality change - except that sound capabilities
are restored when using older configs without any user selection.
Note that the SND_SOC_ACPI_INTEL_MATCH config is currently filtered
out by the top-level selector. This will change in the near future to
allow for this option to be selected by both SST and SOF drivers
(simplification with submenu for machine drivers by Vinod Koul)
Fixes: f6a118a800e3 ("ASoC: Intel: clarify Kconfig dependencies")
Reported-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
---
sound/soc/intel/Kconfig | 66 +++++++++++++++++++----------
sound/soc/intel/Makefile | 2 +-
sound/soc/intel/boards/Kconfig | 94 +++++++++++++++++++++++-------------------
3 files changed, 97 insertions(+), 65 deletions(-)
diff --git a/sound/soc/intel/Kconfig b/sound/soc/intel/Kconfig
index 7b49d04e3c60..b827d3b70095 100644
--- a/sound/soc/intel/Kconfig
+++ b/sound/soc/intel/Kconfig
@@ -1,3 +1,19 @@
+config SND_SOC_INTEL_SST_TOPLEVEL
+ bool "Intel ASoC SST drivers"
+ default y
+ depends on X86 || COMPILE_TEST
+ select SND_SOC_INTEL_MACH
+ help
+ Intel ASoC SST Platform Drivers. If you have a Intel machine that
+ has an audio controller with a DSP and I2S or DMIC port, then
+ enable this option by saying Y
+
+ Note that the answer to this question doesn't directly affect the
+ kernel: saying N will just cause the configurator to skip all
+ the questions about Intel SST drivers.
+
+if SND_SOC_INTEL_SST_TOPLEVEL
+
config SND_SST_IPC
tristate
@@ -11,9 +27,6 @@ config SND_SST_IPC_ACPI
select SND_SOC_INTEL_SST
select IOSF_MBI
-config SND_SOC_INTEL_COMMON
- tristate
-
config SND_SOC_INTEL_SST
tristate
select SND_SOC_INTEL_SST_ACPI if ACPI
@@ -25,47 +38,56 @@ config SND_SOC_INTEL_SST_FIRMWARE
config SND_SOC_INTEL_SST_ACPI
tristate
-config SND_SOC_ACPI_INTEL_MATCH
- tristate
- select SND_SOC_ACPI if ACPI
-
-config SND_SOC_INTEL_SST_TOPLEVEL
- tristate "Intel ASoC SST drivers"
- depends on X86 || COMPILE_TEST
- select SND_SOC_INTEL_MACH
- select SND_SOC_INTEL_COMMON
- help
- Intel ASoC Audio Drivers. If you have a Intel machine that
- has audio controller with a DSP and I2S or DMIC port, then
- enable this option by saying Y or M
- If unsure select "N".
-
config SND_SOC_INTEL_HASWELL
tristate "Intel ASoC SST driver for Haswell/Broadwell"
- depends on SND_SOC_INTEL_SST_TOPLEVEL && SND_DMA_SGBUF
+ depends on SND_DMA_SGBUF
depends on DMADEVICES
select SND_SOC_INTEL_SST
select SND_SOC_INTEL_SST_FIRMWARE
+ select SND_SOC_ACPI_INTEL_MATCH
+ help
+ If you have a Intel Haswell or Broadwell platform connected to
+ an I2S codec, then enable this option by saying Y or m. This is
+ typically used for Chromebooks. This is a recommended option.
config SND_SOC_INTEL_BAYTRAIL
tristate "Intel ASoC SST driver for Baytrail (legacy)"
- depends on SND_SOC_INTEL_SST_TOPLEVEL
depends on DMADEVICES
select SND_SOC_INTEL_SST
select SND_SOC_INTEL_SST_FIRMWARE
+ select SND_SOC_ACPI_INTEL_MATCH
+ help
+ If you have a Intel Baytrail platform connected to an I2S codec,
+ then enable this option by saying Y or m. This was typically used
+ for Baytrail Chromebooks but this option is now deprecated and is
+ not recommended, use SND_SST_ATOM_HIFI2_PLATFORM instead.
config SND_SST_ATOM_HIFI2_PLATFORM
tristate "Intel ASoC SST driver for HiFi2 platforms (*field, *trail)"
- depends on SND_SOC_INTEL_SST_TOPLEVEL && X86
+ depends on X86
select SND_SOC_COMPRESS
+ select SND_SOC_ACPI_INTEL_MATCH
config SND_SOC_INTEL_SKYLAKE
tristate "Intel ASoC SST driver for SKL/BXT/KBL/GLK/CNL"
- depends on SND_SOC_INTEL_SST_TOPLEVEL && PCI && ACPI
+ depends on PCI && ACPI
select SND_HDA_EXT_CORE
select SND_HDA_DSP_LOADER
select SND_SOC_TOPOLOGY
select SND_SOC_INTEL_SST
+ select SND_SOC_ACPI_INTEL_MATCH
+ help
+ If you have a Intel Skylake/Broxton/ApolloLake/KabyLake/
+ GeminiLake or CannonLake platform with the DSP enabled in the BIOS
+ then enable this option by saying Y or m.
+
+config SND_SOC_ACPI_INTEL_MATCH
+ tristate
+ select SND_SOC_ACPI if ACPI
+ # this option controls the compilation of ACPI matching tables and
+ # helpers and is not meant to be selected by the user.
+
+endif ## SND_SOC_INTEL_SST_TOPLEVEL
# ASoC codec drivers
source "sound/soc/intel/boards/Kconfig"
diff --git a/sound/soc/intel/Makefile b/sound/soc/intel/Makefile
index b973d457e834..8160520fd74c 100644
--- a/sound/soc/intel/Makefile
+++ b/sound/soc/intel/Makefile
@@ -1,6 +1,6 @@
# SPDX-License-Identifier: GPL-2.0
# Core support
-obj-$(CONFIG_SND_SOC_INTEL_COMMON) += common/
+obj-$(CONFIG_SND_SOC) += common/
# Platform Support
obj-$(CONFIG_SND_SOC_INTEL_HASWELL) += haswell/
diff --git a/sound/soc/intel/boards/Kconfig b/sound/soc/intel/boards/Kconfig
index 6f754708a48c..08481882c240 100644
--- a/sound/soc/intel/boards/Kconfig
+++ b/sound/soc/intel/boards/Kconfig
@@ -1,7 +1,14 @@
-config SND_SOC_INTEL_MACH
- tristate "Intel Audio machine drivers"
+menuconfig SND_SOC_INTEL_MACH
+ bool "Intel Machine drivers"
depends on SND_SOC_INTEL_SST_TOPLEVEL
- select SND_SOC_ACPI_INTEL_MATCH if ACPI
+ help
+ Intel ASoC Machine Drivers. If you have a Intel machine that
+ has an audio controller with a DSP and I2S or DMIC port, then
+ enable this option by saying Y
+
+ Note that the answer to this question doesn't directly affect the
+ kernel: saying N will just cause the configurator to skip all
+ the questions about Intel ASoC machine drivers.
if SND_SOC_INTEL_MACH
@@ -17,103 +24,106 @@ config SND_MFLD_MACHINE
Say Y if you have such a device.
If unsure select "N".
+if SND_SOC_INTEL_HASWELL
+
config SND_SOC_INTEL_HASWELL_MACH
tristate "ASoC Audio DSP support for Intel Haswell Lynxpoint"
depends on X86_INTEL_LPSS && I2C && I2C_DESIGNWARE_PLATFORM
- depends on SND_SOC_INTEL_HASWELL
select SND_SOC_RT5640
help
This adds support for the Lynxpoint Audio DSP on Intel(R) Haswell
- Ultrabook platforms.
- Say Y if you have such a device.
+ Ultrabook platforms. This is a recommended option.
+ Say Y or m if you have such a device.
If unsure select "N".
config SND_SOC_INTEL_BDW_RT5677_MACH
tristate "ASoC Audio driver for Intel Broadwell with RT5677 codec"
depends on X86_INTEL_LPSS && GPIOLIB && I2C
- depends on SND_SOC_INTEL_HASWELL
select SND_SOC_RT5677
help
This adds support for Intel Broadwell platform based boards with
- the RT5677 audio codec.
+ the RT5677 audio codec. This is a recommended option.
+ Say Y or m if you have such a device.
+ If unsure select "N".
config SND_SOC_INTEL_BROADWELL_MACH
tristate "ASoC Audio DSP support for Intel Broadwell Wildcatpoint"
depends on X86_INTEL_LPSS && I2C && I2C_DESIGNWARE_PLATFORM
- depends on SND_SOC_INTEL_HASWELL
select SND_SOC_RT286
help
This adds support for the Wilcatpoint Audio DSP on Intel(R) Broadwell
Ultrabook platforms.
- Say Y if you have such a device.
+ Say Y or m if you have such a device. This is a recommended option.
If unsure select "N".
+endif
+
+if SND_SOC_INTEL_BAYTRAIL
config SND_SOC_INTEL_BYT_MAX98090_MACH
tristate "ASoC Audio driver for Intel Baytrail with MAX98090 codec"
depends on X86_INTEL_LPSS && I2C
- depends on SND_SST_IPC_ACPI = n
- depends on SND_SOC_INTEL_BAYTRAIL
select SND_SOC_MAX98090
help
This adds audio driver for Intel Baytrail platform based boards
- with the MAX98090 audio codec.
+ with the MAX98090 audio codec. This driver is deprecated, use
+ SND_SOC_INTEL_CHT_BSW_MAX98090_TI_MACH instead for better
+ functionality.
config SND_SOC_INTEL_BYT_RT5640_MACH
tristate "ASoC Audio driver for Intel Baytrail with RT5640 codec"
depends on X86_INTEL_LPSS && I2C
- depends on SND_SST_IPC_ACPI = n
- depends on SND_SOC_INTEL_BAYTRAIL
select SND_SOC_RT5640
help
This adds audio driver for Intel Baytrail platform based boards
with the RT5640 audio codec. This driver is deprecated, use
SND_SOC_INTEL_BYTCR_RT5640_MACH instead for better functionality.
+endif
+
+if SND_SST_ATOM_HIFI2_PLATFORM
+
config SND_SOC_INTEL_BYTCR_RT5640_MACH
tristate "ASoC Audio driver for Intel Baytrail and Baytrail-CR with RT5640 codec"
depends on X86 && I2C && ACPI
select SND_SOC_RT5640
- depends on SND_SST_ATOM_HIFI2_PLATFORM
select SND_SST_IPC_ACPI
help
This adds support for ASoC machine driver for Intel(R) Baytrail and Baytrail-CR
platforms with RT5640 audio codec.
- Say Y if you have such a device.
+ Say Y or m if you have such a device. This is a recommended option.
If unsure select "N".
config SND_SOC_INTEL_BYTCR_RT5651_MACH
tristate "ASoC Audio driver for Intel Baytrail and Baytrail-CR with RT5651 codec"
depends on X86 && I2C && ACPI
select SND_SOC_RT5651
- depends on SND_SST_ATOM_HIFI2_PLATFORM
select SND_SST_IPC_ACPI
help
This adds support for ASoC machine driver for Intel(R) Baytrail and Baytrail-CR
platforms with RT5651 audio codec.
- Say Y if you have such a device.
+ Say Y or m if you have such a device. This is a recommended option.
If unsure select "N".
config SND_SOC_INTEL_CHT_BSW_RT5672_MACH
tristate "ASoC Audio driver for Intel Cherrytrail & Braswell with RT5672 codec"
depends on X86_INTEL_LPSS && I2C && ACPI
select SND_SOC_RT5670
- depends on SND_SST_ATOM_HIFI2_PLATFORM
select SND_SST_IPC_ACPI
help
This adds support for ASoC machine driver for Intel(R) Cherrytrail & Braswell
platforms with RT5672 audio codec.
- Say Y if you have such a device.
+ Say Y or m if you have such a device. This is a recommended option.
If unsure select "N".
config SND_SOC_INTEL_CHT_BSW_RT5645_MACH
tristate "ASoC Audio driver for Intel Cherrytrail & Braswell with RT5645/5650 codec"
depends on X86_INTEL_LPSS && I2C && ACPI
select SND_SOC_RT5645
- depends on SND_SST_ATOM_HIFI2_PLATFORM
select SND_SST_IPC_ACPI
help
This adds support for ASoC machine driver for Intel(R) Cherrytrail & Braswell
platforms with RT5645/5650 audio codec.
+ Say Y or m if you have such a device. This is a recommended option.
If unsure select "N".
config SND_SOC_INTEL_CHT_BSW_MAX98090_TI_MACH
@@ -121,63 +131,67 @@ config SND_SOC_INTEL_CHT_BSW_MAX98090_TI_MACH
depends on X86_INTEL_LPSS && I2C && ACPI
select SND_SOC_MAX98090
select SND_SOC_TS3A227E
- depends on SND_SST_ATOM_HIFI2_PLATFORM
select SND_SST_IPC_ACPI
help
This adds support for ASoC machine driver for Intel(R) Cherrytrail & Braswell
platforms with MAX98090 audio codec it also can support TI jack chip as aux device.
+ Say Y or m if you have such a device. This is a recommended option.
If unsure select "N".
config SND_SOC_INTEL_BYT_CHT_DA7213_MACH
tristate "ASoC Audio driver for Intel Baytrail & Cherrytrail with DA7212/7213 codec"
depends on X86_INTEL_LPSS && I2C && ACPI
select SND_SOC_DA7213
- depends on SND_SST_ATOM_HIFI2_PLATFORM
select SND_SST_IPC_ACPI
help
This adds support for ASoC machine driver for Intel(R) Baytrail & CherryTrail
platforms with DA7212/7213 audio codec.
+ Say Y or m if you have such a device. This is a recommended option.
If unsure select "N".
config SND_SOC_INTEL_BYT_CHT_ES8316_MACH
tristate "ASoC Audio driver for Intel Baytrail & Cherrytrail with ES8316 codec"
depends on X86_INTEL_LPSS && I2C && ACPI
select SND_SOC_ES8316
- depends on SND_SST_ATOM_HIFI2_PLATFORM
select SND_SST_IPC_ACPI
help
This adds support for ASoC machine driver for Intel(R) Baytrail &
Cherrytrail platforms with ES8316 audio codec.
+ Say Y or m if you have such a device. This is a recommended option.
If unsure select "N".
config SND_SOC_INTEL_BYT_CHT_NOCODEC_MACH
tristate "ASoC Audio driver for Intel Baytrail & Cherrytrail platform with no codec (MinnowBoard MAX, Up)"
depends on X86_INTEL_LPSS && I2C && ACPI
- depends on SND_SST_ATOM_HIFI2_PLATFORM
select SND_SST_IPC_ACPI
help
This adds support for ASoC machine driver for the MinnowBoard Max or
Up boards and provides access to I2S signals on the Low-Speed
- connector
+ connector. This is not a recommended option outside of these cases.
+ It is not intended to be enabled by distros by default.
+ Say Y or m if you have such a device.
+
If unsure select "N".
+endif
+
+if SND_SOC_INTEL_SKYLAKE
+
config SND_SOC_INTEL_SKL_RT286_MACH
tristate "ASoC Audio driver for SKL with RT286 I2S mode"
depends on X86 && ACPI && I2C
- depends on SND_SOC_INTEL_SKYLAKE
select SND_SOC_RT286
select SND_SOC_DMIC
select SND_SOC_HDAC_HDMI
help
This adds support for ASoC machine driver for Skylake platforms
with RT286 I2S audio codec.
- Say Y if you have such a device.
+ Say Y or m if you have such a device.
If unsure select "N".
config SND_SOC_INTEL_SKL_NAU88L25_SSM4567_MACH
tristate "ASoC Audio driver for SKL with NAU88L25 and SSM4567 in I2S Mode"
depends on X86_INTEL_LPSS && I2C
- depends on SND_SOC_INTEL_SKYLAKE
select SND_SOC_NAU8825
select SND_SOC_SSM4567
select SND_SOC_DMIC
@@ -185,13 +199,12 @@ config SND_SOC_INTEL_SKL_NAU88L25_SSM4567_MACH
help
This adds support for ASoC Onboard Codec I2S machine driver. This will
create an alsa sound card for NAU88L25 + SSM4567.
- Say Y if you have such a device.
+ Say Y or m if you have such a device. This is a recommended option.
If unsure select "N".
config SND_SOC_INTEL_SKL_NAU88L25_MAX98357A_MACH
tristate "ASoC Audio driver for SKL with NAU88L25 and MAX98357A in I2S Mode"
depends on X86_INTEL_LPSS && I2C
- depends on SND_SOC_INTEL_SKYLAKE
select SND_SOC_NAU8825
select SND_SOC_MAX98357A
select SND_SOC_DMIC
@@ -199,13 +212,12 @@ config SND_SOC_INTEL_SKL_NAU88L25_MAX98357A_MACH
help
This adds support for ASoC Onboard Codec I2S machine driver. This will
create an alsa sound card for NAU88L25 + MAX98357A.
- Say Y if you have such a device.
+ Say Y or m if you have such a device. This is a recommended option.
If unsure select "N".
config SND_SOC_INTEL_BXT_DA7219_MAX98357A_MACH
tristate "ASoC Audio driver for Broxton with DA7219 and MAX98357A in I2S Mode"
depends on X86 && ACPI && I2C
- depends on SND_SOC_INTEL_SKYLAKE
select SND_SOC_DA7219
select SND_SOC_MAX98357A
select SND_SOC_DMIC
@@ -214,13 +226,12 @@ config SND_SOC_INTEL_BXT_DA7219_MAX98357A_MACH
help
This adds support for ASoC machine driver for Broxton-P platforms
with DA7219 + MAX98357A I2S audio codec.
- Say Y if you have such a device.
+ Say Y or m if you have such a device. This is a recommended option.
If unsure select "N".
config SND_SOC_INTEL_BXT_RT298_MACH
tristate "ASoC Audio driver for Broxton with RT298 I2S mode"
depends on X86 && ACPI && I2C
- depends on SND_SOC_INTEL_SKYLAKE
select SND_SOC_RT298
select SND_SOC_DMIC
select SND_SOC_HDAC_HDMI
@@ -228,14 +239,13 @@ config SND_SOC_INTEL_BXT_RT298_MACH
help
This adds support for ASoC machine driver for Broxton platforms
with RT286 I2S audio codec.
- Say Y if you have such a device.
+ Say Y or m if you have such a device. This is a recommended option.
If unsure select "N".
config SND_SOC_INTEL_KBL_RT5663_MAX98927_MACH
tristate "ASoC Audio driver for KBL with RT5663 and MAX98927 in I2S Mode"
depends on X86_INTEL_LPSS && I2C
select SND_SOC_INTEL_SST
- depends on SND_SOC_INTEL_SKYLAKE
select SND_SOC_RT5663
select SND_SOC_MAX98927
select SND_SOC_DMIC
@@ -243,14 +253,13 @@ config SND_SOC_INTEL_KBL_RT5663_MAX98927_MACH
help
This adds support for ASoC Onboard Codec I2S machine driver. This will
create an alsa sound card for RT5663 + MAX98927.
- Say Y if you have such a device.
+ Say Y or m if you have such a device. This is a recommended option.
If unsure select "N".
config SND_SOC_INTEL_KBL_RT5663_RT5514_MAX98927_MACH
tristate "ASoC Audio driver for KBL with RT5663, RT5514 and MAX98927 in I2S Mode"
depends on X86_INTEL_LPSS && I2C && SPI
select SND_SOC_INTEL_SST
- depends on SND_SOC_INTEL_SKYLAKE
select SND_SOC_RT5663
select SND_SOC_RT5514
select SND_SOC_RT5514_SPI
@@ -259,7 +268,8 @@ config SND_SOC_INTEL_KBL_RT5663_RT5514_MAX98927_MACH
help
This adds support for ASoC Onboard Codec I2S machine driver. This will
create an alsa sound card for RT5663 + RT5514 + MAX98927.
- Say Y if you have such a device.
+ Say Y or m if you have such a device. This is a recommended option.
If unsure select "N".
-
endif
+
+endif ## SND_SOC_INTEL_MACH
--
2.14.1
^ permalink raw reply related [flat|nested] 38+ messages in thread
* [PATCH v2 3/9] ASoC: Intel: Kconfig: Simplify-clarify ACPI/PCI dependencies
2018-01-03 16:50 ` Pierre-Louis Bossart
@ 2018-01-03 16:50 ` Pierre-Louis Bossart
-1 siblings, 0 replies; 38+ messages in thread
From: Pierre-Louis Bossart @ 2018-01-03 16:50 UTC (permalink / raw)
To: alsa-devel
Cc: tiwai, broonie, torvalds, vinod.koul, liam.r.girdwood,
andriy.shevchenko, arnd, linux-kernel, Pierre-Louis Bossart
PCI/ACPI selections should not happen in Kconfig for machine drivers,
move to SOC selections.
Add distinction between PCI and ACPI HiFi2 platforms and help text.
There should be no functionality change.
The PCI-based platforms may be removed at some point since Medfield
is not really supported by anyone, and with Edison now defunct support for
Merrifield/Edison is to be determined.
The dependency on SND_DMA_SGBUF for Haswell is not clear at this
point and may have to be further updated.
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
---
sound/soc/intel/Kconfig | 27 +++++++++++++++++++++++----
sound/soc/intel/boards/Kconfig | 14 ++++----------
2 files changed, 27 insertions(+), 14 deletions(-)
diff --git a/sound/soc/intel/Kconfig b/sound/soc/intel/Kconfig
index b827d3b70095..16374576cb6e 100644
--- a/sound/soc/intel/Kconfig
+++ b/sound/soc/intel/Kconfig
@@ -41,7 +41,7 @@ config SND_SOC_INTEL_SST_ACPI
config SND_SOC_INTEL_HASWELL
tristate "Intel ASoC SST driver for Haswell/Broadwell"
depends on SND_DMA_SGBUF
- depends on DMADEVICES
+ depends on DMADEVICES && ACPI
select SND_SOC_INTEL_SST
select SND_SOC_INTEL_SST_FIRMWARE
select SND_SOC_ACPI_INTEL_MATCH
@@ -52,7 +52,7 @@ config SND_SOC_INTEL_HASWELL
config SND_SOC_INTEL_BAYTRAIL
tristate "Intel ASoC SST driver for Baytrail (legacy)"
- depends on DMADEVICES
+ depends on DMADEVICES && ACPI
select SND_SOC_INTEL_SST
select SND_SOC_INTEL_SST_FIRMWARE
select SND_SOC_ACPI_INTEL_MATCH
@@ -62,11 +62,30 @@ config SND_SOC_INTEL_BAYTRAIL
for Baytrail Chromebooks but this option is now deprecated and is
not recommended, use SND_SST_ATOM_HIFI2_PLATFORM instead.
+config SND_SST_ATOM_HIFI2_PLATFORM_PCI
+ tristate "Intel ASoC SST driver for PCI HiFi2 platforms (Medfield, Merrifield)"
+ depends on X86 && PCI
+ select SND_SST_IPC_PCI
+ select SND_SOC_COMPRESS
+ select SND_SOC_INTEL_COMMON
+ help
+ If you have a Intel Medfield or Merrifield/Edison platform, then
+ enable this option by saying Y or m. Distros will typically not
+ enable this option: Medfield devices are not available to
+ developers and while Merrifield/Edison can run a mainline kernel with
+ limited functionality it will require a firmware file which
+ is not in the standard firmware tree
+
config SND_SST_ATOM_HIFI2_PLATFORM
- tristate "Intel ASoC SST driver for HiFi2 platforms (*field, *trail)"
- depends on X86
+ tristate "Intel ASoC SST driver for ACPI HiFi2 platforms (Baytrail, Cherrytrail)"
+ depends on X86 && ACPI
+ select SND_SST_IPC_ACPI
select SND_SOC_COMPRESS
select SND_SOC_ACPI_INTEL_MATCH
+ help
+ If you have a Intel Baytrail or Cherrytrail platform with an I2S
+ codec, then enable this option by saying Y or m. This is a
+ recommended option
config SND_SOC_INTEL_SKYLAKE
tristate "Intel ASoC SST driver for SKL/BXT/KBL/GLK/CNL"
diff --git a/sound/soc/intel/boards/Kconfig b/sound/soc/intel/boards/Kconfig
index 08481882c240..e926f9747232 100644
--- a/sound/soc/intel/boards/Kconfig
+++ b/sound/soc/intel/boards/Kconfig
@@ -12,18 +12,20 @@ menuconfig SND_SOC_INTEL_MACH
if SND_SOC_INTEL_MACH
+if SND_SST_ATOM_HIFI2_PLATFORM_PCI
+
config SND_MFLD_MACHINE
tristate "SOC Machine Audio driver for Intel Medfield MID platform"
depends on INTEL_SCU_IPC
select SND_SOC_SN95031
- depends on SND_SST_ATOM_HIFI2_PLATFORM
- select SND_SST_IPC_PCI
help
This adds support for ASoC machine driver for Intel(R) MID Medfield platform
used as alsa device in audio substem in Intel(R) MID devices
Say Y if you have such a device.
If unsure select "N".
+endif
+
if SND_SOC_INTEL_HASWELL
config SND_SOC_INTEL_HASWELL_MACH
@@ -86,7 +88,6 @@ config SND_SOC_INTEL_BYTCR_RT5640_MACH
tristate "ASoC Audio driver for Intel Baytrail and Baytrail-CR with RT5640 codec"
depends on X86 && I2C && ACPI
select SND_SOC_RT5640
- select SND_SST_IPC_ACPI
help
This adds support for ASoC machine driver for Intel(R) Baytrail and Baytrail-CR
platforms with RT5640 audio codec.
@@ -97,7 +98,6 @@ config SND_SOC_INTEL_BYTCR_RT5651_MACH
tristate "ASoC Audio driver for Intel Baytrail and Baytrail-CR with RT5651 codec"
depends on X86 && I2C && ACPI
select SND_SOC_RT5651
- select SND_SST_IPC_ACPI
help
This adds support for ASoC machine driver for Intel(R) Baytrail and Baytrail-CR
platforms with RT5651 audio codec.
@@ -108,7 +108,6 @@ config SND_SOC_INTEL_CHT_BSW_RT5672_MACH
tristate "ASoC Audio driver for Intel Cherrytrail & Braswell with RT5672 codec"
depends on X86_INTEL_LPSS && I2C && ACPI
select SND_SOC_RT5670
- select SND_SST_IPC_ACPI
help
This adds support for ASoC machine driver for Intel(R) Cherrytrail & Braswell
platforms with RT5672 audio codec.
@@ -119,7 +118,6 @@ config SND_SOC_INTEL_CHT_BSW_RT5645_MACH
tristate "ASoC Audio driver for Intel Cherrytrail & Braswell with RT5645/5650 codec"
depends on X86_INTEL_LPSS && I2C && ACPI
select SND_SOC_RT5645
- select SND_SST_IPC_ACPI
help
This adds support for ASoC machine driver for Intel(R) Cherrytrail & Braswell
platforms with RT5645/5650 audio codec.
@@ -131,7 +129,6 @@ config SND_SOC_INTEL_CHT_BSW_MAX98090_TI_MACH
depends on X86_INTEL_LPSS && I2C && ACPI
select SND_SOC_MAX98090
select SND_SOC_TS3A227E
- select SND_SST_IPC_ACPI
help
This adds support for ASoC machine driver for Intel(R) Cherrytrail & Braswell
platforms with MAX98090 audio codec it also can support TI jack chip as aux device.
@@ -142,7 +139,6 @@ config SND_SOC_INTEL_BYT_CHT_DA7213_MACH
tristate "ASoC Audio driver for Intel Baytrail & Cherrytrail with DA7212/7213 codec"
depends on X86_INTEL_LPSS && I2C && ACPI
select SND_SOC_DA7213
- select SND_SST_IPC_ACPI
help
This adds support for ASoC machine driver for Intel(R) Baytrail & CherryTrail
platforms with DA7212/7213 audio codec.
@@ -153,7 +149,6 @@ config SND_SOC_INTEL_BYT_CHT_ES8316_MACH
tristate "ASoC Audio driver for Intel Baytrail & Cherrytrail with ES8316 codec"
depends on X86_INTEL_LPSS && I2C && ACPI
select SND_SOC_ES8316
- select SND_SST_IPC_ACPI
help
This adds support for ASoC machine driver for Intel(R) Baytrail &
Cherrytrail platforms with ES8316 audio codec.
@@ -163,7 +158,6 @@ config SND_SOC_INTEL_BYT_CHT_ES8316_MACH
config SND_SOC_INTEL_BYT_CHT_NOCODEC_MACH
tristate "ASoC Audio driver for Intel Baytrail & Cherrytrail platform with no codec (MinnowBoard MAX, Up)"
depends on X86_INTEL_LPSS && I2C && ACPI
- select SND_SST_IPC_ACPI
help
This adds support for ASoC machine driver for the MinnowBoard Max or
Up boards and provides access to I2S signals on the Low-Speed
--
2.14.1
^ permalink raw reply related [flat|nested] 38+ messages in thread
* [PATCH v2 3/9] ASoC: Intel: Kconfig: Simplify-clarify ACPI/PCI dependencies
@ 2018-01-03 16:50 ` Pierre-Louis Bossart
0 siblings, 0 replies; 38+ messages in thread
From: Pierre-Louis Bossart @ 2018-01-03 16:50 UTC (permalink / raw)
To: alsa-devel
Cc: arnd, tiwai, linux-kernel, Pierre-Louis Bossart, liam.r.girdwood,
vinod.koul, broonie, andriy.shevchenko, torvalds
PCI/ACPI selections should not happen in Kconfig for machine drivers,
move to SOC selections.
Add distinction between PCI and ACPI HiFi2 platforms and help text.
There should be no functionality change.
The PCI-based platforms may be removed at some point since Medfield
is not really supported by anyone, and with Edison now defunct support for
Merrifield/Edison is to be determined.
The dependency on SND_DMA_SGBUF for Haswell is not clear at this
point and may have to be further updated.
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
---
sound/soc/intel/Kconfig | 27 +++++++++++++++++++++++----
sound/soc/intel/boards/Kconfig | 14 ++++----------
2 files changed, 27 insertions(+), 14 deletions(-)
diff --git a/sound/soc/intel/Kconfig b/sound/soc/intel/Kconfig
index b827d3b70095..16374576cb6e 100644
--- a/sound/soc/intel/Kconfig
+++ b/sound/soc/intel/Kconfig
@@ -41,7 +41,7 @@ config SND_SOC_INTEL_SST_ACPI
config SND_SOC_INTEL_HASWELL
tristate "Intel ASoC SST driver for Haswell/Broadwell"
depends on SND_DMA_SGBUF
- depends on DMADEVICES
+ depends on DMADEVICES && ACPI
select SND_SOC_INTEL_SST
select SND_SOC_INTEL_SST_FIRMWARE
select SND_SOC_ACPI_INTEL_MATCH
@@ -52,7 +52,7 @@ config SND_SOC_INTEL_HASWELL
config SND_SOC_INTEL_BAYTRAIL
tristate "Intel ASoC SST driver for Baytrail (legacy)"
- depends on DMADEVICES
+ depends on DMADEVICES && ACPI
select SND_SOC_INTEL_SST
select SND_SOC_INTEL_SST_FIRMWARE
select SND_SOC_ACPI_INTEL_MATCH
@@ -62,11 +62,30 @@ config SND_SOC_INTEL_BAYTRAIL
for Baytrail Chromebooks but this option is now deprecated and is
not recommended, use SND_SST_ATOM_HIFI2_PLATFORM instead.
+config SND_SST_ATOM_HIFI2_PLATFORM_PCI
+ tristate "Intel ASoC SST driver for PCI HiFi2 platforms (Medfield, Merrifield)"
+ depends on X86 && PCI
+ select SND_SST_IPC_PCI
+ select SND_SOC_COMPRESS
+ select SND_SOC_INTEL_COMMON
+ help
+ If you have a Intel Medfield or Merrifield/Edison platform, then
+ enable this option by saying Y or m. Distros will typically not
+ enable this option: Medfield devices are not available to
+ developers and while Merrifield/Edison can run a mainline kernel with
+ limited functionality it will require a firmware file which
+ is not in the standard firmware tree
+
config SND_SST_ATOM_HIFI2_PLATFORM
- tristate "Intel ASoC SST driver for HiFi2 platforms (*field, *trail)"
- depends on X86
+ tristate "Intel ASoC SST driver for ACPI HiFi2 platforms (Baytrail, Cherrytrail)"
+ depends on X86 && ACPI
+ select SND_SST_IPC_ACPI
select SND_SOC_COMPRESS
select SND_SOC_ACPI_INTEL_MATCH
+ help
+ If you have a Intel Baytrail or Cherrytrail platform with an I2S
+ codec, then enable this option by saying Y or m. This is a
+ recommended option
config SND_SOC_INTEL_SKYLAKE
tristate "Intel ASoC SST driver for SKL/BXT/KBL/GLK/CNL"
diff --git a/sound/soc/intel/boards/Kconfig b/sound/soc/intel/boards/Kconfig
index 08481882c240..e926f9747232 100644
--- a/sound/soc/intel/boards/Kconfig
+++ b/sound/soc/intel/boards/Kconfig
@@ -12,18 +12,20 @@ menuconfig SND_SOC_INTEL_MACH
if SND_SOC_INTEL_MACH
+if SND_SST_ATOM_HIFI2_PLATFORM_PCI
+
config SND_MFLD_MACHINE
tristate "SOC Machine Audio driver for Intel Medfield MID platform"
depends on INTEL_SCU_IPC
select SND_SOC_SN95031
- depends on SND_SST_ATOM_HIFI2_PLATFORM
- select SND_SST_IPC_PCI
help
This adds support for ASoC machine driver for Intel(R) MID Medfield platform
used as alsa device in audio substem in Intel(R) MID devices
Say Y if you have such a device.
If unsure select "N".
+endif
+
if SND_SOC_INTEL_HASWELL
config SND_SOC_INTEL_HASWELL_MACH
@@ -86,7 +88,6 @@ config SND_SOC_INTEL_BYTCR_RT5640_MACH
tristate "ASoC Audio driver for Intel Baytrail and Baytrail-CR with RT5640 codec"
depends on X86 && I2C && ACPI
select SND_SOC_RT5640
- select SND_SST_IPC_ACPI
help
This adds support for ASoC machine driver for Intel(R) Baytrail and Baytrail-CR
platforms with RT5640 audio codec.
@@ -97,7 +98,6 @@ config SND_SOC_INTEL_BYTCR_RT5651_MACH
tristate "ASoC Audio driver for Intel Baytrail and Baytrail-CR with RT5651 codec"
depends on X86 && I2C && ACPI
select SND_SOC_RT5651
- select SND_SST_IPC_ACPI
help
This adds support for ASoC machine driver for Intel(R) Baytrail and Baytrail-CR
platforms with RT5651 audio codec.
@@ -108,7 +108,6 @@ config SND_SOC_INTEL_CHT_BSW_RT5672_MACH
tristate "ASoC Audio driver for Intel Cherrytrail & Braswell with RT5672 codec"
depends on X86_INTEL_LPSS && I2C && ACPI
select SND_SOC_RT5670
- select SND_SST_IPC_ACPI
help
This adds support for ASoC machine driver for Intel(R) Cherrytrail & Braswell
platforms with RT5672 audio codec.
@@ -119,7 +118,6 @@ config SND_SOC_INTEL_CHT_BSW_RT5645_MACH
tristate "ASoC Audio driver for Intel Cherrytrail & Braswell with RT5645/5650 codec"
depends on X86_INTEL_LPSS && I2C && ACPI
select SND_SOC_RT5645
- select SND_SST_IPC_ACPI
help
This adds support for ASoC machine driver for Intel(R) Cherrytrail & Braswell
platforms with RT5645/5650 audio codec.
@@ -131,7 +129,6 @@ config SND_SOC_INTEL_CHT_BSW_MAX98090_TI_MACH
depends on X86_INTEL_LPSS && I2C && ACPI
select SND_SOC_MAX98090
select SND_SOC_TS3A227E
- select SND_SST_IPC_ACPI
help
This adds support for ASoC machine driver for Intel(R) Cherrytrail & Braswell
platforms with MAX98090 audio codec it also can support TI jack chip as aux device.
@@ -142,7 +139,6 @@ config SND_SOC_INTEL_BYT_CHT_DA7213_MACH
tristate "ASoC Audio driver for Intel Baytrail & Cherrytrail with DA7212/7213 codec"
depends on X86_INTEL_LPSS && I2C && ACPI
select SND_SOC_DA7213
- select SND_SST_IPC_ACPI
help
This adds support for ASoC machine driver for Intel(R) Baytrail & CherryTrail
platforms with DA7212/7213 audio codec.
@@ -153,7 +149,6 @@ config SND_SOC_INTEL_BYT_CHT_ES8316_MACH
tristate "ASoC Audio driver for Intel Baytrail & Cherrytrail with ES8316 codec"
depends on X86_INTEL_LPSS && I2C && ACPI
select SND_SOC_ES8316
- select SND_SST_IPC_ACPI
help
This adds support for ASoC machine driver for Intel(R) Baytrail &
Cherrytrail platforms with ES8316 audio codec.
@@ -163,7 +158,6 @@ config SND_SOC_INTEL_BYT_CHT_ES8316_MACH
config SND_SOC_INTEL_BYT_CHT_NOCODEC_MACH
tristate "ASoC Audio driver for Intel Baytrail & Cherrytrail platform with no codec (MinnowBoard MAX, Up)"
depends on X86_INTEL_LPSS && I2C && ACPI
- select SND_SST_IPC_ACPI
help
This adds support for ASoC machine driver for the MinnowBoard Max or
Up boards and provides access to I2S signals on the Low-Speed
--
2.14.1
^ permalink raw reply related [flat|nested] 38+ messages in thread
* [PATCH v2 4/9] ASoC: Intel: document what Kconfig options do
2018-01-03 16:50 ` Pierre-Louis Bossart
@ 2018-01-03 16:50 ` Pierre-Louis Bossart
-1 siblings, 0 replies; 38+ messages in thread
From: Pierre-Louis Bossart @ 2018-01-03 16:50 UTC (permalink / raw)
To: alsa-devel
Cc: tiwai, broonie, torvalds, vinod.koul, liam.r.girdwood,
andriy.shevchenko, arnd, linux-kernel, Pierre-Louis Bossart
Document in comments what the options are supposed to mean, before
clean-up in next patch.
No functionality change here.
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
---
sound/soc/intel/Kconfig | 17 ++++++++++++++---
1 file changed, 14 insertions(+), 3 deletions(-)
diff --git a/sound/soc/intel/Kconfig b/sound/soc/intel/Kconfig
index 16374576cb6e..01b75df6b118 100644
--- a/sound/soc/intel/Kconfig
+++ b/sound/soc/intel/Kconfig
@@ -16,16 +16,27 @@ if SND_SOC_INTEL_SST_TOPLEVEL
config SND_SST_IPC
tristate
+ # This option controls the IPC core for HiFi2 platforms
config SND_SST_IPC_PCI
tristate
select SND_SST_IPC
+ # This option controls the PCI-based IPC for HiFi2 platforms
+ # (Medfield, Merrifield).
config SND_SST_IPC_ACPI
tristate
select SND_SST_IPC
select SND_SOC_INTEL_SST
select IOSF_MBI
+ # This option controls the ACPI-based IPC for HiFi2 platforms
+ # (Baytrail, Cherrytrail)
+
+config SND_SOC_INTEL_SST_ACPI
+ tristate
+ # This option controls ACPI-based probing on
+ # Haswell/Broadwell/Baytrail legacy and will be set
+ # when these platforms are enabled
config SND_SOC_INTEL_SST
tristate
@@ -34,9 +45,9 @@ config SND_SOC_INTEL_SST
config SND_SOC_INTEL_SST_FIRMWARE
tristate
select DW_DMAC_CORE
-
-config SND_SOC_INTEL_SST_ACPI
- tristate
+ # This option controls firmware download on
+ # Haswell/Broadwell/Baytrail legacy and will be set
+ # when these platforms are enabled
config SND_SOC_INTEL_HASWELL
tristate "Intel ASoC SST driver for Haswell/Broadwell"
--
2.14.1
^ permalink raw reply related [flat|nested] 38+ messages in thread
* [PATCH v2 4/9] ASoC: Intel: document what Kconfig options do
@ 2018-01-03 16:50 ` Pierre-Louis Bossart
0 siblings, 0 replies; 38+ messages in thread
From: Pierre-Louis Bossart @ 2018-01-03 16:50 UTC (permalink / raw)
To: alsa-devel
Cc: arnd, tiwai, linux-kernel, Pierre-Louis Bossart, liam.r.girdwood,
vinod.koul, broonie, andriy.shevchenko, torvalds
Document in comments what the options are supposed to mean, before
clean-up in next patch.
No functionality change here.
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
---
sound/soc/intel/Kconfig | 17 ++++++++++++++---
1 file changed, 14 insertions(+), 3 deletions(-)
diff --git a/sound/soc/intel/Kconfig b/sound/soc/intel/Kconfig
index 16374576cb6e..01b75df6b118 100644
--- a/sound/soc/intel/Kconfig
+++ b/sound/soc/intel/Kconfig
@@ -16,16 +16,27 @@ if SND_SOC_INTEL_SST_TOPLEVEL
config SND_SST_IPC
tristate
+ # This option controls the IPC core for HiFi2 platforms
config SND_SST_IPC_PCI
tristate
select SND_SST_IPC
+ # This option controls the PCI-based IPC for HiFi2 platforms
+ # (Medfield, Merrifield).
config SND_SST_IPC_ACPI
tristate
select SND_SST_IPC
select SND_SOC_INTEL_SST
select IOSF_MBI
+ # This option controls the ACPI-based IPC for HiFi2 platforms
+ # (Baytrail, Cherrytrail)
+
+config SND_SOC_INTEL_SST_ACPI
+ tristate
+ # This option controls ACPI-based probing on
+ # Haswell/Broadwell/Baytrail legacy and will be set
+ # when these platforms are enabled
config SND_SOC_INTEL_SST
tristate
@@ -34,9 +45,9 @@ config SND_SOC_INTEL_SST
config SND_SOC_INTEL_SST_FIRMWARE
tristate
select DW_DMAC_CORE
-
-config SND_SOC_INTEL_SST_ACPI
- tristate
+ # This option controls firmware download on
+ # Haswell/Broadwell/Baytrail legacy and will be set
+ # when these platforms are enabled
config SND_SOC_INTEL_HASWELL
tristate "Intel ASoC SST driver for Haswell/Broadwell"
--
2.14.1
^ permalink raw reply related [flat|nested] 38+ messages in thread
* [PATCH v2 5/9] ASoC: Intel: Fix nested/unnecessary Kconfig dependencies
2018-01-03 16:50 ` Pierre-Louis Bossart
@ 2018-01-03 16:50 ` Pierre-Louis Bossart
-1 siblings, 0 replies; 38+ messages in thread
From: Pierre-Louis Bossart @ 2018-01-03 16:50 UTC (permalink / raw)
To: alsa-devel
Cc: tiwai, broonie, torvalds, vinod.koul, liam.r.girdwood,
andriy.shevchenko, arnd, linux-kernel, Pierre-Louis Bossart
This patch fixes a number of issues:
1. IOSF_MBI is only needed for byt-cr detection, which is only supported
on Baytrail/Cherrytrail, move to HiFi2 config
2. SND_SOC_INTEL_SST should not select SND_SOC_INTEL_SST_ACPI, the latter
config is only valid for Haswell/Baytrail legacy but not needed by Skylake
3. SND_SST_IPC_ACPI, used only by the atom/sst driver, should not select
SND_SOC_INTEL_SST, none of the code under common/sst*.c is used
This nesting of configs really makes no sense, it's easier to maintain
if for each platform one can control what is strictly required.
Compiled-tested with each of Haswell, Baytrail legacy, HiFi2, SKL cases
selected independently. 0-day and explicit randconfig tests did not report
additional issues and no functionality loss was observed in Intel tests on
HIFI2 and SKYLAKE platforms
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
---
sound/soc/intel/Kconfig | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/sound/soc/intel/Kconfig b/sound/soc/intel/Kconfig
index 01b75df6b118..b75fa5f59b96 100644
--- a/sound/soc/intel/Kconfig
+++ b/sound/soc/intel/Kconfig
@@ -27,8 +27,6 @@ config SND_SST_IPC_PCI
config SND_SST_IPC_ACPI
tristate
select SND_SST_IPC
- select SND_SOC_INTEL_SST
- select IOSF_MBI
# This option controls the ACPI-based IPC for HiFi2 platforms
# (Baytrail, Cherrytrail)
@@ -40,7 +38,6 @@ config SND_SOC_INTEL_SST_ACPI
config SND_SOC_INTEL_SST
tristate
- select SND_SOC_INTEL_SST_ACPI if ACPI
config SND_SOC_INTEL_SST_FIRMWARE
tristate
@@ -54,6 +51,7 @@ config SND_SOC_INTEL_HASWELL
depends on SND_DMA_SGBUF
depends on DMADEVICES && ACPI
select SND_SOC_INTEL_SST
+ select SND_SOC_INTEL_SST_ACPI
select SND_SOC_INTEL_SST_FIRMWARE
select SND_SOC_ACPI_INTEL_MATCH
help
@@ -65,6 +63,7 @@ config SND_SOC_INTEL_BAYTRAIL
tristate "Intel ASoC SST driver for Baytrail (legacy)"
depends on DMADEVICES && ACPI
select SND_SOC_INTEL_SST
+ select SND_SOC_INTEL_SST_ACPI
select SND_SOC_INTEL_SST_FIRMWARE
select SND_SOC_ACPI_INTEL_MATCH
help
@@ -91,6 +90,7 @@ config SND_SST_ATOM_HIFI2_PLATFORM
tristate "Intel ASoC SST driver for ACPI HiFi2 platforms (Baytrail, Cherrytrail)"
depends on X86 && ACPI
select SND_SST_IPC_ACPI
+ select IOSF_MBI
select SND_SOC_COMPRESS
select SND_SOC_ACPI_INTEL_MATCH
help
--
2.14.1
^ permalink raw reply related [flat|nested] 38+ messages in thread
* [PATCH v2 5/9] ASoC: Intel: Fix nested/unnecessary Kconfig dependencies
@ 2018-01-03 16:50 ` Pierre-Louis Bossart
0 siblings, 0 replies; 38+ messages in thread
From: Pierre-Louis Bossart @ 2018-01-03 16:50 UTC (permalink / raw)
To: alsa-devel
Cc: arnd, tiwai, linux-kernel, Pierre-Louis Bossart, liam.r.girdwood,
vinod.koul, broonie, andriy.shevchenko, torvalds
This patch fixes a number of issues:
1. IOSF_MBI is only needed for byt-cr detection, which is only supported
on Baytrail/Cherrytrail, move to HiFi2 config
2. SND_SOC_INTEL_SST should not select SND_SOC_INTEL_SST_ACPI, the latter
config is only valid for Haswell/Baytrail legacy but not needed by Skylake
3. SND_SST_IPC_ACPI, used only by the atom/sst driver, should not select
SND_SOC_INTEL_SST, none of the code under common/sst*.c is used
This nesting of configs really makes no sense, it's easier to maintain
if for each platform one can control what is strictly required.
Compiled-tested with each of Haswell, Baytrail legacy, HiFi2, SKL cases
selected independently. 0-day and explicit randconfig tests did not report
additional issues and no functionality loss was observed in Intel tests on
HIFI2 and SKYLAKE platforms
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
---
sound/soc/intel/Kconfig | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/sound/soc/intel/Kconfig b/sound/soc/intel/Kconfig
index 01b75df6b118..b75fa5f59b96 100644
--- a/sound/soc/intel/Kconfig
+++ b/sound/soc/intel/Kconfig
@@ -27,8 +27,6 @@ config SND_SST_IPC_PCI
config SND_SST_IPC_ACPI
tristate
select SND_SST_IPC
- select SND_SOC_INTEL_SST
- select IOSF_MBI
# This option controls the ACPI-based IPC for HiFi2 platforms
# (Baytrail, Cherrytrail)
@@ -40,7 +38,6 @@ config SND_SOC_INTEL_SST_ACPI
config SND_SOC_INTEL_SST
tristate
- select SND_SOC_INTEL_SST_ACPI if ACPI
config SND_SOC_INTEL_SST_FIRMWARE
tristate
@@ -54,6 +51,7 @@ config SND_SOC_INTEL_HASWELL
depends on SND_DMA_SGBUF
depends on DMADEVICES && ACPI
select SND_SOC_INTEL_SST
+ select SND_SOC_INTEL_SST_ACPI
select SND_SOC_INTEL_SST_FIRMWARE
select SND_SOC_ACPI_INTEL_MATCH
help
@@ -65,6 +63,7 @@ config SND_SOC_INTEL_BAYTRAIL
tristate "Intel ASoC SST driver for Baytrail (legacy)"
depends on DMADEVICES && ACPI
select SND_SOC_INTEL_SST
+ select SND_SOC_INTEL_SST_ACPI
select SND_SOC_INTEL_SST_FIRMWARE
select SND_SOC_ACPI_INTEL_MATCH
help
@@ -91,6 +90,7 @@ config SND_SST_ATOM_HIFI2_PLATFORM
tristate "Intel ASoC SST driver for ACPI HiFi2 platforms (Baytrail, Cherrytrail)"
depends on X86 && ACPI
select SND_SST_IPC_ACPI
+ select IOSF_MBI
select SND_SOC_COMPRESS
select SND_SOC_ACPI_INTEL_MATCH
help
--
2.14.1
^ permalink raw reply related [flat|nested] 38+ messages in thread
* [PATCH v2 6/9] ASoC: Intel: boards: align Kconfig dependencies for Haswell/Broadwell
2018-01-03 16:50 ` Pierre-Louis Bossart
` (5 preceding siblings ...)
(?)
@ 2018-01-03 16:50 ` Pierre-Louis Bossart
-1 siblings, 0 replies; 38+ messages in thread
From: Pierre-Louis Bossart @ 2018-01-03 16:50 UTC (permalink / raw)
To: alsa-devel
Cc: tiwai, broonie, torvalds, vinod.koul, liam.r.girdwood,
andriy.shevchenko, arnd, linux-kernel, Pierre-Louis Bossart
Make sure that the same I2C/I2C_DESIGNWARE_PLATFORM are selected.
The latter might actually need to be moved to the SOC side of things,
it really has no place in a machine driver dependency
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
---
sound/soc/intel/boards/Kconfig | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sound/soc/intel/boards/Kconfig b/sound/soc/intel/boards/Kconfig
index e926f9747232..358f8f33adc4 100644
--- a/sound/soc/intel/boards/Kconfig
+++ b/sound/soc/intel/boards/Kconfig
@@ -40,7 +40,7 @@ config SND_SOC_INTEL_HASWELL_MACH
config SND_SOC_INTEL_BDW_RT5677_MACH
tristate "ASoC Audio driver for Intel Broadwell with RT5677 codec"
- depends on X86_INTEL_LPSS && GPIOLIB && I2C
+ depends on X86_INTEL_LPSS && I2C && I2C_DESIGNWARE_PLATFORM && GPIOLIB
select SND_SOC_RT5677
help
This adds support for Intel Broadwell platform based boards with
--
2.14.1
^ permalink raw reply related [flat|nested] 38+ messages in thread
* [PATCH v2 7/9] ASoC: Intel: boards: align Kconfig configurations for HiFi2
2018-01-03 16:50 ` Pierre-Louis Bossart
` (6 preceding siblings ...)
(?)
@ 2018-01-03 16:50 ` Pierre-Louis Bossart
2018-01-08 16:21 ` Mark Brown
-1 siblings, 1 reply; 38+ messages in thread
From: Pierre-Louis Bossart @ 2018-01-03 16:50 UTC (permalink / raw)
To: alsa-devel
Cc: tiwai, broonie, torvalds, vinod.koul, liam.r.girdwood,
andriy.shevchenko, arnd, linux-kernel, Pierre-Louis Bossart
Make sure all the configs are aligned
Also add the missing dependencies on SOC_ACPI stuff used to fix
DAI names based on HID and fix a couple of indentation issues
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
---
sound/soc/intel/boards/Kconfig | 33 +++++++++++++++++++--------------
1 file changed, 19 insertions(+), 14 deletions(-)
diff --git a/sound/soc/intel/boards/Kconfig b/sound/soc/intel/boards/Kconfig
index 358f8f33adc4..08c482cc02f7 100644
--- a/sound/soc/intel/boards/Kconfig
+++ b/sound/soc/intel/boards/Kconfig
@@ -85,29 +85,32 @@ endif
if SND_SST_ATOM_HIFI2_PLATFORM
config SND_SOC_INTEL_BYTCR_RT5640_MACH
- tristate "ASoC Audio driver for Intel Baytrail and Baytrail-CR with RT5640 codec"
- depends on X86 && I2C && ACPI
+ tristate "ASoC Audio driver for Intel Baytrail and Baytrail-CR with RT5640 codec"
+ depends on X86_INTEL_LPSS && I2C && ACPI
+ select SND_SOC_ACPI
select SND_SOC_RT5640
help
- This adds support for ASoC machine driver for Intel(R) Baytrail and Baytrail-CR
- platforms with RT5640 audio codec.
- Say Y or m if you have such a device. This is a recommended option.
- If unsure select "N".
+ This adds support for ASoC machine driver for Intel(R) Baytrail and Baytrail-CR
+ platforms with RT5640 audio codec.
+ Say Y or m if you have such a device. This is a recommended option.
+ If unsure select "N".
config SND_SOC_INTEL_BYTCR_RT5651_MACH
- tristate "ASoC Audio driver for Intel Baytrail and Baytrail-CR with RT5651 codec"
- depends on X86 && I2C && ACPI
+ tristate "ASoC Audio driver for Intel Baytrail and Baytrail-CR with RT5651 codec"
+ depends on X86_INTEL_LPSS && I2C && ACPI
+ select SND_SOC_ACPI
select SND_SOC_RT5651
help
- This adds support for ASoC machine driver for Intel(R) Baytrail and Baytrail-CR
- platforms with RT5651 audio codec.
- Say Y or m if you have such a device. This is a recommended option.
- If unsure select "N".
+ This adds support for ASoC machine driver for Intel(R) Baytrail and Baytrail-CR
+ platforms with RT5651 audio codec.
+ Say Y or m if you have such a device. This is a recommended option.
+ If unsure select "N".
config SND_SOC_INTEL_CHT_BSW_RT5672_MACH
- tristate "ASoC Audio driver for Intel Cherrytrail & Braswell with RT5672 codec"
+ tristate "ASoC Audio driver for Intel Cherrytrail & Braswell with RT5672 codec"
depends on X86_INTEL_LPSS && I2C && ACPI
- select SND_SOC_RT5670
+ select SND_SOC_ACPI
+ select SND_SOC_RT5670
help
This adds support for ASoC machine driver for Intel(R) Cherrytrail & Braswell
platforms with RT5672 audio codec.
@@ -117,6 +120,7 @@ config SND_SOC_INTEL_CHT_BSW_RT5672_MACH
config SND_SOC_INTEL_CHT_BSW_RT5645_MACH
tristate "ASoC Audio driver for Intel Cherrytrail & Braswell with RT5645/5650 codec"
depends on X86_INTEL_LPSS && I2C && ACPI
+ select SND_SOC_ACPI
select SND_SOC_RT5645
help
This adds support for ASoC machine driver for Intel(R) Cherrytrail & Braswell
@@ -138,6 +142,7 @@ config SND_SOC_INTEL_CHT_BSW_MAX98090_TI_MACH
config SND_SOC_INTEL_BYT_CHT_DA7213_MACH
tristate "ASoC Audio driver for Intel Baytrail & Cherrytrail with DA7212/7213 codec"
depends on X86_INTEL_LPSS && I2C && ACPI
+ select SND_SOC_ACPI
select SND_SOC_DA7213
help
This adds support for ASoC machine driver for Intel(R) Baytrail & CherryTrail
--
2.14.1
^ permalink raw reply related [flat|nested] 38+ messages in thread
* [PATCH v2 8/9] ASoC: Intel: boards: align/fix SKL/BXT/KBL Kconfigs
2018-01-03 16:50 ` Pierre-Louis Bossart
` (7 preceding siblings ...)
(?)
@ 2018-01-03 16:50 ` Pierre-Louis Bossart
2018-01-03 17:00 ` Andy Shevchenko
-1 siblings, 1 reply; 38+ messages in thread
From: Pierre-Louis Bossart @ 2018-01-03 16:50 UTC (permalink / raw)
To: alsa-devel
Cc: tiwai, broonie, torvalds, vinod.koul, liam.r.girdwood,
andriy.shevchenko, arnd, linux-kernel, Pierre-Louis Bossart
No reason why SND_SOC_INTEL_SST should be set here.
Also make sure same dependencies are used everywhere (only last one has SPI
in addition). Replace X86_INTEL_LPSS by MFD_INTEL_LPSS since the former
makes no sense for Skylake+ devices
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
---
sound/soc/intel/boards/Kconfig | 16 +++++++---------
1 file changed, 7 insertions(+), 9 deletions(-)
diff --git a/sound/soc/intel/boards/Kconfig b/sound/soc/intel/boards/Kconfig
index 08c482cc02f7..6a10df882a88 100644
--- a/sound/soc/intel/boards/Kconfig
+++ b/sound/soc/intel/boards/Kconfig
@@ -178,7 +178,7 @@ if SND_SOC_INTEL_SKYLAKE
config SND_SOC_INTEL_SKL_RT286_MACH
tristate "ASoC Audio driver for SKL with RT286 I2S mode"
- depends on X86 && ACPI && I2C
+ depends on MFD_INTEL_LPSS && I2C && ACPI
select SND_SOC_RT286
select SND_SOC_DMIC
select SND_SOC_HDAC_HDMI
@@ -190,7 +190,7 @@ config SND_SOC_INTEL_SKL_RT286_MACH
config SND_SOC_INTEL_SKL_NAU88L25_SSM4567_MACH
tristate "ASoC Audio driver for SKL with NAU88L25 and SSM4567 in I2S Mode"
- depends on X86_INTEL_LPSS && I2C
+ depends on MFD_INTEL_LPSS && I2C && ACPI
select SND_SOC_NAU8825
select SND_SOC_SSM4567
select SND_SOC_DMIC
@@ -203,7 +203,7 @@ config SND_SOC_INTEL_SKL_NAU88L25_SSM4567_MACH
config SND_SOC_INTEL_SKL_NAU88L25_MAX98357A_MACH
tristate "ASoC Audio driver for SKL with NAU88L25 and MAX98357A in I2S Mode"
- depends on X86_INTEL_LPSS && I2C
+ depends on MFD_INTEL_LPSS && I2C && ACPI
select SND_SOC_NAU8825
select SND_SOC_MAX98357A
select SND_SOC_DMIC
@@ -216,7 +216,7 @@ config SND_SOC_INTEL_SKL_NAU88L25_MAX98357A_MACH
config SND_SOC_INTEL_BXT_DA7219_MAX98357A_MACH
tristate "ASoC Audio driver for Broxton with DA7219 and MAX98357A in I2S Mode"
- depends on X86 && ACPI && I2C
+ depends on MFD_INTEL_LPSS && I2C && ACPI
select SND_SOC_DA7219
select SND_SOC_MAX98357A
select SND_SOC_DMIC
@@ -230,7 +230,7 @@ config SND_SOC_INTEL_BXT_DA7219_MAX98357A_MACH
config SND_SOC_INTEL_BXT_RT298_MACH
tristate "ASoC Audio driver for Broxton with RT298 I2S mode"
- depends on X86 && ACPI && I2C
+ depends on MFD_INTEL_LPSS && I2C && ACPI
select SND_SOC_RT298
select SND_SOC_DMIC
select SND_SOC_HDAC_HDMI
@@ -243,8 +243,7 @@ config SND_SOC_INTEL_BXT_RT298_MACH
config SND_SOC_INTEL_KBL_RT5663_MAX98927_MACH
tristate "ASoC Audio driver for KBL with RT5663 and MAX98927 in I2S Mode"
- depends on X86_INTEL_LPSS && I2C
- select SND_SOC_INTEL_SST
+ depends on MFD_INTEL_LPSS && I2C && ACPI
select SND_SOC_RT5663
select SND_SOC_MAX98927
select SND_SOC_DMIC
@@ -257,8 +256,7 @@ config SND_SOC_INTEL_KBL_RT5663_MAX98927_MACH
config SND_SOC_INTEL_KBL_RT5663_RT5514_MAX98927_MACH
tristate "ASoC Audio driver for KBL with RT5663, RT5514 and MAX98927 in I2S Mode"
- depends on X86_INTEL_LPSS && I2C && SPI
- select SND_SOC_INTEL_SST
+ depends on MFD_INTEL_LPSS && I2C && SPI && ACPI
select SND_SOC_RT5663
select SND_SOC_RT5514
select SND_SOC_RT5514_SPI
--
2.14.1
^ permalink raw reply related [flat|nested] 38+ messages in thread
* [PATCH v2 9/9] ASoC: Intel: kconfig: add some comments for if symbols
2018-01-03 16:50 ` Pierre-Louis Bossart
` (8 preceding siblings ...)
(?)
@ 2018-01-03 16:50 ` Pierre-Louis Bossart
2018-01-03 17:07 ` Andy Shevchenko
2018-01-03 19:25 ` Randy Dunlap
-1 siblings, 2 replies; 38+ messages in thread
From: Pierre-Louis Bossart @ 2018-01-03 16:50 UTC (permalink / raw)
To: alsa-devel
Cc: tiwai, broonie, torvalds, vinod.koul, liam.r.girdwood,
andriy.shevchenko, arnd, linux-kernel, Pierre-Louis Bossart
From: Vinod Koul <vinod.koul@intel.com>
Helps in finding if endings
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
---
sound/soc/intel/Kconfig | 10 ++++----
sound/soc/intel/boards/Kconfig | 52 +++++++++++++++++++++---------------------
2 files changed, 31 insertions(+), 31 deletions(-)
diff --git a/sound/soc/intel/Kconfig b/sound/soc/intel/Kconfig
index b75fa5f59b96..801b205662df 100644
--- a/sound/soc/intel/Kconfig
+++ b/sound/soc/intel/Kconfig
@@ -47,7 +47,7 @@ config SND_SOC_INTEL_SST_FIRMWARE
# when these platforms are enabled
config SND_SOC_INTEL_HASWELL
- tristate "Intel ASoC SST driver for Haswell/Broadwell"
+ tristate "Haswell/Broadwell Platforms"
depends on SND_DMA_SGBUF
depends on DMADEVICES && ACPI
select SND_SOC_INTEL_SST
@@ -60,7 +60,7 @@ config SND_SOC_INTEL_HASWELL
typically used for Chromebooks. This is a recommended option.
config SND_SOC_INTEL_BAYTRAIL
- tristate "Intel ASoC SST driver for Baytrail (legacy)"
+ tristate "Baytrail (legacy) Platforms"
depends on DMADEVICES && ACPI
select SND_SOC_INTEL_SST
select SND_SOC_INTEL_SST_ACPI
@@ -73,7 +73,7 @@ config SND_SOC_INTEL_BAYTRAIL
not recommended, use SND_SST_ATOM_HIFI2_PLATFORM instead.
config SND_SST_ATOM_HIFI2_PLATFORM_PCI
- tristate "Intel ASoC SST driver for PCI HiFi2 platforms (Medfield, Merrifield)"
+ tristate "PCI HiFi2 platforms (Medfield, Merrifield) platforms"
depends on X86 && PCI
select SND_SST_IPC_PCI
select SND_SOC_COMPRESS
@@ -87,7 +87,7 @@ config SND_SST_ATOM_HIFI2_PLATFORM_PCI
is not in the standard firmware tree
config SND_SST_ATOM_HIFI2_PLATFORM
- tristate "Intel ASoC SST driver for ACPI HiFi2 platforms (Baytrail, Cherrytrail)"
+ tristate "ACPI HiFi2 platforms (Baytrail, Cherrytrail) Platforms"
depends on X86 && ACPI
select SND_SST_IPC_ACPI
select IOSF_MBI
@@ -99,7 +99,7 @@ config SND_SST_ATOM_HIFI2_PLATFORM
recommended option
config SND_SOC_INTEL_SKYLAKE
- tristate "Intel ASoC SST driver for SKL/BXT/KBL/GLK/CNL"
+ tristate "SKL/BXT/KBL/GLK/CNL... Platforms"
depends on PCI && ACPI
select SND_HDA_EXT_CORE
select SND_HDA_DSP_LOADER
diff --git a/sound/soc/intel/boards/Kconfig b/sound/soc/intel/boards/Kconfig
index 6a10df882a88..89a73e3d9d2d 100644
--- a/sound/soc/intel/boards/Kconfig
+++ b/sound/soc/intel/boards/Kconfig
@@ -15,7 +15,7 @@ if SND_SOC_INTEL_MACH
if SND_SST_ATOM_HIFI2_PLATFORM_PCI
config SND_MFLD_MACHINE
- tristate "SOC Machine Audio driver for Intel Medfield MID platform"
+ tristate "Intel Medfield MID"
depends on INTEL_SCU_IPC
select SND_SOC_SN95031
help
@@ -24,12 +24,12 @@ config SND_MFLD_MACHINE
Say Y if you have such a device.
If unsure select "N".
-endif
+endif ## SND_SST_ATOM_HIFI2_PLATFORM_PCI
if SND_SOC_INTEL_HASWELL
config SND_SOC_INTEL_HASWELL_MACH
- tristate "ASoC Audio DSP support for Intel Haswell Lynxpoint"
+ tristate "Haswell Lynxpoint"
depends on X86_INTEL_LPSS && I2C && I2C_DESIGNWARE_PLATFORM
select SND_SOC_RT5640
help
@@ -39,7 +39,7 @@ config SND_SOC_INTEL_HASWELL_MACH
If unsure select "N".
config SND_SOC_INTEL_BDW_RT5677_MACH
- tristate "ASoC Audio driver for Intel Broadwell with RT5677 codec"
+ tristate "Broadwell with RT5677 codec"
depends on X86_INTEL_LPSS && I2C && I2C_DESIGNWARE_PLATFORM && GPIOLIB
select SND_SOC_RT5677
help
@@ -49,7 +49,7 @@ config SND_SOC_INTEL_BDW_RT5677_MACH
If unsure select "N".
config SND_SOC_INTEL_BROADWELL_MACH
- tristate "ASoC Audio DSP support for Intel Broadwell Wildcatpoint"
+ tristate "Intel Broadwell Wildcatpoint"
depends on X86_INTEL_LPSS && I2C && I2C_DESIGNWARE_PLATFORM
select SND_SOC_RT286
help
@@ -57,12 +57,12 @@ config SND_SOC_INTEL_BROADWELL_MACH
Ultrabook platforms.
Say Y or m if you have such a device. This is a recommended option.
If unsure select "N".
-endif
+endif ## SND_SOC_INTEL_HASWELL
if SND_SOC_INTEL_BAYTRAIL
config SND_SOC_INTEL_BYT_MAX98090_MACH
- tristate "ASoC Audio driver for Intel Baytrail with MAX98090 codec"
+ tristate "Baytrail with MAX98090 codec"
depends on X86_INTEL_LPSS && I2C
select SND_SOC_MAX98090
help
@@ -72,7 +72,7 @@ config SND_SOC_INTEL_BYT_MAX98090_MACH
functionality.
config SND_SOC_INTEL_BYT_RT5640_MACH
- tristate "ASoC Audio driver for Intel Baytrail with RT5640 codec"
+ tristate "Baytrail with RT5640 codec"
depends on X86_INTEL_LPSS && I2C
select SND_SOC_RT5640
help
@@ -80,12 +80,12 @@ config SND_SOC_INTEL_BYT_RT5640_MACH
with the RT5640 audio codec. This driver is deprecated, use
SND_SOC_INTEL_BYTCR_RT5640_MACH instead for better functionality.
-endif
+endif ## SND_SOC_INTEL_BAYTRAIL
if SND_SST_ATOM_HIFI2_PLATFORM
config SND_SOC_INTEL_BYTCR_RT5640_MACH
- tristate "ASoC Audio driver for Intel Baytrail and Baytrail-CR with RT5640 codec"
+ tristate "Baytrail and Baytrail-CR with RT5640 codec"
depends on X86_INTEL_LPSS && I2C && ACPI
select SND_SOC_ACPI
select SND_SOC_RT5640
@@ -96,7 +96,7 @@ config SND_SOC_INTEL_BYTCR_RT5640_MACH
If unsure select "N".
config SND_SOC_INTEL_BYTCR_RT5651_MACH
- tristate "ASoC Audio driver for Intel Baytrail and Baytrail-CR with RT5651 codec"
+ tristate "Baytrail and Baytrail-CR with RT5651 codec"
depends on X86_INTEL_LPSS && I2C && ACPI
select SND_SOC_ACPI
select SND_SOC_RT5651
@@ -107,7 +107,7 @@ config SND_SOC_INTEL_BYTCR_RT5651_MACH
If unsure select "N".
config SND_SOC_INTEL_CHT_BSW_RT5672_MACH
- tristate "ASoC Audio driver for Intel Cherrytrail & Braswell with RT5672 codec"
+ tristate "Cherrytrail & Braswell with RT5672 codec"
depends on X86_INTEL_LPSS && I2C && ACPI
select SND_SOC_ACPI
select SND_SOC_RT5670
@@ -118,7 +118,7 @@ config SND_SOC_INTEL_CHT_BSW_RT5672_MACH
If unsure select "N".
config SND_SOC_INTEL_CHT_BSW_RT5645_MACH
- tristate "ASoC Audio driver for Intel Cherrytrail & Braswell with RT5645/5650 codec"
+ tristate "Cherrytrail & Braswell with RT5645/5650 codec"
depends on X86_INTEL_LPSS && I2C && ACPI
select SND_SOC_ACPI
select SND_SOC_RT5645
@@ -129,7 +129,7 @@ config SND_SOC_INTEL_CHT_BSW_RT5645_MACH
If unsure select "N".
config SND_SOC_INTEL_CHT_BSW_MAX98090_TI_MACH
- tristate "ASoC Audio driver for Intel Cherrytrail & Braswell with MAX98090 & TI codec"
+ tristate "Cherrytrail & Braswell with MAX98090 & TI codec"
depends on X86_INTEL_LPSS && I2C && ACPI
select SND_SOC_MAX98090
select SND_SOC_TS3A227E
@@ -140,7 +140,7 @@ config SND_SOC_INTEL_CHT_BSW_MAX98090_TI_MACH
If unsure select "N".
config SND_SOC_INTEL_BYT_CHT_DA7213_MACH
- tristate "ASoC Audio driver for Intel Baytrail & Cherrytrail with DA7212/7213 codec"
+ tristate "Baytrail & Cherrytrail with DA7212/7213 codec"
depends on X86_INTEL_LPSS && I2C && ACPI
select SND_SOC_ACPI
select SND_SOC_DA7213
@@ -151,7 +151,7 @@ config SND_SOC_INTEL_BYT_CHT_DA7213_MACH
If unsure select "N".
config SND_SOC_INTEL_BYT_CHT_ES8316_MACH
- tristate "ASoC Audio driver for Intel Baytrail & Cherrytrail with ES8316 codec"
+ tristate "Baytrail & Cherrytrail with ES8316 codec"
depends on X86_INTEL_LPSS && I2C && ACPI
select SND_SOC_ES8316
help
@@ -161,7 +161,7 @@ config SND_SOC_INTEL_BYT_CHT_ES8316_MACH
If unsure select "N".
config SND_SOC_INTEL_BYT_CHT_NOCODEC_MACH
- tristate "ASoC Audio driver for Intel Baytrail & Cherrytrail platform with no codec (MinnowBoard MAX, Up)"
+ tristate "Baytrail & Cherrytrail platform with no codec (MinnowBoard MAX, Up)"
depends on X86_INTEL_LPSS && I2C && ACPI
help
This adds support for ASoC machine driver for the MinnowBoard Max or
@@ -172,12 +172,12 @@ config SND_SOC_INTEL_BYT_CHT_NOCODEC_MACH
If unsure select "N".
-endif
+endif ## SND_SST_ATOM_HIFI2_PLATFORM
if SND_SOC_INTEL_SKYLAKE
config SND_SOC_INTEL_SKL_RT286_MACH
- tristate "ASoC Audio driver for SKL with RT286 I2S mode"
+ tristate "SKL with RT286 I2S mode"
depends on MFD_INTEL_LPSS && I2C && ACPI
select SND_SOC_RT286
select SND_SOC_DMIC
@@ -189,7 +189,7 @@ config SND_SOC_INTEL_SKL_RT286_MACH
If unsure select "N".
config SND_SOC_INTEL_SKL_NAU88L25_SSM4567_MACH
- tristate "ASoC Audio driver for SKL with NAU88L25 and SSM4567 in I2S Mode"
+ tristate "SKL with NAU88L25 and SSM4567 in I2S Mode"
depends on MFD_INTEL_LPSS && I2C && ACPI
select SND_SOC_NAU8825
select SND_SOC_SSM4567
@@ -202,7 +202,7 @@ config SND_SOC_INTEL_SKL_NAU88L25_SSM4567_MACH
If unsure select "N".
config SND_SOC_INTEL_SKL_NAU88L25_MAX98357A_MACH
- tristate "ASoC Audio driver for SKL with NAU88L25 and MAX98357A in I2S Mode"
+ tristate "SKL with NAU88L25 and MAX98357A in I2S Mode"
depends on MFD_INTEL_LPSS && I2C && ACPI
select SND_SOC_NAU8825
select SND_SOC_MAX98357A
@@ -215,7 +215,7 @@ config SND_SOC_INTEL_SKL_NAU88L25_MAX98357A_MACH
If unsure select "N".
config SND_SOC_INTEL_BXT_DA7219_MAX98357A_MACH
- tristate "ASoC Audio driver for Broxton with DA7219 and MAX98357A in I2S Mode"
+ tristate "Broxton with DA7219 and MAX98357A in I2S Mode"
depends on MFD_INTEL_LPSS && I2C && ACPI
select SND_SOC_DA7219
select SND_SOC_MAX98357A
@@ -229,7 +229,7 @@ config SND_SOC_INTEL_BXT_DA7219_MAX98357A_MACH
If unsure select "N".
config SND_SOC_INTEL_BXT_RT298_MACH
- tristate "ASoC Audio driver for Broxton with RT298 I2S mode"
+ tristate "Broxton with RT298 I2S mode"
depends on MFD_INTEL_LPSS && I2C && ACPI
select SND_SOC_RT298
select SND_SOC_DMIC
@@ -242,7 +242,7 @@ config SND_SOC_INTEL_BXT_RT298_MACH
If unsure select "N".
config SND_SOC_INTEL_KBL_RT5663_MAX98927_MACH
- tristate "ASoC Audio driver for KBL with RT5663 and MAX98927 in I2S Mode"
+ tristate "KBL with RT5663 and MAX98927 in I2S Mode"
depends on MFD_INTEL_LPSS && I2C && ACPI
select SND_SOC_RT5663
select SND_SOC_MAX98927
@@ -255,7 +255,7 @@ config SND_SOC_INTEL_KBL_RT5663_MAX98927_MACH
If unsure select "N".
config SND_SOC_INTEL_KBL_RT5663_RT5514_MAX98927_MACH
- tristate "ASoC Audio driver for KBL with RT5663, RT5514 and MAX98927 in I2S Mode"
+ tristate "KBL with RT5663, RT5514 and MAX98927 in I2S Mode"
depends on MFD_INTEL_LPSS && I2C && SPI && ACPI
select SND_SOC_RT5663
select SND_SOC_RT5514
@@ -267,6 +267,6 @@ config SND_SOC_INTEL_KBL_RT5663_RT5514_MAX98927_MACH
create an alsa sound card for RT5663 + RT5514 + MAX98927.
Say Y or m if you have such a device. This is a recommended option.
If unsure select "N".
-endif
+endif ## SND_SOC_INTEL_SKYLAKE
endif ## SND_SOC_INTEL_MACH
--
2.14.1
^ permalink raw reply related [flat|nested] 38+ messages in thread
* Re: [PATCH v2 5/9] ASoC: Intel: Fix nested/unnecessary Kconfig dependencies
2018-01-03 16:50 ` Pierre-Louis Bossart
@ 2018-01-03 16:56 ` Andy Shevchenko
-1 siblings, 0 replies; 38+ messages in thread
From: Andy Shevchenko @ 2018-01-03 16:56 UTC (permalink / raw)
To: Pierre-Louis Bossart, alsa-devel
Cc: tiwai, broonie, torvalds, vinod.koul, liam.r.girdwood, arnd,
linux-kernel
On Wed, 2018-01-03 at 10:50 -0600, Pierre-Louis Bossart wrote:
>
> tristate "Intel ASoC SST driver for ACPI HiFi2 platforms
> (Baytrail, Cherrytrail)"
> depends on X86 && ACPI
> select SND_SST_IPC_ACPI
> + select IOSF_MBI
> select SND_SOC_COMPRESS
> select SND_SOC_ACPI_INTEL_MATCH
> help
A nitpick: perhaps not to split SND_* list of options and put IOSF_MBI
selection last?
--
Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Intel Finland Oy
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: [PATCH v2 5/9] ASoC: Intel: Fix nested/unnecessary Kconfig dependencies
@ 2018-01-03 16:56 ` Andy Shevchenko
0 siblings, 0 replies; 38+ messages in thread
From: Andy Shevchenko @ 2018-01-03 16:56 UTC (permalink / raw)
To: Pierre-Louis Bossart, alsa-devel
Cc: arnd, tiwai, linux-kernel, liam.r.girdwood, vinod.koul, broonie,
torvalds
On Wed, 2018-01-03 at 10:50 -0600, Pierre-Louis Bossart wrote:
>
> tristate "Intel ASoC SST driver for ACPI HiFi2 platforms
> (Baytrail, Cherrytrail)"
> depends on X86 && ACPI
> select SND_SST_IPC_ACPI
> + select IOSF_MBI
> select SND_SOC_COMPRESS
> select SND_SOC_ACPI_INTEL_MATCH
> help
A nitpick: perhaps not to split SND_* list of options and put IOSF_MBI
selection last?
--
Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Intel Finland Oy
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: [PATCH v2 8/9] ASoC: Intel: boards: align/fix SKL/BXT/KBL Kconfigs
2018-01-03 16:50 ` [PATCH v2 8/9] ASoC: Intel: boards: align/fix SKL/BXT/KBL Kconfigs Pierre-Louis Bossart
@ 2018-01-03 17:00 ` Andy Shevchenko
0 siblings, 0 replies; 38+ messages in thread
From: Andy Shevchenko @ 2018-01-03 17:00 UTC (permalink / raw)
To: Pierre-Louis Bossart, alsa-devel
Cc: tiwai, broonie, torvalds, vinod.koul, liam.r.girdwood, arnd,
linux-kernel
On Wed, 2018-01-03 at 10:50 -0600, Pierre-Louis Bossart wrote:
> Also make sure same dependencies are used everywhere (only last one
> has SPI
> in addition).
A nitpick:
> config SND_SOC_INTEL_KBL_RT5663_MAX98927_MACH
> tristate "ASoC Audio driver for KBL with RT5663 and MAX98927
> in I2S Mode"
> - depends on X86_INTEL_LPSS && I2C
> - select SND_SOC_INTEL_SST
> + depends on MFD_INTEL_LPSS && I2C && ACPI
> select SND_SOC_RT5663
> select SND_SOC_MAX98927
> select SND_SOC_DMIC
> @@ -257,8 +256,7 @@ config SND_SOC_INTEL_KBL_RT5663_MAX98927_MACH
>
> config SND_SOC_INTEL_KBL_RT5663_RT5514_MAX98927_MACH
> tristate "ASoC Audio driver for KBL with RT5663, RT5514 and
> MAX98927 in I2S Mode"
> - depends on X86_INTEL_LPSS && I2C && SPI
> - select SND_SOC_INTEL_SST
> + depends on MFD_INTEL_LPSS && I2C && SPI && ACPI
Perhaps to split
depends on SPI
to separate line to follow pattern with the rest ?
--
Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Intel Finland Oy
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: [PATCH v2 8/9] ASoC: Intel: boards: align/fix SKL/BXT/KBL Kconfigs
@ 2018-01-03 17:00 ` Andy Shevchenko
0 siblings, 0 replies; 38+ messages in thread
From: Andy Shevchenko @ 2018-01-03 17:00 UTC (permalink / raw)
To: Pierre-Louis Bossart, alsa-devel
Cc: arnd, tiwai, linux-kernel, liam.r.girdwood, vinod.koul, broonie,
torvalds
On Wed, 2018-01-03 at 10:50 -0600, Pierre-Louis Bossart wrote:
> Also make sure same dependencies are used everywhere (only last one
> has SPI
> in addition).
A nitpick:
> config SND_SOC_INTEL_KBL_RT5663_MAX98927_MACH
> tristate "ASoC Audio driver for KBL with RT5663 and MAX98927
> in I2S Mode"
> - depends on X86_INTEL_LPSS && I2C
> - select SND_SOC_INTEL_SST
> + depends on MFD_INTEL_LPSS && I2C && ACPI
> select SND_SOC_RT5663
> select SND_SOC_MAX98927
> select SND_SOC_DMIC
> @@ -257,8 +256,7 @@ config SND_SOC_INTEL_KBL_RT5663_MAX98927_MACH
>
> config SND_SOC_INTEL_KBL_RT5663_RT5514_MAX98927_MACH
> tristate "ASoC Audio driver for KBL with RT5663, RT5514 and
> MAX98927 in I2S Mode"
> - depends on X86_INTEL_LPSS && I2C && SPI
> - select SND_SOC_INTEL_SST
> + depends on MFD_INTEL_LPSS && I2C && SPI && ACPI
Perhaps to split
depends on SPI
to separate line to follow pattern with the rest ?
--
Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Intel Finland Oy
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: [PATCH v2 9/9] ASoC: Intel: kconfig: add some comments for if symbols
2018-01-03 16:50 ` [PATCH v2 9/9] ASoC: Intel: kconfig: add some comments for if symbols Pierre-Louis Bossart
@ 2018-01-03 17:07 ` Andy Shevchenko
2018-01-03 19:25 ` Randy Dunlap
1 sibling, 0 replies; 38+ messages in thread
From: Andy Shevchenko @ 2018-01-03 17:07 UTC (permalink / raw)
To: Pierre-Louis Bossart, alsa-devel
Cc: tiwai, broonie, torvalds, vinod.koul, liam.r.girdwood, arnd,
linux-kernel
On Wed, 2018-01-03 at 10:50 -0600, Pierre-Louis Bossart wrote:
> From: Vinod Koul <vinod.koul@intel.com>
>
> Helps in finding if endings
Seems some (all?) comments not been addressed.
See below.
> config SND_SOC_INTEL_BAYTRAIL
> - tristate "Intel ASoC SST driver for Baytrail (legacy)"
> + tristate "Baytrail (legacy) Platforms"
> depends on DMADEVICES && ACPI
> select SND_SOC_INTEL_SST
> select SND_SOC_INTEL_SST_ACPI
> @@ -73,7 +73,7 @@ config SND_SOC_INTEL_BAYTRAIL
> not recommended, use SND_SST_ATOM_HIFI2_PLATFORM instead.
>
> config SND_SST_ATOM_HIFI2_PLATFORM_PCI
> - tristate "Intel ASoC SST driver for PCI HiFi2 platforms
> (Medfield, Merrifield)"
> + tristate "PCI HiFi2 platforms (Medfield, Merrifield)
> platforms"
platforms ... platforms.
Moreover, perhaps use above pattern "... Platforms" ?
> depends on X86 && PCI
> select SND_SST_IPC_PCI
> select SND_SOC_COMPRESS
> @@ -87,7 +87,7 @@ config SND_SST_ATOM_HIFI2_PLATFORM_PCI
> is not in the standard firmware tree
>
> config SND_SST_ATOM_HIFI2_PLATFORM
> - tristate "Intel ASoC SST driver for ACPI HiFi2 platforms
> (Baytrail, Cherrytrail)"
> + tristate "ACPI HiFi2 platforms (Baytrail, Cherrytrail)
> Platforms"
Ditto.
> config SND_MFLD_MACHINE
> - tristate "SOC Machine Audio driver for Intel Medfield MID
> platform"
> + tristate "Intel Medfield MID"
Perhaps "Medfield (Intel MID)" ?
At least it looks to me more consistent with the rest.
> config SND_SOC_INTEL_HASWELL_MACH
> - tristate "ASoC Audio DSP support for Intel Haswell Lynxpoint"
> + tristate "Haswell Lynxpoint"
> depends on X86_INTEL_LPSS && I2C && I2C_DESIGNWARE_PLATFORM
> select SND_SOC_RT5640
> help
> config SND_SOC_INTEL_BROADWELL_MACH
> - tristate "ASoC Audio DSP support for Intel Broadwell
> Wildcatpoint"
> + tristate "Intel Broadwell Wildcatpoint"
Drop Intel.
--
Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Intel Finland Oy
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: [PATCH v2 0/9] ASoC: Intel: Kconfig+acpi fixes
2018-01-03 16:50 ` Pierre-Louis Bossart
` (9 preceding siblings ...)
(?)
@ 2018-01-03 17:09 ` Andy Shevchenko
2018-01-03 18:52 ` Pierre-Louis Bossart
-1 siblings, 1 reply; 38+ messages in thread
From: Andy Shevchenko @ 2018-01-03 17:09 UTC (permalink / raw)
To: Pierre-Louis Bossart, alsa-devel
Cc: tiwai, broonie, torvalds, vinod.koul, liam.r.girdwood, arnd,
linux-kernel
On Wed, 2018-01-03 at 10:50 -0600, Pierre-Louis Bossart wrote:
> The first patch solves issues reported by 0day with non-ACPI platforms
>
> The second patch implements what Linus, Takashi and Mark
> requested: a top-level selector defaulting to 'y' to easily filter all
> other options and with no impact on code generation. There should be
> no
> functionality change and will avoid breaking audio for people using
> make oldnoconfig.
>
> The rest of the patch series does a more in-depth cleanup. It was
> tested
> on Baytrail/Cherrytrail/Skylake platforms with no regressions
> observed and no reports of any compilation issues with 0-day or
> randconfig.
>
> The 5th patch is really the most important one, there were nested
> configs which made no sense to me. I don't know the history which led
> to such complicated stuff but simpler is better.
>
> Patches 6..7 are just clean-ups of the machine driver configs,
> for some reason there is no consistency in the settings so I tried to
> apply common sense and use the same rules. At Andy Shevchenko's
> suggestion,
> I also replaced the broken dependency on X86_INTEL_LPSS by
> MFD_INTEL_LPSS
> for Skylake+ machines. No regressions were identified with this
> change.
>
> Patch 9 is new in this series and are just cosmetic changes (comments
> and text simplification).
>
> Thanks to Vinod Koul for his contributions and comments.
Couple of nitpicks and seems patch 9 missed some (all?) comments to be
addressed.
So, after fixing them:
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
>
> Changes since v1:
> fixed more 0-day warnings for e.g. s390 non-ACPI compilation
> fixed use of depends
> fixed use of CONFIG_
> fixed indentations as needed
> simplified text and comments
>
> Changes since RFCv2:
> Moved machine drivers to submenu
> Dropped SND_SOC_INTEL_COMMON since it was not needed
> Added more comments for if/endif
> Simplified text for options (dropped "ASoC Intel driver....")
> Fixed one 0-day warning
>
> Changes since initial RFC:
> Removed default n
> Added help text for HASWELL, BAYTRAIL (legacy) and SKYLAKE options
> Made top level machine driver selection dependent on
> INTEL_SST_TOPLEVEL.
> Added help text for PCI and HIFI2 platforms
> Replaced X86_INTEL_LPSS by MFD_INTEL_LPSS for Skylake+ devices
> Fixed a couple of indentation issues
>
> Pierre-Louis Bossart (8):
> ASoC: acpi: add missing includes for non-ACPI platforms
> ASoC: Intel: Fix Kconfig with top-level selector
> ASoC: Intel: Kconfig: Simplify-clarify ACPI/PCI dependencies
> ASoC: Intel: document what Kconfig options do
> ASoC: Intel: Fix nested/unnecessary Kconfig dependencies
> ASoC: Intel: boards: align Kconfig dependencies for
> Haswell/Broadwell
> ASoC: Intel: boards: align Kconfig configurations for HiFi2
> ASoC: Intel: boards: align/fix SKL/BXT/KBL Kconfigs
>
> Vinod Koul (1):
> ASoC: Intel: kconfig: add some comments for if symbols
>
> include/sound/soc-acpi-intel-match.h | 1 +
> include/sound/soc-acpi.h | 1 +
> sound/soc/intel/Kconfig | 116 +++++++++++++++------
> sound/soc/intel/Makefile | 2 +-
> sound/soc/intel/boards/Kconfig | 191 ++++++++++++++++++------
> -----------
> 5 files changed, 186 insertions(+), 125 deletions(-)
>
--
Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Intel Finland Oy
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: [PATCH v2 5/9] ASoC: Intel: Fix nested/unnecessary Kconfig dependencies
2018-01-03 16:50 ` Pierre-Louis Bossart
(?)
(?)
@ 2018-01-03 18:09 ` Andy Shevchenko
-1 siblings, 0 replies; 38+ messages in thread
From: Andy Shevchenko @ 2018-01-03 18:09 UTC (permalink / raw)
To: Pierre-Louis Bossart, alsa-devel
Cc: tiwai, broonie, torvalds, vinod.koul, liam.r.girdwood, arnd,
linux-kernel
On Wed, 2018-01-03 at 10:50 -0600, Pierre-Louis Bossart wrote:
> This patch fixes a number of issues:
> 1. IOSF_MBI is only needed for byt-cr detection, which is only
> supported
> on Baytrail/Cherrytrail, move to HiFi2 config
>
> tristate "Intel ASoC SST driver for ACPI HiFi2 platforms
> (Baytrail, Cherrytrail)"
> depends on X86 && ACPI
> select SND_SST_IPC_ACPI
> + select IOSF_MBI
> select SND_SOC_COMPRESS
> select SND_SOC_ACPI_INTEL_MATCH
> help
A nitpick: Perhaps not to split SND_* options and thus put IOSF_MBI as
last one in the list?
--
Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Intel Finland Oy
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: [PATCH v2 0/9] ASoC: Intel: Kconfig+acpi fixes
2018-01-03 17:09 ` [PATCH v2 0/9] ASoC: Intel: Kconfig+acpi fixes Andy Shevchenko
@ 2018-01-03 18:52 ` Pierre-Louis Bossart
0 siblings, 0 replies; 38+ messages in thread
From: Pierre-Louis Bossart @ 2018-01-03 18:52 UTC (permalink / raw)
To: Andy Shevchenko, alsa-devel
Cc: tiwai, broonie, torvalds, vinod.koul, liam.r.girdwood, arnd,
linux-kernel
On 01/03/2018 11:09 AM, Andy Shevchenko wrote:
> On Wed, 2018-01-03 at 10:50 -0600, Pierre-Louis Bossart wrote:
>> The first patch solves issues reported by 0day with non-ACPI platforms
>>
>> The second patch implements what Linus, Takashi and Mark
>> requested: a top-level selector defaulting to 'y' to easily filter all
>> other options and with no impact on code generation. There should be
>> no
>> functionality change and will avoid breaking audio for people using
>> make oldnoconfig.
>>
>> The rest of the patch series does a more in-depth cleanup. It was
>> tested
>> on Baytrail/Cherrytrail/Skylake platforms with no regressions
>> observed and no reports of any compilation issues with 0-day or
>> randconfig.
>>
>> The 5th patch is really the most important one, there were nested
>> configs which made no sense to me. I don't know the history which led
>> to such complicated stuff but simpler is better.
>>
>> Patches 6..7 are just clean-ups of the machine driver configs,
>> for some reason there is no consistency in the settings so I tried to
>> apply common sense and use the same rules. At Andy Shevchenko's
>> suggestion,
>> I also replaced the broken dependency on X86_INTEL_LPSS by
>> MFD_INTEL_LPSS
>> for Skylake+ machines. No regressions were identified with this
>> change.
>>
>> Patch 9 is new in this series and are just cosmetic changes (comments
>> and text simplification).
>>
>> Thanks to Vinod Koul for his contributions and comments.
> Couple of nitpicks and seems patch 9 missed some (all?) comments to be
> addressed.
>
> So, after fixing them:
>
> Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Thanks Andy for the quick review. the last patch is new and indeed could
be cleaned-up further, will send a v3.
>
>> Changes since v1:
>> fixed more 0-day warnings for e.g. s390 non-ACPI compilation
>> fixed use of depends
>> fixed use of CONFIG_
>> fixed indentations as needed
>> simplified text and comments
>>
>> Changes since RFCv2:
>> Moved machine drivers to submenu
>> Dropped SND_SOC_INTEL_COMMON since it was not needed
>> Added more comments for if/endif
>> Simplified text for options (dropped "ASoC Intel driver....")
>> Fixed one 0-day warning
>>
>> Changes since initial RFC:
>> Removed default n
>> Added help text for HASWELL, BAYTRAIL (legacy) and SKYLAKE options
>> Made top level machine driver selection dependent on
>> INTEL_SST_TOPLEVEL.
>> Added help text for PCI and HIFI2 platforms
>> Replaced X86_INTEL_LPSS by MFD_INTEL_LPSS for Skylake+ devices
>> Fixed a couple of indentation issues
>>
>> Pierre-Louis Bossart (8):
>> ASoC: acpi: add missing includes for non-ACPI platforms
>> ASoC: Intel: Fix Kconfig with top-level selector
>> ASoC: Intel: Kconfig: Simplify-clarify ACPI/PCI dependencies
>> ASoC: Intel: document what Kconfig options do
>> ASoC: Intel: Fix nested/unnecessary Kconfig dependencies
>> ASoC: Intel: boards: align Kconfig dependencies for
>> Haswell/Broadwell
>> ASoC: Intel: boards: align Kconfig configurations for HiFi2
>> ASoC: Intel: boards: align/fix SKL/BXT/KBL Kconfigs
>>
>> Vinod Koul (1):
>> ASoC: Intel: kconfig: add some comments for if symbols
>>
>> include/sound/soc-acpi-intel-match.h | 1 +
>> include/sound/soc-acpi.h | 1 +
>> sound/soc/intel/Kconfig | 116 +++++++++++++++------
>> sound/soc/intel/Makefile | 2 +-
>> sound/soc/intel/boards/Kconfig | 191 ++++++++++++++++++------
>> -----------
>> 5 files changed, 186 insertions(+), 125 deletions(-)
>>
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: [PATCH v2 0/9] ASoC: Intel: Kconfig+acpi fixes
@ 2018-01-03 18:52 ` Pierre-Louis Bossart
0 siblings, 0 replies; 38+ messages in thread
From: Pierre-Louis Bossart @ 2018-01-03 18:52 UTC (permalink / raw)
To: Andy Shevchenko, alsa-devel
Cc: arnd, tiwai, linux-kernel, liam.r.girdwood, vinod.koul, broonie,
torvalds
On 01/03/2018 11:09 AM, Andy Shevchenko wrote:
> On Wed, 2018-01-03 at 10:50 -0600, Pierre-Louis Bossart wrote:
>> The first patch solves issues reported by 0day with non-ACPI platforms
>>
>> The second patch implements what Linus, Takashi and Mark
>> requested: a top-level selector defaulting to 'y' to easily filter all
>> other options and with no impact on code generation. There should be
>> no
>> functionality change and will avoid breaking audio for people using
>> make oldnoconfig.
>>
>> The rest of the patch series does a more in-depth cleanup. It was
>> tested
>> on Baytrail/Cherrytrail/Skylake platforms with no regressions
>> observed and no reports of any compilation issues with 0-day or
>> randconfig.
>>
>> The 5th patch is really the most important one, there were nested
>> configs which made no sense to me. I don't know the history which led
>> to such complicated stuff but simpler is better.
>>
>> Patches 6..7 are just clean-ups of the machine driver configs,
>> for some reason there is no consistency in the settings so I tried to
>> apply common sense and use the same rules. At Andy Shevchenko's
>> suggestion,
>> I also replaced the broken dependency on X86_INTEL_LPSS by
>> MFD_INTEL_LPSS
>> for Skylake+ machines. No regressions were identified with this
>> change.
>>
>> Patch 9 is new in this series and are just cosmetic changes (comments
>> and text simplification).
>>
>> Thanks to Vinod Koul for his contributions and comments.
> Couple of nitpicks and seems patch 9 missed some (all?) comments to be
> addressed.
>
> So, after fixing them:
>
> Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Thanks Andy for the quick review. the last patch is new and indeed could
be cleaned-up further, will send a v3.
>
>> Changes since v1:
>> fixed more 0-day warnings for e.g. s390 non-ACPI compilation
>> fixed use of depends
>> fixed use of CONFIG_
>> fixed indentations as needed
>> simplified text and comments
>>
>> Changes since RFCv2:
>> Moved machine drivers to submenu
>> Dropped SND_SOC_INTEL_COMMON since it was not needed
>> Added more comments for if/endif
>> Simplified text for options (dropped "ASoC Intel driver....")
>> Fixed one 0-day warning
>>
>> Changes since initial RFC:
>> Removed default n
>> Added help text for HASWELL, BAYTRAIL (legacy) and SKYLAKE options
>> Made top level machine driver selection dependent on
>> INTEL_SST_TOPLEVEL.
>> Added help text for PCI and HIFI2 platforms
>> Replaced X86_INTEL_LPSS by MFD_INTEL_LPSS for Skylake+ devices
>> Fixed a couple of indentation issues
>>
>> Pierre-Louis Bossart (8):
>> ASoC: acpi: add missing includes for non-ACPI platforms
>> ASoC: Intel: Fix Kconfig with top-level selector
>> ASoC: Intel: Kconfig: Simplify-clarify ACPI/PCI dependencies
>> ASoC: Intel: document what Kconfig options do
>> ASoC: Intel: Fix nested/unnecessary Kconfig dependencies
>> ASoC: Intel: boards: align Kconfig dependencies for
>> Haswell/Broadwell
>> ASoC: Intel: boards: align Kconfig configurations for HiFi2
>> ASoC: Intel: boards: align/fix SKL/BXT/KBL Kconfigs
>>
>> Vinod Koul (1):
>> ASoC: Intel: kconfig: add some comments for if symbols
>>
>> include/sound/soc-acpi-intel-match.h | 1 +
>> include/sound/soc-acpi.h | 1 +
>> sound/soc/intel/Kconfig | 116 +++++++++++++++------
>> sound/soc/intel/Makefile | 2 +-
>> sound/soc/intel/boards/Kconfig | 191 ++++++++++++++++++------
>> -----------
>> 5 files changed, 186 insertions(+), 125 deletions(-)
>>
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: [PATCH v2 0/9] ASoC: Intel: Kconfig+acpi fixes
2018-01-03 18:52 ` Pierre-Louis Bossart
(?)
@ 2018-01-03 19:10 ` Andy Shevchenko
-1 siblings, 0 replies; 38+ messages in thread
From: Andy Shevchenko @ 2018-01-03 19:10 UTC (permalink / raw)
To: Pierre-Louis Bossart, alsa-devel
Cc: tiwai, broonie, torvalds, vinod.koul, liam.r.girdwood, arnd,
linux-kernel
On Wed, 2018-01-03 at 12:52 -0600, Pierre-Louis Bossart wrote:
>
> On 01/03/2018 11:09 AM, Andy Shevchenko wrote:
> > On Wed, 2018-01-03 at 10:50 -0600, Pierre-Louis Bossart wrote:
> > Couple of nitpicks and seems patch 9 missed some (all?) comments to
> > be
> > addressed.
> >
> > So, after fixing them:
> >
> > Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
>
> Thanks Andy for the quick review. the last patch is new and indeed
> could
> be cleaned-up further, will send a v3.
You are welcome!
It wasn't quick if you sum all time spend to review previous iterations.
--
Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Intel Finland Oy
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: [PATCH v2 9/9] ASoC: Intel: kconfig: add some comments for if symbols
2018-01-03 16:50 ` [PATCH v2 9/9] ASoC: Intel: kconfig: add some comments for if symbols Pierre-Louis Bossart
@ 2018-01-03 19:25 ` Randy Dunlap
2018-01-03 19:25 ` Randy Dunlap
1 sibling, 0 replies; 38+ messages in thread
From: Randy Dunlap @ 2018-01-03 19:25 UTC (permalink / raw)
To: Pierre-Louis Bossart, alsa-devel
Cc: tiwai, broonie, torvalds, vinod.koul, liam.r.girdwood,
andriy.shevchenko, arnd, linux-kernel
On 01/03/2018 08:50 AM, Pierre-Louis Bossart wrote:
> From: Vinod Koul <vinod.koul@intel.com>
>
> Helps in finding if endings
That partial sentence is confusing. I couldn't decode it without
reading the entire patch. That shouldn't be necessary.
How about:
Help in finding (matching) if/endif pairs.
or
Help in finding matching "if" endings by commenting the "endif".
>
> Signed-off-by: Vinod Koul <vinod.koul@intel.com>
> Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
> ---
> sound/soc/intel/Kconfig | 10 ++++----
> sound/soc/intel/boards/Kconfig | 52 +++++++++++++++++++++---------------------
> 2 files changed, 31 insertions(+), 31 deletions(-)
>
> diff --git a/sound/soc/intel/Kconfig b/sound/soc/intel/Kconfig
> index b75fa5f59b96..801b205662df 100644
> --- a/sound/soc/intel/Kconfig
> +++ b/sound/soc/intel/Kconfig
> @@ -47,7 +47,7 @@ config SND_SOC_INTEL_SST_FIRMWARE
> # when these platforms are enabled
>
> config SND_SOC_INTEL_HASWELL
> - tristate "Intel ASoC SST driver for Haswell/Broadwell"
> + tristate "Haswell/Broadwell Platforms"
> depends on SND_DMA_SGBUF
> depends on DMADEVICES && ACPI
> select SND_SOC_INTEL_SST
> @@ -60,7 +60,7 @@ config SND_SOC_INTEL_HASWELL
> typically used for Chromebooks. This is a recommended option.
>
> config SND_SOC_INTEL_BAYTRAIL
> - tristate "Intel ASoC SST driver for Baytrail (legacy)"
> + tristate "Baytrail (legacy) Platforms"
> depends on DMADEVICES && ACPI
> select SND_SOC_INTEL_SST
> select SND_SOC_INTEL_SST_ACPI
> @@ -73,7 +73,7 @@ config SND_SOC_INTEL_BAYTRAIL
> not recommended, use SND_SST_ATOM_HIFI2_PLATFORM instead.
>
> config SND_SST_ATOM_HIFI2_PLATFORM_PCI
> - tristate "Intel ASoC SST driver for PCI HiFi2 platforms (Medfield, Merrifield)"
> + tristate "PCI HiFi2 platforms (Medfield, Merrifield) platforms"
> depends on X86 && PCI
> select SND_SST_IPC_PCI
> select SND_SOC_COMPRESS
> @@ -87,7 +87,7 @@ config SND_SST_ATOM_HIFI2_PLATFORM_PCI
> is not in the standard firmware tree
>
> config SND_SST_ATOM_HIFI2_PLATFORM
> - tristate "Intel ASoC SST driver for ACPI HiFi2 platforms (Baytrail, Cherrytrail)"
> + tristate "ACPI HiFi2 platforms (Baytrail, Cherrytrail) Platforms"
> depends on X86 && ACPI
> select SND_SST_IPC_ACPI
> select IOSF_MBI
> @@ -99,7 +99,7 @@ config SND_SST_ATOM_HIFI2_PLATFORM
> recommended option
>
> config SND_SOC_INTEL_SKYLAKE
> - tristate "Intel ASoC SST driver for SKL/BXT/KBL/GLK/CNL"
> + tristate "SKL/BXT/KBL/GLK/CNL... Platforms"
> depends on PCI && ACPI
> select SND_HDA_EXT_CORE
> select SND_HDA_DSP_LOADER
> diff --git a/sound/soc/intel/boards/Kconfig b/sound/soc/intel/boards/Kconfig
> index 6a10df882a88..89a73e3d9d2d 100644
> --- a/sound/soc/intel/boards/Kconfig
> +++ b/sound/soc/intel/boards/Kconfig
> @@ -15,7 +15,7 @@ if SND_SOC_INTEL_MACH
> if SND_SST_ATOM_HIFI2_PLATFORM_PCI
>
> config SND_MFLD_MACHINE
> - tristate "SOC Machine Audio driver for Intel Medfield MID platform"
> + tristate "Intel Medfield MID"
> depends on INTEL_SCU_IPC
> select SND_SOC_SN95031
> help
> @@ -24,12 +24,12 @@ config SND_MFLD_MACHINE
> Say Y if you have such a device.
> If unsure select "N".
>
> -endif
> +endif ## SND_SST_ATOM_HIFI2_PLATFORM_PCI
>
> if SND_SOC_INTEL_HASWELL
>
> config SND_SOC_INTEL_HASWELL_MACH
> - tristate "ASoC Audio DSP support for Intel Haswell Lynxpoint"
> + tristate "Haswell Lynxpoint"
> depends on X86_INTEL_LPSS && I2C && I2C_DESIGNWARE_PLATFORM
> select SND_SOC_RT5640
> help
> @@ -39,7 +39,7 @@ config SND_SOC_INTEL_HASWELL_MACH
> If unsure select "N".
>
> config SND_SOC_INTEL_BDW_RT5677_MACH
> - tristate "ASoC Audio driver for Intel Broadwell with RT5677 codec"
> + tristate "Broadwell with RT5677 codec"
> depends on X86_INTEL_LPSS && I2C && I2C_DESIGNWARE_PLATFORM && GPIOLIB
> select SND_SOC_RT5677
> help
> @@ -49,7 +49,7 @@ config SND_SOC_INTEL_BDW_RT5677_MACH
> If unsure select "N".
>
> config SND_SOC_INTEL_BROADWELL_MACH
> - tristate "ASoC Audio DSP support for Intel Broadwell Wildcatpoint"
> + tristate "Intel Broadwell Wildcatpoint"
> depends on X86_INTEL_LPSS && I2C && I2C_DESIGNWARE_PLATFORM
> select SND_SOC_RT286
> help
> @@ -57,12 +57,12 @@ config SND_SOC_INTEL_BROADWELL_MACH
> Ultrabook platforms.
> Say Y or m if you have such a device. This is a recommended option.
> If unsure select "N".
> -endif
> +endif ## SND_SOC_INTEL_HASWELL
>
> if SND_SOC_INTEL_BAYTRAIL
>
> config SND_SOC_INTEL_BYT_MAX98090_MACH
> - tristate "ASoC Audio driver for Intel Baytrail with MAX98090 codec"
> + tristate "Baytrail with MAX98090 codec"
> depends on X86_INTEL_LPSS && I2C
> select SND_SOC_MAX98090
> help
> @@ -72,7 +72,7 @@ config SND_SOC_INTEL_BYT_MAX98090_MACH
> functionality.
>
> config SND_SOC_INTEL_BYT_RT5640_MACH
> - tristate "ASoC Audio driver for Intel Baytrail with RT5640 codec"
> + tristate "Baytrail with RT5640 codec"
> depends on X86_INTEL_LPSS && I2C
> select SND_SOC_RT5640
> help
> @@ -80,12 +80,12 @@ config SND_SOC_INTEL_BYT_RT5640_MACH
> with the RT5640 audio codec. This driver is deprecated, use
> SND_SOC_INTEL_BYTCR_RT5640_MACH instead for better functionality.
>
> -endif
> +endif ## SND_SOC_INTEL_BAYTRAIL
>
> if SND_SST_ATOM_HIFI2_PLATFORM
>
> config SND_SOC_INTEL_BYTCR_RT5640_MACH
> - tristate "ASoC Audio driver for Intel Baytrail and Baytrail-CR with RT5640 codec"
> + tristate "Baytrail and Baytrail-CR with RT5640 codec"
> depends on X86_INTEL_LPSS && I2C && ACPI
> select SND_SOC_ACPI
> select SND_SOC_RT5640
> @@ -96,7 +96,7 @@ config SND_SOC_INTEL_BYTCR_RT5640_MACH
> If unsure select "N".
>
> config SND_SOC_INTEL_BYTCR_RT5651_MACH
> - tristate "ASoC Audio driver for Intel Baytrail and Baytrail-CR with RT5651 codec"
> + tristate "Baytrail and Baytrail-CR with RT5651 codec"
> depends on X86_INTEL_LPSS && I2C && ACPI
> select SND_SOC_ACPI
> select SND_SOC_RT5651
> @@ -107,7 +107,7 @@ config SND_SOC_INTEL_BYTCR_RT5651_MACH
> If unsure select "N".
>
> config SND_SOC_INTEL_CHT_BSW_RT5672_MACH
> - tristate "ASoC Audio driver for Intel Cherrytrail & Braswell with RT5672 codec"
> + tristate "Cherrytrail & Braswell with RT5672 codec"
> depends on X86_INTEL_LPSS && I2C && ACPI
> select SND_SOC_ACPI
> select SND_SOC_RT5670
> @@ -118,7 +118,7 @@ config SND_SOC_INTEL_CHT_BSW_RT5672_MACH
> If unsure select "N".
>
> config SND_SOC_INTEL_CHT_BSW_RT5645_MACH
> - tristate "ASoC Audio driver for Intel Cherrytrail & Braswell with RT5645/5650 codec"
> + tristate "Cherrytrail & Braswell with RT5645/5650 codec"
> depends on X86_INTEL_LPSS && I2C && ACPI
> select SND_SOC_ACPI
> select SND_SOC_RT5645
> @@ -129,7 +129,7 @@ config SND_SOC_INTEL_CHT_BSW_RT5645_MACH
> If unsure select "N".
>
> config SND_SOC_INTEL_CHT_BSW_MAX98090_TI_MACH
> - tristate "ASoC Audio driver for Intel Cherrytrail & Braswell with MAX98090 & TI codec"
> + tristate "Cherrytrail & Braswell with MAX98090 & TI codec"
> depends on X86_INTEL_LPSS && I2C && ACPI
> select SND_SOC_MAX98090
> select SND_SOC_TS3A227E
> @@ -140,7 +140,7 @@ config SND_SOC_INTEL_CHT_BSW_MAX98090_TI_MACH
> If unsure select "N".
>
> config SND_SOC_INTEL_BYT_CHT_DA7213_MACH
> - tristate "ASoC Audio driver for Intel Baytrail & Cherrytrail with DA7212/7213 codec"
> + tristate "Baytrail & Cherrytrail with DA7212/7213 codec"
> depends on X86_INTEL_LPSS && I2C && ACPI
> select SND_SOC_ACPI
> select SND_SOC_DA7213
> @@ -151,7 +151,7 @@ config SND_SOC_INTEL_BYT_CHT_DA7213_MACH
> If unsure select "N".
>
> config SND_SOC_INTEL_BYT_CHT_ES8316_MACH
> - tristate "ASoC Audio driver for Intel Baytrail & Cherrytrail with ES8316 codec"
> + tristate "Baytrail & Cherrytrail with ES8316 codec"
> depends on X86_INTEL_LPSS && I2C && ACPI
> select SND_SOC_ES8316
> help
> @@ -161,7 +161,7 @@ config SND_SOC_INTEL_BYT_CHT_ES8316_MACH
> If unsure select "N".
>
> config SND_SOC_INTEL_BYT_CHT_NOCODEC_MACH
> - tristate "ASoC Audio driver for Intel Baytrail & Cherrytrail platform with no codec (MinnowBoard MAX, Up)"
> + tristate "Baytrail & Cherrytrail platform with no codec (MinnowBoard MAX, Up)"
> depends on X86_INTEL_LPSS && I2C && ACPI
> help
> This adds support for ASoC machine driver for the MinnowBoard Max or
> @@ -172,12 +172,12 @@ config SND_SOC_INTEL_BYT_CHT_NOCODEC_MACH
>
> If unsure select "N".
>
> -endif
> +endif ## SND_SST_ATOM_HIFI2_PLATFORM
>
> if SND_SOC_INTEL_SKYLAKE
>
> config SND_SOC_INTEL_SKL_RT286_MACH
> - tristate "ASoC Audio driver for SKL with RT286 I2S mode"
> + tristate "SKL with RT286 I2S mode"
> depends on MFD_INTEL_LPSS && I2C && ACPI
> select SND_SOC_RT286
> select SND_SOC_DMIC
> @@ -189,7 +189,7 @@ config SND_SOC_INTEL_SKL_RT286_MACH
> If unsure select "N".
>
> config SND_SOC_INTEL_SKL_NAU88L25_SSM4567_MACH
> - tristate "ASoC Audio driver for SKL with NAU88L25 and SSM4567 in I2S Mode"
> + tristate "SKL with NAU88L25 and SSM4567 in I2S Mode"
> depends on MFD_INTEL_LPSS && I2C && ACPI
> select SND_SOC_NAU8825
> select SND_SOC_SSM4567
> @@ -202,7 +202,7 @@ config SND_SOC_INTEL_SKL_NAU88L25_SSM4567_MACH
> If unsure select "N".
>
> config SND_SOC_INTEL_SKL_NAU88L25_MAX98357A_MACH
> - tristate "ASoC Audio driver for SKL with NAU88L25 and MAX98357A in I2S Mode"
> + tristate "SKL with NAU88L25 and MAX98357A in I2S Mode"
> depends on MFD_INTEL_LPSS && I2C && ACPI
> select SND_SOC_NAU8825
> select SND_SOC_MAX98357A
> @@ -215,7 +215,7 @@ config SND_SOC_INTEL_SKL_NAU88L25_MAX98357A_MACH
> If unsure select "N".
>
> config SND_SOC_INTEL_BXT_DA7219_MAX98357A_MACH
> - tristate "ASoC Audio driver for Broxton with DA7219 and MAX98357A in I2S Mode"
> + tristate "Broxton with DA7219 and MAX98357A in I2S Mode"
> depends on MFD_INTEL_LPSS && I2C && ACPI
> select SND_SOC_DA7219
> select SND_SOC_MAX98357A
> @@ -229,7 +229,7 @@ config SND_SOC_INTEL_BXT_DA7219_MAX98357A_MACH
> If unsure select "N".
>
> config SND_SOC_INTEL_BXT_RT298_MACH
> - tristate "ASoC Audio driver for Broxton with RT298 I2S mode"
> + tristate "Broxton with RT298 I2S mode"
> depends on MFD_INTEL_LPSS && I2C && ACPI
> select SND_SOC_RT298
> select SND_SOC_DMIC
> @@ -242,7 +242,7 @@ config SND_SOC_INTEL_BXT_RT298_MACH
> If unsure select "N".
>
> config SND_SOC_INTEL_KBL_RT5663_MAX98927_MACH
> - tristate "ASoC Audio driver for KBL with RT5663 and MAX98927 in I2S Mode"
> + tristate "KBL with RT5663 and MAX98927 in I2S Mode"
> depends on MFD_INTEL_LPSS && I2C && ACPI
> select SND_SOC_RT5663
> select SND_SOC_MAX98927
> @@ -255,7 +255,7 @@ config SND_SOC_INTEL_KBL_RT5663_MAX98927_MACH
> If unsure select "N".
>
> config SND_SOC_INTEL_KBL_RT5663_RT5514_MAX98927_MACH
> - tristate "ASoC Audio driver for KBL with RT5663, RT5514 and MAX98927 in I2S Mode"
> + tristate "KBL with RT5663, RT5514 and MAX98927 in I2S Mode"
> depends on MFD_INTEL_LPSS && I2C && SPI && ACPI
> select SND_SOC_RT5663
> select SND_SOC_RT5514
> @@ -267,6 +267,6 @@ config SND_SOC_INTEL_KBL_RT5663_RT5514_MAX98927_MACH
> create an alsa sound card for RT5663 + RT5514 + MAX98927.
> Say Y or m if you have such a device. This is a recommended option.
> If unsure select "N".
> -endif
> +endif ## SND_SOC_INTEL_SKYLAKE
>
> endif ## SND_SOC_INTEL_MACH
>
--
~Randy
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: [PATCH v2 9/9] ASoC: Intel: kconfig: add some comments for if symbols
@ 2018-01-03 19:25 ` Randy Dunlap
0 siblings, 0 replies; 38+ messages in thread
From: Randy Dunlap @ 2018-01-03 19:25 UTC (permalink / raw)
To: Pierre-Louis Bossart, alsa-devel
Cc: arnd, tiwai, linux-kernel, liam.r.girdwood, vinod.koul, broonie,
andriy.shevchenko, torvalds
On 01/03/2018 08:50 AM, Pierre-Louis Bossart wrote:
> From: Vinod Koul <vinod.koul@intel.com>
>
> Helps in finding if endings
That partial sentence is confusing. I couldn't decode it without
reading the entire patch. That shouldn't be necessary.
How about:
Help in finding (matching) if/endif pairs.
or
Help in finding matching "if" endings by commenting the "endif".
>
> Signed-off-by: Vinod Koul <vinod.koul@intel.com>
> Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
> ---
> sound/soc/intel/Kconfig | 10 ++++----
> sound/soc/intel/boards/Kconfig | 52 +++++++++++++++++++++---------------------
> 2 files changed, 31 insertions(+), 31 deletions(-)
>
> diff --git a/sound/soc/intel/Kconfig b/sound/soc/intel/Kconfig
> index b75fa5f59b96..801b205662df 100644
> --- a/sound/soc/intel/Kconfig
> +++ b/sound/soc/intel/Kconfig
> @@ -47,7 +47,7 @@ config SND_SOC_INTEL_SST_FIRMWARE
> # when these platforms are enabled
>
> config SND_SOC_INTEL_HASWELL
> - tristate "Intel ASoC SST driver for Haswell/Broadwell"
> + tristate "Haswell/Broadwell Platforms"
> depends on SND_DMA_SGBUF
> depends on DMADEVICES && ACPI
> select SND_SOC_INTEL_SST
> @@ -60,7 +60,7 @@ config SND_SOC_INTEL_HASWELL
> typically used for Chromebooks. This is a recommended option.
>
> config SND_SOC_INTEL_BAYTRAIL
> - tristate "Intel ASoC SST driver for Baytrail (legacy)"
> + tristate "Baytrail (legacy) Platforms"
> depends on DMADEVICES && ACPI
> select SND_SOC_INTEL_SST
> select SND_SOC_INTEL_SST_ACPI
> @@ -73,7 +73,7 @@ config SND_SOC_INTEL_BAYTRAIL
> not recommended, use SND_SST_ATOM_HIFI2_PLATFORM instead.
>
> config SND_SST_ATOM_HIFI2_PLATFORM_PCI
> - tristate "Intel ASoC SST driver for PCI HiFi2 platforms (Medfield, Merrifield)"
> + tristate "PCI HiFi2 platforms (Medfield, Merrifield) platforms"
> depends on X86 && PCI
> select SND_SST_IPC_PCI
> select SND_SOC_COMPRESS
> @@ -87,7 +87,7 @@ config SND_SST_ATOM_HIFI2_PLATFORM_PCI
> is not in the standard firmware tree
>
> config SND_SST_ATOM_HIFI2_PLATFORM
> - tristate "Intel ASoC SST driver for ACPI HiFi2 platforms (Baytrail, Cherrytrail)"
> + tristate "ACPI HiFi2 platforms (Baytrail, Cherrytrail) Platforms"
> depends on X86 && ACPI
> select SND_SST_IPC_ACPI
> select IOSF_MBI
> @@ -99,7 +99,7 @@ config SND_SST_ATOM_HIFI2_PLATFORM
> recommended option
>
> config SND_SOC_INTEL_SKYLAKE
> - tristate "Intel ASoC SST driver for SKL/BXT/KBL/GLK/CNL"
> + tristate "SKL/BXT/KBL/GLK/CNL... Platforms"
> depends on PCI && ACPI
> select SND_HDA_EXT_CORE
> select SND_HDA_DSP_LOADER
> diff --git a/sound/soc/intel/boards/Kconfig b/sound/soc/intel/boards/Kconfig
> index 6a10df882a88..89a73e3d9d2d 100644
> --- a/sound/soc/intel/boards/Kconfig
> +++ b/sound/soc/intel/boards/Kconfig
> @@ -15,7 +15,7 @@ if SND_SOC_INTEL_MACH
> if SND_SST_ATOM_HIFI2_PLATFORM_PCI
>
> config SND_MFLD_MACHINE
> - tristate "SOC Machine Audio driver for Intel Medfield MID platform"
> + tristate "Intel Medfield MID"
> depends on INTEL_SCU_IPC
> select SND_SOC_SN95031
> help
> @@ -24,12 +24,12 @@ config SND_MFLD_MACHINE
> Say Y if you have such a device.
> If unsure select "N".
>
> -endif
> +endif ## SND_SST_ATOM_HIFI2_PLATFORM_PCI
>
> if SND_SOC_INTEL_HASWELL
>
> config SND_SOC_INTEL_HASWELL_MACH
> - tristate "ASoC Audio DSP support for Intel Haswell Lynxpoint"
> + tristate "Haswell Lynxpoint"
> depends on X86_INTEL_LPSS && I2C && I2C_DESIGNWARE_PLATFORM
> select SND_SOC_RT5640
> help
> @@ -39,7 +39,7 @@ config SND_SOC_INTEL_HASWELL_MACH
> If unsure select "N".
>
> config SND_SOC_INTEL_BDW_RT5677_MACH
> - tristate "ASoC Audio driver for Intel Broadwell with RT5677 codec"
> + tristate "Broadwell with RT5677 codec"
> depends on X86_INTEL_LPSS && I2C && I2C_DESIGNWARE_PLATFORM && GPIOLIB
> select SND_SOC_RT5677
> help
> @@ -49,7 +49,7 @@ config SND_SOC_INTEL_BDW_RT5677_MACH
> If unsure select "N".
>
> config SND_SOC_INTEL_BROADWELL_MACH
> - tristate "ASoC Audio DSP support for Intel Broadwell Wildcatpoint"
> + tristate "Intel Broadwell Wildcatpoint"
> depends on X86_INTEL_LPSS && I2C && I2C_DESIGNWARE_PLATFORM
> select SND_SOC_RT286
> help
> @@ -57,12 +57,12 @@ config SND_SOC_INTEL_BROADWELL_MACH
> Ultrabook platforms.
> Say Y or m if you have such a device. This is a recommended option.
> If unsure select "N".
> -endif
> +endif ## SND_SOC_INTEL_HASWELL
>
> if SND_SOC_INTEL_BAYTRAIL
>
> config SND_SOC_INTEL_BYT_MAX98090_MACH
> - tristate "ASoC Audio driver for Intel Baytrail with MAX98090 codec"
> + tristate "Baytrail with MAX98090 codec"
> depends on X86_INTEL_LPSS && I2C
> select SND_SOC_MAX98090
> help
> @@ -72,7 +72,7 @@ config SND_SOC_INTEL_BYT_MAX98090_MACH
> functionality.
>
> config SND_SOC_INTEL_BYT_RT5640_MACH
> - tristate "ASoC Audio driver for Intel Baytrail with RT5640 codec"
> + tristate "Baytrail with RT5640 codec"
> depends on X86_INTEL_LPSS && I2C
> select SND_SOC_RT5640
> help
> @@ -80,12 +80,12 @@ config SND_SOC_INTEL_BYT_RT5640_MACH
> with the RT5640 audio codec. This driver is deprecated, use
> SND_SOC_INTEL_BYTCR_RT5640_MACH instead for better functionality.
>
> -endif
> +endif ## SND_SOC_INTEL_BAYTRAIL
>
> if SND_SST_ATOM_HIFI2_PLATFORM
>
> config SND_SOC_INTEL_BYTCR_RT5640_MACH
> - tristate "ASoC Audio driver for Intel Baytrail and Baytrail-CR with RT5640 codec"
> + tristate "Baytrail and Baytrail-CR with RT5640 codec"
> depends on X86_INTEL_LPSS && I2C && ACPI
> select SND_SOC_ACPI
> select SND_SOC_RT5640
> @@ -96,7 +96,7 @@ config SND_SOC_INTEL_BYTCR_RT5640_MACH
> If unsure select "N".
>
> config SND_SOC_INTEL_BYTCR_RT5651_MACH
> - tristate "ASoC Audio driver for Intel Baytrail and Baytrail-CR with RT5651 codec"
> + tristate "Baytrail and Baytrail-CR with RT5651 codec"
> depends on X86_INTEL_LPSS && I2C && ACPI
> select SND_SOC_ACPI
> select SND_SOC_RT5651
> @@ -107,7 +107,7 @@ config SND_SOC_INTEL_BYTCR_RT5651_MACH
> If unsure select "N".
>
> config SND_SOC_INTEL_CHT_BSW_RT5672_MACH
> - tristate "ASoC Audio driver for Intel Cherrytrail & Braswell with RT5672 codec"
> + tristate "Cherrytrail & Braswell with RT5672 codec"
> depends on X86_INTEL_LPSS && I2C && ACPI
> select SND_SOC_ACPI
> select SND_SOC_RT5670
> @@ -118,7 +118,7 @@ config SND_SOC_INTEL_CHT_BSW_RT5672_MACH
> If unsure select "N".
>
> config SND_SOC_INTEL_CHT_BSW_RT5645_MACH
> - tristate "ASoC Audio driver for Intel Cherrytrail & Braswell with RT5645/5650 codec"
> + tristate "Cherrytrail & Braswell with RT5645/5650 codec"
> depends on X86_INTEL_LPSS && I2C && ACPI
> select SND_SOC_ACPI
> select SND_SOC_RT5645
> @@ -129,7 +129,7 @@ config SND_SOC_INTEL_CHT_BSW_RT5645_MACH
> If unsure select "N".
>
> config SND_SOC_INTEL_CHT_BSW_MAX98090_TI_MACH
> - tristate "ASoC Audio driver for Intel Cherrytrail & Braswell with MAX98090 & TI codec"
> + tristate "Cherrytrail & Braswell with MAX98090 & TI codec"
> depends on X86_INTEL_LPSS && I2C && ACPI
> select SND_SOC_MAX98090
> select SND_SOC_TS3A227E
> @@ -140,7 +140,7 @@ config SND_SOC_INTEL_CHT_BSW_MAX98090_TI_MACH
> If unsure select "N".
>
> config SND_SOC_INTEL_BYT_CHT_DA7213_MACH
> - tristate "ASoC Audio driver for Intel Baytrail & Cherrytrail with DA7212/7213 codec"
> + tristate "Baytrail & Cherrytrail with DA7212/7213 codec"
> depends on X86_INTEL_LPSS && I2C && ACPI
> select SND_SOC_ACPI
> select SND_SOC_DA7213
> @@ -151,7 +151,7 @@ config SND_SOC_INTEL_BYT_CHT_DA7213_MACH
> If unsure select "N".
>
> config SND_SOC_INTEL_BYT_CHT_ES8316_MACH
> - tristate "ASoC Audio driver for Intel Baytrail & Cherrytrail with ES8316 codec"
> + tristate "Baytrail & Cherrytrail with ES8316 codec"
> depends on X86_INTEL_LPSS && I2C && ACPI
> select SND_SOC_ES8316
> help
> @@ -161,7 +161,7 @@ config SND_SOC_INTEL_BYT_CHT_ES8316_MACH
> If unsure select "N".
>
> config SND_SOC_INTEL_BYT_CHT_NOCODEC_MACH
> - tristate "ASoC Audio driver for Intel Baytrail & Cherrytrail platform with no codec (MinnowBoard MAX, Up)"
> + tristate "Baytrail & Cherrytrail platform with no codec (MinnowBoard MAX, Up)"
> depends on X86_INTEL_LPSS && I2C && ACPI
> help
> This adds support for ASoC machine driver for the MinnowBoard Max or
> @@ -172,12 +172,12 @@ config SND_SOC_INTEL_BYT_CHT_NOCODEC_MACH
>
> If unsure select "N".
>
> -endif
> +endif ## SND_SST_ATOM_HIFI2_PLATFORM
>
> if SND_SOC_INTEL_SKYLAKE
>
> config SND_SOC_INTEL_SKL_RT286_MACH
> - tristate "ASoC Audio driver for SKL with RT286 I2S mode"
> + tristate "SKL with RT286 I2S mode"
> depends on MFD_INTEL_LPSS && I2C && ACPI
> select SND_SOC_RT286
> select SND_SOC_DMIC
> @@ -189,7 +189,7 @@ config SND_SOC_INTEL_SKL_RT286_MACH
> If unsure select "N".
>
> config SND_SOC_INTEL_SKL_NAU88L25_SSM4567_MACH
> - tristate "ASoC Audio driver for SKL with NAU88L25 and SSM4567 in I2S Mode"
> + tristate "SKL with NAU88L25 and SSM4567 in I2S Mode"
> depends on MFD_INTEL_LPSS && I2C && ACPI
> select SND_SOC_NAU8825
> select SND_SOC_SSM4567
> @@ -202,7 +202,7 @@ config SND_SOC_INTEL_SKL_NAU88L25_SSM4567_MACH
> If unsure select "N".
>
> config SND_SOC_INTEL_SKL_NAU88L25_MAX98357A_MACH
> - tristate "ASoC Audio driver for SKL with NAU88L25 and MAX98357A in I2S Mode"
> + tristate "SKL with NAU88L25 and MAX98357A in I2S Mode"
> depends on MFD_INTEL_LPSS && I2C && ACPI
> select SND_SOC_NAU8825
> select SND_SOC_MAX98357A
> @@ -215,7 +215,7 @@ config SND_SOC_INTEL_SKL_NAU88L25_MAX98357A_MACH
> If unsure select "N".
>
> config SND_SOC_INTEL_BXT_DA7219_MAX98357A_MACH
> - tristate "ASoC Audio driver for Broxton with DA7219 and MAX98357A in I2S Mode"
> + tristate "Broxton with DA7219 and MAX98357A in I2S Mode"
> depends on MFD_INTEL_LPSS && I2C && ACPI
> select SND_SOC_DA7219
> select SND_SOC_MAX98357A
> @@ -229,7 +229,7 @@ config SND_SOC_INTEL_BXT_DA7219_MAX98357A_MACH
> If unsure select "N".
>
> config SND_SOC_INTEL_BXT_RT298_MACH
> - tristate "ASoC Audio driver for Broxton with RT298 I2S mode"
> + tristate "Broxton with RT298 I2S mode"
> depends on MFD_INTEL_LPSS && I2C && ACPI
> select SND_SOC_RT298
> select SND_SOC_DMIC
> @@ -242,7 +242,7 @@ config SND_SOC_INTEL_BXT_RT298_MACH
> If unsure select "N".
>
> config SND_SOC_INTEL_KBL_RT5663_MAX98927_MACH
> - tristate "ASoC Audio driver for KBL with RT5663 and MAX98927 in I2S Mode"
> + tristate "KBL with RT5663 and MAX98927 in I2S Mode"
> depends on MFD_INTEL_LPSS && I2C && ACPI
> select SND_SOC_RT5663
> select SND_SOC_MAX98927
> @@ -255,7 +255,7 @@ config SND_SOC_INTEL_KBL_RT5663_MAX98927_MACH
> If unsure select "N".
>
> config SND_SOC_INTEL_KBL_RT5663_RT5514_MAX98927_MACH
> - tristate "ASoC Audio driver for KBL with RT5663, RT5514 and MAX98927 in I2S Mode"
> + tristate "KBL with RT5663, RT5514 and MAX98927 in I2S Mode"
> depends on MFD_INTEL_LPSS && I2C && SPI && ACPI
> select SND_SOC_RT5663
> select SND_SOC_RT5514
> @@ -267,6 +267,6 @@ config SND_SOC_INTEL_KBL_RT5663_RT5514_MAX98927_MACH
> create an alsa sound card for RT5663 + RT5514 + MAX98927.
> Say Y or m if you have such a device. This is a recommended option.
> If unsure select "N".
> -endif
> +endif ## SND_SOC_INTEL_SKYLAKE
>
> endif ## SND_SOC_INTEL_MACH
>
--
~Randy
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: [PATCH v2 9/9] ASoC: Intel: kconfig: add some comments for if symbols
2018-01-03 19:25 ` Randy Dunlap
(?)
@ 2018-01-03 19:51 ` Pierre-Louis Bossart
-1 siblings, 0 replies; 38+ messages in thread
From: Pierre-Louis Bossart @ 2018-01-03 19:51 UTC (permalink / raw)
To: Randy Dunlap, alsa-devel
Cc: tiwai, broonie, torvalds, vinod.koul, liam.r.girdwood,
andriy.shevchenko, arnd, linux-kernel
On 01/03/2018 01:25 PM, Randy Dunlap wrote:
> On 01/03/2018 08:50 AM, Pierre-Louis Bossart wrote:
>> From: Vinod Koul <vinod.koul@intel.com>
>>
>> Helps in finding if endings
> That partial sentence is confusing. I couldn't decode it without
> reading the entire patch. That shouldn't be necessary.
>
> How about:
>
> Help in finding (matching) if/endif pairs.
> or
> Help in finding matching "if" endings by commenting the "endif".
yes indeed, i'll use the second suggestion.
I also screwed-up and squashed two patches from Vinod so the commit
message isn't fully aligned with the contents of the patch. Gah.
>
>> Signed-off-by: Vinod Koul <vinod.koul@intel.com>
>> Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
>> ---
>> sound/soc/intel/Kconfig | 10 ++++----
>> sound/soc/intel/boards/Kconfig | 52 +++++++++++++++++++++---------------------
>> 2 files changed, 31 insertions(+), 31 deletions(-)
>>
>> diff --git a/sound/soc/intel/Kconfig b/sound/soc/intel/Kconfig
>> index b75fa5f59b96..801b205662df 100644
>> --- a/sound/soc/intel/Kconfig
>> +++ b/sound/soc/intel/Kconfig
>> @@ -47,7 +47,7 @@ config SND_SOC_INTEL_SST_FIRMWARE
>> # when these platforms are enabled
>>
>> config SND_SOC_INTEL_HASWELL
>> - tristate "Intel ASoC SST driver for Haswell/Broadwell"
>> + tristate "Haswell/Broadwell Platforms"
>> depends on SND_DMA_SGBUF
>> depends on DMADEVICES && ACPI
>> select SND_SOC_INTEL_SST
>> @@ -60,7 +60,7 @@ config SND_SOC_INTEL_HASWELL
>> typically used for Chromebooks. This is a recommended option.
>>
>> config SND_SOC_INTEL_BAYTRAIL
>> - tristate "Intel ASoC SST driver for Baytrail (legacy)"
>> + tristate "Baytrail (legacy) Platforms"
>> depends on DMADEVICES && ACPI
>> select SND_SOC_INTEL_SST
>> select SND_SOC_INTEL_SST_ACPI
>> @@ -73,7 +73,7 @@ config SND_SOC_INTEL_BAYTRAIL
>> not recommended, use SND_SST_ATOM_HIFI2_PLATFORM instead.
>>
>> config SND_SST_ATOM_HIFI2_PLATFORM_PCI
>> - tristate "Intel ASoC SST driver for PCI HiFi2 platforms (Medfield, Merrifield)"
>> + tristate "PCI HiFi2 platforms (Medfield, Merrifield) platforms"
>> depends on X86 && PCI
>> select SND_SST_IPC_PCI
>> select SND_SOC_COMPRESS
>> @@ -87,7 +87,7 @@ config SND_SST_ATOM_HIFI2_PLATFORM_PCI
>> is not in the standard firmware tree
>>
>> config SND_SST_ATOM_HIFI2_PLATFORM
>> - tristate "Intel ASoC SST driver for ACPI HiFi2 platforms (Baytrail, Cherrytrail)"
>> + tristate "ACPI HiFi2 platforms (Baytrail, Cherrytrail) Platforms"
>> depends on X86 && ACPI
>> select SND_SST_IPC_ACPI
>> select IOSF_MBI
>> @@ -99,7 +99,7 @@ config SND_SST_ATOM_HIFI2_PLATFORM
>> recommended option
>>
>> config SND_SOC_INTEL_SKYLAKE
>> - tristate "Intel ASoC SST driver for SKL/BXT/KBL/GLK/CNL"
>> + tristate "SKL/BXT/KBL/GLK/CNL... Platforms"
>> depends on PCI && ACPI
>> select SND_HDA_EXT_CORE
>> select SND_HDA_DSP_LOADER
>> diff --git a/sound/soc/intel/boards/Kconfig b/sound/soc/intel/boards/Kconfig
>> index 6a10df882a88..89a73e3d9d2d 100644
>> --- a/sound/soc/intel/boards/Kconfig
>> +++ b/sound/soc/intel/boards/Kconfig
>> @@ -15,7 +15,7 @@ if SND_SOC_INTEL_MACH
>> if SND_SST_ATOM_HIFI2_PLATFORM_PCI
>>
>> config SND_MFLD_MACHINE
>> - tristate "SOC Machine Audio driver for Intel Medfield MID platform"
>> + tristate "Intel Medfield MID"
>> depends on INTEL_SCU_IPC
>> select SND_SOC_SN95031
>> help
>> @@ -24,12 +24,12 @@ config SND_MFLD_MACHINE
>> Say Y if you have such a device.
>> If unsure select "N".
>>
>> -endif
>> +endif ## SND_SST_ATOM_HIFI2_PLATFORM_PCI
>>
>> if SND_SOC_INTEL_HASWELL
>>
>> config SND_SOC_INTEL_HASWELL_MACH
>> - tristate "ASoC Audio DSP support for Intel Haswell Lynxpoint"
>> + tristate "Haswell Lynxpoint"
>> depends on X86_INTEL_LPSS && I2C && I2C_DESIGNWARE_PLATFORM
>> select SND_SOC_RT5640
>> help
>> @@ -39,7 +39,7 @@ config SND_SOC_INTEL_HASWELL_MACH
>> If unsure select "N".
>>
>> config SND_SOC_INTEL_BDW_RT5677_MACH
>> - tristate "ASoC Audio driver for Intel Broadwell with RT5677 codec"
>> + tristate "Broadwell with RT5677 codec"
>> depends on X86_INTEL_LPSS && I2C && I2C_DESIGNWARE_PLATFORM && GPIOLIB
>> select SND_SOC_RT5677
>> help
>> @@ -49,7 +49,7 @@ config SND_SOC_INTEL_BDW_RT5677_MACH
>> If unsure select "N".
>>
>> config SND_SOC_INTEL_BROADWELL_MACH
>> - tristate "ASoC Audio DSP support for Intel Broadwell Wildcatpoint"
>> + tristate "Intel Broadwell Wildcatpoint"
>> depends on X86_INTEL_LPSS && I2C && I2C_DESIGNWARE_PLATFORM
>> select SND_SOC_RT286
>> help
>> @@ -57,12 +57,12 @@ config SND_SOC_INTEL_BROADWELL_MACH
>> Ultrabook platforms.
>> Say Y or m if you have such a device. This is a recommended option.
>> If unsure select "N".
>> -endif
>> +endif ## SND_SOC_INTEL_HASWELL
>>
>> if SND_SOC_INTEL_BAYTRAIL
>>
>> config SND_SOC_INTEL_BYT_MAX98090_MACH
>> - tristate "ASoC Audio driver for Intel Baytrail with MAX98090 codec"
>> + tristate "Baytrail with MAX98090 codec"
>> depends on X86_INTEL_LPSS && I2C
>> select SND_SOC_MAX98090
>> help
>> @@ -72,7 +72,7 @@ config SND_SOC_INTEL_BYT_MAX98090_MACH
>> functionality.
>>
>> config SND_SOC_INTEL_BYT_RT5640_MACH
>> - tristate "ASoC Audio driver for Intel Baytrail with RT5640 codec"
>> + tristate "Baytrail with RT5640 codec"
>> depends on X86_INTEL_LPSS && I2C
>> select SND_SOC_RT5640
>> help
>> @@ -80,12 +80,12 @@ config SND_SOC_INTEL_BYT_RT5640_MACH
>> with the RT5640 audio codec. This driver is deprecated, use
>> SND_SOC_INTEL_BYTCR_RT5640_MACH instead for better functionality.
>>
>> -endif
>> +endif ## SND_SOC_INTEL_BAYTRAIL
>>
>> if SND_SST_ATOM_HIFI2_PLATFORM
>>
>> config SND_SOC_INTEL_BYTCR_RT5640_MACH
>> - tristate "ASoC Audio driver for Intel Baytrail and Baytrail-CR with RT5640 codec"
>> + tristate "Baytrail and Baytrail-CR with RT5640 codec"
>> depends on X86_INTEL_LPSS && I2C && ACPI
>> select SND_SOC_ACPI
>> select SND_SOC_RT5640
>> @@ -96,7 +96,7 @@ config SND_SOC_INTEL_BYTCR_RT5640_MACH
>> If unsure select "N".
>>
>> config SND_SOC_INTEL_BYTCR_RT5651_MACH
>> - tristate "ASoC Audio driver for Intel Baytrail and Baytrail-CR with RT5651 codec"
>> + tristate "Baytrail and Baytrail-CR with RT5651 codec"
>> depends on X86_INTEL_LPSS && I2C && ACPI
>> select SND_SOC_ACPI
>> select SND_SOC_RT5651
>> @@ -107,7 +107,7 @@ config SND_SOC_INTEL_BYTCR_RT5651_MACH
>> If unsure select "N".
>>
>> config SND_SOC_INTEL_CHT_BSW_RT5672_MACH
>> - tristate "ASoC Audio driver for Intel Cherrytrail & Braswell with RT5672 codec"
>> + tristate "Cherrytrail & Braswell with RT5672 codec"
>> depends on X86_INTEL_LPSS && I2C && ACPI
>> select SND_SOC_ACPI
>> select SND_SOC_RT5670
>> @@ -118,7 +118,7 @@ config SND_SOC_INTEL_CHT_BSW_RT5672_MACH
>> If unsure select "N".
>>
>> config SND_SOC_INTEL_CHT_BSW_RT5645_MACH
>> - tristate "ASoC Audio driver for Intel Cherrytrail & Braswell with RT5645/5650 codec"
>> + tristate "Cherrytrail & Braswell with RT5645/5650 codec"
>> depends on X86_INTEL_LPSS && I2C && ACPI
>> select SND_SOC_ACPI
>> select SND_SOC_RT5645
>> @@ -129,7 +129,7 @@ config SND_SOC_INTEL_CHT_BSW_RT5645_MACH
>> If unsure select "N".
>>
>> config SND_SOC_INTEL_CHT_BSW_MAX98090_TI_MACH
>> - tristate "ASoC Audio driver for Intel Cherrytrail & Braswell with MAX98090 & TI codec"
>> + tristate "Cherrytrail & Braswell with MAX98090 & TI codec"
>> depends on X86_INTEL_LPSS && I2C && ACPI
>> select SND_SOC_MAX98090
>> select SND_SOC_TS3A227E
>> @@ -140,7 +140,7 @@ config SND_SOC_INTEL_CHT_BSW_MAX98090_TI_MACH
>> If unsure select "N".
>>
>> config SND_SOC_INTEL_BYT_CHT_DA7213_MACH
>> - tristate "ASoC Audio driver for Intel Baytrail & Cherrytrail with DA7212/7213 codec"
>> + tristate "Baytrail & Cherrytrail with DA7212/7213 codec"
>> depends on X86_INTEL_LPSS && I2C && ACPI
>> select SND_SOC_ACPI
>> select SND_SOC_DA7213
>> @@ -151,7 +151,7 @@ config SND_SOC_INTEL_BYT_CHT_DA7213_MACH
>> If unsure select "N".
>>
>> config SND_SOC_INTEL_BYT_CHT_ES8316_MACH
>> - tristate "ASoC Audio driver for Intel Baytrail & Cherrytrail with ES8316 codec"
>> + tristate "Baytrail & Cherrytrail with ES8316 codec"
>> depends on X86_INTEL_LPSS && I2C && ACPI
>> select SND_SOC_ES8316
>> help
>> @@ -161,7 +161,7 @@ config SND_SOC_INTEL_BYT_CHT_ES8316_MACH
>> If unsure select "N".
>>
>> config SND_SOC_INTEL_BYT_CHT_NOCODEC_MACH
>> - tristate "ASoC Audio driver for Intel Baytrail & Cherrytrail platform with no codec (MinnowBoard MAX, Up)"
>> + tristate "Baytrail & Cherrytrail platform with no codec (MinnowBoard MAX, Up)"
>> depends on X86_INTEL_LPSS && I2C && ACPI
>> help
>> This adds support for ASoC machine driver for the MinnowBoard Max or
>> @@ -172,12 +172,12 @@ config SND_SOC_INTEL_BYT_CHT_NOCODEC_MACH
>>
>> If unsure select "N".
>>
>> -endif
>> +endif ## SND_SST_ATOM_HIFI2_PLATFORM
>>
>> if SND_SOC_INTEL_SKYLAKE
>>
>> config SND_SOC_INTEL_SKL_RT286_MACH
>> - tristate "ASoC Audio driver for SKL with RT286 I2S mode"
>> + tristate "SKL with RT286 I2S mode"
>> depends on MFD_INTEL_LPSS && I2C && ACPI
>> select SND_SOC_RT286
>> select SND_SOC_DMIC
>> @@ -189,7 +189,7 @@ config SND_SOC_INTEL_SKL_RT286_MACH
>> If unsure select "N".
>>
>> config SND_SOC_INTEL_SKL_NAU88L25_SSM4567_MACH
>> - tristate "ASoC Audio driver for SKL with NAU88L25 and SSM4567 in I2S Mode"
>> + tristate "SKL with NAU88L25 and SSM4567 in I2S Mode"
>> depends on MFD_INTEL_LPSS && I2C && ACPI
>> select SND_SOC_NAU8825
>> select SND_SOC_SSM4567
>> @@ -202,7 +202,7 @@ config SND_SOC_INTEL_SKL_NAU88L25_SSM4567_MACH
>> If unsure select "N".
>>
>> config SND_SOC_INTEL_SKL_NAU88L25_MAX98357A_MACH
>> - tristate "ASoC Audio driver for SKL with NAU88L25 and MAX98357A in I2S Mode"
>> + tristate "SKL with NAU88L25 and MAX98357A in I2S Mode"
>> depends on MFD_INTEL_LPSS && I2C && ACPI
>> select SND_SOC_NAU8825
>> select SND_SOC_MAX98357A
>> @@ -215,7 +215,7 @@ config SND_SOC_INTEL_SKL_NAU88L25_MAX98357A_MACH
>> If unsure select "N".
>>
>> config SND_SOC_INTEL_BXT_DA7219_MAX98357A_MACH
>> - tristate "ASoC Audio driver for Broxton with DA7219 and MAX98357A in I2S Mode"
>> + tristate "Broxton with DA7219 and MAX98357A in I2S Mode"
>> depends on MFD_INTEL_LPSS && I2C && ACPI
>> select SND_SOC_DA7219
>> select SND_SOC_MAX98357A
>> @@ -229,7 +229,7 @@ config SND_SOC_INTEL_BXT_DA7219_MAX98357A_MACH
>> If unsure select "N".
>>
>> config SND_SOC_INTEL_BXT_RT298_MACH
>> - tristate "ASoC Audio driver for Broxton with RT298 I2S mode"
>> + tristate "Broxton with RT298 I2S mode"
>> depends on MFD_INTEL_LPSS && I2C && ACPI
>> select SND_SOC_RT298
>> select SND_SOC_DMIC
>> @@ -242,7 +242,7 @@ config SND_SOC_INTEL_BXT_RT298_MACH
>> If unsure select "N".
>>
>> config SND_SOC_INTEL_KBL_RT5663_MAX98927_MACH
>> - tristate "ASoC Audio driver for KBL with RT5663 and MAX98927 in I2S Mode"
>> + tristate "KBL with RT5663 and MAX98927 in I2S Mode"
>> depends on MFD_INTEL_LPSS && I2C && ACPI
>> select SND_SOC_RT5663
>> select SND_SOC_MAX98927
>> @@ -255,7 +255,7 @@ config SND_SOC_INTEL_KBL_RT5663_MAX98927_MACH
>> If unsure select "N".
>>
>> config SND_SOC_INTEL_KBL_RT5663_RT5514_MAX98927_MACH
>> - tristate "ASoC Audio driver for KBL with RT5663, RT5514 and MAX98927 in I2S Mode"
>> + tristate "KBL with RT5663, RT5514 and MAX98927 in I2S Mode"
>> depends on MFD_INTEL_LPSS && I2C && SPI && ACPI
>> select SND_SOC_RT5663
>> select SND_SOC_RT5514
>> @@ -267,6 +267,6 @@ config SND_SOC_INTEL_KBL_RT5663_RT5514_MAX98927_MACH
>> create an alsa sound card for RT5663 + RT5514 + MAX98927.
>> Say Y or m if you have such a device. This is a recommended option.
>> If unsure select "N".
>> -endif
>> +endif ## SND_SOC_INTEL_SKYLAKE
>>
>> endif ## SND_SOC_INTEL_MACH
>>
>
^ permalink raw reply [flat|nested] 38+ messages in thread
* Applied "ASoC: Intel: boards: align Kconfig configurations for HiFi2" to the asoc tree
2018-01-03 16:50 ` [PATCH v2 7/9] ASoC: Intel: boards: align Kconfig configurations for HiFi2 Pierre-Louis Bossart
@ 2018-01-08 16:21 ` Mark Brown
0 siblings, 0 replies; 38+ messages in thread
From: Mark Brown @ 2018-01-08 16:21 UTC (permalink / raw)
To: Pierre-Louis Bossart
Cc: Mark Brown, alsa-devel, arnd, tiwai, linux-kernel,
liam.r.girdwood, vinod.koul, broonie, andriy.shevchenko,
torvalds, alsa-devel
The patch
ASoC: Intel: boards: align Kconfig configurations for HiFi2
has been applied to the asoc tree at
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying
to this mail.
Thanks,
Mark
>From 99644597d71333866070f0223bffa62c03f36587 Mon Sep 17 00:00:00 2001
From: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Date: Thu, 4 Jan 2018 16:35:58 -0600
Subject: [PATCH] ASoC: Intel: boards: align Kconfig configurations for HiFi2
Make sure all the configs are aligned
Also add the missing dependencies on SOC_ACPI stuff used to fix
DAI names based on HID and fix a couple of indentation issues
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Acked-By: Vinod Koul <vinod.koul@intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
---
sound/soc/intel/boards/Kconfig | 33 +++++++++++++++++++--------------
1 file changed, 19 insertions(+), 14 deletions(-)
diff --git a/sound/soc/intel/boards/Kconfig b/sound/soc/intel/boards/Kconfig
index 358f8f33adc4..08c482cc02f7 100644
--- a/sound/soc/intel/boards/Kconfig
+++ b/sound/soc/intel/boards/Kconfig
@@ -85,29 +85,32 @@ endif
if SND_SST_ATOM_HIFI2_PLATFORM
config SND_SOC_INTEL_BYTCR_RT5640_MACH
- tristate "ASoC Audio driver for Intel Baytrail and Baytrail-CR with RT5640 codec"
- depends on X86 && I2C && ACPI
+ tristate "ASoC Audio driver for Intel Baytrail and Baytrail-CR with RT5640 codec"
+ depends on X86_INTEL_LPSS && I2C && ACPI
+ select SND_SOC_ACPI
select SND_SOC_RT5640
help
- This adds support for ASoC machine driver for Intel(R) Baytrail and Baytrail-CR
- platforms with RT5640 audio codec.
- Say Y or m if you have such a device. This is a recommended option.
- If unsure select "N".
+ This adds support for ASoC machine driver for Intel(R) Baytrail and Baytrail-CR
+ platforms with RT5640 audio codec.
+ Say Y or m if you have such a device. This is a recommended option.
+ If unsure select "N".
config SND_SOC_INTEL_BYTCR_RT5651_MACH
- tristate "ASoC Audio driver for Intel Baytrail and Baytrail-CR with RT5651 codec"
- depends on X86 && I2C && ACPI
+ tristate "ASoC Audio driver for Intel Baytrail and Baytrail-CR with RT5651 codec"
+ depends on X86_INTEL_LPSS && I2C && ACPI
+ select SND_SOC_ACPI
select SND_SOC_RT5651
help
- This adds support for ASoC machine driver for Intel(R) Baytrail and Baytrail-CR
- platforms with RT5651 audio codec.
- Say Y or m if you have such a device. This is a recommended option.
- If unsure select "N".
+ This adds support for ASoC machine driver for Intel(R) Baytrail and Baytrail-CR
+ platforms with RT5651 audio codec.
+ Say Y or m if you have such a device. This is a recommended option.
+ If unsure select "N".
config SND_SOC_INTEL_CHT_BSW_RT5672_MACH
- tristate "ASoC Audio driver for Intel Cherrytrail & Braswell with RT5672 codec"
+ tristate "ASoC Audio driver for Intel Cherrytrail & Braswell with RT5672 codec"
depends on X86_INTEL_LPSS && I2C && ACPI
- select SND_SOC_RT5670
+ select SND_SOC_ACPI
+ select SND_SOC_RT5670
help
This adds support for ASoC machine driver for Intel(R) Cherrytrail & Braswell
platforms with RT5672 audio codec.
@@ -117,6 +120,7 @@ config SND_SOC_INTEL_CHT_BSW_RT5672_MACH
config SND_SOC_INTEL_CHT_BSW_RT5645_MACH
tristate "ASoC Audio driver for Intel Cherrytrail & Braswell with RT5645/5650 codec"
depends on X86_INTEL_LPSS && I2C && ACPI
+ select SND_SOC_ACPI
select SND_SOC_RT5645
help
This adds support for ASoC machine driver for Intel(R) Cherrytrail & Braswell
@@ -138,6 +142,7 @@ config SND_SOC_INTEL_CHT_BSW_MAX98090_TI_MACH
config SND_SOC_INTEL_BYT_CHT_DA7213_MACH
tristate "ASoC Audio driver for Intel Baytrail & Cherrytrail with DA7212/7213 codec"
depends on X86_INTEL_LPSS && I2C && ACPI
+ select SND_SOC_ACPI
select SND_SOC_DA7213
help
This adds support for ASoC machine driver for Intel(R) Baytrail & CherryTrail
--
2.15.1
^ permalink raw reply related [flat|nested] 38+ messages in thread
* Applied "ASoC: Intel: boards: align Kconfig configurations for HiFi2" to the asoc tree
@ 2018-01-08 16:21 ` Mark Brown
0 siblings, 0 replies; 38+ messages in thread
From: Mark Brown @ 2018-01-08 16:21 UTC (permalink / raw)
To: Pierre-Louis Bossart
Cc: Mark Brown, alsa-devel, arnd, tiwai, linux-kernel,
liam.r.girdwood, vinod.koul
The patch
ASoC: Intel: boards: align Kconfig configurations for HiFi2
has been applied to the asoc tree at
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying
to this mail.
Thanks,
Mark
>From 99644597d71333866070f0223bffa62c03f36587 Mon Sep 17 00:00:00 2001
From: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Date: Thu, 4 Jan 2018 16:35:58 -0600
Subject: [PATCH] ASoC: Intel: boards: align Kconfig configurations for HiFi2
Make sure all the configs are aligned
Also add the missing dependencies on SOC_ACPI stuff used to fix
DAI names based on HID and fix a couple of indentation issues
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Acked-By: Vinod Koul <vinod.koul@intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
---
sound/soc/intel/boards/Kconfig | 33 +++++++++++++++++++--------------
1 file changed, 19 insertions(+), 14 deletions(-)
diff --git a/sound/soc/intel/boards/Kconfig b/sound/soc/intel/boards/Kconfig
index 358f8f33adc4..08c482cc02f7 100644
--- a/sound/soc/intel/boards/Kconfig
+++ b/sound/soc/intel/boards/Kconfig
@@ -85,29 +85,32 @@ endif
if SND_SST_ATOM_HIFI2_PLATFORM
config SND_SOC_INTEL_BYTCR_RT5640_MACH
- tristate "ASoC Audio driver for Intel Baytrail and Baytrail-CR with RT5640 codec"
- depends on X86 && I2C && ACPI
+ tristate "ASoC Audio driver for Intel Baytrail and Baytrail-CR with RT5640 codec"
+ depends on X86_INTEL_LPSS && I2C && ACPI
+ select SND_SOC_ACPI
select SND_SOC_RT5640
help
- This adds support for ASoC machine driver for Intel(R) Baytrail and Baytrail-CR
- platforms with RT5640 audio codec.
- Say Y or m if you have such a device. This is a recommended option.
- If unsure select "N".
+ This adds support for ASoC machine driver for Intel(R) Baytrail and Baytrail-CR
+ platforms with RT5640 audio codec.
+ Say Y or m if you have such a device. This is a recommended option.
+ If unsure select "N".
config SND_SOC_INTEL_BYTCR_RT5651_MACH
- tristate "ASoC Audio driver for Intel Baytrail and Baytrail-CR with RT5651 codec"
- depends on X86 && I2C && ACPI
+ tristate "ASoC Audio driver for Intel Baytrail and Baytrail-CR with RT5651 codec"
+ depends on X86_INTEL_LPSS && I2C && ACPI
+ select SND_SOC_ACPI
select SND_SOC_RT5651
help
- This adds support for ASoC machine driver for Intel(R) Baytrail and Baytrail-CR
- platforms with RT5651 audio codec.
- Say Y or m if you have such a device. This is a recommended option.
- If unsure select "N".
+ This adds support for ASoC machine driver for Intel(R) Baytrail and Baytrail-CR
+ platforms with RT5651 audio codec.
+ Say Y or m if you have such a device. This is a recommended option.
+ If unsure select "N".
config SND_SOC_INTEL_CHT_BSW_RT5672_MACH
- tristate "ASoC Audio driver for Intel Cherrytrail & Braswell with RT5672 codec"
+ tristate "ASoC Audio driver for Intel Cherrytrail & Braswell with RT5672 codec"
depends on X86_INTEL_LPSS && I2C && ACPI
- select SND_SOC_RT5670
+ select SND_SOC_ACPI
+ select SND_SOC_RT5670
help
This adds support for ASoC machine driver for Intel(R) Cherrytrail & Braswell
platforms with RT5672 audio codec.
@@ -117,6 +120,7 @@ config SND_SOC_INTEL_CHT_BSW_RT5672_MACH
config SND_SOC_INTEL_CHT_BSW_RT5645_MACH
tristate "ASoC Audio driver for Intel Cherrytrail & Braswell with RT5645/5650 codec"
depends on X86_INTEL_LPSS && I2C && ACPI
+ select SND_SOC_ACPI
select SND_SOC_RT5645
help
This adds support for ASoC machine driver for Intel(R) Cherrytrail & Braswell
@@ -138,6 +142,7 @@ config SND_SOC_INTEL_CHT_BSW_MAX98090_TI_MACH
config SND_SOC_INTEL_BYT_CHT_DA7213_MACH
tristate "ASoC Audio driver for Intel Baytrail & Cherrytrail with DA7212/7213 codec"
depends on X86_INTEL_LPSS && I2C && ACPI
+ select SND_SOC_ACPI
select SND_SOC_DA7213
help
This adds support for ASoC machine driver for Intel(R) Baytrail & CherryTrail
--
2.15.1
^ permalink raw reply related [flat|nested] 38+ messages in thread
* Applied "ASoC: Intel: document what Kconfig options do" to the asoc tree
2018-01-03 16:50 ` Pierre-Louis Bossart
@ 2018-01-08 16:22 ` Mark Brown
-1 siblings, 0 replies; 38+ messages in thread
From: Mark Brown @ 2018-01-08 16:22 UTC (permalink / raw)
To: Pierre-Louis Bossart
Cc: Mark Brown, alsa-devel, arnd, tiwai, linux-kernel,
liam.r.girdwood, vinod.koul, broonie, andriy.shevchenko,
torvalds, alsa-devel
The patch
ASoC: Intel: document what Kconfig options do
has been applied to the asoc tree at
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying
to this mail.
Thanks,
Mark
>From def2c4284fd6b3402265ee050d769897e3331521 Mon Sep 17 00:00:00 2001
From: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Date: Thu, 4 Jan 2018 16:35:55 -0600
Subject: [PATCH] ASoC: Intel: document what Kconfig options do
Document in comments what the options are supposed to mean, before
clean-up in next patch.
No functionality change here.
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Acked-By: Vinod Koul <vinod.koul@intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
---
sound/soc/intel/Kconfig | 17 ++++++++++++++---
1 file changed, 14 insertions(+), 3 deletions(-)
diff --git a/sound/soc/intel/Kconfig b/sound/soc/intel/Kconfig
index 16374576cb6e..01b75df6b118 100644
--- a/sound/soc/intel/Kconfig
+++ b/sound/soc/intel/Kconfig
@@ -16,16 +16,27 @@ if SND_SOC_INTEL_SST_TOPLEVEL
config SND_SST_IPC
tristate
+ # This option controls the IPC core for HiFi2 platforms
config SND_SST_IPC_PCI
tristate
select SND_SST_IPC
+ # This option controls the PCI-based IPC for HiFi2 platforms
+ # (Medfield, Merrifield).
config SND_SST_IPC_ACPI
tristate
select SND_SST_IPC
select SND_SOC_INTEL_SST
select IOSF_MBI
+ # This option controls the ACPI-based IPC for HiFi2 platforms
+ # (Baytrail, Cherrytrail)
+
+config SND_SOC_INTEL_SST_ACPI
+ tristate
+ # This option controls ACPI-based probing on
+ # Haswell/Broadwell/Baytrail legacy and will be set
+ # when these platforms are enabled
config SND_SOC_INTEL_SST
tristate
@@ -34,9 +45,9 @@ config SND_SOC_INTEL_SST
config SND_SOC_INTEL_SST_FIRMWARE
tristate
select DW_DMAC_CORE
-
-config SND_SOC_INTEL_SST_ACPI
- tristate
+ # This option controls firmware download on
+ # Haswell/Broadwell/Baytrail legacy and will be set
+ # when these platforms are enabled
config SND_SOC_INTEL_HASWELL
tristate "Intel ASoC SST driver for Haswell/Broadwell"
--
2.15.1
^ permalink raw reply related [flat|nested] 38+ messages in thread
* Applied "ASoC: Intel: document what Kconfig options do" to the asoc tree
@ 2018-01-08 16:22 ` Mark Brown
0 siblings, 0 replies; 38+ messages in thread
From: Mark Brown @ 2018-01-08 16:22 UTC (permalink / raw)
To: Pierre-Louis Bossart
Cc: Mark Brown, alsa-devel, arnd, tiwai, linux-kernel,
liam.r.girdwood, vinod.koul
The patch
ASoC: Intel: document what Kconfig options do
has been applied to the asoc tree at
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying
to this mail.
Thanks,
Mark
>From def2c4284fd6b3402265ee050d769897e3331521 Mon Sep 17 00:00:00 2001
From: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Date: Thu, 4 Jan 2018 16:35:55 -0600
Subject: [PATCH] ASoC: Intel: document what Kconfig options do
Document in comments what the options are supposed to mean, before
clean-up in next patch.
No functionality change here.
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Acked-By: Vinod Koul <vinod.koul@intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
---
sound/soc/intel/Kconfig | 17 ++++++++++++++---
1 file changed, 14 insertions(+), 3 deletions(-)
diff --git a/sound/soc/intel/Kconfig b/sound/soc/intel/Kconfig
index 16374576cb6e..01b75df6b118 100644
--- a/sound/soc/intel/Kconfig
+++ b/sound/soc/intel/Kconfig
@@ -16,16 +16,27 @@ if SND_SOC_INTEL_SST_TOPLEVEL
config SND_SST_IPC
tristate
+ # This option controls the IPC core for HiFi2 platforms
config SND_SST_IPC_PCI
tristate
select SND_SST_IPC
+ # This option controls the PCI-based IPC for HiFi2 platforms
+ # (Medfield, Merrifield).
config SND_SST_IPC_ACPI
tristate
select SND_SST_IPC
select SND_SOC_INTEL_SST
select IOSF_MBI
+ # This option controls the ACPI-based IPC for HiFi2 platforms
+ # (Baytrail, Cherrytrail)
+
+config SND_SOC_INTEL_SST_ACPI
+ tristate
+ # This option controls ACPI-based probing on
+ # Haswell/Broadwell/Baytrail legacy and will be set
+ # when these platforms are enabled
config SND_SOC_INTEL_SST
tristate
@@ -34,9 +45,9 @@ config SND_SOC_INTEL_SST
config SND_SOC_INTEL_SST_FIRMWARE
tristate
select DW_DMAC_CORE
-
-config SND_SOC_INTEL_SST_ACPI
- tristate
+ # This option controls firmware download on
+ # Haswell/Broadwell/Baytrail legacy and will be set
+ # when these platforms are enabled
config SND_SOC_INTEL_HASWELL
tristate "Intel ASoC SST driver for Haswell/Broadwell"
--
2.15.1
^ permalink raw reply related [flat|nested] 38+ messages in thread
* Applied "ASoC: Intel: Kconfig: Simplify-clarify ACPI/PCI dependencies" to the asoc tree
2018-01-03 16:50 ` Pierre-Louis Bossart
@ 2018-01-08 16:22 ` Mark Brown
-1 siblings, 0 replies; 38+ messages in thread
From: Mark Brown @ 2018-01-08 16:22 UTC (permalink / raw)
To: Pierre-Louis Bossart
Cc: Mark Brown, alsa-devel, arnd, tiwai, linux-kernel,
liam.r.girdwood, vinod.koul, broonie, andriy.shevchenko,
torvalds, alsa-devel
The patch
ASoC: Intel: Kconfig: Simplify-clarify ACPI/PCI dependencies
has been applied to the asoc tree at
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying
to this mail.
Thanks,
Mark
>From 4772c16ede522d46219a59646503d2020841a6f4 Mon Sep 17 00:00:00 2001
From: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Date: Thu, 4 Jan 2018 16:35:54 -0600
Subject: [PATCH] ASoC: Intel: Kconfig: Simplify-clarify ACPI/PCI dependencies
PCI/ACPI selections should not happen in Kconfig for machine drivers,
move to SOC selections.
Add distinction between PCI and ACPI HiFi2 platforms and help text.
There should be no functionality change.
The PCI-based platforms may be removed at some point since Medfield
is not really supported by anyone, and with Edison now defunct support for
Merrifield/Edison is to be determined.
The dependency on SND_DMA_SGBUF for Haswell is not clear at this
point and may have to be further updated.
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Acked-By: Vinod Koul <vinod.koul@intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
---
sound/soc/intel/Kconfig | 27 +++++++++++++++++++++++----
sound/soc/intel/boards/Kconfig | 14 ++++----------
2 files changed, 27 insertions(+), 14 deletions(-)
diff --git a/sound/soc/intel/Kconfig b/sound/soc/intel/Kconfig
index b827d3b70095..16374576cb6e 100644
--- a/sound/soc/intel/Kconfig
+++ b/sound/soc/intel/Kconfig
@@ -41,7 +41,7 @@ config SND_SOC_INTEL_SST_ACPI
config SND_SOC_INTEL_HASWELL
tristate "Intel ASoC SST driver for Haswell/Broadwell"
depends on SND_DMA_SGBUF
- depends on DMADEVICES
+ depends on DMADEVICES && ACPI
select SND_SOC_INTEL_SST
select SND_SOC_INTEL_SST_FIRMWARE
select SND_SOC_ACPI_INTEL_MATCH
@@ -52,7 +52,7 @@ config SND_SOC_INTEL_HASWELL
config SND_SOC_INTEL_BAYTRAIL
tristate "Intel ASoC SST driver for Baytrail (legacy)"
- depends on DMADEVICES
+ depends on DMADEVICES && ACPI
select SND_SOC_INTEL_SST
select SND_SOC_INTEL_SST_FIRMWARE
select SND_SOC_ACPI_INTEL_MATCH
@@ -62,11 +62,30 @@ config SND_SOC_INTEL_BAYTRAIL
for Baytrail Chromebooks but this option is now deprecated and is
not recommended, use SND_SST_ATOM_HIFI2_PLATFORM instead.
+config SND_SST_ATOM_HIFI2_PLATFORM_PCI
+ tristate "Intel ASoC SST driver for PCI HiFi2 platforms (Medfield, Merrifield)"
+ depends on X86 && PCI
+ select SND_SST_IPC_PCI
+ select SND_SOC_COMPRESS
+ select SND_SOC_INTEL_COMMON
+ help
+ If you have a Intel Medfield or Merrifield/Edison platform, then
+ enable this option by saying Y or m. Distros will typically not
+ enable this option: Medfield devices are not available to
+ developers and while Merrifield/Edison can run a mainline kernel with
+ limited functionality it will require a firmware file which
+ is not in the standard firmware tree
+
config SND_SST_ATOM_HIFI2_PLATFORM
- tristate "Intel ASoC SST driver for HiFi2 platforms (*field, *trail)"
- depends on X86
+ tristate "Intel ASoC SST driver for ACPI HiFi2 platforms (Baytrail, Cherrytrail)"
+ depends on X86 && ACPI
+ select SND_SST_IPC_ACPI
select SND_SOC_COMPRESS
select SND_SOC_ACPI_INTEL_MATCH
+ help
+ If you have a Intel Baytrail or Cherrytrail platform with an I2S
+ codec, then enable this option by saying Y or m. This is a
+ recommended option
config SND_SOC_INTEL_SKYLAKE
tristate "Intel ASoC SST driver for SKL/BXT/KBL/GLK/CNL"
diff --git a/sound/soc/intel/boards/Kconfig b/sound/soc/intel/boards/Kconfig
index 08481882c240..e926f9747232 100644
--- a/sound/soc/intel/boards/Kconfig
+++ b/sound/soc/intel/boards/Kconfig
@@ -12,18 +12,20 @@ menuconfig SND_SOC_INTEL_MACH
if SND_SOC_INTEL_MACH
+if SND_SST_ATOM_HIFI2_PLATFORM_PCI
+
config SND_MFLD_MACHINE
tristate "SOC Machine Audio driver for Intel Medfield MID platform"
depends on INTEL_SCU_IPC
select SND_SOC_SN95031
- depends on SND_SST_ATOM_HIFI2_PLATFORM
- select SND_SST_IPC_PCI
help
This adds support for ASoC machine driver for Intel(R) MID Medfield platform
used as alsa device in audio substem in Intel(R) MID devices
Say Y if you have such a device.
If unsure select "N".
+endif
+
if SND_SOC_INTEL_HASWELL
config SND_SOC_INTEL_HASWELL_MACH
@@ -86,7 +88,6 @@ config SND_SOC_INTEL_BYTCR_RT5640_MACH
tristate "ASoC Audio driver for Intel Baytrail and Baytrail-CR with RT5640 codec"
depends on X86 && I2C && ACPI
select SND_SOC_RT5640
- select SND_SST_IPC_ACPI
help
This adds support for ASoC machine driver for Intel(R) Baytrail and Baytrail-CR
platforms with RT5640 audio codec.
@@ -97,7 +98,6 @@ config SND_SOC_INTEL_BYTCR_RT5651_MACH
tristate "ASoC Audio driver for Intel Baytrail and Baytrail-CR with RT5651 codec"
depends on X86 && I2C && ACPI
select SND_SOC_RT5651
- select SND_SST_IPC_ACPI
help
This adds support for ASoC machine driver for Intel(R) Baytrail and Baytrail-CR
platforms with RT5651 audio codec.
@@ -108,7 +108,6 @@ config SND_SOC_INTEL_CHT_BSW_RT5672_MACH
tristate "ASoC Audio driver for Intel Cherrytrail & Braswell with RT5672 codec"
depends on X86_INTEL_LPSS && I2C && ACPI
select SND_SOC_RT5670
- select SND_SST_IPC_ACPI
help
This adds support for ASoC machine driver for Intel(R) Cherrytrail & Braswell
platforms with RT5672 audio codec.
@@ -119,7 +118,6 @@ config SND_SOC_INTEL_CHT_BSW_RT5645_MACH
tristate "ASoC Audio driver for Intel Cherrytrail & Braswell with RT5645/5650 codec"
depends on X86_INTEL_LPSS && I2C && ACPI
select SND_SOC_RT5645
- select SND_SST_IPC_ACPI
help
This adds support for ASoC machine driver for Intel(R) Cherrytrail & Braswell
platforms with RT5645/5650 audio codec.
@@ -131,7 +129,6 @@ config SND_SOC_INTEL_CHT_BSW_MAX98090_TI_MACH
depends on X86_INTEL_LPSS && I2C && ACPI
select SND_SOC_MAX98090
select SND_SOC_TS3A227E
- select SND_SST_IPC_ACPI
help
This adds support for ASoC machine driver for Intel(R) Cherrytrail & Braswell
platforms with MAX98090 audio codec it also can support TI jack chip as aux device.
@@ -142,7 +139,6 @@ config SND_SOC_INTEL_BYT_CHT_DA7213_MACH
tristate "ASoC Audio driver for Intel Baytrail & Cherrytrail with DA7212/7213 codec"
depends on X86_INTEL_LPSS && I2C && ACPI
select SND_SOC_DA7213
- select SND_SST_IPC_ACPI
help
This adds support for ASoC machine driver for Intel(R) Baytrail & CherryTrail
platforms with DA7212/7213 audio codec.
@@ -153,7 +149,6 @@ config SND_SOC_INTEL_BYT_CHT_ES8316_MACH
tristate "ASoC Audio driver for Intel Baytrail & Cherrytrail with ES8316 codec"
depends on X86_INTEL_LPSS && I2C && ACPI
select SND_SOC_ES8316
- select SND_SST_IPC_ACPI
help
This adds support for ASoC machine driver for Intel(R) Baytrail &
Cherrytrail platforms with ES8316 audio codec.
@@ -163,7 +158,6 @@ config SND_SOC_INTEL_BYT_CHT_ES8316_MACH
config SND_SOC_INTEL_BYT_CHT_NOCODEC_MACH
tristate "ASoC Audio driver for Intel Baytrail & Cherrytrail platform with no codec (MinnowBoard MAX, Up)"
depends on X86_INTEL_LPSS && I2C && ACPI
- select SND_SST_IPC_ACPI
help
This adds support for ASoC machine driver for the MinnowBoard Max or
Up boards and provides access to I2S signals on the Low-Speed
--
2.15.1
^ permalink raw reply related [flat|nested] 38+ messages in thread
* Applied "ASoC: Intel: Kconfig: Simplify-clarify ACPI/PCI dependencies" to the asoc tree
@ 2018-01-08 16:22 ` Mark Brown
0 siblings, 0 replies; 38+ messages in thread
From: Mark Brown @ 2018-01-08 16:22 UTC (permalink / raw)
To: Pierre-Louis Bossart
Cc: Mark Brown, alsa-devel, arnd, tiwai, linux-kernel,
liam.r.girdwood, vinod.koul
The patch
ASoC: Intel: Kconfig: Simplify-clarify ACPI/PCI dependencies
has been applied to the asoc tree at
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying
to this mail.
Thanks,
Mark
>From 4772c16ede522d46219a59646503d2020841a6f4 Mon Sep 17 00:00:00 2001
From: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Date: Thu, 4 Jan 2018 16:35:54 -0600
Subject: [PATCH] ASoC: Intel: Kconfig: Simplify-clarify ACPI/PCI dependencies
PCI/ACPI selections should not happen in Kconfig for machine drivers,
move to SOC selections.
Add distinction between PCI and ACPI HiFi2 platforms and help text.
There should be no functionality change.
The PCI-based platforms may be removed at some point since Medfield
is not really supported by anyone, and with Edison now defunct support for
Merrifield/Edison is to be determined.
The dependency on SND_DMA_SGBUF for Haswell is not clear at this
point and may have to be further updated.
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Acked-By: Vinod Koul <vinod.koul@intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
---
sound/soc/intel/Kconfig | 27 +++++++++++++++++++++++----
sound/soc/intel/boards/Kconfig | 14 ++++----------
2 files changed, 27 insertions(+), 14 deletions(-)
diff --git a/sound/soc/intel/Kconfig b/sound/soc/intel/Kconfig
index b827d3b70095..16374576cb6e 100644
--- a/sound/soc/intel/Kconfig
+++ b/sound/soc/intel/Kconfig
@@ -41,7 +41,7 @@ config SND_SOC_INTEL_SST_ACPI
config SND_SOC_INTEL_HASWELL
tristate "Intel ASoC SST driver for Haswell/Broadwell"
depends on SND_DMA_SGBUF
- depends on DMADEVICES
+ depends on DMADEVICES && ACPI
select SND_SOC_INTEL_SST
select SND_SOC_INTEL_SST_FIRMWARE
select SND_SOC_ACPI_INTEL_MATCH
@@ -52,7 +52,7 @@ config SND_SOC_INTEL_HASWELL
config SND_SOC_INTEL_BAYTRAIL
tristate "Intel ASoC SST driver for Baytrail (legacy)"
- depends on DMADEVICES
+ depends on DMADEVICES && ACPI
select SND_SOC_INTEL_SST
select SND_SOC_INTEL_SST_FIRMWARE
select SND_SOC_ACPI_INTEL_MATCH
@@ -62,11 +62,30 @@ config SND_SOC_INTEL_BAYTRAIL
for Baytrail Chromebooks but this option is now deprecated and is
not recommended, use SND_SST_ATOM_HIFI2_PLATFORM instead.
+config SND_SST_ATOM_HIFI2_PLATFORM_PCI
+ tristate "Intel ASoC SST driver for PCI HiFi2 platforms (Medfield, Merrifield)"
+ depends on X86 && PCI
+ select SND_SST_IPC_PCI
+ select SND_SOC_COMPRESS
+ select SND_SOC_INTEL_COMMON
+ help
+ If you have a Intel Medfield or Merrifield/Edison platform, then
+ enable this option by saying Y or m. Distros will typically not
+ enable this option: Medfield devices are not available to
+ developers and while Merrifield/Edison can run a mainline kernel with
+ limited functionality it will require a firmware file which
+ is not in the standard firmware tree
+
config SND_SST_ATOM_HIFI2_PLATFORM
- tristate "Intel ASoC SST driver for HiFi2 platforms (*field, *trail)"
- depends on X86
+ tristate "Intel ASoC SST driver for ACPI HiFi2 platforms (Baytrail, Cherrytrail)"
+ depends on X86 && ACPI
+ select SND_SST_IPC_ACPI
select SND_SOC_COMPRESS
select SND_SOC_ACPI_INTEL_MATCH
+ help
+ If you have a Intel Baytrail or Cherrytrail platform with an I2S
+ codec, then enable this option by saying Y or m. This is a
+ recommended option
config SND_SOC_INTEL_SKYLAKE
tristate "Intel ASoC SST driver for SKL/BXT/KBL/GLK/CNL"
diff --git a/sound/soc/intel/boards/Kconfig b/sound/soc/intel/boards/Kconfig
index 08481882c240..e926f9747232 100644
--- a/sound/soc/intel/boards/Kconfig
+++ b/sound/soc/intel/boards/Kconfig
@@ -12,18 +12,20 @@ menuconfig SND_SOC_INTEL_MACH
if SND_SOC_INTEL_MACH
+if SND_SST_ATOM_HIFI2_PLATFORM_PCI
+
config SND_MFLD_MACHINE
tristate "SOC Machine Audio driver for Intel Medfield MID platform"
depends on INTEL_SCU_IPC
select SND_SOC_SN95031
- depends on SND_SST_ATOM_HIFI2_PLATFORM
- select SND_SST_IPC_PCI
help
This adds support for ASoC machine driver for Intel(R) MID Medfield platform
used as alsa device in audio substem in Intel(R) MID devices
Say Y if you have such a device.
If unsure select "N".
+endif
+
if SND_SOC_INTEL_HASWELL
config SND_SOC_INTEL_HASWELL_MACH
@@ -86,7 +88,6 @@ config SND_SOC_INTEL_BYTCR_RT5640_MACH
tristate "ASoC Audio driver for Intel Baytrail and Baytrail-CR with RT5640 codec"
depends on X86 && I2C && ACPI
select SND_SOC_RT5640
- select SND_SST_IPC_ACPI
help
This adds support for ASoC machine driver for Intel(R) Baytrail and Baytrail-CR
platforms with RT5640 audio codec.
@@ -97,7 +98,6 @@ config SND_SOC_INTEL_BYTCR_RT5651_MACH
tristate "ASoC Audio driver for Intel Baytrail and Baytrail-CR with RT5651 codec"
depends on X86 && I2C && ACPI
select SND_SOC_RT5651
- select SND_SST_IPC_ACPI
help
This adds support for ASoC machine driver for Intel(R) Baytrail and Baytrail-CR
platforms with RT5651 audio codec.
@@ -108,7 +108,6 @@ config SND_SOC_INTEL_CHT_BSW_RT5672_MACH
tristate "ASoC Audio driver for Intel Cherrytrail & Braswell with RT5672 codec"
depends on X86_INTEL_LPSS && I2C && ACPI
select SND_SOC_RT5670
- select SND_SST_IPC_ACPI
help
This adds support for ASoC machine driver for Intel(R) Cherrytrail & Braswell
platforms with RT5672 audio codec.
@@ -119,7 +118,6 @@ config SND_SOC_INTEL_CHT_BSW_RT5645_MACH
tristate "ASoC Audio driver for Intel Cherrytrail & Braswell with RT5645/5650 codec"
depends on X86_INTEL_LPSS && I2C && ACPI
select SND_SOC_RT5645
- select SND_SST_IPC_ACPI
help
This adds support for ASoC machine driver for Intel(R) Cherrytrail & Braswell
platforms with RT5645/5650 audio codec.
@@ -131,7 +129,6 @@ config SND_SOC_INTEL_CHT_BSW_MAX98090_TI_MACH
depends on X86_INTEL_LPSS && I2C && ACPI
select SND_SOC_MAX98090
select SND_SOC_TS3A227E
- select SND_SST_IPC_ACPI
help
This adds support for ASoC machine driver for Intel(R) Cherrytrail & Braswell
platforms with MAX98090 audio codec it also can support TI jack chip as aux device.
@@ -142,7 +139,6 @@ config SND_SOC_INTEL_BYT_CHT_DA7213_MACH
tristate "ASoC Audio driver for Intel Baytrail & Cherrytrail with DA7212/7213 codec"
depends on X86_INTEL_LPSS && I2C && ACPI
select SND_SOC_DA7213
- select SND_SST_IPC_ACPI
help
This adds support for ASoC machine driver for Intel(R) Baytrail & CherryTrail
platforms with DA7212/7213 audio codec.
@@ -153,7 +149,6 @@ config SND_SOC_INTEL_BYT_CHT_ES8316_MACH
tristate "ASoC Audio driver for Intel Baytrail & Cherrytrail with ES8316 codec"
depends on X86_INTEL_LPSS && I2C && ACPI
select SND_SOC_ES8316
- select SND_SST_IPC_ACPI
help
This adds support for ASoC machine driver for Intel(R) Baytrail &
Cherrytrail platforms with ES8316 audio codec.
@@ -163,7 +158,6 @@ config SND_SOC_INTEL_BYT_CHT_ES8316_MACH
config SND_SOC_INTEL_BYT_CHT_NOCODEC_MACH
tristate "ASoC Audio driver for Intel Baytrail & Cherrytrail platform with no codec (MinnowBoard MAX, Up)"
depends on X86_INTEL_LPSS && I2C && ACPI
- select SND_SST_IPC_ACPI
help
This adds support for ASoC machine driver for the MinnowBoard Max or
Up boards and provides access to I2S signals on the Low-Speed
--
2.15.1
^ permalink raw reply related [flat|nested] 38+ messages in thread
* Applied "ASoC: Intel: Fix Kconfig with top-level selector" to the asoc tree
2018-01-03 16:50 ` [PATCH v2 2/9] ASoC: Intel: Fix Kconfig with top-level selector Pierre-Louis Bossart
@ 2018-01-08 16:22 ` Mark Brown
0 siblings, 0 replies; 38+ messages in thread
From: Mark Brown @ 2018-01-08 16:22 UTC (permalink / raw)
To: Pierre-Louis Bossart
Cc: Linus Torvalds, Vinod Koul, Mark Brown, alsa-devel, arnd, tiwai,
linux-kernel, liam.r.girdwood, vinod.koul, broonie,
andriy.shevchenko, torvalds, alsa-devel
The patch
ASoC: Intel: Fix Kconfig with top-level selector
has been applied to the asoc tree at
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying
to this mail.
Thanks,
Mark
>From c6059879be298cccda52f77bf019a7a99eb13e78 Mon Sep 17 00:00:00 2001
From: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Date: Thu, 4 Jan 2018 16:35:53 -0600
Subject: [PATCH] ASoC: Intel: Fix Kconfig with top-level selector
Follow network example suggested by Linus, move Intel definitions
in if/endif block and clarify in help text which options distro
configurations should enable - everything except legacy Baytrail stuff and
NOCODEC (test only)
To avoid user confusion, machine drivers are handled with a submenu made
dependent on this top-level selector.
There should be no functionality change - except that sound capabilities
are restored when using older configs without any user selection.
Note that the SND_SOC_ACPI_INTEL_MATCH config is currently filtered
out by the top-level selector. This will change in the near future to
allow for this option to be selected by both SST and SOF drivers
(simplification with submenu for machine drivers by Vinod Koul)
Fixes: f6a118a800e3 ("ASoC: Intel: clarify Kconfig dependencies")
Reported-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
---
sound/soc/intel/Kconfig | 66 +++++++++++++++++++----------
sound/soc/intel/Makefile | 2 +-
sound/soc/intel/boards/Kconfig | 94 +++++++++++++++++++++++-------------------
3 files changed, 97 insertions(+), 65 deletions(-)
diff --git a/sound/soc/intel/Kconfig b/sound/soc/intel/Kconfig
index 7b49d04e3c60..b827d3b70095 100644
--- a/sound/soc/intel/Kconfig
+++ b/sound/soc/intel/Kconfig
@@ -1,3 +1,19 @@
+config SND_SOC_INTEL_SST_TOPLEVEL
+ bool "Intel ASoC SST drivers"
+ default y
+ depends on X86 || COMPILE_TEST
+ select SND_SOC_INTEL_MACH
+ help
+ Intel ASoC SST Platform Drivers. If you have a Intel machine that
+ has an audio controller with a DSP and I2S or DMIC port, then
+ enable this option by saying Y
+
+ Note that the answer to this question doesn't directly affect the
+ kernel: saying N will just cause the configurator to skip all
+ the questions about Intel SST drivers.
+
+if SND_SOC_INTEL_SST_TOPLEVEL
+
config SND_SST_IPC
tristate
@@ -11,9 +27,6 @@ config SND_SST_IPC_ACPI
select SND_SOC_INTEL_SST
select IOSF_MBI
-config SND_SOC_INTEL_COMMON
- tristate
-
config SND_SOC_INTEL_SST
tristate
select SND_SOC_INTEL_SST_ACPI if ACPI
@@ -25,47 +38,56 @@ config SND_SOC_INTEL_SST_FIRMWARE
config SND_SOC_INTEL_SST_ACPI
tristate
-config SND_SOC_ACPI_INTEL_MATCH
- tristate
- select SND_SOC_ACPI if ACPI
-
-config SND_SOC_INTEL_SST_TOPLEVEL
- tristate "Intel ASoC SST drivers"
- depends on X86 || COMPILE_TEST
- select SND_SOC_INTEL_MACH
- select SND_SOC_INTEL_COMMON
- help
- Intel ASoC Audio Drivers. If you have a Intel machine that
- has audio controller with a DSP and I2S or DMIC port, then
- enable this option by saying Y or M
- If unsure select "N".
-
config SND_SOC_INTEL_HASWELL
tristate "Intel ASoC SST driver for Haswell/Broadwell"
- depends on SND_SOC_INTEL_SST_TOPLEVEL && SND_DMA_SGBUF
+ depends on SND_DMA_SGBUF
depends on DMADEVICES
select SND_SOC_INTEL_SST
select SND_SOC_INTEL_SST_FIRMWARE
+ select SND_SOC_ACPI_INTEL_MATCH
+ help
+ If you have a Intel Haswell or Broadwell platform connected to
+ an I2S codec, then enable this option by saying Y or m. This is
+ typically used for Chromebooks. This is a recommended option.
config SND_SOC_INTEL_BAYTRAIL
tristate "Intel ASoC SST driver for Baytrail (legacy)"
- depends on SND_SOC_INTEL_SST_TOPLEVEL
depends on DMADEVICES
select SND_SOC_INTEL_SST
select SND_SOC_INTEL_SST_FIRMWARE
+ select SND_SOC_ACPI_INTEL_MATCH
+ help
+ If you have a Intel Baytrail platform connected to an I2S codec,
+ then enable this option by saying Y or m. This was typically used
+ for Baytrail Chromebooks but this option is now deprecated and is
+ not recommended, use SND_SST_ATOM_HIFI2_PLATFORM instead.
config SND_SST_ATOM_HIFI2_PLATFORM
tristate "Intel ASoC SST driver for HiFi2 platforms (*field, *trail)"
- depends on SND_SOC_INTEL_SST_TOPLEVEL && X86
+ depends on X86
select SND_SOC_COMPRESS
+ select SND_SOC_ACPI_INTEL_MATCH
config SND_SOC_INTEL_SKYLAKE
tristate "Intel ASoC SST driver for SKL/BXT/KBL/GLK/CNL"
- depends on SND_SOC_INTEL_SST_TOPLEVEL && PCI && ACPI
+ depends on PCI && ACPI
select SND_HDA_EXT_CORE
select SND_HDA_DSP_LOADER
select SND_SOC_TOPOLOGY
select SND_SOC_INTEL_SST
+ select SND_SOC_ACPI_INTEL_MATCH
+ help
+ If you have a Intel Skylake/Broxton/ApolloLake/KabyLake/
+ GeminiLake or CannonLake platform with the DSP enabled in the BIOS
+ then enable this option by saying Y or m.
+
+config SND_SOC_ACPI_INTEL_MATCH
+ tristate
+ select SND_SOC_ACPI if ACPI
+ # this option controls the compilation of ACPI matching tables and
+ # helpers and is not meant to be selected by the user.
+
+endif ## SND_SOC_INTEL_SST_TOPLEVEL
# ASoC codec drivers
source "sound/soc/intel/boards/Kconfig"
diff --git a/sound/soc/intel/Makefile b/sound/soc/intel/Makefile
index b973d457e834..8160520fd74c 100644
--- a/sound/soc/intel/Makefile
+++ b/sound/soc/intel/Makefile
@@ -1,6 +1,6 @@
# SPDX-License-Identifier: GPL-2.0
# Core support
-obj-$(CONFIG_SND_SOC_INTEL_COMMON) += common/
+obj-$(CONFIG_SND_SOC) += common/
# Platform Support
obj-$(CONFIG_SND_SOC_INTEL_HASWELL) += haswell/
diff --git a/sound/soc/intel/boards/Kconfig b/sound/soc/intel/boards/Kconfig
index 6f754708a48c..08481882c240 100644
--- a/sound/soc/intel/boards/Kconfig
+++ b/sound/soc/intel/boards/Kconfig
@@ -1,7 +1,14 @@
-config SND_SOC_INTEL_MACH
- tristate "Intel Audio machine drivers"
+menuconfig SND_SOC_INTEL_MACH
+ bool "Intel Machine drivers"
depends on SND_SOC_INTEL_SST_TOPLEVEL
- select SND_SOC_ACPI_INTEL_MATCH if ACPI
+ help
+ Intel ASoC Machine Drivers. If you have a Intel machine that
+ has an audio controller with a DSP and I2S or DMIC port, then
+ enable this option by saying Y
+
+ Note that the answer to this question doesn't directly affect the
+ kernel: saying N will just cause the configurator to skip all
+ the questions about Intel ASoC machine drivers.
if SND_SOC_INTEL_MACH
@@ -17,103 +24,106 @@ config SND_MFLD_MACHINE
Say Y if you have such a device.
If unsure select "N".
+if SND_SOC_INTEL_HASWELL
+
config SND_SOC_INTEL_HASWELL_MACH
tristate "ASoC Audio DSP support for Intel Haswell Lynxpoint"
depends on X86_INTEL_LPSS && I2C && I2C_DESIGNWARE_PLATFORM
- depends on SND_SOC_INTEL_HASWELL
select SND_SOC_RT5640
help
This adds support for the Lynxpoint Audio DSP on Intel(R) Haswell
- Ultrabook platforms.
- Say Y if you have such a device.
+ Ultrabook platforms. This is a recommended option.
+ Say Y or m if you have such a device.
If unsure select "N".
config SND_SOC_INTEL_BDW_RT5677_MACH
tristate "ASoC Audio driver for Intel Broadwell with RT5677 codec"
depends on X86_INTEL_LPSS && GPIOLIB && I2C
- depends on SND_SOC_INTEL_HASWELL
select SND_SOC_RT5677
help
This adds support for Intel Broadwell platform based boards with
- the RT5677 audio codec.
+ the RT5677 audio codec. This is a recommended option.
+ Say Y or m if you have such a device.
+ If unsure select "N".
config SND_SOC_INTEL_BROADWELL_MACH
tristate "ASoC Audio DSP support for Intel Broadwell Wildcatpoint"
depends on X86_INTEL_LPSS && I2C && I2C_DESIGNWARE_PLATFORM
- depends on SND_SOC_INTEL_HASWELL
select SND_SOC_RT286
help
This adds support for the Wilcatpoint Audio DSP on Intel(R) Broadwell
Ultrabook platforms.
- Say Y if you have such a device.
+ Say Y or m if you have such a device. This is a recommended option.
If unsure select "N".
+endif
+
+if SND_SOC_INTEL_BAYTRAIL
config SND_SOC_INTEL_BYT_MAX98090_MACH
tristate "ASoC Audio driver for Intel Baytrail with MAX98090 codec"
depends on X86_INTEL_LPSS && I2C
- depends on SND_SST_IPC_ACPI = n
- depends on SND_SOC_INTEL_BAYTRAIL
select SND_SOC_MAX98090
help
This adds audio driver for Intel Baytrail platform based boards
- with the MAX98090 audio codec.
+ with the MAX98090 audio codec. This driver is deprecated, use
+ SND_SOC_INTEL_CHT_BSW_MAX98090_TI_MACH instead for better
+ functionality.
config SND_SOC_INTEL_BYT_RT5640_MACH
tristate "ASoC Audio driver for Intel Baytrail with RT5640 codec"
depends on X86_INTEL_LPSS && I2C
- depends on SND_SST_IPC_ACPI = n
- depends on SND_SOC_INTEL_BAYTRAIL
select SND_SOC_RT5640
help
This adds audio driver for Intel Baytrail platform based boards
with the RT5640 audio codec. This driver is deprecated, use
SND_SOC_INTEL_BYTCR_RT5640_MACH instead for better functionality.
+endif
+
+if SND_SST_ATOM_HIFI2_PLATFORM
+
config SND_SOC_INTEL_BYTCR_RT5640_MACH
tristate "ASoC Audio driver for Intel Baytrail and Baytrail-CR with RT5640 codec"
depends on X86 && I2C && ACPI
select SND_SOC_RT5640
- depends on SND_SST_ATOM_HIFI2_PLATFORM
select SND_SST_IPC_ACPI
help
This adds support for ASoC machine driver for Intel(R) Baytrail and Baytrail-CR
platforms with RT5640 audio codec.
- Say Y if you have such a device.
+ Say Y or m if you have such a device. This is a recommended option.
If unsure select "N".
config SND_SOC_INTEL_BYTCR_RT5651_MACH
tristate "ASoC Audio driver for Intel Baytrail and Baytrail-CR with RT5651 codec"
depends on X86 && I2C && ACPI
select SND_SOC_RT5651
- depends on SND_SST_ATOM_HIFI2_PLATFORM
select SND_SST_IPC_ACPI
help
This adds support for ASoC machine driver for Intel(R) Baytrail and Baytrail-CR
platforms with RT5651 audio codec.
- Say Y if you have such a device.
+ Say Y or m if you have such a device. This is a recommended option.
If unsure select "N".
config SND_SOC_INTEL_CHT_BSW_RT5672_MACH
tristate "ASoC Audio driver for Intel Cherrytrail & Braswell with RT5672 codec"
depends on X86_INTEL_LPSS && I2C && ACPI
select SND_SOC_RT5670
- depends on SND_SST_ATOM_HIFI2_PLATFORM
select SND_SST_IPC_ACPI
help
This adds support for ASoC machine driver for Intel(R) Cherrytrail & Braswell
platforms with RT5672 audio codec.
- Say Y if you have such a device.
+ Say Y or m if you have such a device. This is a recommended option.
If unsure select "N".
config SND_SOC_INTEL_CHT_BSW_RT5645_MACH
tristate "ASoC Audio driver for Intel Cherrytrail & Braswell with RT5645/5650 codec"
depends on X86_INTEL_LPSS && I2C && ACPI
select SND_SOC_RT5645
- depends on SND_SST_ATOM_HIFI2_PLATFORM
select SND_SST_IPC_ACPI
help
This adds support for ASoC machine driver for Intel(R) Cherrytrail & Braswell
platforms with RT5645/5650 audio codec.
+ Say Y or m if you have such a device. This is a recommended option.
If unsure select "N".
config SND_SOC_INTEL_CHT_BSW_MAX98090_TI_MACH
@@ -121,63 +131,67 @@ config SND_SOC_INTEL_CHT_BSW_MAX98090_TI_MACH
depends on X86_INTEL_LPSS && I2C && ACPI
select SND_SOC_MAX98090
select SND_SOC_TS3A227E
- depends on SND_SST_ATOM_HIFI2_PLATFORM
select SND_SST_IPC_ACPI
help
This adds support for ASoC machine driver for Intel(R) Cherrytrail & Braswell
platforms with MAX98090 audio codec it also can support TI jack chip as aux device.
+ Say Y or m if you have such a device. This is a recommended option.
If unsure select "N".
config SND_SOC_INTEL_BYT_CHT_DA7213_MACH
tristate "ASoC Audio driver for Intel Baytrail & Cherrytrail with DA7212/7213 codec"
depends on X86_INTEL_LPSS && I2C && ACPI
select SND_SOC_DA7213
- depends on SND_SST_ATOM_HIFI2_PLATFORM
select SND_SST_IPC_ACPI
help
This adds support for ASoC machine driver for Intel(R) Baytrail & CherryTrail
platforms with DA7212/7213 audio codec.
+ Say Y or m if you have such a device. This is a recommended option.
If unsure select "N".
config SND_SOC_INTEL_BYT_CHT_ES8316_MACH
tristate "ASoC Audio driver for Intel Baytrail & Cherrytrail with ES8316 codec"
depends on X86_INTEL_LPSS && I2C && ACPI
select SND_SOC_ES8316
- depends on SND_SST_ATOM_HIFI2_PLATFORM
select SND_SST_IPC_ACPI
help
This adds support for ASoC machine driver for Intel(R) Baytrail &
Cherrytrail platforms with ES8316 audio codec.
+ Say Y or m if you have such a device. This is a recommended option.
If unsure select "N".
config SND_SOC_INTEL_BYT_CHT_NOCODEC_MACH
tristate "ASoC Audio driver for Intel Baytrail & Cherrytrail platform with no codec (MinnowBoard MAX, Up)"
depends on X86_INTEL_LPSS && I2C && ACPI
- depends on SND_SST_ATOM_HIFI2_PLATFORM
select SND_SST_IPC_ACPI
help
This adds support for ASoC machine driver for the MinnowBoard Max or
Up boards and provides access to I2S signals on the Low-Speed
- connector
+ connector. This is not a recommended option outside of these cases.
+ It is not intended to be enabled by distros by default.
+ Say Y or m if you have such a device.
+
If unsure select "N".
+endif
+
+if SND_SOC_INTEL_SKYLAKE
+
config SND_SOC_INTEL_SKL_RT286_MACH
tristate "ASoC Audio driver for SKL with RT286 I2S mode"
depends on X86 && ACPI && I2C
- depends on SND_SOC_INTEL_SKYLAKE
select SND_SOC_RT286
select SND_SOC_DMIC
select SND_SOC_HDAC_HDMI
help
This adds support for ASoC machine driver for Skylake platforms
with RT286 I2S audio codec.
- Say Y if you have such a device.
+ Say Y or m if you have such a device.
If unsure select "N".
config SND_SOC_INTEL_SKL_NAU88L25_SSM4567_MACH
tristate "ASoC Audio driver for SKL with NAU88L25 and SSM4567 in I2S Mode"
depends on X86_INTEL_LPSS && I2C
- depends on SND_SOC_INTEL_SKYLAKE
select SND_SOC_NAU8825
select SND_SOC_SSM4567
select SND_SOC_DMIC
@@ -185,13 +199,12 @@ config SND_SOC_INTEL_SKL_NAU88L25_SSM4567_MACH
help
This adds support for ASoC Onboard Codec I2S machine driver. This will
create an alsa sound card for NAU88L25 + SSM4567.
- Say Y if you have such a device.
+ Say Y or m if you have such a device. This is a recommended option.
If unsure select "N".
config SND_SOC_INTEL_SKL_NAU88L25_MAX98357A_MACH
tristate "ASoC Audio driver for SKL with NAU88L25 and MAX98357A in I2S Mode"
depends on X86_INTEL_LPSS && I2C
- depends on SND_SOC_INTEL_SKYLAKE
select SND_SOC_NAU8825
select SND_SOC_MAX98357A
select SND_SOC_DMIC
@@ -199,13 +212,12 @@ config SND_SOC_INTEL_SKL_NAU88L25_MAX98357A_MACH
help
This adds support for ASoC Onboard Codec I2S machine driver. This will
create an alsa sound card for NAU88L25 + MAX98357A.
- Say Y if you have such a device.
+ Say Y or m if you have such a device. This is a recommended option.
If unsure select "N".
config SND_SOC_INTEL_BXT_DA7219_MAX98357A_MACH
tristate "ASoC Audio driver for Broxton with DA7219 and MAX98357A in I2S Mode"
depends on X86 && ACPI && I2C
- depends on SND_SOC_INTEL_SKYLAKE
select SND_SOC_DA7219
select SND_SOC_MAX98357A
select SND_SOC_DMIC
@@ -214,13 +226,12 @@ config SND_SOC_INTEL_BXT_DA7219_MAX98357A_MACH
help
This adds support for ASoC machine driver for Broxton-P platforms
with DA7219 + MAX98357A I2S audio codec.
- Say Y if you have such a device.
+ Say Y or m if you have such a device. This is a recommended option.
If unsure select "N".
config SND_SOC_INTEL_BXT_RT298_MACH
tristate "ASoC Audio driver for Broxton with RT298 I2S mode"
depends on X86 && ACPI && I2C
- depends on SND_SOC_INTEL_SKYLAKE
select SND_SOC_RT298
select SND_SOC_DMIC
select SND_SOC_HDAC_HDMI
@@ -228,14 +239,13 @@ config SND_SOC_INTEL_BXT_RT298_MACH
help
This adds support for ASoC machine driver for Broxton platforms
with RT286 I2S audio codec.
- Say Y if you have such a device.
+ Say Y or m if you have such a device. This is a recommended option.
If unsure select "N".
config SND_SOC_INTEL_KBL_RT5663_MAX98927_MACH
tristate "ASoC Audio driver for KBL with RT5663 and MAX98927 in I2S Mode"
depends on X86_INTEL_LPSS && I2C
select SND_SOC_INTEL_SST
- depends on SND_SOC_INTEL_SKYLAKE
select SND_SOC_RT5663
select SND_SOC_MAX98927
select SND_SOC_DMIC
@@ -243,14 +253,13 @@ config SND_SOC_INTEL_KBL_RT5663_MAX98927_MACH
help
This adds support for ASoC Onboard Codec I2S machine driver. This will
create an alsa sound card for RT5663 + MAX98927.
- Say Y if you have such a device.
+ Say Y or m if you have such a device. This is a recommended option.
If unsure select "N".
config SND_SOC_INTEL_KBL_RT5663_RT5514_MAX98927_MACH
tristate "ASoC Audio driver for KBL with RT5663, RT5514 and MAX98927 in I2S Mode"
depends on X86_INTEL_LPSS && I2C && SPI
select SND_SOC_INTEL_SST
- depends on SND_SOC_INTEL_SKYLAKE
select SND_SOC_RT5663
select SND_SOC_RT5514
select SND_SOC_RT5514_SPI
@@ -259,7 +268,8 @@ config SND_SOC_INTEL_KBL_RT5663_RT5514_MAX98927_MACH
help
This adds support for ASoC Onboard Codec I2S machine driver. This will
create an alsa sound card for RT5663 + RT5514 + MAX98927.
- Say Y if you have such a device.
+ Say Y or m if you have such a device. This is a recommended option.
If unsure select "N".
-
endif
+
+endif ## SND_SOC_INTEL_MACH
--
2.15.1
^ permalink raw reply related [flat|nested] 38+ messages in thread
* Applied "ASoC: Intel: Fix Kconfig with top-level selector" to the asoc tree
@ 2018-01-08 16:22 ` Mark Brown
0 siblings, 0 replies; 38+ messages in thread
From: Mark Brown @ 2018-01-08 16:22 UTC (permalink / raw)
To: Pierre-Louis Bossart
Cc: Linus Torvalds, Vinod Koul, Mark Brown, alsa-devel, arnd, tiwai,
linux-kernel, liam.r.girdwood
The patch
ASoC: Intel: Fix Kconfig with top-level selector
has been applied to the asoc tree at
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying
to this mail.
Thanks,
Mark
>From c6059879be298cccda52f77bf019a7a99eb13e78 Mon Sep 17 00:00:00 2001
From: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Date: Thu, 4 Jan 2018 16:35:53 -0600
Subject: [PATCH] ASoC: Intel: Fix Kconfig with top-level selector
Follow network example suggested by Linus, move Intel definitions
in if/endif block and clarify in help text which options distro
configurations should enable - everything except legacy Baytrail stuff and
NOCODEC (test only)
To avoid user confusion, machine drivers are handled with a submenu made
dependent on this top-level selector.
There should be no functionality change - except that sound capabilities
are restored when using older configs without any user selection.
Note that the SND_SOC_ACPI_INTEL_MATCH config is currently filtered
out by the top-level selector. This will change in the near future to
allow for this option to be selected by both SST and SOF drivers
(simplification with submenu for machine drivers by Vinod Koul)
Fixes: f6a118a800e3 ("ASoC: Intel: clarify Kconfig dependencies")
Reported-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
---
sound/soc/intel/Kconfig | 66 +++++++++++++++++++----------
sound/soc/intel/Makefile | 2 +-
sound/soc/intel/boards/Kconfig | 94 +++++++++++++++++++++++-------------------
3 files changed, 97 insertions(+), 65 deletions(-)
diff --git a/sound/soc/intel/Kconfig b/sound/soc/intel/Kconfig
index 7b49d04e3c60..b827d3b70095 100644
--- a/sound/soc/intel/Kconfig
+++ b/sound/soc/intel/Kconfig
@@ -1,3 +1,19 @@
+config SND_SOC_INTEL_SST_TOPLEVEL
+ bool "Intel ASoC SST drivers"
+ default y
+ depends on X86 || COMPILE_TEST
+ select SND_SOC_INTEL_MACH
+ help
+ Intel ASoC SST Platform Drivers. If you have a Intel machine that
+ has an audio controller with a DSP and I2S or DMIC port, then
+ enable this option by saying Y
+
+ Note that the answer to this question doesn't directly affect the
+ kernel: saying N will just cause the configurator to skip all
+ the questions about Intel SST drivers.
+
+if SND_SOC_INTEL_SST_TOPLEVEL
+
config SND_SST_IPC
tristate
@@ -11,9 +27,6 @@ config SND_SST_IPC_ACPI
select SND_SOC_INTEL_SST
select IOSF_MBI
-config SND_SOC_INTEL_COMMON
- tristate
-
config SND_SOC_INTEL_SST
tristate
select SND_SOC_INTEL_SST_ACPI if ACPI
@@ -25,47 +38,56 @@ config SND_SOC_INTEL_SST_FIRMWARE
config SND_SOC_INTEL_SST_ACPI
tristate
-config SND_SOC_ACPI_INTEL_MATCH
- tristate
- select SND_SOC_ACPI if ACPI
-
-config SND_SOC_INTEL_SST_TOPLEVEL
- tristate "Intel ASoC SST drivers"
- depends on X86 || COMPILE_TEST
- select SND_SOC_INTEL_MACH
- select SND_SOC_INTEL_COMMON
- help
- Intel ASoC Audio Drivers. If you have a Intel machine that
- has audio controller with a DSP and I2S or DMIC port, then
- enable this option by saying Y or M
- If unsure select "N".
-
config SND_SOC_INTEL_HASWELL
tristate "Intel ASoC SST driver for Haswell/Broadwell"
- depends on SND_SOC_INTEL_SST_TOPLEVEL && SND_DMA_SGBUF
+ depends on SND_DMA_SGBUF
depends on DMADEVICES
select SND_SOC_INTEL_SST
select SND_SOC_INTEL_SST_FIRMWARE
+ select SND_SOC_ACPI_INTEL_MATCH
+ help
+ If you have a Intel Haswell or Broadwell platform connected to
+ an I2S codec, then enable this option by saying Y or m. This is
+ typically used for Chromebooks. This is a recommended option.
config SND_SOC_INTEL_BAYTRAIL
tristate "Intel ASoC SST driver for Baytrail (legacy)"
- depends on SND_SOC_INTEL_SST_TOPLEVEL
depends on DMADEVICES
select SND_SOC_INTEL_SST
select SND_SOC_INTEL_SST_FIRMWARE
+ select SND_SOC_ACPI_INTEL_MATCH
+ help
+ If you have a Intel Baytrail platform connected to an I2S codec,
+ then enable this option by saying Y or m. This was typically used
+ for Baytrail Chromebooks but this option is now deprecated and is
+ not recommended, use SND_SST_ATOM_HIFI2_PLATFORM instead.
config SND_SST_ATOM_HIFI2_PLATFORM
tristate "Intel ASoC SST driver for HiFi2 platforms (*field, *trail)"
- depends on SND_SOC_INTEL_SST_TOPLEVEL && X86
+ depends on X86
select SND_SOC_COMPRESS
+ select SND_SOC_ACPI_INTEL_MATCH
config SND_SOC_INTEL_SKYLAKE
tristate "Intel ASoC SST driver for SKL/BXT/KBL/GLK/CNL"
- depends on SND_SOC_INTEL_SST_TOPLEVEL && PCI && ACPI
+ depends on PCI && ACPI
select SND_HDA_EXT_CORE
select SND_HDA_DSP_LOADER
select SND_SOC_TOPOLOGY
select SND_SOC_INTEL_SST
+ select SND_SOC_ACPI_INTEL_MATCH
+ help
+ If you have a Intel Skylake/Broxton/ApolloLake/KabyLake/
+ GeminiLake or CannonLake platform with the DSP enabled in the BIOS
+ then enable this option by saying Y or m.
+
+config SND_SOC_ACPI_INTEL_MATCH
+ tristate
+ select SND_SOC_ACPI if ACPI
+ # this option controls the compilation of ACPI matching tables and
+ # helpers and is not meant to be selected by the user.
+
+endif ## SND_SOC_INTEL_SST_TOPLEVEL
# ASoC codec drivers
source "sound/soc/intel/boards/Kconfig"
diff --git a/sound/soc/intel/Makefile b/sound/soc/intel/Makefile
index b973d457e834..8160520fd74c 100644
--- a/sound/soc/intel/Makefile
+++ b/sound/soc/intel/Makefile
@@ -1,6 +1,6 @@
# SPDX-License-Identifier: GPL-2.0
# Core support
-obj-$(CONFIG_SND_SOC_INTEL_COMMON) += common/
+obj-$(CONFIG_SND_SOC) += common/
# Platform Support
obj-$(CONFIG_SND_SOC_INTEL_HASWELL) += haswell/
diff --git a/sound/soc/intel/boards/Kconfig b/sound/soc/intel/boards/Kconfig
index 6f754708a48c..08481882c240 100644
--- a/sound/soc/intel/boards/Kconfig
+++ b/sound/soc/intel/boards/Kconfig
@@ -1,7 +1,14 @@
-config SND_SOC_INTEL_MACH
- tristate "Intel Audio machine drivers"
+menuconfig SND_SOC_INTEL_MACH
+ bool "Intel Machine drivers"
depends on SND_SOC_INTEL_SST_TOPLEVEL
- select SND_SOC_ACPI_INTEL_MATCH if ACPI
+ help
+ Intel ASoC Machine Drivers. If you have a Intel machine that
+ has an audio controller with a DSP and I2S or DMIC port, then
+ enable this option by saying Y
+
+ Note that the answer to this question doesn't directly affect the
+ kernel: saying N will just cause the configurator to skip all
+ the questions about Intel ASoC machine drivers.
if SND_SOC_INTEL_MACH
@@ -17,103 +24,106 @@ config SND_MFLD_MACHINE
Say Y if you have such a device.
If unsure select "N".
+if SND_SOC_INTEL_HASWELL
+
config SND_SOC_INTEL_HASWELL_MACH
tristate "ASoC Audio DSP support for Intel Haswell Lynxpoint"
depends on X86_INTEL_LPSS && I2C && I2C_DESIGNWARE_PLATFORM
- depends on SND_SOC_INTEL_HASWELL
select SND_SOC_RT5640
help
This adds support for the Lynxpoint Audio DSP on Intel(R) Haswell
- Ultrabook platforms.
- Say Y if you have such a device.
+ Ultrabook platforms. This is a recommended option.
+ Say Y or m if you have such a device.
If unsure select "N".
config SND_SOC_INTEL_BDW_RT5677_MACH
tristate "ASoC Audio driver for Intel Broadwell with RT5677 codec"
depends on X86_INTEL_LPSS && GPIOLIB && I2C
- depends on SND_SOC_INTEL_HASWELL
select SND_SOC_RT5677
help
This adds support for Intel Broadwell platform based boards with
- the RT5677 audio codec.
+ the RT5677 audio codec. This is a recommended option.
+ Say Y or m if you have such a device.
+ If unsure select "N".
config SND_SOC_INTEL_BROADWELL_MACH
tristate "ASoC Audio DSP support for Intel Broadwell Wildcatpoint"
depends on X86_INTEL_LPSS && I2C && I2C_DESIGNWARE_PLATFORM
- depends on SND_SOC_INTEL_HASWELL
select SND_SOC_RT286
help
This adds support for the Wilcatpoint Audio DSP on Intel(R) Broadwell
Ultrabook platforms.
- Say Y if you have such a device.
+ Say Y or m if you have such a device. This is a recommended option.
If unsure select "N".
+endif
+
+if SND_SOC_INTEL_BAYTRAIL
config SND_SOC_INTEL_BYT_MAX98090_MACH
tristate "ASoC Audio driver for Intel Baytrail with MAX98090 codec"
depends on X86_INTEL_LPSS && I2C
- depends on SND_SST_IPC_ACPI = n
- depends on SND_SOC_INTEL_BAYTRAIL
select SND_SOC_MAX98090
help
This adds audio driver for Intel Baytrail platform based boards
- with the MAX98090 audio codec.
+ with the MAX98090 audio codec. This driver is deprecated, use
+ SND_SOC_INTEL_CHT_BSW_MAX98090_TI_MACH instead for better
+ functionality.
config SND_SOC_INTEL_BYT_RT5640_MACH
tristate "ASoC Audio driver for Intel Baytrail with RT5640 codec"
depends on X86_INTEL_LPSS && I2C
- depends on SND_SST_IPC_ACPI = n
- depends on SND_SOC_INTEL_BAYTRAIL
select SND_SOC_RT5640
help
This adds audio driver for Intel Baytrail platform based boards
with the RT5640 audio codec. This driver is deprecated, use
SND_SOC_INTEL_BYTCR_RT5640_MACH instead for better functionality.
+endif
+
+if SND_SST_ATOM_HIFI2_PLATFORM
+
config SND_SOC_INTEL_BYTCR_RT5640_MACH
tristate "ASoC Audio driver for Intel Baytrail and Baytrail-CR with RT5640 codec"
depends on X86 && I2C && ACPI
select SND_SOC_RT5640
- depends on SND_SST_ATOM_HIFI2_PLATFORM
select SND_SST_IPC_ACPI
help
This adds support for ASoC machine driver for Intel(R) Baytrail and Baytrail-CR
platforms with RT5640 audio codec.
- Say Y if you have such a device.
+ Say Y or m if you have such a device. This is a recommended option.
If unsure select "N".
config SND_SOC_INTEL_BYTCR_RT5651_MACH
tristate "ASoC Audio driver for Intel Baytrail and Baytrail-CR with RT5651 codec"
depends on X86 && I2C && ACPI
select SND_SOC_RT5651
- depends on SND_SST_ATOM_HIFI2_PLATFORM
select SND_SST_IPC_ACPI
help
This adds support for ASoC machine driver for Intel(R) Baytrail and Baytrail-CR
platforms with RT5651 audio codec.
- Say Y if you have such a device.
+ Say Y or m if you have such a device. This is a recommended option.
If unsure select "N".
config SND_SOC_INTEL_CHT_BSW_RT5672_MACH
tristate "ASoC Audio driver for Intel Cherrytrail & Braswell with RT5672 codec"
depends on X86_INTEL_LPSS && I2C && ACPI
select SND_SOC_RT5670
- depends on SND_SST_ATOM_HIFI2_PLATFORM
select SND_SST_IPC_ACPI
help
This adds support for ASoC machine driver for Intel(R) Cherrytrail & Braswell
platforms with RT5672 audio codec.
- Say Y if you have such a device.
+ Say Y or m if you have such a device. This is a recommended option.
If unsure select "N".
config SND_SOC_INTEL_CHT_BSW_RT5645_MACH
tristate "ASoC Audio driver for Intel Cherrytrail & Braswell with RT5645/5650 codec"
depends on X86_INTEL_LPSS && I2C && ACPI
select SND_SOC_RT5645
- depends on SND_SST_ATOM_HIFI2_PLATFORM
select SND_SST_IPC_ACPI
help
This adds support for ASoC machine driver for Intel(R) Cherrytrail & Braswell
platforms with RT5645/5650 audio codec.
+ Say Y or m if you have such a device. This is a recommended option.
If unsure select "N".
config SND_SOC_INTEL_CHT_BSW_MAX98090_TI_MACH
@@ -121,63 +131,67 @@ config SND_SOC_INTEL_CHT_BSW_MAX98090_TI_MACH
depends on X86_INTEL_LPSS && I2C && ACPI
select SND_SOC_MAX98090
select SND_SOC_TS3A227E
- depends on SND_SST_ATOM_HIFI2_PLATFORM
select SND_SST_IPC_ACPI
help
This adds support for ASoC machine driver for Intel(R) Cherrytrail & Braswell
platforms with MAX98090 audio codec it also can support TI jack chip as aux device.
+ Say Y or m if you have such a device. This is a recommended option.
If unsure select "N".
config SND_SOC_INTEL_BYT_CHT_DA7213_MACH
tristate "ASoC Audio driver for Intel Baytrail & Cherrytrail with DA7212/7213 codec"
depends on X86_INTEL_LPSS && I2C && ACPI
select SND_SOC_DA7213
- depends on SND_SST_ATOM_HIFI2_PLATFORM
select SND_SST_IPC_ACPI
help
This adds support for ASoC machine driver for Intel(R) Baytrail & CherryTrail
platforms with DA7212/7213 audio codec.
+ Say Y or m if you have such a device. This is a recommended option.
If unsure select "N".
config SND_SOC_INTEL_BYT_CHT_ES8316_MACH
tristate "ASoC Audio driver for Intel Baytrail & Cherrytrail with ES8316 codec"
depends on X86_INTEL_LPSS && I2C && ACPI
select SND_SOC_ES8316
- depends on SND_SST_ATOM_HIFI2_PLATFORM
select SND_SST_IPC_ACPI
help
This adds support for ASoC machine driver for Intel(R) Baytrail &
Cherrytrail platforms with ES8316 audio codec.
+ Say Y or m if you have such a device. This is a recommended option.
If unsure select "N".
config SND_SOC_INTEL_BYT_CHT_NOCODEC_MACH
tristate "ASoC Audio driver for Intel Baytrail & Cherrytrail platform with no codec (MinnowBoard MAX, Up)"
depends on X86_INTEL_LPSS && I2C && ACPI
- depends on SND_SST_ATOM_HIFI2_PLATFORM
select SND_SST_IPC_ACPI
help
This adds support for ASoC machine driver for the MinnowBoard Max or
Up boards and provides access to I2S signals on the Low-Speed
- connector
+ connector. This is not a recommended option outside of these cases.
+ It is not intended to be enabled by distros by default.
+ Say Y or m if you have such a device.
+
If unsure select "N".
+endif
+
+if SND_SOC_INTEL_SKYLAKE
+
config SND_SOC_INTEL_SKL_RT286_MACH
tristate "ASoC Audio driver for SKL with RT286 I2S mode"
depends on X86 && ACPI && I2C
- depends on SND_SOC_INTEL_SKYLAKE
select SND_SOC_RT286
select SND_SOC_DMIC
select SND_SOC_HDAC_HDMI
help
This adds support for ASoC machine driver for Skylake platforms
with RT286 I2S audio codec.
- Say Y if you have such a device.
+ Say Y or m if you have such a device.
If unsure select "N".
config SND_SOC_INTEL_SKL_NAU88L25_SSM4567_MACH
tristate "ASoC Audio driver for SKL with NAU88L25 and SSM4567 in I2S Mode"
depends on X86_INTEL_LPSS && I2C
- depends on SND_SOC_INTEL_SKYLAKE
select SND_SOC_NAU8825
select SND_SOC_SSM4567
select SND_SOC_DMIC
@@ -185,13 +199,12 @@ config SND_SOC_INTEL_SKL_NAU88L25_SSM4567_MACH
help
This adds support for ASoC Onboard Codec I2S machine driver. This will
create an alsa sound card for NAU88L25 + SSM4567.
- Say Y if you have such a device.
+ Say Y or m if you have such a device. This is a recommended option.
If unsure select "N".
config SND_SOC_INTEL_SKL_NAU88L25_MAX98357A_MACH
tristate "ASoC Audio driver for SKL with NAU88L25 and MAX98357A in I2S Mode"
depends on X86_INTEL_LPSS && I2C
- depends on SND_SOC_INTEL_SKYLAKE
select SND_SOC_NAU8825
select SND_SOC_MAX98357A
select SND_SOC_DMIC
@@ -199,13 +212,12 @@ config SND_SOC_INTEL_SKL_NAU88L25_MAX98357A_MACH
help
This adds support for ASoC Onboard Codec I2S machine driver. This will
create an alsa sound card for NAU88L25 + MAX98357A.
- Say Y if you have such a device.
+ Say Y or m if you have such a device. This is a recommended option.
If unsure select "N".
config SND_SOC_INTEL_BXT_DA7219_MAX98357A_MACH
tristate "ASoC Audio driver for Broxton with DA7219 and MAX98357A in I2S Mode"
depends on X86 && ACPI && I2C
- depends on SND_SOC_INTEL_SKYLAKE
select SND_SOC_DA7219
select SND_SOC_MAX98357A
select SND_SOC_DMIC
@@ -214,13 +226,12 @@ config SND_SOC_INTEL_BXT_DA7219_MAX98357A_MACH
help
This adds support for ASoC machine driver for Broxton-P platforms
with DA7219 + MAX98357A I2S audio codec.
- Say Y if you have such a device.
+ Say Y or m if you have such a device. This is a recommended option.
If unsure select "N".
config SND_SOC_INTEL_BXT_RT298_MACH
tristate "ASoC Audio driver for Broxton with RT298 I2S mode"
depends on X86 && ACPI && I2C
- depends on SND_SOC_INTEL_SKYLAKE
select SND_SOC_RT298
select SND_SOC_DMIC
select SND_SOC_HDAC_HDMI
@@ -228,14 +239,13 @@ config SND_SOC_INTEL_BXT_RT298_MACH
help
This adds support for ASoC machine driver for Broxton platforms
with RT286 I2S audio codec.
- Say Y if you have such a device.
+ Say Y or m if you have such a device. This is a recommended option.
If unsure select "N".
config SND_SOC_INTEL_KBL_RT5663_MAX98927_MACH
tristate "ASoC Audio driver for KBL with RT5663 and MAX98927 in I2S Mode"
depends on X86_INTEL_LPSS && I2C
select SND_SOC_INTEL_SST
- depends on SND_SOC_INTEL_SKYLAKE
select SND_SOC_RT5663
select SND_SOC_MAX98927
select SND_SOC_DMIC
@@ -243,14 +253,13 @@ config SND_SOC_INTEL_KBL_RT5663_MAX98927_MACH
help
This adds support for ASoC Onboard Codec I2S machine driver. This will
create an alsa sound card for RT5663 + MAX98927.
- Say Y if you have such a device.
+ Say Y or m if you have such a device. This is a recommended option.
If unsure select "N".
config SND_SOC_INTEL_KBL_RT5663_RT5514_MAX98927_MACH
tristate "ASoC Audio driver for KBL with RT5663, RT5514 and MAX98927 in I2S Mode"
depends on X86_INTEL_LPSS && I2C && SPI
select SND_SOC_INTEL_SST
- depends on SND_SOC_INTEL_SKYLAKE
select SND_SOC_RT5663
select SND_SOC_RT5514
select SND_SOC_RT5514_SPI
@@ -259,7 +268,8 @@ config SND_SOC_INTEL_KBL_RT5663_RT5514_MAX98927_MACH
help
This adds support for ASoC Onboard Codec I2S machine driver. This will
create an alsa sound card for RT5663 + RT5514 + MAX98927.
- Say Y if you have such a device.
+ Say Y or m if you have such a device. This is a recommended option.
If unsure select "N".
-
endif
+
+endif ## SND_SOC_INTEL_MACH
--
2.15.1
^ permalink raw reply related [flat|nested] 38+ messages in thread
* Applied "ASoC: acpi: add missing includes for non-ACPI platforms" to the asoc tree
2018-01-03 16:50 ` Pierre-Louis Bossart
@ 2018-01-08 16:23 ` Mark Brown
-1 siblings, 0 replies; 38+ messages in thread
From: Mark Brown @ 2018-01-08 16:23 UTC (permalink / raw)
To: Pierre-Louis Bossart
Cc: Mark Brown, alsa-devel, arnd, tiwai, linux-kernel,
liam.r.girdwood, vinod.koul, broonie, andriy.shevchenko,
torvalds, alsa-devel
The patch
ASoC: acpi: add missing includes for non-ACPI platforms
has been applied to the asoc tree at
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying
to this mail.
Thanks,
Mark
>From 845ab40092601630ec9eb58398a53b9a87b6900b Mon Sep 17 00:00:00 2001
From: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Date: Thu, 4 Jan 2018 16:35:52 -0600
Subject: [PATCH] ASoC: acpi: add missing includes for non-ACPI platforms
0-day reports compilation issues with non-ACPI platforms.
In file included from sound/soc/soc-acpi.c:17:0:
>> include/sound/soc-acpi.h:36:46: error: 'ACPI_ID_LEN' undeclared here
(not in a function); did you mean 'ACPI_FILE'?
snd_soc_acpi_find_name_from_hid(const u8 hid[ACPI_ID_LEN])
sound/soc/soc-acpi.c: At top level:
>> sound/soc/soc-acpi.c:174:16: error: expected declaration specifiers or
'...' before string constant
MODULE_LICENSE("GPL v2");
Add missing include files.
Fixes: 7feb2f786a46 ("ASoC: move ACPI common code out of Intel/sst tree")
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Acked-By: Vinod Koul <vinod.koul@intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
---
include/sound/soc-acpi-intel-match.h | 1 +
include/sound/soc-acpi.h | 1 +
2 files changed, 2 insertions(+)
diff --git a/include/sound/soc-acpi-intel-match.h b/include/sound/soc-acpi-intel-match.h
index 1a9191cd4bb3..9da6388c20a1 100644
--- a/include/sound/soc-acpi-intel-match.h
+++ b/include/sound/soc-acpi-intel-match.h
@@ -16,6 +16,7 @@
#ifndef __LINUX_SND_SOC_ACPI_INTEL_MATCH_H
#define __LINUX_SND_SOC_ACPI_INTEL_MATCH_H
+#include <linux/module.h>
#include <linux/stddef.h>
#include <linux/acpi.h>
diff --git a/include/sound/soc-acpi.h b/include/sound/soc-acpi.h
index a7d8d335b043..a93436089bf5 100644
--- a/include/sound/soc-acpi.h
+++ b/include/sound/soc-acpi.h
@@ -17,6 +17,7 @@
#include <linux/stddef.h>
#include <linux/acpi.h>
+#include <linux/mod_devicetable.h>
struct snd_soc_acpi_package_context {
char *name; /* package name */
--
2.15.1
^ permalink raw reply related [flat|nested] 38+ messages in thread
* Applied "ASoC: acpi: add missing includes for non-ACPI platforms" to the asoc tree
@ 2018-01-08 16:23 ` Mark Brown
0 siblings, 0 replies; 38+ messages in thread
From: Mark Brown @ 2018-01-08 16:23 UTC (permalink / raw)
To: Pierre-Louis Bossart
Cc: Mark Brown, alsa-devel, arnd, tiwai, linux-kernel,
liam.r.girdwood, vinod.koul
The patch
ASoC: acpi: add missing includes for non-ACPI platforms
has been applied to the asoc tree at
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying
to this mail.
Thanks,
Mark
>From 845ab40092601630ec9eb58398a53b9a87b6900b Mon Sep 17 00:00:00 2001
From: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Date: Thu, 4 Jan 2018 16:35:52 -0600
Subject: [PATCH] ASoC: acpi: add missing includes for non-ACPI platforms
0-day reports compilation issues with non-ACPI platforms.
In file included from sound/soc/soc-acpi.c:17:0:
>> include/sound/soc-acpi.h:36:46: error: 'ACPI_ID_LEN' undeclared here
(not in a function); did you mean 'ACPI_FILE'?
snd_soc_acpi_find_name_from_hid(const u8 hid[ACPI_ID_LEN])
sound/soc/soc-acpi.c: At top level:
>> sound/soc/soc-acpi.c:174:16: error: expected declaration specifiers or
'...' before string constant
MODULE_LICENSE("GPL v2");
Add missing include files.
Fixes: 7feb2f786a46 ("ASoC: move ACPI common code out of Intel/sst tree")
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Acked-By: Vinod Koul <vinod.koul@intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
---
include/sound/soc-acpi-intel-match.h | 1 +
include/sound/soc-acpi.h | 1 +
2 files changed, 2 insertions(+)
diff --git a/include/sound/soc-acpi-intel-match.h b/include/sound/soc-acpi-intel-match.h
index 1a9191cd4bb3..9da6388c20a1 100644
--- a/include/sound/soc-acpi-intel-match.h
+++ b/include/sound/soc-acpi-intel-match.h
@@ -16,6 +16,7 @@
#ifndef __LINUX_SND_SOC_ACPI_INTEL_MATCH_H
#define __LINUX_SND_SOC_ACPI_INTEL_MATCH_H
+#include <linux/module.h>
#include <linux/stddef.h>
#include <linux/acpi.h>
diff --git a/include/sound/soc-acpi.h b/include/sound/soc-acpi.h
index a7d8d335b043..a93436089bf5 100644
--- a/include/sound/soc-acpi.h
+++ b/include/sound/soc-acpi.h
@@ -17,6 +17,7 @@
#include <linux/stddef.h>
#include <linux/acpi.h>
+#include <linux/mod_devicetable.h>
struct snd_soc_acpi_package_context {
char *name; /* package name */
--
2.15.1
^ permalink raw reply related [flat|nested] 38+ messages in thread
end of thread, other threads:[~2018-01-08 16:23 UTC | newest]
Thread overview: 38+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-01-03 16:50 [PATCH v2 0/9] ASoC: Intel: Kconfig+acpi fixes Pierre-Louis Bossart
2018-01-03 16:50 ` Pierre-Louis Bossart
2018-01-03 16:50 ` [PATCH v2 1/9] ASoC: acpi: add missing includes for non-ACPI platforms Pierre-Louis Bossart
2018-01-03 16:50 ` Pierre-Louis Bossart
2018-01-08 16:23 ` Applied "ASoC: acpi: add missing includes for non-ACPI platforms" to the asoc tree Mark Brown
2018-01-08 16:23 ` Mark Brown
2018-01-03 16:50 ` [PATCH v2 2/9] ASoC: Intel: Fix Kconfig with top-level selector Pierre-Louis Bossart
2018-01-08 16:22 ` Applied "ASoC: Intel: Fix Kconfig with top-level selector" to the asoc tree Mark Brown
2018-01-08 16:22 ` Mark Brown
2018-01-03 16:50 ` [PATCH v2 3/9] ASoC: Intel: Kconfig: Simplify-clarify ACPI/PCI dependencies Pierre-Louis Bossart
2018-01-03 16:50 ` Pierre-Louis Bossart
2018-01-08 16:22 ` Applied "ASoC: Intel: Kconfig: Simplify-clarify ACPI/PCI dependencies" to the asoc tree Mark Brown
2018-01-08 16:22 ` Mark Brown
2018-01-03 16:50 ` [PATCH v2 4/9] ASoC: Intel: document what Kconfig options do Pierre-Louis Bossart
2018-01-03 16:50 ` Pierre-Louis Bossart
2018-01-08 16:22 ` Applied "ASoC: Intel: document what Kconfig options do" to the asoc tree Mark Brown
2018-01-08 16:22 ` Mark Brown
2018-01-03 16:50 ` [PATCH v2 5/9] ASoC: Intel: Fix nested/unnecessary Kconfig dependencies Pierre-Louis Bossart
2018-01-03 16:50 ` Pierre-Louis Bossart
2018-01-03 16:56 ` Andy Shevchenko
2018-01-03 16:56 ` Andy Shevchenko
2018-01-03 18:09 ` Andy Shevchenko
2018-01-03 16:50 ` [PATCH v2 6/9] ASoC: Intel: boards: align Kconfig dependencies for Haswell/Broadwell Pierre-Louis Bossart
2018-01-03 16:50 ` [PATCH v2 7/9] ASoC: Intel: boards: align Kconfig configurations for HiFi2 Pierre-Louis Bossart
2018-01-08 16:21 ` Applied "ASoC: Intel: boards: align Kconfig configurations for HiFi2" to the asoc tree Mark Brown
2018-01-08 16:21 ` Mark Brown
2018-01-03 16:50 ` [PATCH v2 8/9] ASoC: Intel: boards: align/fix SKL/BXT/KBL Kconfigs Pierre-Louis Bossart
2018-01-03 17:00 ` Andy Shevchenko
2018-01-03 17:00 ` Andy Shevchenko
2018-01-03 16:50 ` [PATCH v2 9/9] ASoC: Intel: kconfig: add some comments for if symbols Pierre-Louis Bossart
2018-01-03 17:07 ` Andy Shevchenko
2018-01-03 19:25 ` Randy Dunlap
2018-01-03 19:25 ` Randy Dunlap
2018-01-03 19:51 ` Pierre-Louis Bossart
2018-01-03 17:09 ` [PATCH v2 0/9] ASoC: Intel: Kconfig+acpi fixes Andy Shevchenko
2018-01-03 18:52 ` Pierre-Louis Bossart
2018-01-03 18:52 ` Pierre-Louis Bossart
2018-01-03 19:10 ` Andy Shevchenko
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.