[GIT PULL] ARM: amba: Enable module alias autogeneration for AMBA drivers

[GIT PULL] ARM: amba: Enable module alias autogeneration for AMBA drivers

[Dave Martin]

Hi Russell,

This series enables the general infrastructure for modalias
generation to work for AMBA devices, and enables it in the affected
drivers.

Since there are several patches here, I though it better to send a
pull request.

The first two patches (subject lines "ARM: amba: ...") are the core
patches; the remainder of the patches are the driver changes --
each is trivial and simply adds a MODULE_DEVICE_ALIAS() entry.

I have Acks on some of the driver patches and no comments on the
rest.  I've been circulating these for some time, so if you're
happy to pull those driver patches via your tree, please go ahead.

Otherwise, let me know and I can continue trying to push the driver
patches via other routes.

Cheers
---Dave

The following changes since commit cfcfc9eca2bcbd26a8e206baeb005b055dbf8e37:

  Linux 3.2-rc2 (2011-11-15 15:02:59 -0200)

are available in the git repository at:
  git://git.linaro.org/people/dmart/linux-2.6-arm.git arm/amba-modalias+for-rmk

Dave Martin (16):
      ARM: amba: Move definition of struct amba_id to mod_devicetable.h
      ARM: amba: Auto-generate AMBA driver module aliases during modpost
      hwrng: nomadik: Enable module alias autogeneration for AMBA drivers
      dmaengine: pl08x: Enable module alias autogeneration for AMBA drivers
      dmaengine: pl330: Enable module alias autogeneration for AMBA drivers
      gpio: pl061: Enable module alias autogeneration for AMBA drivers
      input: ambakmi: Enable module alias autogeneration for AMBA drivers
      mmc: mmci: Enable module alias autogeneration for AMBA drivers
      rtc: pl030: Enable module alias autogeneration for AMBA drivers
      rtc: pl031: Enable module alias autogeneration for AMBA drivers
      spi: pl022: Enable module alias autogeneration for AMBA drivers
      serial: pl010: Enable module alias autogeneration for AMBA drivers
      serial: pl011: Enable module alias autogeneration for AMBA drivers
      fbdev: amba: Enable module alias autogeneration for AMBA drivers
      watchdog: sp805: Enable module alias autogeneration for AMBA drivers
      sound: aaci: Enable module alias autogeneration for AMBA drivers

 drivers/amba/bus.c                   |    4 ++
 drivers/char/hw_random/nomadik-rng.c |    2 +
 drivers/dma/amba-pl08x.c             |    2 +
 drivers/dma/pl330.c                  |    2 +
 drivers/gpio/gpio-pl061.c            |    2 +
 drivers/input/serio/ambakmi.c        |    2 +
 drivers/mmc/host/mmci.c              |    2 +
 drivers/rtc/rtc-pl030.c              |    2 +
 drivers/rtc/rtc-pl031.c              |    2 +
 drivers/spi/spi-pl022.c              |    2 +
 drivers/tty/serial/amba-pl010.c      |    2 +
 drivers/tty/serial/amba-pl011.c      |    2 +
 drivers/video/amba-clcd.c            |    2 +
 drivers/watchdog/sp805_wdt.c         |    2 +
 include/linux/amba/bus.h             |    7 +---
 include/linux/mod_devicetable.h      |   18 ++++++++
 scripts/mod/file2alias.c             |   72 ++++++++++++++++++++++++++++++++++
 sound/arm/aaci.c                     |    2 +
 18 files changed, 123 insertions(+), 6 deletions(-)

Re: [GIT PULL] ARM: amba: Enable module alias autogeneration for

[Alessandro Rubini]

> I have Acks on some of the driver patches and no comments on the
> rest.  I've been circulating these for some time, so if you're
> happy to pull those driver patches via your tree, please go ahead.

Sure I have no problem with the nomadik-rng.c, (so please have my
Acked-by: -- sorry for not noting it earlier) but I think this
file2alias thing needs a serious rework to split each bus in a
different file, using ELF sections like we do elsewhere.

I posted a patch last week but I got no comment at all. Maybe this
is the time to ask for comments? I can rebase and repost if needed.

  lkml.org/lkml/2011/11/4/125 (0/2: description of the work)
  lkml.org/lkml/2011/11/4/126 (1/2: turn the if plethora to table lookup)
  lkml.org/lkml/2011/11/4/127 (2/2: partial split to type-specific files).

thanks
/alessandro

Re: [GIT PULL] ARM: amba: Enable module alias autogeneration for

[Dave Martin]

On Tue, Nov 22, 2011 at 12:56:32PM +0100, Alessandro Rubini wrote:
> > I have Acks on some of the driver patches and no comments on the
> > rest.  I've been circulating these for some time, so if you're
> > happy to pull those driver patches via your tree, please go ahead.
> 
> Sure I have no problem with the nomadik-rng.c, (so please have my
> Acked-by: -- sorry for not noting it earlier) but I think this

thanks

> file2alias thing needs a serious rework to split each bus in a
> different file, using ELF sections like we do elsewhere.
> 
> I posted a patch last week but I got no comment at all. Maybe this
> is the time to ask for comments? I can rebase and repost if needed.
> 
>   lkml.org/lkml/2011/11/4/125 (0/2: description of the work)
>   lkml.org/lkml/2011/11/4/126 (1/2: turn the if plethora to table lookup)
>   lkml.org/lkml/2011/11/4/127 (2/2: partial split to type-specific files).

Splitting this up doesn't look like a silly idea -- I thought it was
unfortunate to have to patch a core file just to add a bus type.

I guess the question is how many new buses we get over time.  If they
only get added gradually, people might not be too concerned.  Of course,
this is one of those maintenance issues which can only get worse as time
goes on.

Cheers
---Dave

Re: [GIT PULL] ARM: amba: Enable module alias autogeneration for

[Alessandro Rubini]

>>   lkml.org/lkml/2011/11/4/125 (0/2: description of the work)
>>   lkml.org/lkml/2011/11/4/126 (1/2: turn the if plethora to table lookup)
>>   lkml.org/lkml/2011/11/4/127 (2/2: partial split to type-specific files).
> 
> Splitting this up doesn't look like a silly idea -- I thought it was
> unfortunate to have to patch a core file just to add a bus type.
>
> I guess the question is how many new buses we get over time.

Well, CERN will have 2 in a short time. And I'm sure the bus concept
is so good that a number of them exists as external patches. Being
forced to patch a core file is not good, with conflicts that accumulate
over time.

I'd better be able to drop in my own file and add a kconfig-aware line
in Makefile.  I think the implementation is straightforward. Who should
I send it to?

thanks
/alessandro

Re: [GIT PULL] ARM: amba: Enable module alias autogeneration for

[Greg KH]

On Tue, Nov 22, 2011 at 12:56:32PM +0100, Alessandro Rubini wrote:
> > I have Acks on some of the driver patches and no comments on the
> > rest.  I've been circulating these for some time, so if you're
> > happy to pull those driver patches via your tree, please go ahead.
> 
> Sure I have no problem with the nomadik-rng.c, (so please have my
> Acked-by: -- sorry for not noting it earlier) but I think this
> file2alias thing needs a serious rework to split each bus in a
> different file, using ELF sections like we do elsewhere.
> 
> I posted a patch last week but I got no comment at all. Maybe this
> is the time to ask for comments? I can rebase and repost if needed.
> 
>   lkml.org/lkml/2011/11/4/125 (0/2: description of the work)
>   lkml.org/lkml/2011/11/4/126 (1/2: turn the if plethora to table lookup)
>   lkml.org/lkml/2011/11/4/127 (2/2: partial split to type-specific files).

Ah, I missed that, yes, this would be a good thing to have, we've been
wanting it for _years_.

greg k-h

[GIT PULL] ARM: amba: Enable module alias autogeneration for AMBA

[Dave Martin]

Hi Russell,

Further to my previous pull request:

> The following changes since commit cfcfc9eca2bcbd26a8e206baeb005b055dbf8e37:
> 
>   Linux 3.2-rc2 (2011-11-15 15:02:59 -0200)
> 
> are available in the git repository at:
>   git://git.linaro.org/people/dmart/linux-2.6-arm.git arm/amba-modalias+for-rmk
> 
> Dave Martin (16):
>       ARM: amba: Move definition of struct amba_id to mod_devicetable.h
>       ARM: amba: Auto-generate AMBA driver module aliases during modpost
[...]

... it looks like Alessandro's proposed change to tidy up scripts/mod/
ile2alias.c may get merged soon -- if that happens, you will get a
conflict with the second patch of the series referenced by the previous
pull request.  Fixing it up is straightforward -- if you prefer to
resolve the conflict yourself, that's fine by me.  Alternatively, you
can pull the following modified series instead.

The only difference is in the second patch
("ARM: amba: Auto-generate AMBA driver module aliases during modpost").

Cheers
---Dave

The following changes since commit 114339d31aa813995461866c659bbf07e1cf2267:

  modpost: use table-lookup to build module aliases (2011-12-02 15:18:08 +0000)

are available in the git repository at:
  git://git.linaro.org/people/dmart/linux-2.6-arm.git arm/amba-modalias+alessandro-modalias-v2+for-rmk

Dave Martin (16):
      ARM: amba: Move definition of struct amba_id to mod_devicetable.h
      ARM: amba: Auto-generate AMBA driver module aliases during modpost
      hwrng: nomadik: Enable module alias autogeneration for AMBA drivers
      dmaengine: pl08x: Enable module alias autogeneration for AMBA drivers
      dmaengine: pl330: Enable module alias autogeneration for AMBA drivers
      gpio: pl061: Enable module alias autogeneration for AMBA drivers
      input: ambakmi: Enable module alias autogeneration for AMBA drivers
      mmc: mmci: Enable module alias autogeneration for AMBA drivers
      rtc: pl030: Enable module alias autogeneration for AMBA drivers
      rtc: pl031: Enable module alias autogeneration for AMBA drivers
      spi: pl022: Enable module alias autogeneration for AMBA drivers
      serial: pl010: Enable module alias autogeneration for AMBA drivers
      serial: pl011: Enable module alias autogeneration for AMBA drivers
      fbdev: amba: Enable module alias autogeneration for AMBA drivers
      watchdog: sp805: Enable module alias autogeneration for AMBA drivers
      sound: aaci: Enable module alias autogeneration for AMBA drivers

 drivers/amba/bus.c                   |    4 ++
 drivers/char/hw_random/nomadik-rng.c |    2 +
 drivers/dma/amba-pl08x.c             |    2 +
 drivers/dma/pl330.c                  |    2 +
 drivers/gpio/gpio-pl061.c            |    2 +
 drivers/input/serio/ambakmi.c        |    2 +
 drivers/mmc/host/mmci.c              |    2 +
 drivers/rtc/rtc-pl030.c              |    2 +
 drivers/rtc/rtc-pl031.c              |    2 +
 drivers/spi/spi-pl022.c              |    2 +
 drivers/tty/serial/amba-pl010.c      |    2 +
 drivers/tty/serial/amba-pl011.c      |    2 +
 drivers/video/amba-clcd.c            |    2 +
 drivers/watchdog/sp805_wdt.c         |    2 +
 include/linux/amba/bus.h             |    7 +---
 include/linux/mod_devicetable.h      |   18 +++++++++
 scripts/mod/file2alias.c             |   71 +++++++++++++++++++++++++++++++++-
 sound/arm/aaci.c                     |    2 +
 18 files changed, 121 insertions(+), 7 deletions(-)

Re: [GIT PULL] ARM: amba: Enable module alias autogeneration for

[Alessandro Rubini]

> ... it looks like Alessandro's proposed change to tidy up scripts/mod/
> ile2alias.c may get merged soon

No, I don't think it will happen. Rusty disagrees, and his own
suggestion is in the queue. I'm waiting a while to understand
what is happening.

Anyways, I think it's better for me to wait for amba to come in, and
work on scripts/mod later on. After all, it's meant to ease adding new
buses later, not to make it more difficult for already scheduled ones.

/alessandro

Re: [GIT PULL] ARM: amba: Enable module alias autogeneration for

[Dave Martin]

On Tue, Dec 06, 2011 at 04:59:11PM +0100, Alessandro Rubini wrote:
> > ... it looks like Alessandro's proposed change to tidy up scripts/mod/
> > ile2alias.c may get merged soon
> 
> No, I don't think it will happen. Rusty disagrees, and his own
> suggestion is in the queue. I'm waiting a while to understand
> what is happening.
> 
> Anyways, I think it's better for me to wait for amba to come in, and
> work on scripts/mod later on. After all, it's meant to ease adding new
> buses later, not to make it more difficult for already scheduled ones.

OK -- thanks for the clarification.


Russell, it sounds like you shouldn't get a merge conflict with the
original version of the series after all.

For reference, the original pull request is here:

http://lists.infradead.org/pipermail/linux-arm-kernel/2011-November/073619.html


Cheers
---Dave

Re: [GIT PULL] ARM: amba: Enable module alias autogeneration for

[Dave Martin]

Hi Russell,

This one isn't urgent, but I'm not seeing the amba modalias patches
anywhere yet.  Did you have any outstanding concerns which need to be
resolved?

If you can suggest when/if these are likely to merge that would be great.

Since Alessandro is now expecting to have to rebase on top of the amba
additions anyway, we shouldn't need to worry about conflicting with his
patches.

Of course, if you've already merged these somewhere, then there's no
problem.

Cheers
---Dave

Re: [GIT PULL] ARM: amba: Enable module alias autogeneration for

[Russell King - ARM Linux]

On Mon, Dec 19, 2011 at 01:24:09PM +0000, Dave Martin wrote:
> Hi Russell,
> 
> This one isn't urgent, but I'm not seeing the amba modalias patches
> anywhere yet.  Did you have any outstanding concerns which need to be
> resolved?
> 
> If you can suggest when/if these are likely to merge that would be great.
> 
> Since Alessandro is now expecting to have to rebase on top of the amba
> additions anyway, we shouldn't need to worry about conflicting with his
> patches.
> 
> Of course, if you've already merged these somewhere, then there's no
> problem.

I have pulled it, I just haven't merged it in anywhere yet.

Re: [GIT PULL] ARM: amba: Enable module alias autogeneration for

[Dave Martin]

On Mon, Dec 19, 2011 at 09:39:42PM +0000, Russell King - ARM Linux wrote:
> On Mon, Dec 19, 2011 at 01:24:09PM +0000, Dave Martin wrote:
> > Hi Russell,
> > 
> > This one isn't urgent, but I'm not seeing the amba modalias patches
> > anywhere yet.  Did you have any outstanding concerns which need to be
> > resolved?
> > 
> > If you can suggest when/if these are likely to merge that would be great.
> > 
> > Since Alessandro is now expecting to have to rebase on top of the amba
> > additions anyway, we shouldn't need to worry about conflicting with his
> > patches.
> > 
> > Of course, if you've already merged these somewhere, then there's no
> > problem.
> 
> I have pulled it, I just haven't merged it in anywhere yet.

OK, great -- thanks.

I wasn't too familiar with the procedure, so I just wanted
to be sure that I hadn't done things wrong.

Have a good Christmas in the meantime!

Cheers
---Dave

Re: [GIT PULL] ARM: amba: Enable module alias autogeneration for

[Russell King - ARM Linux]

On Thu, Dec 22, 2011 at 11:21:25AM +0000, Dave Martin wrote:
> On Mon, Dec 19, 2011 at 09:39:42PM +0000, Russell King - ARM Linux wrote:
> > I have pulled it, I just haven't merged it in anywhere yet.
> 
> OK, great -- thanks.
> 
> I wasn't too familiar with the procedure, so I just wanted
> to be sure that I hadn't done things wrong.

FYI, I'll be pushing out an update to my tree Friday evening.