From 2c79eeb1aaf2bf0a6d9bb4732596f7dc147cab4d Mon Sep 17 00:00:00 2001 From: Randy Dunlap Date: Thu, 30 May 2019 06:50:12 -0500 Subject: [PATCH] ASoc: fix sound/soc/intel/skylake/slk-ssp-clk.c build error on IA64 skl-ssp-clk.c does not build on IA64 because the driver uses the common clock interface, so make the driver depend on COMMON_CLK. Fixes this build error: ../sound/soc/intel/skylake/skl-ssp-clk.c:26:16: error: field 'hw' has incomplete type struct clk_hw hw; ^~ [Corrections for SKL support by Pierre Bossart] Reported-by: kbuild test robot Signed-off-by: Randy Dunlap Signed-off-by: Pierre-Louis Bossart Cc: Mark Brown Cc: Liam Girdwood Cc: Jie Yang Cc: alsa-devel@alsa-project.org Signed-off-by: Mark Brown --- sound/soc/intel/Kconfig | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/sound/soc/intel/Kconfig b/sound/soc/intel/Kconfig index b089ed3bf77f..a3cf47d09816 100644 --- a/sound/soc/intel/Kconfig +++ b/sound/soc/intel/Kconfig @@ -104,6 +104,7 @@ config SND_SST_ATOM_HIFI2_PLATFORM_ACPI config SND_SOC_INTEL_SKYLAKE tristate "All Skylake/SST Platforms" depends on PCI && ACPI + depends on COMMON_CLK select SND_SOC_INTEL_SKL select SND_SOC_INTEL_APL select SND_SOC_INTEL_KBL @@ -120,6 +121,7 @@ config SND_SOC_INTEL_SKYLAKE config SND_SOC_INTEL_SKL tristate "Skylake Platforms" depends on PCI && ACPI + depends on COMMON_CLK select SND_SOC_INTEL_SKYLAKE_FAMILY help If you have a Intel Skylake platform with the DSP enabled @@ -128,6 +130,7 @@ config SND_SOC_INTEL_SKL config SND_SOC_INTEL_APL tristate "Broxton/ApolloLake Platforms" depends on PCI && ACPI + depends on COMMON_CLK select SND_SOC_INTEL_SKYLAKE_FAMILY help If you have a Intel Broxton/ApolloLake platform with the DSP @@ -136,6 +139,7 @@ config SND_SOC_INTEL_APL config SND_SOC_INTEL_KBL tristate "Kabylake Platforms" depends on PCI && ACPI + depends on COMMON_CLK select SND_SOC_INTEL_SKYLAKE_FAMILY help If you have a Intel Kabylake platform with the DSP @@ -144,6 +148,7 @@ config SND_SOC_INTEL_KBL config SND_SOC_INTEL_GLK tristate "GeminiLake Platforms" depends on PCI && ACPI + depends on COMMON_CLK select SND_SOC_INTEL_SKYLAKE_FAMILY help If you have a Intel GeminiLake platform with the DSP @@ -152,6 +157,7 @@ config SND_SOC_INTEL_GLK config SND_SOC_INTEL_CNL tristate "CannonLake/WhiskyLake Platforms" depends on PCI && ACPI + depends on COMMON_CLK select SND_SOC_INTEL_SKYLAKE_FAMILY help If you have a Intel CNL/WHL platform with the DSP @@ -160,6 +166,7 @@ config SND_SOC_INTEL_CNL config SND_SOC_INTEL_CFL tristate "CoffeeLake Platforms" depends on PCI && ACPI + depends on COMMON_CLK select SND_SOC_INTEL_SKYLAKE_FAMILY help If you have a Intel CoffeeLake platform with the DSP @@ -168,6 +175,7 @@ config SND_SOC_INTEL_CFL config SND_SOC_INTEL_CML_H tristate "CometLake-H Platforms" depends on PCI && ACPI + depends on COMMON_CLK select SND_SOC_INTEL_SKYLAKE_FAMILY help If you have a Intel CometLake-H platform with the DSP @@ -176,6 +184,7 @@ config SND_SOC_INTEL_CML_H config SND_SOC_INTEL_CML_LP tristate "CometLake-LP Platforms" depends on PCI && ACPI + depends on COMMON_CLK select SND_SOC_INTEL_SKYLAKE_FAMILY help If you have a Intel CometLake-LP platform with the DSP -- 2.30.2