OSDN Git Service

ASoc: fix sound/soc/intel/skylake/slk-ssp-clk.c build error on IA64
authorRandy Dunlap <rdunlap@infradead.org>
Thu, 30 May 2019 11:50:12 +0000 (06:50 -0500)
committerMark Brown <broonie@kernel.org>
Thu, 30 May 2019 15:34:12 +0000 (16:34 +0100)
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 <lkp@intel.com>
Signed-off-by: Randy Dunlap <rdunlap@infradead.org>
Signed-off-by: Pierre-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: Mark Brown <broonie@kernel.org>
sound/soc/intel/Kconfig

index b089ed3..a3cf47d 100644 (file)
@@ -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