[PATCH] Fix ADS7846 dependencies

[PATCH] Fix ADS7846 dependencies

[Arnaud Patard]

[-- Attachment #1: Type: text/plain, Size: 430 bytes --]

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.

Signed-off-by: Arnaud Patard <arnaud.patard@rtp-net.org>
---

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: fix_ads7846_kconfig_deps.patch --]
[-- Type: text/x-patch, Size: 951 bytes --]

---
 drivers/input/touchscreen/Kconfig |    5 	4 +	1 -	0 !
 1 files changed, 4 insertions(+), 1 deletion(-)

Index: linux-2.6.18/drivers/input/touchscreen/Kconfig
===================================================================
--- linux-2.6.18.orig/drivers/input/touchscreen/Kconfig	2006-09-20 05:42:06.000000000 +0200
+++ linux-2.6.18/drivers/input/touchscreen/Kconfig	2006-11-10 14:24:47.000000000 +0100
@@ -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").
 

[-- Attachment #3: Type: text/plain, Size: 0 bytes --]

Re: [PATCH] Fix ADS7846 dependencies

[Tony Lindgren]

Hi,

* Arnaud Patard <arnaud.patard@rtp-net.org> [061110 15:34]:
> 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.
> 
> Signed-off-by: Arnaud Patard <arnaud.patard@rtp-net.org>
> ---

> ---
>  drivers/input/touchscreen/Kconfig |    5 	4 +	1 -	0 !
>  1 files changed, 4 insertions(+), 1 deletion(-)
> 
> Index: linux-2.6.18/drivers/input/touchscreen/Kconfig
> ===================================================================
> --- linux-2.6.18.orig/drivers/input/touchscreen/Kconfig	2006-09-20 05:42:06.000000000 +0200
> +++ linux-2.6.18/drivers/input/touchscreen/Kconfig	2006-11-10 14:24:47.000000000 +0100
> @@ -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").
>  

This looks OK to me, Dave any comments?

Tony

Re: [PATCH] Fix ADS7846 dependencies

[Tony Lindgren]

* Tony Lindgren <tony@atomide.com> [061110 16:44]:
> Hi,
> 
> * Arnaud Patard <arnaud.patard@rtp-net.org> [061110 15:34]:
> > 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.
> > 
> > Signed-off-by: Arnaud Patard <arnaud.patard@rtp-net.org>
> > ---
> 
> > ---
> >  drivers/input/touchscreen/Kconfig |    5 	4 +	1 -	0 !
> >  1 files changed, 4 insertions(+), 1 deletion(-)
> > 
> > Index: linux-2.6.18/drivers/input/touchscreen/Kconfig
> > ===================================================================
> > --- linux-2.6.18.orig/drivers/input/touchscreen/Kconfig	2006-09-20 05:42:06.000000000 +0200
> > +++ linux-2.6.18/drivers/input/touchscreen/Kconfig	2006-11-10 14:24:47.000000000 +0100
> > @@ -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").
> >  
> 
> This looks OK to me, Dave any comments?

Pushing today.

Tony

Re: [PATCH] Fix ADS7846 dependencies

[David Brownell]

On Thursday 21 December 2006 3:31 pm, Tony Lindgren wrote:
> * Tony Lindgren <tony@atomide.com> [061110 16:44]:
> > 
> > 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

Re: [PATCH] Fix ADS7846 dependencies

[Tony Lindgren]

* David Brownell <david-b@pacbell.net> [061221 22:56]:
> On Thursday 21 December 2006 3:31 pm, Tony Lindgren wrote:
> > * Tony Lindgren <tony@atomide.com> [061110 16:44]:
> > > 
> > > 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...)

Great, we'll switch to the mainline version when your patches are
integrated.

Tony