lkml.org 
[lkml]   [2012]   [Apr]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v5 7/10] iio: lpc32xx-adc: Remove driver conflict due to device tree
    Date
    Previously, the touchscreen and ADC drivers of the LPC32xx SoC had a Kconfig
    conflict declared because they use the same hardware. Upon the introduction of
    device tree support in both drivers, the conflict must be removed to enable
    the same kernel to support different hardware (configured via the device tree).

    Signed-off-by: Roland Stigge <stigge@antcom.de>
    Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---

    Applies to v3.4-rc3

    drivers/staging/iio/adc/Kconfig | 8 +++++---
    1 file changed, 5 insertions(+), 3 deletions(-)

    --- linux-2.6.orig/drivers/staging/iio/adc/Kconfig
    +++ linux-2.6/drivers/staging/iio/adc/Kconfig
    @@ -195,11 +195,13 @@ config MAX1363_RING_BUFFER

    config LPC32XX_ADC
    tristate "NXP LPC32XX ADC"
    - depends on ARCH_LPC32XX && !TOUCHSCREEN_LPC32XX
    + depends on ARCH_LPC32XX
    help
    Say yes here to build support for the integrated ADC inside the
    LPC32XX SoC. Note that this feature uses the same hardware as the
    - touchscreen driver, so you can only select one of the two drivers
    - (lpc32xx_adc or lpc32xx_ts). Provides direct access via sysfs.
    + touchscreen driver, so you should either select only one of the two
    + drivers (lpc32xx_adc or lpc32xx_ts) or, in the OpenFirmware case,
    + activate only one via device tree selection. Provides direct access
    + via sysfs.

    endmenu

    \
     
     \ /
      Last update: 2012-04-21 11:39    [W:2.626 / U:0.056 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site