[PATCH] Input: mainstone: fix pxa2xx_ac97 dependency

Arnd Bergmann
2023-02-14T09:09:15Z

From: Arnd Bergmann <arnd@arndb.de>

The exported PXA AC97 symbols are provided by the snd-pxa2xx-lib module
if SND_PXA2XX_SOC_AC97 is set, so both symbols have to be enabled for
the mainstone driver to actually work, and if snd-pxa2xx-lib is a loadable
module, the touchscreen driver cannot be built-in:

arm-linux-gnueabi-ld: drivers/input/touchscreen/mainstone-wm97xx.o: in function `wm97xx_acc_pen_up':
mainstone-wm97xx.c:(.text+0x8c): undefined reference to `pxa2xx_ac97_read_modr'
arm-linux-gnueabi-ld: drivers/input/touchscreen/mainstone-wm97xx.o: in function `wm97xx_acc_pen_down':
mainstone-wm97xx.c:(.text+0x2e0): undefined reference to `pxa2xx_ac97_read_modr'

The misconfiguration has always been possible but I never hit this after
my previous incomplete fix in 2019: since there were many options that
each 'select SND_PXA2XX_SOC_AC97', randconfig builds for PXA would almost
always have this built-in, not in a loadable module.

Fixes: e217b085a1ac ("Input: touchscreen: use wrapper for pxa2xx ac97 registers")
Fixes: b401d1fd8053 ("ASoC: pxa: remove unused board support")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
drivers/input/touchscreen/Kconfig | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/input/touchscreen/Kconfig b/drivers/input/touchscreen/Kconfig
index 61bb8e632413..1601f5bae005 100644
--- a/drivers/input/touchscreen/Kconfig
+++ b/drivers/input/touchscreen/Kconfig
@@ -903,7 +903,7 @@ config TOUCHSCREEN_WM9713
config TOUCHSCREEN_WM97XX_MAINSTONE
tristate "WM97xx Mainstone/Palm accelerated touch"
depends on TOUCHSCREEN_WM97XX && ARCH_PXA
- depends on SND_PXA2XX_LIB_AC97
+ depends on SND_PXA2XX_LIB && SND_PXA2XX_LIB_AC97
help
Say Y here for support for streaming mode with WM97xx touchscreens
on Mainstone, Palm Tungsten T5, TX and LifeDrive systems.
--
2.39.1