Unverified Commit a5a8ac3c authored by Mark Brown's avatar Mark Brown
Browse files

Merge series "ASoC: SOF: Kconfig corrections" from Pierre-Louis Bossart... 

Merge series "ASoC: SOF: Kconfig corrections" from Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>:

Three cosmetic patches and a fix for a randconfig issue.

v2: rebase to remove git am issue (worked with --3way before)

Pierre-Louis Bossart (1):
  ASoC: SOF: Intel: fix Kconfig dependency for SND_INTEL_DSP_CONFIG

Randy Dunlap (3):
  ASoC: SOF: imx: fix Kconfig punctuation
  ASoC: SOF: Kconfig: fix Kconfig punctuation and wording
  ASoC: SOF: Intel: fix Kconfig punctuation and wording

 sound/soc/sof/Kconfig       | 42 ++++++++++++------------
 sound/soc/sof/imx/Kconfig   | 10 +++---
 sound/soc/sof/intel/Kconfig | 64 ++++++++++++++++++-------------------
 3 files changed, 58 insertions(+), 58 deletions(-)

--
2.25.1
parents 9c2368e3 358f0ac1

sound/soc/sof/Kconfig

+21 −21
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
config SND_SOC_SOF_TOPLEVEL

	bool "Sound Open Firmware Support"

	help

	  This adds support for Sound Open Firmware (SOF). SOF is a free and

	  This adds support for Sound Open Firmware (SOF). SOF is free and

	  generic open source audio DSP firmware for multiple devices.

	  Say Y if you have such a device that is supported by SOF.

	  If unsure select "N".
@@ -16,8 +16,8 @@ config SND_SOC_SOF_PCI 
	select SND_SOC_ACPI if ACPI

	help

	  This adds support for PCI enumeration. This option is

	  required to enable Intel Skylake+ devices

	  Say Y if you need this option

	  required to enable Intel Skylake+ devices.

	  Say Y if you need this option.

	  If unsure select "N".



config SND_SOC_SOF_ACPI
@@ -28,8 +28,8 @@ config SND_SOC_SOF_ACPI 
	select IOSF_MBI if X86 && PCI

	help

	  This adds support for ACPI enumeration. This option is required

	  to enable Intel Broadwell/Baytrail/Cherrytrail devices

	  Say Y if you need this option

	  to enable Intel Broadwell/Baytrail/Cherrytrail devices.

	  Say Y if you need this option.

	  If unsure select "N".



config SND_SOC_SOF_OF
@@ -54,12 +54,12 @@ config SND_SOC_SOF_DEVELOPER_SUPPORT 
	bool "SOF developer options support"

	depends on EXPERT

	help

	  This option unlock SOF developer options for debug/performance/

	  This option unlocks SOF developer options for debug/performance/

	  code hardening.

	  Distributions should not select this option, only SOF development

	  teams should select it.

	  Say Y if you are involved in SOF development and need this option

	  If not, select N

	  Say Y if you are involved in SOF development and need this option.

	  If not, select N.



if SND_SOC_SOF_DEVELOPER_SUPPORT
@@ -72,13 +72,13 @@ config SND_SOC_SOF_NOCODEC_SUPPORT 
	  This adds support for a dummy/nocodec machine driver fallback

	  option if no known codec is detected. This is typically only

	  enabled for developers or devices where the sound card is

	  controlled externally

	  This option is mutually exclusive with the Intel HDAudio support,

	  selecting it may have negative impacts and prevent e.g. microphone

	  controlled externally.

	  This option is mutually exclusive with the Intel HDAudio support.

	  Selecting it may have negative impacts and prevent e.g. microphone

	  functionality from being enabled on Intel CoffeeLake and later

	  platforms.

	  Distributions should not select this option!

	  Say Y if you need this nocodec fallback option

	  Say Y if you need this nocodec fallback option.

	  If unsure select "N".



config SND_SOC_SOF_STRICT_ABI_CHECKS
@@ -92,8 +92,8 @@ config SND_SOC_SOF_STRICT_ABI_CHECKS 
	  is invoked.

	  This option will stop topology creation and firmware load upfront.

	  It is intended for SOF CI/releases and not for users or distros.

	  Say Y if you want strict ABI checks for an SOF release

	  If you are not involved in SOF releases and CI development

	  Say Y if you want strict ABI checks for an SOF release.

	  If you are not involved in SOF releases and CI development,

	  select "N".



config SND_SOC_SOF_DEBUG
@@ -114,8 +114,8 @@ config SND_SOC_SOF_FORCE_NOCODEC_MODE 
	  though there is a codec detected on the real platform. This is

	  typically only enabled for developers for debug purposes, before

	  codec/machine driver is ready, or to exclude the impact of those

	  drivers

	  Say Y if you need this force nocodec mode option

	  drivers.

	  Say Y if you need this force nocodec mode option.

	  If unsure select "N".



config SND_SOC_SOF_DEBUG_XRUN_STOP
@@ -137,12 +137,12 @@ config SND_SOC_SOF_DEBUG_VERBOSE_IPC 
config SND_SOC_SOF_DEBUG_FORCE_IPC_POSITION

	bool "SOF force to use IPC for position update on SKL+"

	help

	  This option force to handle stream position update IPCs and run pcm

	  This option forces to handle stream position update IPCs and run PCM

	  elapse to inform ALSA about that, on platforms (e.g. Intel SKL+) that

	  with other approach (e.g. HDAC DPIB/posbuf) to elapse PCM.

	  On platforms (e.g. Intel SKL-) where position update IPC is the only

	  one choice, this setting won't impact anything.

	  if you are trying to debug pointer update with position IPCs or where

	  If you are trying to debug pointer update with position IPCs or where

	  DPIB/posbuf is not ready, select "Y".

	  If unsure select "N".
@@ -161,7 +161,7 @@ config SND_SOC_SOF_DEBUG_ENABLE_FIRMWARE_TRACE 
	help

	  The firmware trace can be enabled either at build-time with

	  this option, or dynamically by setting flags in the SOF core

	  module parameter (similar to dynamic debug)

	  module parameter (similar to dynamic debug).

	  If unsure, select "N".



config SND_SOC_SOF_DEBUG_IPC_FLOOD_TEST
@@ -190,7 +190,7 @@ config SND_SOC_SOF 
	select SND_SOC_SOF_NOCODEC if SND_SOC_SOF_NOCODEC_SUPPORT

	help

	  This option is not user-selectable but automagically handled by

	  'select' statements at a higher level

	  'select' statements at a higher level.

	  The selection is made at the top level and does not exactly follow

	  module dependencies but since the module or built-in type is decided

	  at the top level it doesn't matter.
@@ -199,7 +199,7 @@ config SND_SOC_SOF_PROBE_WORK_QUEUE 
	bool

	help

	  This option is not user-selectable but automagically handled by

	  'select' statements at a higher level

	  'select' statements at a higher level.

	  When selected, the probe is handled in two steps, for example to

	  avoid lockdeps if request_module is used in the probe.

sound/soc/sof/imx/Kconfig

+5 −5
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ config SND_SOC_SOF_IMX_OF 
	select SND_SOC_SOF_IMX8M if SND_SOC_SOF_IMX8M_SUPPORT

	help

	  This option is not user-selectable but automagically handled by

	  'select' statements at a higher level

	  'select' statements at a higher level.



config SND_SOC_SOF_IMX_COMMON

	tristate
@@ -30,7 +30,7 @@ config SND_SOC_SOF_IMX8_SUPPORT 
	depends on IMX_SCU=y || IMX_SCU=SND_SOC_SOF_IMX_OF

	depends on IMX_DSP=y || IMX_DSP=SND_SOC_SOF_IMX_OF

	help

	  This adds support for Sound Open Firmware for NXP i.MX8 platforms

	  This adds support for Sound Open Firmware for NXP i.MX8 platforms.

	  Say Y if you have such a device.

	  If unsure select "N".
@@ -40,13 +40,13 @@ config SND_SOC_SOF_IMX8 
	select SND_SOC_SOF_XTENSA

	help

	  This option is not user-selectable but automagically handled by

	  'select' statements at a higher level

	  'select' statements at a higher level.



config SND_SOC_SOF_IMX8M_SUPPORT

	bool "SOF support for i.MX8M"

	depends on IMX_DSP=y || IMX_DSP=SND_SOC_SOF_OF

	help

	  This adds support for Sound Open Firmware for NXP i.MX8M platforms

	  This adds support for Sound Open Firmware for NXP i.MX8M platforms.

	  Say Y if you have such a device.

	  If unsure select "N".
@@ -56,6 +56,6 @@ config SND_SOC_SOF_IMX8M 
	select SND_SOC_SOF_XTENSA

	help

	  This option is not user-selectable but automagically handled by

	  'select' statements at a higher level

	  'select' statements at a higher level.



endif ## SND_SOC_SOF_IMX_IMX_TOPLEVEL

sound/soc/sof/intel/Kconfig

+32 −32
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ config SND_SOC_SOF_INTEL_ACPI 
	select SND_SOC_SOF_BROADWELL if SND_SOC_SOF_BROADWELL_SUPPORT

	help

	  This option is not user-selectable but automagically handled by

	  'select' statements at a higher level

	  'select' statements at a higher level.



config SND_SOC_SOF_INTEL_PCI

	def_tristate SND_SOC_SOF_PCI
@@ -31,13 +31,13 @@ config SND_SOC_SOF_INTEL_PCI 
	select SND_SOC_SOF_JASPERLAKE  if SND_SOC_SOF_JASPERLAKE_SUPPORT

	help

	  This option is not user-selectable but automagically handled by

	  'select' statements at a higher level

	  'select' statements at a higher level.



config SND_SOC_SOF_INTEL_HIFI_EP_IPC

	tristate

	help

	  This option is not user-selectable but automagically handled by

	  'select' statements at a higher level

	  'select' statements at a higher level.



config SND_SOC_SOF_INTEL_ATOM_HIFI_EP

	tristate
@@ -45,7 +45,7 @@ config SND_SOC_SOF_INTEL_ATOM_HIFI_EP 
	select SND_SOC_SOF_INTEL_HIFI_EP_IPC

	help

	  This option is not user-selectable but automagically handled by

	  'select' statements at a higher level

	  'select' statements at a higher level.



config SND_SOC_SOF_INTEL_COMMON

	tristate
@@ -55,7 +55,7 @@ config SND_SOC_SOF_INTEL_COMMON 
	select SND_SOC_ACPI if ACPI

	help

	  This option is not user-selectable but automagically handled by

	  'select' statements at a higher level

	  'select' statements at a higher level.



if SND_SOC_SOF_INTEL_ACPI
@@ -72,7 +72,7 @@ config SND_SOC_SOF_BAYTRAIL_SUPPORT 
	  recommended for distros. At some point all legacy drivers will be

	  deprecated but not before all userspace firmware/topology/UCM files

	  are made available to downstream distros.

	  Say Y if you want to enable SOF on Baytrail/Cherrytrail

	  Say Y if you want to enable SOF on Baytrail/Cherrytrail.

	  If unsure select "N".



config SND_SOC_SOF_BAYTRAIL
@@ -80,7 +80,7 @@ config SND_SOC_SOF_BAYTRAIL 
	select SND_SOC_SOF_INTEL_ATOM_HIFI_EP

	help

	  This option is not user-selectable but automagically handled by

	  'select' statements at a higher level

	  'select' statements at a higher level.



config SND_SOC_SOF_BROADWELL_SUPPORT

	bool "SOF support for Broadwell"
@@ -91,11 +91,11 @@ config SND_SOC_SOF_BROADWELL_SUPPORT 
	  This option is mutually exclusive with the Haswell/Broadwell legacy

	  driver. If you want to enable SOF on Broadwell you need to deselect

	  the legacy driver first.

	  SOF does fully support Broadwell yet, so this option is not

	  SOF does not fully support Broadwell yet, so this option is not

	  recommended for distros. At some point all legacy drivers will be

	  deprecated but not before all userspace firmware/topology/UCM files

	  are made available to downstream distros.

	  Say Y if you want to enable SOF on Broadwell

	  Say Y if you want to enable SOF on Broadwell.

	  If unsure select "N".



config SND_SOC_SOF_BROADWELL
@@ -104,7 +104,7 @@ config SND_SOC_SOF_BROADWELL 
	select SND_SOC_SOF_INTEL_HIFI_EP_IPC

	help

	  This option is not user-selectable but automagically handled by

	  'select' statements at a higher level

	  'select' statements at a higher level.



endif ## SND_SOC_SOF_INTEL_ACPI
@@ -123,7 +123,7 @@ config SND_SOC_SOF_MERRIFIELD 
	select SND_SOC_SOF_INTEL_ATOM_HIFI_EP

	help

	  This option is not user-selectable but automagically handled by

	  'select' statements at a higher level

	  'select' statements at a higher level.



config SND_SOC_SOF_APOLLOLAKE_SUPPORT

	bool "SOF support for Apollolake"
@@ -138,7 +138,7 @@ config SND_SOC_SOF_APOLLOLAKE 
	select SND_SOC_SOF_HDA_COMMON

	help

	  This option is not user-selectable but automagically handled by

	  'select' statements at a higher level

	  'select' statements at a higher level.



config SND_SOC_SOF_GEMINILAKE_SUPPORT

	bool "SOF support for GeminiLake"
@@ -153,7 +153,7 @@ config SND_SOC_SOF_GEMINILAKE 
	select SND_SOC_SOF_HDA_COMMON

	help

	  This option is not user-selectable but automagically handled by

	  'select' statements at a higher level

	  'select' statements at a higher level.



config SND_SOC_SOF_CANNONLAKE_SUPPORT

	bool "SOF support for Cannonlake"
@@ -169,7 +169,7 @@ config SND_SOC_SOF_CANNONLAKE 
	select SND_SOC_SOF_INTEL_SOUNDWIRE_LINK_BASELINE

	help

	  This option is not user-selectable but automagically handled by

	  'select' statements at a higher level

	  'select' statements at a higher level.



config SND_SOC_SOF_COFFEELAKE_SUPPORT

	bool "SOF support for CoffeeLake"
@@ -185,7 +185,7 @@ config SND_SOC_SOF_COFFEELAKE 
	select SND_SOC_SOF_INTEL_SOUNDWIRE_LINK_BASELINE

	help

	  This option is not user-selectable but automagically handled by

	  'select' statements at a higher level

	  'select' statements at a higher level.



config SND_SOC_SOF_ICELAKE_SUPPORT

	bool "SOF support for Icelake"
@@ -201,7 +201,7 @@ config SND_SOC_SOF_ICELAKE 
	select SND_SOC_SOF_INTEL_SOUNDWIRE_LINK_BASELINE

	help

	  This option is not user-selectable but automagically handled by

	  'select' statements at a higher level

	  'select' statements at a higher level.



config SND_SOC_SOF_COMETLAKE

	tristate
@@ -209,7 +209,7 @@ config SND_SOC_SOF_COMETLAKE 
	select SND_SOC_SOF_INTEL_SOUNDWIRE_LINK_BASELINE

	help

	  This option is not user-selectable but automagically handled by

	  'select' statements at a higher level

	  'select' statements at a higher level.



config SND_SOC_SOF_COMETLAKE_SUPPORT

	bool
@@ -236,7 +236,7 @@ config SND_SOC_SOF_TIGERLAKE 
	select SND_SOC_SOF_INTEL_SOUNDWIRE_LINK_BASELINE

	help

	  This option is not user-selectable but automagically handled by

	  'select' statements at a higher level

	  'select' statements at a higher level.



config SND_SOC_SOF_ELKHARTLAKE_SUPPORT

	bool "SOF support for ElkhartLake"
@@ -252,7 +252,7 @@ config SND_SOC_SOF_ELKHARTLAKE 
	select SND_SOC_SOF_INTEL_SOUNDWIRE_LINK_BASELINE

	help

	  This option is not user-selectable but automagically handled by

	  'select' statements at a higher level

	  'select' statements at a higher level.



config SND_SOC_SOF_JASPERLAKE_SUPPORT

	bool "SOF support for JasperLake"
@@ -267,15 +267,16 @@ config SND_SOC_SOF_JASPERLAKE 
	select SND_SOC_SOF_HDA_COMMON

	help

	  This option is not user-selectable but automagically handled by

	  'select' statements at a higher level

	  'select' statements at a higher level.



config SND_SOC_SOF_HDA_COMMON

	tristate

	select SND_INTEL_DSP_CONFIG

	select SND_SOC_SOF_INTEL_COMMON

	select SND_SOC_SOF_HDA_LINK_BASELINE

	help

	  This option is not user-selectable but automagically handled by

	  'select' statements at a higher level

	  'select' statements at a higher level.



if SND_SOC_SOF_HDA_COMMON
@@ -302,8 +303,8 @@ config SND_SOC_SOF_HDA_PROBES 
	bool "SOF enable probes over HDA"

	depends on SND_SOC_SOF_DEBUG_PROBES

	help

	  This option enables the data probing for Intel(R).

		  Intel(R) Skylake and newer platforms.

	  This option enables the data probing for Intel(R)

	  Skylake and newer platforms.

	  Say Y if you want to enable probes.

	  If unsure, select "N".
@@ -314,7 +315,7 @@ config SND_SOC_SOF_HDA_ALWAYS_ENABLE_DMI_L1 
	  and disables known workarounds for specific HDAudio platforms.

	  Only use to look into power optimizations on platforms not

	  affected by DMI L1 issues. This option is not recommended.

	  Say Y if you want to enable DMI Link L1

	  Say Y if you want to enable DMI Link L1.

	  If unsure, select "N".



endif ## SND_SOC_SOF_HDA_COMMON
@@ -324,16 +325,15 @@ config SND_SOC_SOF_HDA_LINK_BASELINE 
	select SND_SOC_SOF_HDA if SND_SOC_SOF_HDA_LINK

	help

	  This option is not user-selectable but automagically handled by

	  'select' statements at a higher level

	  'select' statements at a higher level.



config SND_SOC_SOF_HDA

	tristate

	select SND_HDA_EXT_CORE if SND_SOC_SOF_HDA_LINK

	select SND_SOC_HDAC_HDA if SND_SOC_SOF_HDA_AUDIO_CODEC

	select SND_INTEL_DSP_CONFIG

	help

	  This option is not user-selectable but automagically handled by

	  'select' statements at a higher level

	  'select' statements at a higher level.



config SND_SOC_SOF_INTEL_SOUNDWIRE_LINK

	bool "SOF support for SoundWire"
@@ -349,14 +349,14 @@ config SND_SOC_SOF_INTEL_SOUNDWIRE_LINK_BASELINE 
	select SND_SOC_SOF_INTEL_SOUNDWIRE if SND_SOC_SOF_INTEL_SOUNDWIRE_LINK

	help

	  This option is not user-selectable but automagically handled by

	  'select' statements at a higher level

	  'select' statements at a higher level.



config SND_SOC_SOF_INTEL_SOUNDWIRE

	tristate

	select SOUNDWIRE_INTEL

	help

	  This option is not user-selectable but automagically handled by

	  'select' statements at a higher level

	  'select' statements at a higher level.



endif ## SND_SOC_SOF_INTEL_PCI

CRA Git | Maintained and supported by SUSTech CRA and CCSE