* [PATCH 0/2] cc10001_adc Kconfig and Makefile fixes
@ 2015-06-21 10:15 Hartmut Knaack
2015-06-21 10:15 ` [PATCH 1/2] iio:adc:cc10001_adc: fix Kconfig dependency Hartmut Knaack
2015-06-21 10:15 ` [PATCH 2/2] iio:adc:cc10001_adc: resort entry in Kconfig and Makefile Hartmut Knaack
0 siblings, 2 replies; 6+ messages in thread
From: Hartmut Knaack @ 2015-06-21 10:15 UTC (permalink / raw)
To: linux-iio
Cc: Jonathan Cameron, Lars-Peter Clausen, Peter Meerwald,
Ezequiel Garcia, Naidu Tellapati, Phani Movva
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(-)
--
2.3.6
--
To unsubscribe from this list: send the line "unsubscribe linux-iio" in
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 1/2] iio:adc:cc10001_adc: fix Kconfig dependency
2015-06-21 10:15 [PATCH 0/2] cc10001_adc Kconfig and Makefile fixes Hartmut Knaack
@ 2015-06-21 10:15 ` Hartmut Knaack
2015-06-21 15:15 ` Jonathan Cameron
2015-06-21 10:15 ` [PATCH 2/2] iio:adc:cc10001_adc: resort entry in Kconfig and Makefile Hartmut Knaack
1 sibling, 1 reply; 6+ messages in thread
From: Hartmut Knaack @ 2015-06-21 10:15 UTC (permalink / raw)
To: linux-iio
Cc: Jonathan Cameron, Lars-Peter Clausen, Peter Meerwald,
Ezequiel Garcia, Naidu Tellapati, Phani Movva
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 <knaack.h@gmx.de>
---
drivers/iio/adc/Kconfig | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/iio/adc/Kconfig b/drivers/iio/adc/Kconfig
index 7c55658..eb0cd89 100644
--- a/drivers/iio/adc/Kconfig
+++ b/drivers/iio/adc/Kconfig
@@ -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
--
2.3.6
--
To unsubscribe from this list: send the line "unsubscribe linux-iio" in
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH 1/2] iio:adc:cc10001_adc: fix Kconfig dependency
2015-06-21 10:15 ` [PATCH 1/2] iio:adc:cc10001_adc: fix Kconfig dependency Hartmut Knaack
@ 2015-06-21 15:15 ` Jonathan Cameron
0 siblings, 0 replies; 6+ messages in thread
From: Jonathan Cameron @ 2015-06-21 15:15 UTC (permalink / raw)
To: Hartmut Knaack, linux-iio
Cc: Lars-Peter Clausen, Peter Meerwald, Ezequiel Garcia,
Naidu Tellapati, Phani Movva
On 21/06/15 11:15, Hartmut Knaack wrote:
> 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 <knaack.h@gmx.de>
Applied to the fixes-togreg branch of iio.git and marked for stable.
Thanks,
Jonathan
> ---
> drivers/iio/adc/Kconfig | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/drivers/iio/adc/Kconfig b/drivers/iio/adc/Kconfig
> index 7c55658..eb0cd89 100644
> --- a/drivers/iio/adc/Kconfig
> +++ b/drivers/iio/adc/Kconfig
> @@ -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
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 2/2] iio:adc:cc10001_adc: resort entry in Kconfig and Makefile
2015-06-21 10:15 [PATCH 0/2] cc10001_adc Kconfig and Makefile fixes Hartmut Knaack
2015-06-21 10:15 ` [PATCH 1/2] iio:adc:cc10001_adc: fix Kconfig dependency Hartmut Knaack
@ 2015-06-21 10:15 ` Hartmut Knaack
2015-06-21 15:17 ` Jonathan Cameron
1 sibling, 1 reply; 6+ messages in thread
From: Hartmut Knaack @ 2015-06-21 10:15 UTC (permalink / raw)
To: linux-iio
Cc: Jonathan Cameron, Lars-Peter Clausen, Peter Meerwald,
Ezequiel Garcia, Naidu Tellapati, Phani Movva
Move the entry for the CC 10001 ADC driver in Kconfig and Makefile up to
maintain alphabetic order.
Signed-off-by: Hartmut Knaack <knaack.h@gmx.de>
---
drivers/iio/adc/Kconfig | 18 +++++++++---------
drivers/iio/adc/Makefile | 2 +-
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/drivers/iio/adc/Kconfig b/drivers/iio/adc/Kconfig
index eb0cd89..4790071 100644
--- a/drivers/iio/adc/Kconfig
+++ b/drivers/iio/adc/Kconfig
@@ -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)
diff --git a/drivers/iio/adc/Makefile b/drivers/iio/adc/Makefile
index a096210..fa5723a 100644
--- a/drivers/iio/adc/Makefile
+++ b/drivers/iio/adc/Makefile
@@ -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
--
2.3.6
--
To unsubscribe from this list: send the line "unsubscribe linux-iio" in
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH 2/2] iio:adc:cc10001_adc: resort entry in Kconfig and Makefile
2015-06-21 10:15 ` [PATCH 2/2] iio:adc:cc10001_adc: resort entry in Kconfig and Makefile Hartmut Knaack
@ 2015-06-21 15:17 ` Jonathan Cameron
2015-08-12 21:21 ` Jonathan Cameron
0 siblings, 1 reply; 6+ messages in thread
From: Jonathan Cameron @ 2015-06-21 15:17 UTC (permalink / raw)
To: Hartmut Knaack, linux-iio
Cc: Lars-Peter Clausen, Peter Meerwald, Ezequiel Garcia,
Naidu Tellapati, Phani Movva
On 21/06/15 11:15, Hartmut Knaack wrote:
> Move the entry for the CC 10001 ADC driver in Kconfig and Makefile up to
> maintain alphabetic order.
>
> Signed-off-by: Hartmut Knaack <knaack.h@gmx.de>
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
> ---
> drivers/iio/adc/Kconfig | 18 +++++++++---------
> drivers/iio/adc/Makefile | 2 +-
> 2 files changed, 10 insertions(+), 10 deletions(-)
>
> diff --git a/drivers/iio/adc/Kconfig b/drivers/iio/adc/Kconfig
> index eb0cd89..4790071 100644
> --- a/drivers/iio/adc/Kconfig
> +++ b/drivers/iio/adc/Kconfig
> @@ -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)
> diff --git a/drivers/iio/adc/Makefile b/drivers/iio/adc/Makefile
> index a096210..fa5723a 100644
> --- a/drivers/iio/adc/Makefile
> +++ b/drivers/iio/adc/Makefile
> @@ -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
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 2/2] iio:adc:cc10001_adc: resort entry in Kconfig and Makefile
2015-06-21 15:17 ` Jonathan Cameron
@ 2015-08-12 21:21 ` Jonathan Cameron
0 siblings, 0 replies; 6+ messages in thread
From: Jonathan Cameron @ 2015-08-12 21:21 UTC (permalink / raw)
To: Hartmut Knaack, linux-iio
Cc: Lars-Peter Clausen, Peter Meerwald, Ezequiel Garcia,
Naidu Tellapati, Phani Movva
On 21/06/15 16:17, Jonathan Cameron wrote:
> On 21/06/15 11:15, Hartmut Knaack wrote:
>> Move the entry for the CC 10001 ADC driver in Kconfig and Makefile up to
>> maintain alphabetic order.
>>
>> Signed-off-by: Hartmut Knaack <knaack.h@gmx.de>
> 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)
>
> Jonathan
>> ---
>> drivers/iio/adc/Kconfig | 18 +++++++++---------
>> drivers/iio/adc/Makefile | 2 +-
>> 2 files changed, 10 insertions(+), 10 deletions(-)
>>
>> diff --git a/drivers/iio/adc/Kconfig b/drivers/iio/adc/Kconfig
>> index eb0cd89..4790071 100644
>> --- a/drivers/iio/adc/Kconfig
>> +++ b/drivers/iio/adc/Kconfig
>> @@ -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)
>> diff --git a/drivers/iio/adc/Makefile b/drivers/iio/adc/Makefile
>> index a096210..fa5723a 100644
>> --- a/drivers/iio/adc/Makefile
>> +++ b/drivers/iio/adc/Makefile
>> @@ -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
>
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2015-08-12 21:21 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-06-21 10:15 [PATCH 0/2] cc10001_adc Kconfig and Makefile fixes Hartmut Knaack
2015-06-21 10:15 ` [PATCH 1/2] iio:adc:cc10001_adc: fix Kconfig dependency Hartmut Knaack
2015-06-21 15:15 ` Jonathan Cameron
2015-06-21 10:15 ` [PATCH 2/2] iio:adc:cc10001_adc: resort entry in Kconfig and Makefile Hartmut Knaack
2015-06-21 15:17 ` Jonathan Cameron
2015-08-12 21:21 ` Jonathan Cameron
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).