staging:iio:adc:lpc32xx Move out of staging.

There are a few more little cleanups that could be done on this driver, but
I don't think any are sufficient to justify not moving it out of staging.

It's a very simple driver (presumably for a simple part) so not much that can
go wrong.  I think it was only ever in staging because that's where IIO was
as a whole at the time and then we forgot about it!

Signed-off-by: Jonathan Cameron <jic23@kernel.org>
Cc: Roland Stigge <stigge@antcom.de>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>

diff --git a/drivers/iio/adc/Kconfig b/drivers/iio/adc/Kconfig
index 789a5fb7c0be8996463ada06c20fd449a120735f..d777a972586ddaf62d5e8dcacd0cd69aa32e0418 100644 (file)
--- a/drivers/iio/adc/Kconfig
+++ b/drivers/iio/adc/Kconfig
@@ -305,6 +305,18 @@ config LPC18XX_ADC
          To compile this driver as a module, choose M here: the module will be
          called lpc18xx_adc.
 
+config LPC32XX_ADC
+       tristate "NXP LPC32XX ADC"
+       depends on ARCH_LPC32XX || COMPILE_TEST
+       depends on HAS_IOMEM
+       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 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.
+
 config LTC2485
        tristate "Linear Technology LTC2485 ADC driver"
        depends on I2C

diff --git a/drivers/iio/adc/Makefile b/drivers/iio/adc/Makefile
index 19e48af43b97a86a2389e1059da32675740ee5f7..b11bb57675430ecd64792ef875d025ce4d0a41ba 100644 (file)
--- a/drivers/iio/adc/Makefile
+++ b/drivers/iio/adc/Makefile
@@ -30,6 +30,7 @@ obj-$(CONFIG_IMX7D_ADC) += imx7d_adc.o
 obj-$(CONFIG_INA2XX_ADC) += ina2xx-adc.o
 obj-$(CONFIG_LP8788_ADC) += lp8788_adc.o
 obj-$(CONFIG_LPC18XX_ADC) += lpc18xx_adc.o
+obj-$(CONFIG_LPC32XX_ADC) += lpc32xx_adc.o
 obj-$(CONFIG_LTC2485) += ltc2485.o
 obj-$(CONFIG_MAX1027) += max1027.o
 obj-$(CONFIG_MAX11100) += max11100.o

diff --git a/drivers/staging/iio/adc/lpc32xx_adc.c b/drivers/iio/adc/lpc32xx_adc.c
similarity index 100%
rename from drivers/staging/iio/adc/lpc32xx_adc.c
rename to drivers/iio/adc/lpc32xx_adc.c

diff --git a/drivers/staging/iio/adc/Kconfig b/drivers/staging/iio/adc/Kconfig
index 0ad5c44042b2515f9b0c17f6599d6195bf0b72dc..e17efb03bac02229c439fa6fbf07558061286cf8 100644 (file)
--- a/drivers/staging/iio/adc/Kconfig
+++ b/drivers/staging/iio/adc/Kconfig
@@ -80,16 +80,4 @@ config AD7280
          To compile this driver as a module, choose M here: the
          module will be called ad7280a
 
-config LPC32XX_ADC
-       tristate "NXP LPC32XX ADC"
-       depends on ARCH_LPC32XX || COMPILE_TEST
-       depends on HAS_IOMEM
-       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 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

diff --git a/drivers/staging/iio/adc/Makefile b/drivers/staging/iio/adc/Makefile
index e7098dedeb754034b3a835d70dad8e06f98a62e0..bf18bdd7c99da59648d1c3673c6c10f43b46c11b 100644 (file)
--- a/drivers/staging/iio/adc/Makefile
+++ b/drivers/staging/iio/adc/Makefile
@@ -10,4 +10,3 @@ obj-$(CONFIG_AD7780) += ad7780.o
 obj-$(CONFIG_AD7816) += ad7816.o
 obj-$(CONFIG_AD7192) += ad7192.o
 obj-$(CONFIG_AD7280) += ad7280a.o
-obj-$(CONFIG_LPC32XX_ADC) += lpc32xx_adc.o