Skip to contentSkip to conversation

GIC DT binding support

GIT PULL Rob Herring 2 participants 5 messages Oct 24, 2011 – Oct 31, 2011

lore
Share & tools
lore
#0 lore raw

Arnd,

I'm not sure if you want a rebased branch to fix merge conflicts or not. If that's okay, please pull. I've also fixed the msm compile failure.

The dependencies are v3.1-rc9 and rmk's devel-stable.

The following changes since commit 3a8254364277fabe01bc0e12b9691722939f5ef3:

Merge remote-tracking branch 'rmk/devel-stable' into HEAD (2011-10-24
14:02:37 -0500)

are available in the git repository at:

git://sources.calxeda.com/kernel/linux.git gic-dt

Rob Herring (5):
of/irq: introduce of_irq_init
irq: support domains with non-zero hwirq base
ARM: gic: add irq_domain support
ARM: gic: add OF based initialization
ARM: gic: fix irq_alloc_descs handling for sparse irq

 Documentation/devicetree/bindings/arm/gic.txt |   55 +++++++
 arch/arm/common/Kconfig                       |    1 +
 arch/arm/common/gic.c                         |  187
++++++++++++++++---------
 arch/arm/include/asm/hardware/gic.h           |   10 +-
 drivers/of/irq.c                              |  107 ++++++++++++++
 include/linux/irqdomain.h                     |   16 ++-
 include/linux/of_irq.h                        |    3 +
 kernel/irq/irqdomain.c                        |   12 +-
 8 files changed, 319 insertions(+), 72 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/arm/gic.txt

Rob

#1 lore raw

Arnd,

Quoted 7 lines · Rob Herring

Arnd,

I'm not sure if you want a rebased branch to fix merge conflicts or not. If that's okay, please pull. I've also fixed the msm compile failure.

The dependencies are v3.1-rc9 and rmk's devel-stable.

Here's an updated pull request to fix missing export.h include. Now it's also dependent on module.h clean-up branch:

git://openlinux.windriver.com/people/paulg/linux-next for-sfr

The following changes since commit fa1d6d372245a160eecf5f57d64d2b21ea248e08:

Merge branch 'for-sfr' of
git://openlinux.windriver.com/people/paulg/linux-next into HEAD (2011-10-28 15:51:07 -0500)

are available in the git repository at:

git://sources.calxeda.com/kernel/linux.git gic-dt

Rob Herring (5):
of/irq: introduce of_irq_init
irq: support domains with non-zero hwirq base
ARM: gic: add irq_domain support
ARM: gic: add OF based initialization
ARM: gic: fix irq_alloc_descs handling for sparse irq

 Documentation/devicetree/bindings/arm/gic.txt |   55 +++++++
 arch/arm/common/Kconfig                       |    1 +
 arch/arm/common/gic.c                         |  188
++++++++++++++++--------
 arch/arm/include/asm/hardware/gic.h           |   10 +-
 drivers/of/irq.c                              |  107 ++++++++++++++
 include/linux/irqdomain.h                     |   16 ++-
 include/linux/of_irq.h                        |    3 +
 kernel/irq/irqdomain.c                        |   12 +-
 8 files changed, 320 insertions(+), 72 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/arm/gic.txt

Rob

#2 lore raw
Quoted 8 lines · Rob Herring

Here's an updated pull request to fix missing export.h include. Now it's also dependent on module.h clean-up branch:

git://openlinux.windriver.com/people/paulg/linux-next for-sfr

The following changes since commit fa1d6d372245a160eecf5f57d64d2b21ea248e08:

Quoted 7 lines

Merge branch 'for-sfr' of
git://openlinux.windriver.com/people/paulg/linux-next into HEAD (2011-10-28 15:51:07 -0500)

are available in the git repository at:

git://sources.calxeda.com/kernel/linux.git gic-dt

I've pulled it and am now trying to clean up the mess resulting from having the previous version in a number of branches already.

Can you check that the highbank/soc branch is ok this time?

Arnd

#3 lore raw
In reply to Rob Herring
Quoted 4 lines · Rob Herring

Merge branch 'for-sfr' of
git://openlinux.windriver.com/people/paulg/linux-next into HEAD (2011-10-28 15:51:07 -0500)

Rob, I think there is no chance that this is working out.

I've just spent a few hours trying to resolve all the dependencies from this, but I don't think it will work out, unless Linus pulls that tree very soon, which I think is very unlikely.

Have you made sure that Paul even considers this branch stable?

Normally this kind of change gets pushed *last* in the merge window, to make it possible to fix up all the stuff that breaks. This means I cannot wait for the branch to get merged upstream before send a pull request for my next/dt and next/soc branches.

Do you even depend on that branch? It seems to me that you merely have a conflict, not a dependency, so why do you even try fixing it up?

Arnd

#4 lore raw

Arnd,

Quoted 6 lines · Arnd Bergmann
Quoted 4 lines · Rob Herring

Merge branch 'for-sfr' of
git://openlinux.windriver.com/people/paulg/linux-next into HEAD (2011-10-28 15:51:07 -0500)

Quoted 7 lines

Rob, I think there is no chance that this is working out.

I've just spent a few hours trying to resolve all the dependencies from this, but I don't think it will work out, unless Linus pulls that tree very soon, which I think is very unlikely.

Have you made sure that Paul even considers this branch stable?

No.

Quoted 7 lines

Normally this kind of change gets pushed *last* in the merge window, to make it possible to fix up all the stuff that breaks. This means I cannot wait for the branch to get merged upstream before send a pull request for my next/dt and next/soc branches.

Do you even depend on that branch? It seems to me that you merely have a conflict, not a dependency, so why do you even try fixing it up?

Sorry about this. I thought I needed to fix the linux-next build breakage. I only depend on it when export.h gets introduced, so I can drop that out. All the other dependencies are in Linus' master now. I pushed out a branch without Paul's branch:

I get to Connect around 2PM tomorrow, we can discuss further then if necessary.

The following changes since commit ce949717b559709423c1ef716a9db16d1dcadaed:

Merge git://github.com/rustyrussell/linux (2011-10-29 07:52:16 -0700)

are available in the git repository at:

git://sources.calxeda.com/kernel/linux.git gic-dt-v2

Rob Herring (5):
of/irq: introduce of_irq_init
irq: support domains with non-zero hwirq base
ARM: gic: add irq_domain support
ARM: gic: add OF based initialization
ARM: gic: fix irq_alloc_descs handling for sparse irq

 Documentation/devicetree/bindings/arm/gic.txt |   55 +++++++
 arch/arm/common/Kconfig                       |    1 +
 arch/arm/common/gic.c                         |  187
++++++++++++++++---------
 arch/arm/include/asm/hardware/gic.h           |   10 +-
 drivers/of/irq.c                              |  107 ++++++++++++++
 include/linux/irqdomain.h                     |   16 ++-
 include/linux/of_irq.h                        |    3 +
 kernel/irq/irqdomain.c                        |   12 +-
 8 files changed, 319 insertions(+), 72 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/arm/gic.txt

Rob