public inbox for linux-arm-kernel@lists.infradead.org
 help / color / mirror / Atom feed
From: jason@lakedaemon.net (Jason Cooper)
To: linux-arm-kernel@lists.infradead.org
Subject: [GIT PULL  3/4] ARM: mvebu: boards for v3.9
Date: Fri, 1 Feb 2013 15:51:59 +0000	[thread overview]
Message-ID: <1359733919.c3D01c3.22262@triton> (raw)
In-Reply-To: <1359733918.Bf7ecc0.22262@triton>

The following changes since commit 949db153b6466c6f7cad5a427ecea94985927311:

  Linux 3.8-rc5

are available in the git repository at:

  git://git.infradead.org/users/jcooper/linux.git tags/boards_for_v3.9

for you to fetch changes up to c7064904895f69b2e33117b450a05746f75abf3a:

  ARM: kirkwood: convert Guruplug Server Plus to use the device tree

----------------------------------------------------------------
mvebu boards for v3.9
     - Guruplug Server Plus DT board
     - RD-A370-A1 board
     - mvebu improved SMP support in interrupt controller
     - update defconfigs
     - split legacy and DT setup for dove
     - remove some redundant clock aliases
    
    depends on:
     - tags/mvebu_fixes_for_v3.8-rc6
     - tags/cleanup_for_v3.9_round2
     - tags/drivers_for_v3.9
     - mmc/mmc-next up to:
        d293875 mmc: mvsdio: add pinctrl integration
    
    conflicts:
     - arm-soc/for-next
        - arch/arm/mach-dove/common.c
           * remove all DT code (it's now in .../board-dt.c)
    
    build fixes (not merge conflict)
     - arm-soc/for-next
        - arch/arm/mach-dove/board-dt.c
           - .timer no longer used
           * s/.timer = &dove_timer/.init_time = dove_timer_init/ (not valid sed)
----------------------------------------------------------------
Andrew Lunn (2):
      ARM: Kirkwood: Remove redundent USB clock alias
      ARM: Kirkwood: Remove redundent SDIO clock alias

Florian Fainelli (1):
      arm: mvebu: add DTS file for Marvell RD-A370-A1 board

Gregory CLEMENT (2):
      arm: mvebu: Update defconfig with Marvell RTC support
      arm: mvebu: Improve the SMP support of the interrupt controller

Jason Cooper (4):
      Merge tag 'tags/mvebu_fixes_for_v3.8-rc6' into mvebu/boards
      Merge tag 'tags/cleanup_for_v3.9_round2' into mvebu/boards
      Merge tag 'tags/drivers_for_v3.9' into mvebu/boards
      Merge commit 'd293875' into mvebu/boards

Olof Johansson (1):
      ARM: dove: update dove_defconfig with a few useful options

Sebastian Hesselbarth (1):
      ARM: Dove: split legacy and DT setup

Thomas Petazzoni (4):
      arm: mvebu: enable SDIO support in mvebu_defconfig
      arm: mvebu: enable mwifiex driver in mvebu_defconfig
      arm: mvebu: enable btmrvl driver in mvebu_defconfig
      arm: mvebu: add LEDs support to defconfig file

Willy Tarreau (1):
      ARM: kirkwood: convert Guruplug Server Plus to use the device tree

 .../bindings/mmc/brcm,bcm2835-sdhci.txt         |  18 ++
 .../devicetree/bindings/mmc/orion-sdio.txt      |  17 ++
 arch/arm/boot/dts/Makefile                      |   2 +
 arch/arm/boot/dts/armada-370-rd.dts             |  61 ++++
 arch/arm/boot/dts/armada-xp.dtsi                |   2 +-
 arch/arm/boot/dts/dove.dtsi                     |   2 +
 .../boot/dts/kirkwood-guruplug-server-plus.dts  |  94 +++++++
 arch/arm/configs/dove_defconfig                 |  28 +-
 arch/arm/configs/kirkwood_defconfig             |   1 +
 arch/arm/configs/mvebu_defconfig                |  16 ++
 arch/arm/mach-dove/Kconfig                      |   5 +
 arch/arm/mach-dove/Makefile                     |   4 +-
 arch/arm/mach-dove/board-dt.c                   | 102 +++++++
 arch/arm/mach-dove/common.c                     | 114 +-------
 arch/arm/mach-kirkwood/Kconfig                  |   7 +
 arch/arm/mach-kirkwood/Makefile                 |   2 +-
 arch/arm/mach-kirkwood/board-dt.c               |  15 +-
 arch/arm/mach-kirkwood/board-guruplug.c         |  39 +++
 arch/arm/mach-kirkwood/board-ib62x0.c           |   1 -
 arch/arm/mach-kirkwood/board-mplcec4.c          |   1 -
 arch/arm/mach-kirkwood/board-nsa310.c           |   8 +-
 arch/arm/mach-kirkwood/common.c                 |  23 ++
 arch/arm/mach-kirkwood/common.h                 |   6 +
 arch/arm/mach-kirkwood/dockstar-setup.c         |   1 -
 arch/arm/mach-kirkwood/include/mach/kirkwood.h  |   3 +-
 arch/arm/mach-kirkwood/pcie.c                   |  10 +-
 arch/arm/mach-mvebu/irq-armada-370-xp.c         |  72 +++++
 arch/arm/plat-orion/mpp.c                       |   2 +-
 drivers/cpuidle/Kconfig                         |   6 +
 drivers/cpuidle/Makefile                        |   1 +
 .../cpuidle/cpuidle-kirkwood.c                  |  45 ++-
 drivers/mmc/card/block.c                        |  30 +-
 drivers/mmc/card/queue.c                        |  32 ++-
 drivers/mmc/card/queue.h                        |   3 +
 drivers/mmc/core/bus.c                          |   1 +
 drivers/mmc/core/core.c                         | 121 +++++++-
 drivers/mmc/core/core.h                         |   1 +
 drivers/mmc/core/sdio.c                         |  33 ++-
 drivers/mmc/core/slot-gpio.c                    |  57 +++-
 drivers/mmc/host/Kconfig                        |  11 +
 drivers/mmc/host/Makefile                       |   1 +
 drivers/mmc/host/mvsdio.c                       | 131 +++++----
 drivers/mmc/host/sdhci-bcm2835.c                | 227 +++++++++++++++
 drivers/mmc/host/sdhci-esdhc-imx.c              |  59 +---
 drivers/mmc/host/sdhci-pxav3.c                  |  12 +-
 drivers/mmc/host/sdhci.c                        | 117 +++++---
 drivers/mmc/host/sh_mmcif.c                     | 280 +++++++++++--------
 drivers/mmc/host/tmio_mmc_pio.c                 |   8 -
 drivers/rtc/Kconfig                             |   2 +-
 include/linux/mmc/card.h                        |  12 +
 include/linux/mmc/core.h                        |   3 +-
 include/linux/mmc/host.h                        |  25 ++
 52 files changed, 1381 insertions(+), 493 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/mmc/brcm,bcm2835-sdhci.txt
 create mode 100644 Documentation/devicetree/bindings/mmc/orion-sdio.txt
 create mode 100644 arch/arm/boot/dts/armada-370-rd.dts
 create mode 100644 arch/arm/boot/dts/kirkwood-guruplug-server-plus.dts
 create mode 100644 arch/arm/mach-dove/board-dt.c
 create mode 100644 arch/arm/mach-kirkwood/board-guruplug.c
 rename arch/arm/mach-kirkwood/cpuidle.c => drivers/cpuidle/cpuidle-kirkwood.c (61%)
 create mode 100644 drivers/mmc/host/sdhci-bcm2835.c

  parent reply	other threads:[~2013-02-01 15:51 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-02-01 15:51 [GIT PULL 0/4] ARM: mvebu: changes for v3.9 Jason Cooper
2013-02-01 15:51 ` [GIT PULL 1/4] ARM: mvebu: cleanup " Jason Cooper
2013-02-05  7:10   ` Olof Johansson
2013-02-01 15:51 ` Jason Cooper [this message]
2013-02-05  7:10   ` [GIT PULL 3/4] ARM: mvebu: boards " Olof Johansson
2013-02-05 11:21     ` Jason Cooper
2013-02-05 18:23       ` Olof Johansson
2013-02-05 18:30         ` Jason Cooper
2013-02-05 23:26           ` Olof Johansson
2013-02-06 13:20             ` Jason Cooper
2013-02-10  0:31               ` Olof Johansson
2013-02-10 21:05                 ` Jason Cooper
2013-02-01 15:51 ` [GIT PULL 4/4] ARM: mvebu: dt " Jason Cooper
2013-02-01 15:51 ` [GIT PULL 2/4] ARM: mvebu: drivers " Jason Cooper
2013-02-05  7:10   ` Olof Johansson
2013-02-04  8:29 ` [GIT PULL 0/4] ARM: mvebu: changes " Gregory CLEMENT
2013-02-04 12:05   ` Jason Cooper
  -- strict thread matches above, loose matches on Subject: below --
2013-01-12 23:29 Jason Cooper
2013-01-12 23:29 ` [GIT PULL 3/4] ARM: mvebu: boards " Jason Cooper
     [not found] ` <E1TuAWD-0004Ec-1G@merlin.infradead.org>
2013-01-13  1:06   ` Russell King - ARM Linux

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1359733919.c3D01c3.22262@triton \
    --to=jason@lakedaemon.net \
    --cc=linux-arm-kernel@lists.infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox