[GIT,PULL] Support for Cadence GEM in the MACB driver

Submitted by Jamie Iles on Nov. 21, 2011, 10 a.m.

Details

Message ID 20111121100020.GB7314@totoro
State New
Headers show

Pull-request

git://github.com/jamieiles/linux-2.6-ji.git macb-gem

Commit Message

Jamie Iles Nov. 21, 2011, 10 a.m.
Hi Arnd,

Please consider pulling the patches to add support for Cadence GEM to 
the MACB driver.  These have been ready to go for a little while but got 
held up with the rename of Ethernet drivers in the last merge window.  
It would be great if we can get some exposure in -next for a little 
while before the next merge window.

Thanks,

Jamie

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://github.com/jamieiles/linux-2.6-ji.git macb-gem

Jamie Iles (9):
      at91: provide macb clks with "pclk" and "hclk" name
      macb: remove conditional clk handling
      macb: unify at91 and avr32 platform data
      macb: convert printk to netdev_ and friends
      macb: initial support for Cadence GEM
      macb: support higher rate GEM MDIO clock divisors
      macb: support statistics for GEM devices
      macb: support DMA bus widths > 32 bits
      macb: allow GEM to have configurable receive buffer size

 arch/arm/mach-at91/at91cap9.c               |    8 +-
 arch/arm/mach-at91/at91cap9_devices.c       |    6 +-
 arch/arm/mach-at91/at91rm9200_devices.c     |    6 +-
 arch/arm/mach-at91/at91sam9260.c            |    8 +-
 arch/arm/mach-at91/at91sam9260_devices.c    |    6 +-
 arch/arm/mach-at91/at91sam9263.c            |    8 +-
 arch/arm/mach-at91/at91sam9263_devices.c    |    6 +-
 arch/arm/mach-at91/at91sam9g45.c            |    8 +-
 arch/arm/mach-at91/at91sam9g45_devices.c    |    6 +-
 arch/arm/mach-at91/board-1arm.c             |    2 +-
 arch/arm/mach-at91/board-afeb-9260v1.c      |    2 +-
 arch/arm/mach-at91/board-cam60.c            |    2 +-
 arch/arm/mach-at91/board-cap9adk.c          |    2 +-
 arch/arm/mach-at91/board-carmeva.c          |    2 +-
 arch/arm/mach-at91/board-cpu9krea.c         |    2 +-
 arch/arm/mach-at91/board-cpuat91.c          |    2 +-
 arch/arm/mach-at91/board-csb337.c           |    2 +-
 arch/arm/mach-at91/board-csb637.c           |    2 +-
 arch/arm/mach-at91/board-eb9200.c           |    2 +-
 arch/arm/mach-at91/board-ecbat91.c          |    2 +-
 arch/arm/mach-at91/board-eco920.c           |    2 +-
 arch/arm/mach-at91/board-foxg20.c           |    2 +-
 arch/arm/mach-at91/board-gsia18s.c          |    2 +-
 arch/arm/mach-at91/board-kafa.c             |    2 +-
 arch/arm/mach-at91/board-kb9202.c           |    2 +-
 arch/arm/mach-at91/board-neocore926.c       |    2 +-
 arch/arm/mach-at91/board-pcontrol-g20.c     |    2 +-
 arch/arm/mach-at91/board-picotux200.c       |    2 +-
 arch/arm/mach-at91/board-qil-a9260.c        |    2 +-
 arch/arm/mach-at91/board-rm9200dk.c         |    2 +-
 arch/arm/mach-at91/board-rm9200ek.c         |    2 +-
 arch/arm/mach-at91/board-rsi-ews.c          |    2 +-
 arch/arm/mach-at91/board-sam9-l9260.c       |    2 +-
 arch/arm/mach-at91/board-sam9260ek.c        |    2 +-
 arch/arm/mach-at91/board-sam9263ek.c        |    2 +-
 arch/arm/mach-at91/board-sam9g20ek.c        |    2 +-
 arch/arm/mach-at91/board-sam9m10g45ek.c     |    2 +-
 arch/arm/mach-at91/board-snapper9260.c      |    2 +-
 arch/arm/mach-at91/board-stamp9g20.c        |    2 +-
 arch/arm/mach-at91/board-usb-a926x.c        |    2 +-
 arch/arm/mach-at91/board-yl-9200.c          |    2 +-
 arch/arm/mach-at91/include/mach/board.h     |   14 +-
 arch/avr32/boards/atngw100/setup.c          |    2 +-
 arch/avr32/boards/atstk1000/atstk1002.c     |    2 +-
 arch/avr32/boards/favr-32/setup.c           |    2 +-
 arch/avr32/boards/hammerhead/setup.c        |    2 +-
 arch/avr32/boards/merisc/setup.c            |    2 +-
 arch/avr32/boards/mimc200/setup.c           |    2 +-
 arch/avr32/mach-at32ap/at32ap700x.c         |    8 +-
 arch/avr32/mach-at32ap/include/mach/board.h |    7 +-
 drivers/net/ethernet/Makefile               |    2 +-
 drivers/net/ethernet/cadence/Kconfig        |   16 +-
 drivers/net/ethernet/cadence/at91_ether.c   |    3 +-
 drivers/net/ethernet/cadence/at91_ether.h   |    4 +-
 drivers/net/ethernet/cadence/macb.c         |  344 +++++++++++++++++----------
 drivers/net/ethernet/cadence/macb.h         |  150 ++++++++++++-
 include/linux/platform_data/macb.h          |   17 ++
 57 files changed, 492 insertions(+), 211 deletions(-)
 create mode 100644 include/linux/platform_data/macb.h

Comments

Jean-Christophe PLAGNIOL-VILLARD Nov. 22, 2011, 10 a.m.
On 10:00 Mon 21 Nov     , Jamie Iles wrote:
> Hi Arnd,
> 
> Please consider pulling the patches to add support for Cadence GEM to 
> the MACB driver.  These have been ready to go for a little while but got 
> held up with the rename of Ethernet drivers in the last merge window.  
> It would be great if we can get some exposure in -next for a little 
> while before the next merge window.
> 
> Thanks,
> 
> Jamie
> 
> 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://github.com/jamieiles/linux-2.6-ji.git macb-gem
Arnd please wait

please update his patch

"at91: provide macb clks with "pclk" and "hclk" name"

with the version I send to the ML

Best Regards,
J.
> 
> Jamie Iles (9):
>       at91: provide macb clks with "pclk" and "hclk" name
>       macb: remove conditional clk handling
>       macb: unify at91 and avr32 platform data
>       macb: convert printk to netdev_ and friends
>       macb: initial support for Cadence GEM
>       macb: support higher rate GEM MDIO clock divisors
>       macb: support statistics for GEM devices
>       macb: support DMA bus widths > 32 bits
>       macb: allow GEM to have configurable receive buffer size
> 
>  arch/arm/mach-at91/at91cap9.c               |    8 +-
>  arch/arm/mach-at91/at91cap9_devices.c       |    6 +-
>  arch/arm/mach-at91/at91rm9200_devices.c     |    6 +-
>  arch/arm/mach-at91/at91sam9260.c            |    8 +-
>  arch/arm/mach-at91/at91sam9260_devices.c    |    6 +-
>  arch/arm/mach-at91/at91sam9263.c            |    8 +-
>  arch/arm/mach-at91/at91sam9263_devices.c    |    6 +-
>  arch/arm/mach-at91/at91sam9g45.c            |    8 +-
>  arch/arm/mach-at91/at91sam9g45_devices.c    |    6 +-
>  arch/arm/mach-at91/board-1arm.c             |    2 +-
>  arch/arm/mach-at91/board-afeb-9260v1.c      |    2 +-
>  arch/arm/mach-at91/board-cam60.c            |    2 +-
>  arch/arm/mach-at91/board-cap9adk.c          |    2 +-
>  arch/arm/mach-at91/board-carmeva.c          |    2 +-
>  arch/arm/mach-at91/board-cpu9krea.c         |    2 +-
>  arch/arm/mach-at91/board-cpuat91.c          |    2 +-
>  arch/arm/mach-at91/board-csb337.c           |    2 +-
>  arch/arm/mach-at91/board-csb637.c           |    2 +-
>  arch/arm/mach-at91/board-eb9200.c           |    2 +-
>  arch/arm/mach-at91/board-ecbat91.c          |    2 +-
>  arch/arm/mach-at91/board-eco920.c           |    2 +-
>  arch/arm/mach-at91/board-foxg20.c           |    2 +-
>  arch/arm/mach-at91/board-gsia18s.c          |    2 +-
>  arch/arm/mach-at91/board-kafa.c             |    2 +-
>  arch/arm/mach-at91/board-kb9202.c           |    2 +-
>  arch/arm/mach-at91/board-neocore926.c       |    2 +-
>  arch/arm/mach-at91/board-pcontrol-g20.c     |    2 +-
>  arch/arm/mach-at91/board-picotux200.c       |    2 +-
>  arch/arm/mach-at91/board-qil-a9260.c        |    2 +-
>  arch/arm/mach-at91/board-rm9200dk.c         |    2 +-
>  arch/arm/mach-at91/board-rm9200ek.c         |    2 +-
>  arch/arm/mach-at91/board-rsi-ews.c          |    2 +-
>  arch/arm/mach-at91/board-sam9-l9260.c       |    2 +-
>  arch/arm/mach-at91/board-sam9260ek.c        |    2 +-
>  arch/arm/mach-at91/board-sam9263ek.c        |    2 +-
>  arch/arm/mach-at91/board-sam9g20ek.c        |    2 +-
>  arch/arm/mach-at91/board-sam9m10g45ek.c     |    2 +-
>  arch/arm/mach-at91/board-snapper9260.c      |    2 +-
>  arch/arm/mach-at91/board-stamp9g20.c        |    2 +-
>  arch/arm/mach-at91/board-usb-a926x.c        |    2 +-
>  arch/arm/mach-at91/board-yl-9200.c          |    2 +-
>  arch/arm/mach-at91/include/mach/board.h     |   14 +-
>  arch/avr32/boards/atngw100/setup.c          |    2 +-
>  arch/avr32/boards/atstk1000/atstk1002.c     |    2 +-
>  arch/avr32/boards/favr-32/setup.c           |    2 +-
>  arch/avr32/boards/hammerhead/setup.c        |    2 +-
>  arch/avr32/boards/merisc/setup.c            |    2 +-
>  arch/avr32/boards/mimc200/setup.c           |    2 +-
>  arch/avr32/mach-at32ap/at32ap700x.c         |    8 +-
>  arch/avr32/mach-at32ap/include/mach/board.h |    7 +-
>  drivers/net/ethernet/Makefile               |    2 +-
>  drivers/net/ethernet/cadence/Kconfig        |   16 +-
>  drivers/net/ethernet/cadence/at91_ether.c   |    3 +-
>  drivers/net/ethernet/cadence/at91_ether.h   |    4 +-
>  drivers/net/ethernet/cadence/macb.c         |  344 +++++++++++++++++----------
>  drivers/net/ethernet/cadence/macb.h         |  150 ++++++++++++-
>  include/linux/platform_data/macb.h          |   17 ++
>  57 files changed, 492 insertions(+), 211 deletions(-)
>  create mode 100644 include/linux/platform_data/macb.h
Jamie Iles Nov. 22, 2011, 10:20 a.m.
Hi Jean-Christophe,

On Tue, Nov 22, 2011 at 11:00:32AM +0100, Jean-Christophe PLAGNIOL-VILLARD wrote:
> On 10:00 Mon 21 Nov     , Jamie Iles wrote:
> > Hi Arnd,
> > 
> > Please consider pulling the patches to add support for Cadence GEM to 
> > the MACB driver.  These have been ready to go for a little while but got 
> > held up with the rename of Ethernet drivers in the last merge window.  
> > It would be great if we can get some exposure in -next for a little 
> > while before the next merge window.
> > 
> > Thanks,
> > 
> > Jamie
> > 
> > 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://github.com/jamieiles/linux-2.6-ji.git macb-gem
> Arnd please wait
> 
> please update his patch
> 
> "at91: provide macb clks with "pclk" and "hclk" name"
> 
> with the version I send to the ML

Is that a patch that you've already posted or will be posting?  Is there 
a board that I've missed?  I thought I had them all.

Jamie
Jean-Christophe PLAGNIOL-VILLARD Nov. 22, 2011, 2:59 p.m.
On 10:20 Tue 22 Nov     , Jamie Iles wrote:
> Hi Jean-Christophe,
> 
> On Tue, Nov 22, 2011 at 11:00:32AM +0100, Jean-Christophe PLAGNIOL-VILLARD wrote:
> > On 10:00 Mon 21 Nov     , Jamie Iles wrote:
> > > Hi Arnd,
> > > 
> > > Please consider pulling the patches to add support for Cadence GEM to 
> > > the MACB driver.  These have been ready to go for a little while but got 
> > > held up with the rename of Ethernet drivers in the last merge window.  
> > > It would be great if we can get some exposure in -next for a little 
> > > while before the next merge window.
> > > 
> > > Thanks,
> > > 
> > > Jamie
> > > 
> > > 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://github.com/jamieiles/linux-2.6-ji.git macb-gem
> > Arnd please wait
> > 
> > please update his patch
> > 
> > "at91: provide macb clks with "pclk" and "hclk" name"
> > 
> > with the version I send to the ML
> 
> Is that a patch that you've already posted or will be posting?
http://patchwork.ozlabs.org/patch/109265/

but please specify the device too

Best Regards,
J.
Arnd Bergmann Nov. 23, 2011, 9:14 p.m.
On Monday 21 November 2011, Jamie Iles wrote:
> Hi Arnd,
> 
> Please consider pulling the patches to add support for Cadence GEM to 
> the MACB driver.  These have been ready to go for a little while but got 
> held up with the rename of Ethernet drivers in the last merge window.  
> It would be great if we can get some exposure in -next for a little 
> while before the next merge window.

Hi Jamie,

I was actually meaning to pull these in time for 3.2, but for some reason
this got dropped on the floor when I was travelling just before
and during the merge window.

Anyway, I've pulled them into the next/driver branch of the arm-soc tree
now. Thanks for your patience!

	Arnd