[PATCH] ARM: allmodconfig regressions in linux-next

[PATCH] ARM: allmodconfig regressions in linux-next

[Arnd Bergmann]

Hi everyone,

These are a couple of simple patches to fix bugs that break allyesconfig
and that are only present in linux-next at the moment. Please apply
to the appropriate trees or provide feedback!

Arnd Bergmann (5):
  mfd: ab8500: remove broken ab8500_debug_register_interrupt logic
  usb: phy: phy core cannot yet be a module
  ASoC: don't call of_dma_request_slave_channel directly
  hwrng: bcm2835: fix MODULE_LICENSE tag
  clocksource: kona: adapt to CLOCKSOURCE_OF_DECLARE change

 drivers/char/hw_random/bcm2835-rng.c  |  2 +-
 drivers/clocksource/bcm_kona_timer.c  | 15 ++++-----------
 drivers/mfd/ab8500-debugfs.c          | 10 ----------
 drivers/usb/phy/Kconfig               |  2 +-
 sound/soc/soc-generic-dmaengine-pcm.c |  9 +++++----
 5 files changed, 11 insertions(+), 27 deletions(-)

Cc: Christian Daudt <csd@broadcom.com>
Cc: Dom Cobley <popcornmix@gmail.com>
Cc: Felipe Balbi <balbi@ti.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Herbert Xu <herbert@gondor.apana.org.au>
Cc: John Stultz <john.stultz@linaro.org>
Cc: Jonas ABERG <jonas.aberg@stericsson.com>
Cc: Lars-Peter Clausen <lars@metafoo.de>
Cc: Lee Jones <lee.jones@linaro.org>
Cc: Linus Walleij <linus.walleij@stericsson.com>
Cc: Lubomir Rintel <lkundrak@v3.sk>
Cc: Mark Brown <broonie@opensource.wolfsonmicro.com>
Cc: Matt Mackall <mpm@selenic.com>
Cc: Mattias WALLIN <mattias.wallin@stericsson.com>
Cc: Per FORLIN <per.forlin@stericsson.com>
Cc: Samuel Ortiz <sameo@linux.intel.com>
Cc: Shawn Guo <shawn.guo@linaro.org>
Cc: Stephen Warren <swarren@wwwdotorg.org>
Cc: alsa-devel@alsa-project.org
Cc: linux-rpi-kernel@lists.infradead.org
Cc: linux-usb@vger.kernel.org
Cc: srinidhi kasagar <srinidhi.kasagar@stericsson.com>
-- 
1.8.1.2

[PATCH] usb: phy: phy core cannot yet be a module

[Arnd Bergmann]

A lot of platform code calls into the usb phy core at the moment, which
does not work if it is built as a loadable module. This will hopefully
change when those platforms are all converted to DT based probing,
but for now, the easiest solution is to change it from "tristate"
to "bool".

This solves at least these ARM allmodconfig build errors:

arch/arm/mach-imx/built-in.o: In function `imx_otg_ulpi_create':
arch/arm/mach-imx/ulpi.c:117: undefined reference to `otg_ulpi_create'
arch/arm/mach-omap2/built-in.o: In function `usbhs_init_phys':
arch/arm/mach-omap2/usb-host.c:652: undefined reference to `usb_bind_phy'
arch/arm/mach-omap2/built-in.o: In function `omap_2430sdp_init':
arch/arm/mach-omap2/board-2430sdp.c:236: undefined reference to `usb_bind_phy'
arch/arm/mach-omap2/built-in.o: In function `omap3_beagle_init':
arch/arm/mach-omap2/board-omap3beagle.c:554: undefined reference to `usb_bind_phy'
arch/arm/mach-omap2/built-in.o: In function `devkit8000_init':
arch/arm/mach-omap2/board-devkit8000.c:596: undefined reference to `usb_bind_phy'
arch/arm/mach-omap2/built-in.o: In function `omap_ldp_init':
arch/arm/mach-omap2/board-ldp.c:379: undefined reference to `usb_bind_phy'
drivers/built-in.o: In function `ab8500_charger_probe':
drivers/power/ab8500_charger.c:3629: undefined reference to `usb_get_phy'
drivers/power/ab8500_charger.c:3706: undefined reference to `usb_put_phy'
drivers/built-in.o: In function `ab8500_charger_remove':
drivers/power/ab8500_charger.c:3411: undefined reference to `usb_put_phy'

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: Felipe Balbi <balbi@ti.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: linux-usb@vger.kernel.org
---
 drivers/usb/phy/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/usb/phy/Kconfig b/drivers/usb/phy/Kconfig
index 21153d1..371d0e7 100644
--- a/drivers/usb/phy/Kconfig
+++ b/drivers/usb/phy/Kconfig
@@ -2,7 +2,7 @@
 # Physical Layer USB driver configuration
 #
 menuconfig USB_PHY
-	tristate "USB Physical Layer drivers"
+	bool "USB Physical Layer drivers"
 	help
 	  USB controllers (those which are host, device or DRD) need a
 	  device to handle the physical layer signalling, commonly called
-- 
1.8.1.2

Re: [PATCH] usb: phy: phy core cannot yet be a module

[Felipe Balbi]

[-- Attachment #1: Type: text/plain, Size: 2585 bytes --]

Hi,

On Tue, Apr 23, 2013 at 05:54:32PM +0200, Arnd Bergmann wrote:
> A lot of platform code calls into the usb phy core at the moment, which
> does not work if it is built as a loadable module. This will hopefully
> change when those platforms are all converted to DT based probing,
> but for now, the easiest solution is to change it from "tristate"
> to "bool".
> 
> This solves at least these ARM allmodconfig build errors:
> 
> arch/arm/mach-imx/built-in.o: In function `imx_otg_ulpi_create':
> arch/arm/mach-imx/ulpi.c:117: undefined reference to `otg_ulpi_create'
> arch/arm/mach-omap2/built-in.o: In function `usbhs_init_phys':
> arch/arm/mach-omap2/usb-host.c:652: undefined reference to `usb_bind_phy'
> arch/arm/mach-omap2/built-in.o: In function `omap_2430sdp_init':
> arch/arm/mach-omap2/board-2430sdp.c:236: undefined reference to `usb_bind_phy'
> arch/arm/mach-omap2/built-in.o: In function `omap3_beagle_init':
> arch/arm/mach-omap2/board-omap3beagle.c:554: undefined reference to `usb_bind_phy'
> arch/arm/mach-omap2/built-in.o: In function `devkit8000_init':
> arch/arm/mach-omap2/board-devkit8000.c:596: undefined reference to `usb_bind_phy'
> arch/arm/mach-omap2/built-in.o: In function `omap_ldp_init':
> arch/arm/mach-omap2/board-ldp.c:379: undefined reference to `usb_bind_phy'
> drivers/built-in.o: In function `ab8500_charger_probe':
> drivers/power/ab8500_charger.c:3629: undefined reference to `usb_get_phy'
> drivers/power/ab8500_charger.c:3706: undefined reference to `usb_put_phy'
> drivers/built-in.o: In function `ab8500_charger_remove':
> drivers/power/ab8500_charger.c:3411: undefined reference to `usb_put_phy'
> 
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> Cc: Felipe Balbi <balbi@ti.com>
> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> Cc: linux-usb@vger.kernel.org
> ---
>  drivers/usb/phy/Kconfig | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/usb/phy/Kconfig b/drivers/usb/phy/Kconfig
> index 21153d1..371d0e7 100644
> --- a/drivers/usb/phy/Kconfig
> +++ b/drivers/usb/phy/Kconfig
> @@ -2,7 +2,7 @@
>  # Physical Layer USB driver configuration
>  #
>  menuconfig USB_PHY
> -	tristate "USB Physical Layer drivers"
> +	bool "USB Physical Layer drivers"

looks like this is the only way, indeed. Do you need on the merge window
on can this wait until -rc1 ? I just sent a pull request to Greg with
urgent fixes for the merge window.

Greg, if you want to take this one as a patch, go for it:

Acked-by: Felipe Balbi <balbi@ti.com>

-- 
balbi

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

Re: [PATCH] usb: phy: phy core cannot yet be a module

[Arnd Bergmann]

On Tuesday 23 April 2013, Felipe Balbi wrote:
> looks like this is the only way, indeed. Do you need on the merge window
> on can this wait until -rc1 ? I just sent a pull request to Greg with
> urgent fixes for the merge window.
> 
> Greg, if you want to take this one as a patch, go for it:
> 
> Acked-by: Felipe Balbi <balbi@ti.com>

It's not relevant for real-life scenarios, it's fine as long as this
makes it into 3.10.

	Arnd

Re: [PATCH] usb: phy: phy core cannot yet be a module

[Felipe Balbi]

[-- Attachment #1: Type: text/plain, Size: 583 bytes --]

Hi,

On Tue, Apr 23, 2013 at 06:11:35PM +0200, Arnd Bergmann wrote:
> On Tuesday 23 April 2013, Felipe Balbi wrote:
> > looks like this is the only way, indeed. Do you need on the merge window
> > on can this wait until -rc1 ? I just sent a pull request to Greg with
> > urgent fixes for the merge window.
> > 
> > Greg, if you want to take this one as a patch, go for it:
> > 
> > Acked-by: Felipe Balbi <balbi@ti.com>
> 
> It's not relevant for real-life scenarios, it's fine as long as this
> makes it into 3.10.

sure, I can take this on -rc1 then.

-- 
balbi

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

Re: [PATCH] usb: phy: phy core cannot yet be a module

[Greg Kroah-Hartman]

On Tue, Apr 23, 2013 at 07:07:59PM +0300, Felipe Balbi wrote:
> Hi,
> 
> On Tue, Apr 23, 2013 at 05:54:32PM +0200, Arnd Bergmann wrote:
> > A lot of platform code calls into the usb phy core at the moment, which
> > does not work if it is built as a loadable module. This will hopefully
> > change when those platforms are all converted to DT based probing,
> > but for now, the easiest solution is to change it from "tristate"
> > to "bool".
> > 
> > This solves at least these ARM allmodconfig build errors:
> > 
> > arch/arm/mach-imx/built-in.o: In function `imx_otg_ulpi_create':
> > arch/arm/mach-imx/ulpi.c:117: undefined reference to `otg_ulpi_create'
> > arch/arm/mach-omap2/built-in.o: In function `usbhs_init_phys':
> > arch/arm/mach-omap2/usb-host.c:652: undefined reference to `usb_bind_phy'
> > arch/arm/mach-omap2/built-in.o: In function `omap_2430sdp_init':
> > arch/arm/mach-omap2/board-2430sdp.c:236: undefined reference to `usb_bind_phy'
> > arch/arm/mach-omap2/built-in.o: In function `omap3_beagle_init':
> > arch/arm/mach-omap2/board-omap3beagle.c:554: undefined reference to `usb_bind_phy'
> > arch/arm/mach-omap2/built-in.o: In function `devkit8000_init':
> > arch/arm/mach-omap2/board-devkit8000.c:596: undefined reference to `usb_bind_phy'
> > arch/arm/mach-omap2/built-in.o: In function `omap_ldp_init':
> > arch/arm/mach-omap2/board-ldp.c:379: undefined reference to `usb_bind_phy'
> > drivers/built-in.o: In function `ab8500_charger_probe':
> > drivers/power/ab8500_charger.c:3629: undefined reference to `usb_get_phy'
> > drivers/power/ab8500_charger.c:3706: undefined reference to `usb_put_phy'
> > drivers/built-in.o: In function `ab8500_charger_remove':
> > drivers/power/ab8500_charger.c:3411: undefined reference to `usb_put_phy'
> > 
> > Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> > Cc: Felipe Balbi <balbi@ti.com>
> > Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> > Cc: linux-usb@vger.kernel.org
> > ---
> >  drivers/usb/phy/Kconfig | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> > 
> > diff --git a/drivers/usb/phy/Kconfig b/drivers/usb/phy/Kconfig
> > index 21153d1..371d0e7 100644
> > --- a/drivers/usb/phy/Kconfig
> > +++ b/drivers/usb/phy/Kconfig
> > @@ -2,7 +2,7 @@
> >  # Physical Layer USB driver configuration
> >  #
> >  menuconfig USB_PHY
> > -	tristate "USB Physical Layer drivers"
> > +	bool "USB Physical Layer drivers"
> 
> looks like this is the only way, indeed. Do you need on the merge window
> on can this wait until -rc1 ? I just sent a pull request to Greg with
> urgent fixes for the merge window.
> 
> Greg, if you want to take this one as a patch, go for it:
> 
> Acked-by: Felipe Balbi <balbi@ti.com>

I'll take this now, thanks.

greg k-h

[PATCH] ASoC: don't call of_dma_request_slave_channel directly

[Arnd Bergmann]

The exported interface for device drivers is dma_request_slave_channel,
not of_dma_request_slave_channel. The former does not depend on device
tree but also works with ACPI and other interfaces providing an
abstraction for DMA channels.

This fixes link errors when building ALSA as a loadable module.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: alsa-devel@alsa-project.org
Cc: Lars-Peter Clausen <lars@metafoo.de>
Cc: Shawn Guo <shawn.guo@linaro.org>
Cc: Mark Brown <broonie@opensource.wolfsonmicro.com>
---
 sound/soc/soc-generic-dmaengine-pcm.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/sound/soc/soc-generic-dmaengine-pcm.c b/sound/soc/soc-generic-dmaengine-pcm.c
index 5fd5ed4..8ee9859 100644
--- a/sound/soc/soc-generic-dmaengine-pcm.c
+++ b/sound/soc/soc-generic-dmaengine-pcm.c
@@ -219,19 +219,20 @@ static const char * const dmaengine_pcm_dma_channel_names[] = {
 };
 
 static void dmaengine_pcm_request_chan_of(struct dmaengine_pcm *pcm,
-	struct device_node *of_node)
+	struct device *dev)
 {
 	unsigned int i;
+	struct device_node *of_node = dev->of_node;
 
 	if ((pcm->flags & SND_DMAENGINE_PCM_FLAG_NO_DT) || !of_node)
 		return;
 
 	if (pcm->flags & SND_DMAENGINE_PCM_FLAG_HALF_DUPLEX) {
-		pcm->chan[0] = of_dma_request_slave_channel(of_node, "tx_rx");
+		pcm->chan[0] = dma_request_slave_channel(dev, "tx_rx");
 		pcm->chan[1] = pcm->chan[0];
 	} else {
 		for (i = SNDRV_PCM_STREAM_PLAYBACK; i <= SNDRV_PCM_STREAM_CAPTURE; i++) {
-			pcm->chan[i] = of_dma_request_slave_channel(of_node,
+			pcm->chan[i] = dma_request_slave_channel(dev,
 					dmaengine_pcm_dma_channel_names[i]);
 		}
 	}
@@ -255,7 +256,7 @@ int snd_dmaengine_pcm_register(struct device *dev,
 	pcm->config = config;
 	pcm->flags = flags;
 
-	dmaengine_pcm_request_chan_of(pcm, dev->of_node);
+	dmaengine_pcm_request_chan_of(pcm, dev);
 
 	if (flags & SND_DMAENGINE_PCM_FLAG_NO_RESIDUE)
 		return snd_soc_add_platform(dev, &pcm->platform,
-- 
1.8.1.2

Re: [PATCH] ASoC: don't call of_dma_request_slave_channel directly

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 558 bytes --]

On Tue, Apr 23, 2013 at 05:54:33PM +0200, Arnd Bergmann wrote:
> The exported interface for device drivers is dma_request_slave_channel,
> not of_dma_request_slave_channel. The former does not depend on device
> tree but also works with ACPI and other interfaces providing an
> abstraction for DMA channels.

> This fixes link errors when building ALSA as a loadable module.

This has already been changed separately, I'm surprised this applies
against current code.  Though one does have to wonder why it's in the
header file if it's not a supported API...

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

Re: [PATCH] ASoC: don't call of_dma_request_slave_channel directly

[Shawn Guo]

On Tue, Apr 23, 2013 at 05:54:33PM +0200, Arnd Bergmann wrote:
> The exported interface for device drivers is dma_request_slave_channel,
> not of_dma_request_slave_channel. The former does not depend on device
> tree but also works with ACPI and other interfaces providing an
> abstraction for DMA channels.
> 
> This fixes link errors when building ALSA as a loadable module.
> 
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>

I had already sent a similar patch [1] for that.

Shawn

[1] http://thread.gmane.org/gmane.linux.alsa.devel/107568/

> Cc: alsa-devel@alsa-project.org
> Cc: Lars-Peter Clausen <lars@metafoo.de>
> Cc: Shawn Guo <shawn.guo@linaro.org>
> Cc: Mark Brown <broonie@opensource.wolfsonmicro.com>
> ---
>  sound/soc/soc-generic-dmaengine-pcm.c | 9 +++++----
>  1 file changed, 5 insertions(+), 4 deletions(-)
> 
> diff --git a/sound/soc/soc-generic-dmaengine-pcm.c b/sound/soc/soc-generic-dmaengine-pcm.c
> index 5fd5ed4..8ee9859 100644
> --- a/sound/soc/soc-generic-dmaengine-pcm.c
> +++ b/sound/soc/soc-generic-dmaengine-pcm.c
> @@ -219,19 +219,20 @@ static const char * const dmaengine_pcm_dma_channel_names[] = {
>  };
>  
>  static void dmaengine_pcm_request_chan_of(struct dmaengine_pcm *pcm,
> -	struct device_node *of_node)
> +	struct device *dev)
>  {
>  	unsigned int i;
> +	struct device_node *of_node = dev->of_node;
>  
>  	if ((pcm->flags & SND_DMAENGINE_PCM_FLAG_NO_DT) || !of_node)
>  		return;
>  
>  	if (pcm->flags & SND_DMAENGINE_PCM_FLAG_HALF_DUPLEX) {
> -		pcm->chan[0] = of_dma_request_slave_channel(of_node, "tx_rx");
> +		pcm->chan[0] = dma_request_slave_channel(dev, "tx_rx");
>  		pcm->chan[1] = pcm->chan[0];
>  	} else {
>  		for (i = SNDRV_PCM_STREAM_PLAYBACK; i <= SNDRV_PCM_STREAM_CAPTURE; i++) {
> -			pcm->chan[i] = of_dma_request_slave_channel(of_node,
> +			pcm->chan[i] = dma_request_slave_channel(dev,
>  					dmaengine_pcm_dma_channel_names[i]);
>  		}
>  	}
> @@ -255,7 +256,7 @@ int snd_dmaengine_pcm_register(struct device *dev,
>  	pcm->config = config;
>  	pcm->flags = flags;
>  
> -	dmaengine_pcm_request_chan_of(pcm, dev->of_node);
> +	dmaengine_pcm_request_chan_of(pcm, dev);
>  
>  	if (flags & SND_DMAENGINE_PCM_FLAG_NO_RESIDUE)
>  		return snd_soc_add_platform(dev, &pcm->platform,
> -- 
> 1.8.1.2
> 

Re: [PATCH] ASoC: don't call of_dma_request_slave_channel directly

[Arnd Bergmann]

On Wednesday 24 April 2013, Shawn Guo wrote:
> On Tue, Apr 23, 2013 at 05:54:33PM +0200, Arnd Bergmann wrote:
> > The exported interface for device drivers is dma_request_slave_channel,
> > not of_dma_request_slave_channel. The former does not depend on device
> > tree but also works with ACPI and other interfaces providing an
> > abstraction for DMA channels.
> > 
> > This fixes link errors when building ALSA as a loadable module.
> > 
> > Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> 
> I had already sent a similar patch [1] for that.
> 

Yes, I see it in linux-next now.

Thanks,

	Arnd

[PATCH] hwrng: bcm2835: fix MODULE_LICENSE tag

[Arnd Bergmann]

The MODULE_LICENSE macro invocation must use either "GPL" or "GPL v2",
but not "GPLv2" in order to be detected by the module loader.

This fixes the allmodconfig build error:

FATAL: modpost: GPL-incompatible module bcm2835-rng.ko uses GPL-only symbol 'platform_driver_unregister'

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: Dom Cobley <popcornmix@gmail.com>
Cc: Lubomir Rintel <lkundrak@v3.sk>
Cc: Stephen Warren <swarren@wwwdotorg.org>
Cc: Matt Mackall <mpm@selenic.com>
Cc: linux-rpi-kernel@lists.infradead.org
Cc: Herbert Xu <herbert@gondor.apana.org.au>
---
 drivers/char/hw_random/bcm2835-rng.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/char/hw_random/bcm2835-rng.c b/drivers/char/hw_random/bcm2835-rng.c
index eb7f147..43577ca 100644
--- a/drivers/char/hw_random/bcm2835-rng.c
+++ b/drivers/char/hw_random/bcm2835-rng.c
@@ -110,4 +110,4 @@ module_platform_driver(bcm2835_rng_driver);
 
 MODULE_AUTHOR("Lubomir Rintel <lkundrak@v3.sk>");
 MODULE_DESCRIPTION("BCM2835 Random Number Generator (RNG) driver");
-MODULE_LICENSE("GPLv2");
+MODULE_LICENSE("GPL v2");
-- 
1.8.1.2

Re: [PATCH] hwrng: bcm2835: fix MODULE_LICENSE tag

[Lubomir Rintel]

On Tue, 2013-04-23 at 17:54 +0200, Arnd Bergmann wrote:
> The MODULE_LICENSE macro invocation must use either "GPL" or "GPL v2",
> but not "GPLv2" in order to be detected by the module loader.
> 
> This fixes the allmodconfig build error:
> 
> FATAL: modpost: GPL-incompatible module bcm2835-rng.ko uses GPL-only symbol 'platform_driver_unregister'

Thank you, obviously a typo of mine that slipped through. I'm wondering
if this could get queued for 3.10; it definitely can't do any harm.

Acked-by: Lubomir Rintel <lkundrak@v3.sk>

> 
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> Cc: Dom Cobley <popcornmix@gmail.com>
> Cc: Lubomir Rintel <lkundrak@v3.sk>
> Cc: Stephen Warren <swarren@wwwdotorg.org>
> Cc: Matt Mackall <mpm@selenic.com>
> Cc: linux-rpi-kernel@lists.infradead.org
> Cc: Herbert Xu <herbert@gondor.apana.org.au>
> ---
>  drivers/char/hw_random/bcm2835-rng.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/char/hw_random/bcm2835-rng.c b/drivers/char/hw_random/bcm2835-rng.c
> index eb7f147..43577ca 100644
> --- a/drivers/char/hw_random/bcm2835-rng.c
> +++ b/drivers/char/hw_random/bcm2835-rng.c
> @@ -110,4 +110,4 @@ module_platform_driver(bcm2835_rng_driver);
>  
>  MODULE_AUTHOR("Lubomir Rintel <lkundrak@v3.sk>");
>  MODULE_DESCRIPTION("BCM2835 Random Number Generator (RNG) driver");
> -MODULE_LICENSE("GPLv2");
> +MODULE_LICENSE("GPL v2");

[PATCH] clocksource: kona: adapt to CLOCKSOURCE_OF_DECLARE change

[Arnd Bergmann]

The CLOCKSOURCE_OF_DECLARE functions now take a device_node pointer
as their argument, as of the clksrc/cleanup branch in arm-soc.
This patch adapts the bcm_kona_timer driver to the new interface.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: Christian Daudt <csd@broadcom.com>
Cc: John Stultz <john.stultz@linaro.org>
---
 drivers/clocksource/bcm_kona_timer.c | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/drivers/clocksource/bcm_kona_timer.c b/drivers/clocksource/bcm_kona_timer.c
index 350f493..ba3d859 100644
--- a/drivers/clocksource/bcm_kona_timer.c
+++ b/drivers/clocksource/bcm_kona_timer.c
@@ -103,16 +103,10 @@ static const struct of_device_id bcm_timer_ids[] __initconst = {
 	{},
 };
 
-static void __init kona_timers_init(void)
+static void __init kona_timers_init(struct device_node *node)
 {
-	struct device_node *node;
 	u32 freq;
 
-	node = of_find_matching_node(NULL, bcm_timer_ids);
-
-	if (!node)
-		panic("No timer");
-
 	if (!of_property_read_u32(node, "clock-frequency", &freq))
 		arch_timer_rate = freq;
 	else
@@ -199,13 +193,12 @@ static struct irqaction kona_timer_irq = {
 	.handler = kona_timer_interrupt,
 };
 
-static void __init kona_timer_init(void)
+static void __init kona_timer_init(struct device_node *node)
 {
-	kona_timers_init();
+	kona_timers_init(node);
 	kona_timer_clockevents_init();
 	setup_irq(timers.tmr_irq, &kona_timer_irq);
 	kona_timer_set_next_event((arch_timer_rate / HZ), NULL);
 }
 
-CLOCKSOURCE_OF_DECLARE(bcm_kona, "bcm,kona-timer",
-	kona_timer_init);
+CLOCKSOURCE_OF_DECLARE(bcm_kona, "bcm,kona-timer", kona_timer_init);
-- 
1.8.1.2

Re: [PATCH] clocksource: kona: adapt to CLOCKSOURCE_OF_DECLARE change

[Christian Daudt]

On 13-04-23 08:54 AM, Arnd Bergmann wrote:
> The CLOCKSOURCE_OF_DECLARE functions now take a device_node pointer
> as their argument, as of the clksrc/cleanup branch in arm-soc.
> This patch adapts the bcm_kona_timer driver to the new interface.
>
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> Cc: Christian Daudt <csd@broadcom.com>
> Cc: John Stultz <john.stultz@linaro.org>
> ---
>   drivers/clocksource/bcm_kona_timer.c | 15 ++++-----------
>   1 file changed, 4 insertions(+), 11 deletions(-)
>
> diff --git a/drivers/clocksource/bcm_kona_timer.c b/drivers/clocksource/bcm_kona_timer.c
> ...
>   
> -CLOCKSOURCE_OF_DECLARE(bcm_kona, "bcm,kona-timer",
> -	kona_timer_init);
> +CLOCKSOURCE_OF_DECLARE(bcm_kona, "bcm,kona-timer", kona_timer_init);
acked-by: Christian Daudt <csd@broadcom.com>
tested-by: Christian Daudt <csd@broadcom.com>

  thanks,
    csd