mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
* [PATCH] iio: adc: sun4i: add THERMAL dependency
@ 2017-03-28 10:07 Arnd Bergmann
  2017-04-02 10:38 ` Jonathan Cameron
  0 siblings, 1 reply; 2+ messages in thread
From: Arnd Bergmann @ 2017-03-28 10:07 UTC (permalink / raw)
  To: Jonathan Cameron, Quentin Schulz
  Cc: Arnd Bergmann, Hartmut Knaack, Lars-Peter Clausen,
	Peter Meerwald-Stadler, Fabrice Gasnier, linux-iio, linux-kernel

With CONFIG_THERMAL=m and CONFIG_SUN4I_GPADC=y, we get a link error
from calling devm_thermal_zone_of_sensor_register:

drivers/iio/built-in.o: In function `sun4i_gpadc_probe':
:(.text+0x1c284): undefined reference to `devm_thermal_zone_of_sensor_register'

This adds a Kconfig dependency to ensure we can only have the ADC
driver as built-in when this function is also built-in, or when
we see the empty stub implementation. When the thermal code is
a module, we can still build the adc driver as a module, too.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
 drivers/iio/adc/Kconfig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/iio/adc/Kconfig b/drivers/iio/adc/Kconfig
index d0af51d7bcac..7ccbad70a617 100644
--- a/drivers/iio/adc/Kconfig
+++ b/drivers/iio/adc/Kconfig
@@ -562,6 +562,7 @@ config SUN4I_GPADC
 	tristate "Support for the Allwinner SoCs GPADC"
 	depends on IIO
 	depends on MFD_SUN4I_GPADC
+	depends on THERMAL || !THERMAL_OF
 	help
 	  Say yes here to build support for Allwinner (A10, A13 and A31) SoCs
 	  GPADC. This ADC provides 4 channels which can be used as an ADC or as
-- 
2.9.0

^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [PATCH] iio: adc: sun4i: add THERMAL dependency
  2017-03-28 10:07 [PATCH] iio: adc: sun4i: add THERMAL dependency Arnd Bergmann
@ 2017-04-02 10:38 ` Jonathan Cameron
  0 siblings, 0 replies; 2+ messages in thread
From: Jonathan Cameron @ 2017-04-02 10:38 UTC (permalink / raw)
  To: Arnd Bergmann, Quentin Schulz
  Cc: Hartmut Knaack, Lars-Peter Clausen, Peter Meerwald-Stadler,
	Fabrice Gasnier, linux-iio, linux-kernel

On 28/03/17 11:07, Arnd Bergmann wrote:
> With CONFIG_THERMAL=m and CONFIG_SUN4I_GPADC=y, we get a link error
> from calling devm_thermal_zone_of_sensor_register:
> 
> drivers/iio/built-in.o: In function `sun4i_gpadc_probe':
> :(.text+0x1c284): undefined reference to `devm_thermal_zone_of_sensor_register'
> 
> This adds a Kconfig dependency to ensure we can only have the ADC
> driver as built-in when this function is also built-in, or when
> we see the empty stub implementation. When the thermal code is
> a module, we can still build the adc driver as a module, too.
> 
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Thanks Arnd,

Applied to the togreg branch of iio.git.  Should be heading
to Greg later today if build tests pass on the branch.

I've added a fixes tag.

Jonathan
> ---
>  drivers/iio/adc/Kconfig | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/drivers/iio/adc/Kconfig b/drivers/iio/adc/Kconfig
> index d0af51d7bcac..7ccbad70a617 100644
> --- a/drivers/iio/adc/Kconfig
> +++ b/drivers/iio/adc/Kconfig
> @@ -562,6 +562,7 @@ config SUN4I_GPADC
>  	tristate "Support for the Allwinner SoCs GPADC"
>  	depends on IIO
>  	depends on MFD_SUN4I_GPADC
> +	depends on THERMAL || !THERMAL_OF
>  	help
>  	  Say yes here to build support for Allwinner (A10, A13 and A31) SoCs
>  	  GPADC. This ADC provides 4 channels which can be used as an ADC or as
> 

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2017-04-02 10:38 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-03-28 10:07 [PATCH] iio: adc: sun4i: add THERMAL dependency Arnd Bergmann
2017-04-02 10:38 ` Jonathan Cameron

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®