ab34403db2
Fixed ACPI dependency complie errors and warnings as listed below.
All warnings (new ones prefixed by >>):
sound/soc/soc-acpi.c:34:1: error: redefinition of 'snd_soc_acpi_find_machine'
34 | snd_soc_acpi_find_machine(struct snd_soc_acpi_mach *machines)
| ^~~~~~~~~~~~~~~~~~~~~~~~~
In file included from sound/soc/soc-acpi.c:9:
include/sound/soc-acpi.h:38:1: note: previous definition of
'snd_soc_acpi_find_machine'
with type 'struct snd_soc_acpi_mach *(struct snd_soc_acpi_mach *)'
38 | snd_soc_acpi_find_machine(struct snd_soc_acpi_mach *machines)
| ^~~~~~~~~~~~~~~~~~~~~~~~~
sound/soc/soc-acpi.c: In function 'snd_soc_acpi_find_package':
sound/soc/soc-acpi.c:58:36: error: implicit declaration of function
'acpi_fetch_acpi_dev';
did you mean 'device_match_acpi_dev'?
[-Werror=implicit-function-declaration]
58 | struct acpi_device *adev = acpi_fetch_acpi_dev(handle);
| ^~~~~~~~~~~~~~~~~~~
| device_match_acpi_dev
>> sound/soc/soc-acpi.c:58:36: warning: initialization of
'struct acpi_device *' from 'int' makes pointer from integer
without a cast [-Wint-conversion]
sound/soc/soc-acpi.c:64:25: error: invalid use of undefined type
'struct acpi_device'
64 | if (adev && adev->status.present && adev->status.functional) {
| ^~
sound/soc/soc-acpi.c:64:49: error: invalid use of undefined type
'struct acpi_device'
64 | if (adev && adev->status.present && adev->status.functional) {
| ^~
sound/soc/soc-acpi.c:80:26: error: implicit declaration of function
'acpi_extract_package' [-Werror=implicit-function-declaration]
80 | status = acpi_extract_package(myobj,
| ^~~~~~~~~~~~~~~~~~~~
sound/soc/soc-acpi.c: At top level:
sound/soc/soc-acpi.c:95:6: error: redefinition of
'snd_soc_acpi_find_package_from_hid'
95 | bool snd_soc_acpi_find_package_from_hid(const u8 hid[ACPI_ID_LEN],
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
In file included from sound/soc/soc-acpi.c:9:
include/sound/soc-acpi.h:44:1: note: previous definition of
'snd_soc_acpi_find_package_from_hid'
with type 'bool(const u8 *, struct snd_soc_acpi_package_context *)'
{aka '_Bool(const unsigned char *,
struct snd_soc_acpi_package_context *)'}
44 | snd_soc_acpi_find_package_from_hid(const u8 hid[ACPI_ID_LEN],
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
sound/soc/soc-acpi.c:109:27: error: redefinition of
'snd_soc_acpi_codec_list'
109 | struct snd_soc_acpi_mach *snd_soc_acpi_codec_list(void *arg)
| ^~~~~~~~~~~~~~~~~~~~~~~
In file included from sound/soc/soc-acpi.c:9:
include/sound/soc-acpi.h:51:41: note: previous definition of
'snd_soc_acpi_codec_list' with type 'struct snd_soc_acpi_mach *(void *)'
51 | static inline struct snd_soc_acpi_mach
*snd_soc_acpi_codec_list(void *arg)
| ^~~~~~~~~~~~~~~~~~~~~~~
Signed-off-by: Vijendar Mukunda <Vijendar.Mukunda@amd.com>
Reported-by: kernel test robot <lkp@intel.com>
Link: https://lore.kernel.org/r/20220706205515.2485601-1-Vijendar.Mukunda@amd.com
Signed-off-by: Mark Brown <broonie@kernel.org>
120 lines
3.4 KiB
Plaintext
120 lines
3.4 KiB
Plaintext
# SPDX-License-Identifier: GPL-2.0-only
|
|
config SND_SOC_AMD_ACP
|
|
tristate "AMD Audio Coprocessor support"
|
|
help
|
|
This option enables ACP DMA support on AMD platform.
|
|
|
|
config SND_SOC_AMD_CZ_DA7219MX98357_MACH
|
|
tristate "AMD CZ support for DA7219, RT5682 and MAX9835"
|
|
select CLK_FIXED_FCH
|
|
select SND_SOC_DA7219
|
|
select SND_SOC_RT5682_I2C
|
|
select SND_SOC_MAX98357A
|
|
select SND_SOC_ADAU7002
|
|
select REGULATOR
|
|
depends on SND_SOC_AMD_ACP && I2C && GPIOLIB && ACPI
|
|
help
|
|
This option enables machine driver for DA7219, RT5682 and MAX9835.
|
|
|
|
config SND_SOC_AMD_CZ_RT5645_MACH
|
|
tristate "AMD CZ support for RT5645"
|
|
select SND_SOC_RT5645
|
|
depends on SND_SOC_AMD_ACP && I2C
|
|
help
|
|
This option enables machine driver for rt5645.
|
|
|
|
config SND_SOC_AMD_ST_ES8336_MACH
|
|
tristate "AMD ST support for ES8336"
|
|
select SND_SOC_ACPI if ACPI
|
|
select SND_SOC_ES8316
|
|
depends on SND_SOC_AMD_ACP && ACPI
|
|
depends on I2C || COMPILE_TEST
|
|
help
|
|
This option enables machine driver for Jadeite platform
|
|
using es8336 codec.
|
|
Say m if you have such a device.
|
|
If unsure select "N".
|
|
|
|
config SND_SOC_AMD_ACP3x
|
|
tristate "AMD Audio Coprocessor-v3.x support"
|
|
depends on X86 && PCI
|
|
help
|
|
This option enables ACP v3.x I2S support on AMD platform
|
|
|
|
config SND_SOC_AMD_RV_RT5682_MACH
|
|
tristate "AMD RV support for RT5682"
|
|
select CLK_FIXED_FCH
|
|
select SND_SOC_RT5682_I2C
|
|
select SND_SOC_MAX98357A
|
|
select SND_SOC_CROS_EC_CODEC
|
|
select I2C_CROS_EC_TUNNEL
|
|
select SND_SOC_RT1015
|
|
select SND_SOC_RT1015P
|
|
depends on SND_SOC_AMD_ACP3x && I2C && CROS_EC && GPIOLIB
|
|
help
|
|
This option enables machine driver for RT5682 and MAX9835.
|
|
|
|
config SND_SOC_AMD_RENOIR
|
|
tristate "AMD Audio Coprocessor - Renoir support"
|
|
select SND_AMD_ACP_CONFIG
|
|
depends on X86 && PCI
|
|
help
|
|
This option enables ACP support for Renoir platform
|
|
|
|
config SND_SOC_AMD_RENOIR_MACH
|
|
tristate "AMD Renoir support for DMIC"
|
|
select SND_SOC_DMIC
|
|
depends on SND_SOC_AMD_RENOIR && GPIOLIB
|
|
help
|
|
This option enables machine driver for DMIC
|
|
|
|
config SND_SOC_AMD_ACP5x
|
|
tristate "AMD Audio Coprocessor-v5.x I2S support"
|
|
depends on X86 && PCI
|
|
help
|
|
This option enables ACP v5.x support on AMD platform
|
|
|
|
By enabling this flag build will trigger for ACP PCI driver,
|
|
ACP DMA driver, CPU DAI driver.
|
|
|
|
config SND_SOC_AMD_VANGOGH_MACH
|
|
tristate "AMD Vangogh support for NAU8821 CS35L41"
|
|
select SND_SOC_NAU8821
|
|
select SND_SOC_CS35L41_SPI
|
|
depends on SND_SOC_AMD_ACP5x && I2C && SPI_MASTER
|
|
help
|
|
This option enables machine driver for Vangogh platform
|
|
using NAU8821 and CS35L41 codecs.
|
|
Say m if you have such a device.
|
|
If unsure select "N".
|
|
|
|
config SND_SOC_AMD_ACP6x
|
|
tristate "AMD Audio Coprocessor-v6.x Yellow Carp support"
|
|
depends on X86 && PCI
|
|
help
|
|
This option enables Audio Coprocessor i.e ACP v6.x support on
|
|
AMD Yellow Carp platform. By enabling this flag build will be
|
|
triggered for ACP PCI driver, ACP PDM DMA driver.
|
|
Say m if you have such a device.
|
|
If unsure select "N".
|
|
|
|
config SND_SOC_AMD_YC_MACH
|
|
tristate "AMD YC support for DMIC"
|
|
select SND_SOC_DMIC
|
|
depends on SND_SOC_AMD_ACP6x
|
|
help
|
|
This option enables machine driver for Yellow Carp platform
|
|
using dmic. ACP IP has PDM Decoder block with DMA controller.
|
|
DMIC can be connected directly to ACP IP.
|
|
Say m if you have such a device.
|
|
If unsure select "N".
|
|
|
|
config SND_AMD_ACP_CONFIG
|
|
tristate "AMD ACP configuration selection"
|
|
select SND_SOC_ACPI if ACPI
|
|
help
|
|
This option adds an auto detection to determine which ACP
|
|
driver modules to use
|
|
|
|
source "sound/soc/amd/acp/Kconfig"
|