cc10001_adc Kconfig and Makefile fixes

PATCH Applied Hartmut Knaack 2 participants 6 messages Jun 21, 2015 – Aug 12, 2015 IIO

Share & tools

Hartmut Knaack

author

2015-06-21 10:16 UTC #0 lore raw

cover cc10001_adc Kconfig and Makefile fixes

This series adresses the cc10001_adc dependency issue pointed out by Jonathan [1] and moves up its entries in Kconfig and Makefile, which suffered from a merge with Sebastian Reichels tree, to get in the da9150.

[1] https://marc.info/?l=linux-iio&m=142774444503561

Hartmut Knaack (2):
iio:adc:cc10001_adc: fix Kconfig dependency iio:adc:cc10001_adc: resort entry in Kconfig and Makefile

 drivers/iio/adc/Kconfig  | 21 ++++++++++-----------
 drivers/iio/adc/Makefile |  2 +-
 2 files changed, 11 insertions(+), 12 deletions(-)

Signature · 4 lines

2.3.6

--
To unsubscribe from this list: send the line "unsubscribe linux-iio" in

Hartmut Knaack

author

2015-06-21 10:16 UTC #1 lore raw

PATCH 1/2 iio:adc:cc10001_adc: fix Kconfig dependency

The Cosmic Circuits 10001 ADC driver depends on HAS_IOMEM, HAVE_CLK and REGULATOR together, not just any of these.

Signed-off-by Hartmut Knaack <[email protected]>

---
 drivers/iio/adc/Kconfig | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

drivers/iio/adc/Kconfig +1 -2

index 7c55658..eb0cd89 100644
@@ -153,8 +153,7 @@ config DA9150_GPADC
 
 config CC10001_ADC
 	tristate "Cosmic Circuits 10001 ADC driver"
-	depends on HAVE_CLK || REGULATOR
-	depends on HAS_IOMEM
+	depends on HAS_IOMEM && HAVE_CLK && REGULATOR
 	select IIO_BUFFER
 	select IIO_TRIGGERED_BUFFER
 	help

Signature · 4 lines

2.3.6

--
To unsubscribe from this list: send the line "unsubscribe linux-iio" in

Jonathan Cameron

maintainer Applied

2015-06-21 15:15 UTC #2 lore raw

Re: [PATCH 1/2] iio:adc:cc10001_adc: fix Kconfig dependency

Quoted 4 lines · Hartmut Knaack

The Cosmic Circuits 10001 ADC driver depends on HAS_IOMEM, HAVE_CLK and REGULATOR together, not just any of these.
Signed-off-by Hartmut Knaack <[email protected]>

Applied to the fixes-togreg branch of iio.git and marked for stable.

Thanks,

Jonathan

Quoted 10 lines

---
 drivers/iio/adc/Kconfig | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

drivers/iio/adc/Kconfig +0 -0

index 7c55658..eb0cd89 100644

drivers/iio/adc/Kconfig config DA9150_GPADC · line 159

Quoted 9 lines

drivers/iio/adc/Kconfig +1 -2

@@ -153,8 +153,7 @@ config DA9150_GPADC
 
 config CC10001_ADC
 	tristate "Cosmic Circuits 10001 ADC driver"
-	depends on HAVE_CLK || REGULATOR
-	depends on HAS_IOMEM
+	depends on HAS_IOMEM && HAVE_CLK && REGULATOR
 	select IIO_BUFFER
 	select IIO_TRIGGERED_BUFFER
 	help

--
To unsubscribe from this list: send the line "unsubscribe linux-iio" in

Hartmut Knaack

author

2015-06-21 10:16 UTC #3 lore raw

PATCH 2/2 iio:adc:cc10001_adc: resort entry in Kconfig and Makefile

In reply to Hartmut Knaack

Move the entry for the CC 10001 ADC driver in Kconfig and Makefile up to maintain alphabetic order.

Signed-off-by Hartmut Knaack <[email protected]>

---
 drivers/iio/adc/Kconfig  | 18 +++++++++---------
 drivers/iio/adc/Makefile |  2 +-
 2 files changed, 10 insertions(+), 10 deletions(-)

drivers/iio/adc/Kconfig +9 -9

index eb0cd89..4790071 100644
@@ -142,15 +142,6 @@ config BERLIN2_ADC
 	  Marvell Berlin2 ADC driver. This ADC has 8 channels, with one used for
 	  temperature measurement.
 
-config DA9150_GPADC
-	tristate "Dialog DA9150 GPADC driver support"
-	depends on MFD_DA9150
-	help
-	  Say yes here to build support for Dialog DA9150 GPADC.
-
-	  This driver can also be built as a module. If chosen, the module name
-	  will be da9150-gpadc.
-
 config CC10001_ADC
 	tristate "Cosmic Circuits 10001 ADC driver"
 	depends on HAS_IOMEM && HAVE_CLK && REGULATOR

@@ -162,6 +153,15 @@ config CC10001_ADC
 	  This driver can also be built as a module. If so, the module will be
 	  called cc10001_adc.
 
+config DA9150_GPADC
+	tristate "Dialog DA9150 GPADC driver support"
+	depends on MFD_DA9150
+	help
+	  Say yes here to build support for Dialog DA9150 GPADC.
+
+	  This driver can also be built as a module. If chosen, the module name
+	  will be da9150-gpadc.
+
 config EXYNOS_ADC
 	tristate "Exynos ADC driver support"
 	depends on ARCH_EXYNOS || ARCH_S3C24XX || ARCH_S3C64XX || (OF && COMPILE_TEST)

drivers/iio/adc/Makefile +1 -1

index a096210..fa5723a 100644
@@ -16,8 +16,8 @@ obj-$(CONFIG_AD799X) += ad799x.o
 obj-$(CONFIG_AT91_ADC) += at91_adc.o
 obj-$(CONFIG_AXP288_ADC) += axp288_adc.o
 obj-$(CONFIG_BERLIN2_ADC) += berlin2-adc.o
-obj-$(CONFIG_DA9150_GPADC) += da9150-gpadc.o
 obj-$(CONFIG_CC10001_ADC) += cc10001_adc.o
+obj-$(CONFIG_DA9150_GPADC) += da9150-gpadc.o
 obj-$(CONFIG_EXYNOS_ADC) += exynos_adc.o
 obj-$(CONFIG_LP8788_ADC) += lp8788_adc.o
 obj-$(CONFIG_MAX1027) += max1027.o

Signature · 4 lines

2.3.6

--
To unsubscribe from this list: send the line "unsubscribe linux-iio" in

Jonathan Cameron

maintainer

2015-06-21 15:17 UTC #4 lore raw

Re: [PATCH 2/2] iio:adc:cc10001_adc: resort entry in Kconfig and Makefile

Quoted 4 lines · Hartmut Knaack

Move the entry for the CC 10001 ADC driver in Kconfig and Makefile up to maintain alphabetic order.
Signed-off-by Hartmut Knaack <[email protected]>

As you might have guessed, will have to hold this one for now to let the fix get through to my togreg tree.
Same for the other patch you sent.

Give me a poke if I look to have forgotten either of them!

Jonathan

Quoted 47 lines

---
 drivers/iio/adc/Kconfig  | 18 +++++++++---------
 drivers/iio/adc/Makefile |  2 +-
 2 files changed, 10 insertions(+), 10 deletions(-)

drivers/iio/adc/Kconfig +9 -9

index eb0cd89..4790071 100644
@@ -142,15 +142,6 @@ config BERLIN2_ADC
 	  Marvell Berlin2 ADC driver. This ADC has 8 channels, with one used for
 	  temperature measurement.
 
-config DA9150_GPADC
-	tristate "Dialog DA9150 GPADC driver support"
-	depends on MFD_DA9150
-	help
-	  Say yes here to build support for Dialog DA9150 GPADC.
-
-	  This driver can also be built as a module. If chosen, the module name
-	  will be da9150-gpadc.
-
 config CC10001_ADC
 	tristate "Cosmic Circuits 10001 ADC driver"
 	depends on HAS_IOMEM && HAVE_CLK && REGULATOR

@@ -162,6 +153,15 @@ config CC10001_ADC
 	  This driver can also be built as a module. If so, the module will be
 	  called cc10001_adc.
 
+config DA9150_GPADC
+	tristate "Dialog DA9150 GPADC driver support"
+	depends on MFD_DA9150
+	help
+	  Say yes here to build support for Dialog DA9150 GPADC.
+
+	  This driver can also be built as a module. If chosen, the module name
+	  will be da9150-gpadc.
+
 config EXYNOS_ADC
 	tristate "Exynos ADC driver support"
 	depends on ARCH_EXYNOS || ARCH_S3C24XX || ARCH_S3C64XX || (OF && COMPILE_TEST)

drivers/iio/adc/Makefile +0 -0

index a096210..fa5723a 100644

drivers/iio/adc/Makefile obj-$(CONFIG_AD799X) += ad799x.o · line 23

Quoted 9 lines

drivers/iio/adc/Makefile +1 -1

@@ -16,8 +16,8 @@ obj-$(CONFIG_AD799X) += ad799x.o
 obj-$(CONFIG_AT91_ADC) += at91_adc.o
 obj-$(CONFIG_AXP288_ADC) += axp288_adc.o
 obj-$(CONFIG_BERLIN2_ADC) += berlin2-adc.o
-obj-$(CONFIG_DA9150_GPADC) += da9150-gpadc.o
 obj-$(CONFIG_CC10001_ADC) += cc10001_adc.o
+obj-$(CONFIG_DA9150_GPADC) += da9150-gpadc.o
 obj-$(CONFIG_EXYNOS_ADC) += exynos_adc.o
 obj-$(CONFIG_LP8788_ADC) += lp8788_adc.o
 obj-$(CONFIG_MAX1027) += max1027.o

--
To unsubscribe from this list: send the line "unsubscribe linux-iio" in

Jonathan Cameron

maintainer

2015-08-12 21:21 UTC #5 lore raw

Re: [PATCH 2/2] iio:adc:cc10001_adc: resort entry in Kconfig and Makefile

Quoted 10 lines · Jonathan Cameron

Quoted 4 lines · Hartmut Knaack
Move the entry for the CC 10001 ADC driver in Kconfig and Makefile up to maintain alphabetic order.
Signed-off-by Hartmut Knaack <[email protected]>
As you might have guessed, will have to hold this one for now to let the fix get through to my togreg tree.
Same for the other patch you sent.
Give me a poke if I look to have forgotten either of them!

Applied (with fuzz)

Quoted 62 lines

Jonathan

Quoted 47 lines

---
 drivers/iio/adc/Kconfig  | 18 +++++++++---------
 drivers/iio/adc/Makefile |  2 +-
 2 files changed, 10 insertions(+), 10 deletions(-)

drivers/iio/adc/Kconfig +9 -9

index eb0cd89..4790071 100644
@@ -142,15 +142,6 @@ config BERLIN2_ADC
 	  Marvell Berlin2 ADC driver. This ADC has 8 channels, with one used for
 	  temperature measurement.
 
-config DA9150_GPADC
-	tristate "Dialog DA9150 GPADC driver support"
-	depends on MFD_DA9150
-	help
-	  Say yes here to build support for Dialog DA9150 GPADC.
-
-	  This driver can also be built as a module. If chosen, the module name
-	  will be da9150-gpadc.
-
 config CC10001_ADC
 	tristate "Cosmic Circuits 10001 ADC driver"
 	depends on HAS_IOMEM && HAVE_CLK && REGULATOR

@@ -162,6 +153,15 @@ config CC10001_ADC
 	  This driver can also be built as a module. If so, the module will be
 	  called cc10001_adc.
 
+config DA9150_GPADC
+	tristate "Dialog DA9150 GPADC driver support"
+	depends on MFD_DA9150
+	help
+	  Say yes here to build support for Dialog DA9150 GPADC.
+
+	  This driver can also be built as a module. If chosen, the module name
+	  will be da9150-gpadc.
+
 config EXYNOS_ADC
 	tristate "Exynos ADC driver support"
 	depends on ARCH_EXYNOS || ARCH_S3C24XX || ARCH_S3C64XX || (OF && COMPILE_TEST)

drivers/iio/adc/Makefile +0 -0

index a096210..fa5723a 100644

drivers/iio/adc/Makefile obj-$(CONFIG_AD799X) += ad799x.o · line 23

Quoted 9 lines

drivers/iio/adc/Makefile +1 -1

@@ -16,8 +16,8 @@ obj-$(CONFIG_AD799X) += ad799x.o
 obj-$(CONFIG_AT91_ADC) += at91_adc.o
 obj-$(CONFIG_AXP288_ADC) += axp288_adc.o
 obj-$(CONFIG_BERLIN2_ADC) += berlin2-adc.o
-obj-$(CONFIG_DA9150_GPADC) += da9150-gpadc.o
 obj-$(CONFIG_CC10001_ADC) += cc10001_adc.o
+obj-$(CONFIG_DA9150_GPADC) += da9150-gpadc.o
 obj-$(CONFIG_EXYNOS_ADC) += exynos_adc.o
 obj-$(CONFIG_LP8788_ADC) += lp8788_adc.o
 obj-$(CONFIG_MAX1027) += max1027.o

--
To unsubscribe from this list: send the line "unsubscribe linux-iio" in