Commit 2c79eeb1 authored by Randy Dunlap's avatar Randy Dunlap Committed by Mark Brown

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: default avatarkbuild test robot <lkp@intel.com>
Signed-off-by: default avatarRandy Dunlap <rdunlap@infradead.org>
Signed-off-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Cc: Mark Brown <broonie@kernel.org>
Cc: Liam Girdwood <liam.r.girdwood@linux.intel.com>
Cc: Jie Yang <yang.jie@linux.intel.com>
Cc: alsa-devel@alsa-project.org
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 536cfd2f
...@@ -104,6 +104,7 @@ config SND_SST_ATOM_HIFI2_PLATFORM_ACPI ...@@ -104,6 +104,7 @@ config SND_SST_ATOM_HIFI2_PLATFORM_ACPI
config SND_SOC_INTEL_SKYLAKE config SND_SOC_INTEL_SKYLAKE
tristate "All Skylake/SST Platforms" tristate "All Skylake/SST Platforms"
depends on PCI && ACPI depends on PCI && ACPI
depends on COMMON_CLK
select SND_SOC_INTEL_SKL select SND_SOC_INTEL_SKL
select SND_SOC_INTEL_APL select SND_SOC_INTEL_APL
select SND_SOC_INTEL_KBL select SND_SOC_INTEL_KBL
...@@ -120,6 +121,7 @@ config SND_SOC_INTEL_SKYLAKE ...@@ -120,6 +121,7 @@ config SND_SOC_INTEL_SKYLAKE
config SND_SOC_INTEL_SKL config SND_SOC_INTEL_SKL
tristate "Skylake Platforms" tristate "Skylake Platforms"
depends on PCI && ACPI depends on PCI && ACPI
depends on COMMON_CLK
select SND_SOC_INTEL_SKYLAKE_FAMILY select SND_SOC_INTEL_SKYLAKE_FAMILY
help help
If you have a Intel Skylake platform with the DSP enabled If you have a Intel Skylake platform with the DSP enabled
...@@ -128,6 +130,7 @@ config SND_SOC_INTEL_SKL ...@@ -128,6 +130,7 @@ config SND_SOC_INTEL_SKL
config SND_SOC_INTEL_APL config SND_SOC_INTEL_APL
tristate "Broxton/ApolloLake Platforms" tristate "Broxton/ApolloLake Platforms"
depends on PCI && ACPI depends on PCI && ACPI
depends on COMMON_CLK
select SND_SOC_INTEL_SKYLAKE_FAMILY select SND_SOC_INTEL_SKYLAKE_FAMILY
help help
If you have a Intel Broxton/ApolloLake platform with the DSP If you have a Intel Broxton/ApolloLake platform with the DSP
...@@ -136,6 +139,7 @@ config SND_SOC_INTEL_APL ...@@ -136,6 +139,7 @@ config SND_SOC_INTEL_APL
config SND_SOC_INTEL_KBL config SND_SOC_INTEL_KBL
tristate "Kabylake Platforms" tristate "Kabylake Platforms"
depends on PCI && ACPI depends on PCI && ACPI
depends on COMMON_CLK
select SND_SOC_INTEL_SKYLAKE_FAMILY select SND_SOC_INTEL_SKYLAKE_FAMILY
help help
If you have a Intel Kabylake platform with the DSP If you have a Intel Kabylake platform with the DSP
...@@ -144,6 +148,7 @@ config SND_SOC_INTEL_KBL ...@@ -144,6 +148,7 @@ config SND_SOC_INTEL_KBL
config SND_SOC_INTEL_GLK config SND_SOC_INTEL_GLK
tristate "GeminiLake Platforms" tristate "GeminiLake Platforms"
depends on PCI && ACPI depends on PCI && ACPI
depends on COMMON_CLK
select SND_SOC_INTEL_SKYLAKE_FAMILY select SND_SOC_INTEL_SKYLAKE_FAMILY
help help
If you have a Intel GeminiLake platform with the DSP If you have a Intel GeminiLake platform with the DSP
...@@ -152,6 +157,7 @@ config SND_SOC_INTEL_GLK ...@@ -152,6 +157,7 @@ config SND_SOC_INTEL_GLK
config SND_SOC_INTEL_CNL config SND_SOC_INTEL_CNL
tristate "CannonLake/WhiskyLake Platforms" tristate "CannonLake/WhiskyLake Platforms"
depends on PCI && ACPI depends on PCI && ACPI
depends on COMMON_CLK
select SND_SOC_INTEL_SKYLAKE_FAMILY select SND_SOC_INTEL_SKYLAKE_FAMILY
help help
If you have a Intel CNL/WHL platform with the DSP If you have a Intel CNL/WHL platform with the DSP
...@@ -160,6 +166,7 @@ config SND_SOC_INTEL_CNL ...@@ -160,6 +166,7 @@ config SND_SOC_INTEL_CNL
config SND_SOC_INTEL_CFL config SND_SOC_INTEL_CFL
tristate "CoffeeLake Platforms" tristate "CoffeeLake Platforms"
depends on PCI && ACPI depends on PCI && ACPI
depends on COMMON_CLK
select SND_SOC_INTEL_SKYLAKE_FAMILY select SND_SOC_INTEL_SKYLAKE_FAMILY
help help
If you have a Intel CoffeeLake platform with the DSP If you have a Intel CoffeeLake platform with the DSP
...@@ -168,6 +175,7 @@ config SND_SOC_INTEL_CFL ...@@ -168,6 +175,7 @@ config SND_SOC_INTEL_CFL
config SND_SOC_INTEL_CML_H config SND_SOC_INTEL_CML_H
tristate "CometLake-H Platforms" tristate "CometLake-H Platforms"
depends on PCI && ACPI depends on PCI && ACPI
depends on COMMON_CLK
select SND_SOC_INTEL_SKYLAKE_FAMILY select SND_SOC_INTEL_SKYLAKE_FAMILY
help help
If you have a Intel CometLake-H platform with the DSP If you have a Intel CometLake-H platform with the DSP
...@@ -176,6 +184,7 @@ config SND_SOC_INTEL_CML_H ...@@ -176,6 +184,7 @@ config SND_SOC_INTEL_CML_H
config SND_SOC_INTEL_CML_LP config SND_SOC_INTEL_CML_LP
tristate "CometLake-LP Platforms" tristate "CometLake-LP Platforms"
depends on PCI && ACPI depends on PCI && ACPI
depends on COMMON_CLK
select SND_SOC_INTEL_SKYLAKE_FAMILY select SND_SOC_INTEL_SKYLAKE_FAMILY
help help
If you have a Intel CometLake-LP platform with the DSP If you have a Intel CometLake-LP platform with the DSP
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment