Fix ADS7846 dependencies
PATCH 1/1 Fix ADS7846 dependencies
Hi,
While playing with my kernel configuration, I found out that now, setting CONFIG_HWMON to 'n' and TOUCHSCREEN_ADS7846 to 'y' was allowed, which leads to a build failure.
This was caused by the commit 954423251daf362272076c6228dcdac65d72b287 which reverts the changes introduced by the commit 659cb49d6a8ba8d5651e53dd22a0addab6a479e6.
This patch fix the trouble.
---
---
drivers/input/touchscreen/Kconfig | 5 4 + 1 - 0 !
1 files changed, 4 insertions(+), 1 deletion(-)
drivers/input/touchscreen/Kconfig +4 -1
@@ -14,10 +14,13 @@ if INPUT_TOUCHSCREEN config TOUCHSCREEN_ADS7846 tristate "ADS 7846 based touchscreens" depends on SPI_MASTER + select HWMON help Say Y here if you have a touchscreen interface using the ADS7846 controller, and your board-specific initialization - code includes that in its table of SPI devices. + code includes that in its table of SPI devices. You will + also get hwmon interfaces for the temperature and voltage + sensors this chip provides. If unsure, say N (but it's safe to say "Y").
Hi,
Quoted 26 lines · Arnaud Patard
Hi,
While playing with my kernel configuration, I found out that now, setting
CONFIG_HWMONto 'n' andTOUCHSCREEN_ADS7846to 'y' was allowed, which leads to a build failure.
This was caused by the commit954423251daf362272076c6228dcdac65d72b287which reverts the changes introduced by the commit659cb49d6a8ba8d5651e53dd22a0addab6a479e6.
This patch fix the trouble.Signed-off-by Arnaud Patard <[email protected]>---
---
drivers/input/touchscreen/Kconfig| 5 4 + 1 - 0 !1 files changed, 4 insertions(+), 1 deletion(-)Index: linux-2.6.18/drivers/input/touchscreen/Kconfig
===================================================================drivers/input/touchscreen/Kconfig +1
-0@@ -14,10 +14,13 @@ if INPUT_TOUCHSCREEN config TOUCHSCREEN_ADS7846 tristate "ADS 7846 based touchscreens" depends on SPI_MASTER + select HWMON
drivers/input/touchscreen/Kconfig if INPUT_TOUCHSCREEN · line 26
Quoted 10 lines
drivers/input/touchscreen/Kconfig +3
-1help Say Y here if you have a touchscreen interface using the ADS7846 controller, and your board-specific initialization - code includes that in its table of SPI devices. + code includes that in its table of SPI devices. You will + also get hwmon interfaces for the temperature and voltage + sensors this chip provides. If unsure, say N (but it's safe to say "Y").
This looks OK to me, Dave any comments?
Tony
Quoted 37 lines · Tony Lindgren
Hi,
Quoted 34 lines · Arnaud Patard
Hi,
While playing with my kernel configuration, I found out that now, setting
CONFIG_HWMONto 'n' andTOUCHSCREEN_ADS7846to 'y' was allowed, which leads to a build failure.
This was caused by the commit954423251daf362272076c6228dcdac65d72b287which reverts the changes introduced by the commit659cb49d6a8ba8d5651e53dd22a0addab6a479e6.
This patch fix the trouble.Signed-off-by Arnaud Patard <[email protected]>---
---
drivers/input/touchscreen/Kconfig| 5 4 + 1 - 0 !1 files changed, 4 insertions(+), 1 deletion(-)Index: linux-2.6.18/drivers/input/touchscreen/Kconfig
===================================================================drivers/input/touchscreen/Kconfig +4
-1@@ -14,10 +14,13 @@ if INPUT_TOUCHSCREEN config TOUCHSCREEN_ADS7846 tristate "ADS 7846 based touchscreens" depends on SPI_MASTER + select HWMON help Say Y here if you have a touchscreen interface using the ADS7846 controller, and your board-specific initialization - code includes that in its table of SPI devices. + code includes that in its table of SPI devices. You will + also get hwmon interfaces for the temperature and voltage + sensors this chip provides.
Quoted 4 lines
drivers/input/touchscreen/Kconfig if INPUT_TOUCHSCREEN · line 26
Quoted 2 lines
drivers/input/touchscreen/Kconfig +0
-0If unsure, say N (but it's safe to say "Y").This looks OK to me, Dave any comments?
Pushing today.
Tony
Quoted 3 lines · Tony Lindgren
Quoted 2 lines · Tony Lindgren
This looks OK to me, Dave any comments?
Actually I'm trying to sync up the mainline code with what's in the OMA tree; they've diverged a bit too much for it to be straightforward.
The hwmon related parts of that sync-up, against mainline, are at:
http://lists.lm-sensors.org/pipermail/lm-sensors/2006-December/018484.html
and the behavioral summary is that the hwmon functionality won't exist without someone separately configuring hwmon. :)
What this is going to mean is that at some point all the updates specific to the OMAP tree should just be wiped out by pulling down the version from the main tree. After that, I hope there won't be divergence again ...
(The original reason for divergence was that the OMAP version had workarounds for byteswap bugs in the omap_uwire driver. Now that those are gone, there's no longer a reason to diverge...)
- Dave
Quoted 17 lines · David Brownell
Quoted 3 lines · Tony Lindgren
Quoted 2 lines · Tony Lindgren
This looks OK to me, Dave any comments?
Actually I'm trying to sync up the mainline code with what's in the OMA tree; they've diverged a bit too much for it to be straightforward.
The hwmon related parts of that sync-up, against mainline, are at:
http://lists.lm-sensors.org/pipermail/lm-sensors/2006-December/018484.html
and the behavioral summary is that the hwmon functionality won't exist without someone separately configuring hwmon. :)
Quoted 8 lines
What this is going to mean is that at some point all the updates specific to the OMAP tree should just be wiped out by pulling down the version from the main tree. After that, I hope there won't be divergence again ...
(The original reason for divergence was that the OMAP version had workarounds for byteswap bugs in the
omap_uwiredriver. Now that those are gone, there's no longer a reason to diverge...)
Great, we'll switch to the mainline version when your patches are integrated.
Tony