| Message ID | 20220901113415.27449-1-povik+lin@cutebit.org (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 7d2497b7fd3bf45706360bfe289f19d61d37f536 |
| Headers | show |
| Series | [1/2] ASoC: apple: mca: Unselect COMMON_CLK in Kconfig | expand |
On Thu, 1 Sep 2022 13:34:14 +0200, Martin Povišer wrote: > The MCA driver selects COMMON_CLK, which leads to misconfiguration > on platforms with HAVE_LEGACY_CLK (under compile test). Kconfig catches > the conflict with the following warning: > > WARNING: unmet direct dependencies detected for COMMON_CLK > Depends on [n]: !HAVE_LEGACY_CLK [=y] > Selected by [m]: > - SND_SOC_APPLE_MCA [=m] && SOUND [=m] && !UML && SND [=m] && > SND_SOC [=m] && (ARCH_APPLE || COMPILE_TEST [=y]) > > [...] Applied to https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next Thanks! [1/2] ASoC: apple: mca: Unselect COMMON_CLK in Kconfig commit: 7d2497b7fd3bf45706360bfe289f19d61d37f536 [2/2] MAINTAINERS: Fix file pattern for ARM/APPLE MACHINE SOUND DRIVERS commit: 55e2bd9c41e800638676dce3f19dcfd16b309a08 All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark
diff --git a/sound/soc/apple/Kconfig b/sound/soc/apple/Kconfig index 0ba955657e98..793f7782e0d7 100644 --- a/sound/soc/apple/Kconfig +++ b/sound/soc/apple/Kconfig @@ -2,7 +2,6 @@ config SND_SOC_APPLE_MCA tristate "Apple Silicon MCA driver" depends on ARCH_APPLE || COMPILE_TEST select SND_DMAENGINE_PCM - select COMMON_CLK default ARCH_APPLE help This option enables an ASoC platform driver for MCA peripherals found
The MCA driver selects COMMON_CLK, which leads to misconfiguration on platforms with HAVE_LEGACY_CLK (under compile test). Kconfig catches the conflict with the following warning: WARNING: unmet direct dependencies detected for COMMON_CLK Depends on [n]: !HAVE_LEGACY_CLK [=y] Selected by [m]: - SND_SOC_APPLE_MCA [=m] && SOUND [=m] && !UML && SND [=m] && SND_SOC [=m] && (ARCH_APPLE || COMPILE_TEST [=y]) Eventually the build fails with errors like: >> drivers/clk/clk.c:867:6: error: redefinition of 'clk_unprepare' 867 | void clk_unprepare(struct clk *clk) | ^~~~~~~~~~~~~ In file included from drivers/clk/clk.c:9: include/linux/clk.h:303:20: note: previous definition of 'clk_unprepare' with type 'void(struct clk *)' 303 | static inline void clk_unprepare(struct clk *clk) | ^~~~~~~~~~~~~ which appears to be because COMMON_CLK is selected but HAVE_CLK_PREPARE is not. In the end it seems we had no business selecting COMMON_CLK from an unrelated driver like that, so remove the selection. The linux/clk.h API is there anyway. Fixes: 3df5d0d97289 ("ASoC: apple: mca: Start new platform driver") Reported-by: kernel test robot <lkp@intel.com> Signed-off-by: Martin Povišer <povik+lin@cutebit.org> --- sound/soc/apple/Kconfig | 1 - 1 file changed, 1 deletion(-)