[GIT PULL 1/2] ARM: mvebu: dt changes for v3.11 (round 6!)

Jason Cooper jason at lakedaemon.net
Fri Jun 21 12:46:11 EDT 2013


Arnd, Olof,

Here's the last stragglers for v3.11.  Nothing too traumatic :)

This does cause a merge conflict in kirkwood.dtsi with my
mvebu/pcie_kirkwood branch.  The resolution is to keep the changes in
this branch.


The following changes since commit 918f8f309643978b9e761f39af8962a7388d332d:

  ARM: Kirkwood: ts219: Enable second PCIe port in DT. (2013-06-11 16:02:08 +0000)

are available in the git repository at:

  git://git.infradead.org/users/jcooper/linux.git tags/dt-3.11-6

for you to fetch changes up to 01db527e657d6cf646c6e6f059ad41e7023a25e7:

  ARM: Kirkwood: Fix the internal register ranges translation (2013-06-21 15:38:20 +0000)

----------------------------------------------------------------
mvebu dt changes for v3.11 (round 6)

 - mvebu
    - mini-PCIe connectors on Armada 370 RD

 - kirkwood
    - correct internal register ranges translation

----------------------------------------------------------------
Ezequiel Garcia (1):
      ARM: Kirkwood: Fix the internal register ranges translation

Thomas Petazzoni (1):
      arm: mvebu: enable mini-PCIe connectors on Armada 370 RD

 arch/arm/boot/dts/armada-370-rd.dts | 16 ++++++++++++++++
 arch/arm/boot/dts/kirkwood.dtsi     |  5 +++--
 2 files changed, 19 insertions(+), 2 deletions(-)



More information about the linux-arm-kernel mailing list