linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
* [GIT PULL] ARM: mvebu: driver changes for v3.13
@ 2013-09-30 15:36 Jason Cooper
  2013-10-07 17:02 ` Olof Johansson
  0 siblings, 1 reply; 5+ messages in thread
From: Jason Cooper @ 2013-09-30 15:36 UTC (permalink / raw)
  To: linux-arm-kernel

Guys,

Here are all of the driver changes that didn't make it during the last
merge window.  They've been in -next since v3.12-rc1, without
merge-conflicts or build issues.

thx,

Jason.

The following changes since commit 272b98c6455f00884f0350f775c5342358ebb73f:

  Linux 3.12-rc1 (2013-09-16 16:17:51 -0400)

are available in the git repository at:

  git://git.infradead.org/linux-mvebu.git tags/drivers-3.13

for you to fetch changes up to cc54ccd9a6966708c00ebd8a08acc3e627a432c5:

  PCI: mvebu: add support for Marvell Dove SoCs (2013-09-30 14:58:47 +0000)

----------------------------------------------------------------
mvebu drivers changes for v3.13

 - irqchip
    - add MSI support for armada-370/XP
 - pci
    - add MSI support
    - add support for Marvell Dove SoCs

----------------------------------------------------------------
Sebastian Hesselbarth (5):
      PCI: mvebu: move clock enable before register access
      PCI: mvebu: increment nports only for registered ports
      PCI: mvebu: remove subsys_initcall
      PCI: mvebu: add support for reset on GPIO
      PCI: mvebu: add support for Marvell Dove SoCs

Thomas Petazzoni (3):
      irqchip: armada-370-xp: properly request resources
      irqchip: armada-370-xp: implement MSI support
      PCI: mvebu: add support for MSI

 .../devicetree/bindings/arm/armada-370-xp-mpic.txt |   3 +
 .../devicetree/bindings/pci/mvebu-pci.txt          |  10 +
 drivers/irqchip/irq-armada-370-xp.c                | 202 ++++++++++++++++++++-
 drivers/pci/host/Kconfig                           |   2 +-
 drivers/pci/host/pci-mvebu.c                       | 121 ++++++++----
 5 files changed, 298 insertions(+), 40 deletions(-)

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

* [GIT PULL] ARM: mvebu: driver changes for v3.13
  2013-09-30 15:36 [GIT PULL] ARM: mvebu: driver changes for v3.13 Jason Cooper
@ 2013-10-07 17:02 ` Olof Johansson
  2013-10-07 18:04   ` Jason Cooper
  2013-10-08 15:49   ` [GIT PULL V2] " Jason Cooper
  0 siblings, 2 replies; 5+ messages in thread
From: Olof Johansson @ 2013-10-07 17:02 UTC (permalink / raw)
  To: linux-arm-kernel

Hi Jason,

On Mon, Sep 30, 2013 at 11:36:43AM -0400, Jason Cooper wrote:
> Guys,
> 
> Here are all of the driver changes that didn't make it during the last
> merge window.  They've been in -next since v3.12-rc1, without
> merge-conflicts or build issues.

It looks like the PCI pieces here are all independent now and can go through
Bjorn's tree instead of arm-soc. Or do you anticipate having something
dependent on this later on such that we should take it?

For 3.12 it was easier to take through arm-soc since this built on top of the
other PCI/MSI work we were queueing.

If you want us to take it, see if you can shake an ack out of Bjorn, mostly to
make sure he's aware that there's PCI code going through our tree.


-Olof

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

* [GIT PULL] ARM: mvebu: driver changes for v3.13
  2013-10-07 17:02 ` Olof Johansson
@ 2013-10-07 18:04   ` Jason Cooper
  2013-10-08 15:49   ` [GIT PULL V2] " Jason Cooper
  1 sibling, 0 replies; 5+ messages in thread
From: Jason Cooper @ 2013-10-07 18:04 UTC (permalink / raw)
  To: linux-arm-kernel

Hi!

On Mon, Oct 07, 2013 at 10:02:06AM -0700, Olof Johansson wrote:
> Hi Jason,
> 
> On Mon, Sep 30, 2013 at 11:36:43AM -0400, Jason Cooper wrote:
> > Guys,
> > 
> > Here are all of the driver changes that didn't make it during the last
> > merge window.  They've been in -next since v3.12-rc1, without
> > merge-conflicts or build issues.
> 
> It looks like the PCI pieces here are all independent now and can go through
> Bjorn's tree instead of arm-soc. Or do you anticipate having something
> dependent on this later on such that we should take it?

I chose to keep them on the same path as last window because of the
dependency between the irqchip changes:

  627dfcc irqchip: armada-370-xp: properly request resources
  31f614e irqchip: armada-370-xp: implement MSI support

which the pci/msi changes depend on.

> For 3.12 it was easier to take through arm-soc since this built on top of the
> other PCI/MSI work we were queueing.

As well as the irqchip changes...

> If you want us to take it, see if you can shake an ack out of Bjorn, mostly to
> make sure he's aware that there's PCI code going through our tree.

Here's a link to where Bjorn agreed to the strategy for this merge
window:

http://lkml.org/lkml/2013/9/27/474

hth,

Jason.

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

* [GIT PULL V2] ARM: mvebu: driver changes for v3.13
  2013-10-07 17:02 ` Olof Johansson
  2013-10-07 18:04   ` Jason Cooper
@ 2013-10-08 15:49   ` Jason Cooper
  2013-10-09 20:20     ` Kevin Hilman
  1 sibling, 1 reply; 5+ messages in thread
From: Jason Cooper @ 2013-10-08 15:49 UTC (permalink / raw)
  To: linux-arm-kernel

Olof,

Here's the updated pull request for mvebu/drivers.  I've pulled the two
patches from mvebu/soc into this branch to prevent the dependency.
There is a trivial conflict with Sebastian's init_timer cleanup branch,
but that would happen anyway.

thx,

Jason.


The following changes since commit 272b98c6455f00884f0350f775c5342358ebb73f:

  Linux 3.12-rc1 (2013-09-16 16:17:51 -0400)

are available in the git repository at:

  git://git.infradead.org/linux-mvebu.git tags/drivers-3.13

for you to fetch changes up to 96ae0b548672adc12431312718835e77472f5bf0:

  ARM: mvebu: fix gated clock documentation (2013-10-08 15:17:56 +0000)

----------------------------------------------------------------
mvebu drivers changes for v3.13

 - irqchip
    - add MSI support for armada-370/XP

 - pci
    - add MSI support
    - add support for Marvell Dove SoCs

 - mvebu (soc changes depending on the pci and irq changes)
    - probe mbus windows via DT
    - probe pcie and clock via DT

 - docs for mvebu
    - update gated clock documentation

----------------------------------------------------------------
Gregory CLEMENT (1):
      ARM: mvebu: fix gated clock documentation

Sebastian Hesselbarth (7):
      PCI: mvebu: move clock enable before register access
      PCI: mvebu: increment nports only for registered ports
      PCI: mvebu: remove subsys_initcall
      PCI: mvebu: add support for reset on GPIO
      PCI: mvebu: add support for Marvell Dove SoCs
      ARM: dove: switch to DT probed mbus address windows
      ARM: dove: remove legacy pcie and clock init

Thomas Petazzoni (3):
      irqchip: armada-370-xp: properly request resources
      irqchip: armada-370-xp: implement MSI support
      PCI: mvebu: add support for MSI

 .../devicetree/bindings/arm/armada-370-xp-mpic.txt |   3 +
 .../bindings/clock/mvebu-gated-clock.txt           |  14 +-
 .../devicetree/bindings/pci/mvebu-pci.txt          |  10 +
 arch/arm/mach-dove/board-dt.c                      |  39 +---
 drivers/irqchip/irq-armada-370-xp.c                | 202 ++++++++++++++++++++-
 drivers/pci/host/Kconfig                           |   2 +-
 drivers/pci/host/pci-mvebu.c                       | 121 ++++++++----
 7 files changed, 307 insertions(+), 84 deletions(-)

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

* [GIT PULL V2] ARM: mvebu: driver changes for v3.13
  2013-10-08 15:49   ` [GIT PULL V2] " Jason Cooper
@ 2013-10-09 20:20     ` Kevin Hilman
  0 siblings, 0 replies; 5+ messages in thread
From: Kevin Hilman @ 2013-10-09 20:20 UTC (permalink / raw)
  To: linux-arm-kernel

Jason Cooper <jason@lakedaemon.net> writes:

> Olof,
>
> Here's the updated pull request for mvebu/drivers.  I've pulled the two
> patches from mvebu/soc into this branch to prevent the dependency.

Thanks for simplifying the dependencies.

> There is a trivial conflict with Sebastian's init_timer cleanup branch,
> but that would happen anyway.

Thanks, applied this version to next/drivers.

Kevin

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

end of thread, other threads:[~2013-10-09 20:20 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-09-30 15:36 [GIT PULL] ARM: mvebu: driver changes for v3.13 Jason Cooper
2013-10-07 17:02 ` Olof Johansson
2013-10-07 18:04   ` Jason Cooper
2013-10-08 15:49   ` [GIT PULL V2] " Jason Cooper
2013-10-09 20:20     ` Kevin Hilman

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).