* [GIT PULL 1/3] arm-soc: i.MX DT changes
2013-02-28 22:54 [GIT PULL 0/3] arm-soc: late changes for 3.9 Olof Johansson
@ 2013-02-28 22:54 ` Olof Johansson
2013-02-28 22:54 ` [GIT PULL 2/3] arm-soc: late OMAP changes Olof Johansson
` (3 subsequent siblings)
4 siblings, 0 replies; 8+ messages in thread
From: Olof Johansson @ 2013-02-28 22:54 UTC (permalink / raw)
To: torvalds; +Cc: linux-arm-kernel, linux-kernel, arm, Olof Johansson
This branch contains of devicetree changes for the Freescale i.MX platform.
The base patch of the branch changes the format of the dts files to a
slightly different format that makes it easier to do derivative board
definitions, but it also introduces a lot of churn in the process since
every line of the file is touched.
On top of that are a handful of the regular changes; enabling more boards
as DT-based instead of legacy board files (mx25pdk), enabling another
driver for devicetree and thus adding bindings (onewire), etc.
I'm not happy about the churn, and will likely not take it for other platforms
in the future.
----------------------------------------------------------------
The following changes since commit 2a7d2b96d5cba7568139d9ab157a0e97ab32440f:
Merge branch 'akpm' (final batch from Andrew)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git tags/late-dt
for you to fetch changes up to 4a9226a3d192c38493106dcaf5f47f291ede9ed5:
Merge branch 'imx/cpuidle' into late/dt
----------------------------------------------------------------
Anson Huang (1):
ARM: dts: i.MX6: Add regulator delay support
Arnd Bergmann (1):
Merge branch 'imx/cpuidle' into late/dt
Fabio Estevam (5):
ARM: dts: imx27-3ds: Rename it to imx27-pdk
ARM: boot: dts: Add an entry for imx27-pdk.dtb
ARM: mx25pdk: Add device tree support
ARM: dts: imx25-karo-tx25: Put status entry in the end
ARM: dts: imx6q: Remove silicon version from SDMA firmware
Laurent Cans (1):
ARM: dts: Add apf51 basic support
Liu Ying (2):
ARM: dts: imx: Add imx51 KPP entry
ARM i.MX51 babbage: Add keypad support
Martin Fuzzey (3):
W1: Add device tree support to MXC onewire master.
ARM: i.MX53: Add clocks for i.mx53 onewire master.
ARM: dts: Add device tree entry for onewire master on i.MX53
Olof Johansson (1):
Merge tag 'imx-dt-3.9' of git://git.linaro.org/people/shawnguo/linux-2.6 into late/dt
Peter Chen (1):
ARM i.MX6: change mxs usbphy clock usage
Sascha Hauer (1):
ARM i.MX53: add dts for the TQ tqma53 module
Shawn Guo (6):
Merge tag 'imx-fixes-3.8-4' into imx/dt
ARM: dts: add missing imx dtb targets
ARM: dts: imx: use nodes label in board dts
ARM: imx: enable imx6q-cpufreq support
ARM: dts: rename imx6q.dtsi to imx6qdl.dtsi
ARM: dts: add dtsi for imx6q and imx6dl
Steffen Trumtrar (2):
ARM: dts: imx53: pinctrl update
ARM i.MX53: dts: add oftree for MBa53 baseboard
.../devicetree/bindings/arm/armadeus.txt | 6 +
Documentation/devicetree/bindings/arm/fsl.txt | 8 +
.../devicetree/bindings/clock/imx5-clock.txt | 1 +
.../devicetree/bindings/clock/imx6q-clock.txt | 2 +
.../devicetree/bindings/w1/fsl-imx-owire.txt | 19 +
arch/arm/boot/dts/Makefile | 10 +-
arch/arm/boot/dts/imx25-karo-tx25.dts | 30 +-
arch/arm/boot/dts/imx25-pdk.dts | 36 +
arch/arm/boot/dts/imx25.dtsi | 2 +-
arch/arm/boot/dts/imx27-apf27.dts | 82 +-
.../boot/dts/{imx27-3ds.dts => imx27-pdk.dts} | 24 +-
arch/arm/boot/dts/imx31-bug.dts | 12 +-
arch/arm/boot/dts/imx51-apf51.dts | 52 ++
arch/arm/boot/dts/imx51-babbage.dts | 478 +++++------
arch/arm/boot/dts/imx51.dtsi | 53 ++
arch/arm/boot/dts/imx53-ard.dts | 126 ++-
arch/arm/boot/dts/imx53-evk.dts | 194 +++--
arch/arm/boot/dts/imx53-mba53.dts | 130 +++
arch/arm/boot/dts/imx53-qsb.dts | 380 +++++----
arch/arm/boot/dts/imx53-smd.dts | 294 ++++---
arch/arm/boot/dts/imx53-tqma53.dtsi | 172 ++++
arch/arm/boot/dts/imx53.dtsi | 68 ++
arch/arm/boot/dts/imx6dl.dtsi | 59 ++
arch/arm/boot/dts/imx6q-arm2.dts | 124 ++-
arch/arm/boot/dts/imx6q-sabreauto.dts | 64 +-
arch/arm/boot/dts/imx6q-sabrelite.dts | 216 +++--
arch/arm/boot/dts/imx6q-sabresd.dts | 102 ++-
arch/arm/boot/dts/imx6q.dtsi | 796 +-----------------
arch/arm/boot/dts/imx6qdl.dtsi | 800 +++++++++++++++++++
arch/arm/mach-imx/clk-imx51-imx53.c | 4 +-
arch/arm/mach-imx/clk-imx6q.c | 26 +-
arch/arm/mach-imx/mach-imx6q.c | 65 ++
drivers/w1/masters/mxc_w1.c | 9 +-
33 files changed, 2560 insertions(+), 1884 deletions(-)
create mode 100644 Documentation/devicetree/bindings/arm/armadeus.txt
create mode 100644 Documentation/devicetree/bindings/w1/fsl-imx-owire.txt
create mode 100644 arch/arm/boot/dts/imx25-pdk.dts
rename arch/arm/boot/dts/{imx27-3ds.dts => imx27-pdk.dts} (59%)
create mode 100644 arch/arm/boot/dts/imx51-apf51.dts
create mode 100644 arch/arm/boot/dts/imx53-mba53.dts
create mode 100644 arch/arm/boot/dts/imx53-tqma53.dtsi
create mode 100644 arch/arm/boot/dts/imx6dl.dtsi
create mode 100644 arch/arm/boot/dts/imx6qdl.dtsi
^ permalink raw reply [flat|nested] 8+ messages in thread* [GIT PULL 2/3] arm-soc: late OMAP changes
2013-02-28 22:54 [GIT PULL 0/3] arm-soc: late changes for 3.9 Olof Johansson
2013-02-28 22:54 ` [GIT PULL 1/3] arm-soc: i.MX DT changes Olof Johansson
@ 2013-02-28 22:54 ` Olof Johansson
2013-02-28 22:54 ` [GIT PULL 3/3] arm-soc: mvebu platform changes (not rebased) Olof Johansson
` (2 subsequent siblings)
4 siblings, 0 replies; 8+ messages in thread
From: Olof Johansson @ 2013-02-28 22:54 UTC (permalink / raw)
To: torvalds; +Cc: linux-arm-kernel, linux-kernel, arm, Olof Johansson
This branch contains changes for OMAP that came in late during the release
staging, close to when the merge window opened.
It contains, among other things:
- OMAP PM fixes and some patches for audio device integration
- OMAP clock fixes related to common clock conversion
- A set of patches cleaning up WFI entry and blocking.
- A set of fixes and IP block support for PM on TI AM33xx SoCs (Beaglebone, etc)
- A set of smaller fixes and cleanups around AM33xx restart and revision
detection, as well as removal of some dead code (CONFIG_32K_TIMER_HZ)
----------------------------------------------------------------
The following changes since commit 1b4d123a8d9c42208e03e615ae64ef076f66309e:
Merge branch 'late/dt' into HEAD
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git tags/late-omap
for you to fetch changes up to 55ccb1a8b4c14c086427fd6b7272448fbd0c4449:
ARM: omap2: include linux/errno.h in hwmod_reset
----------------------------------------------------------------
Afzal Mohammed (3):
ARM: OMAP2+: dpll: am335x - avoid freqsel
ARM: OMAP2+: clock data: add DEFINE_STRUCT_CLK_FLAGS helper
ARM: OMAP AM33XX: clock data: SET_RATE_PARENT in lcd path
AnilKumar Ch (1):
ARM: OMAP2: AM33XX: id: Add support for AM335x PG2.0
Arnd Bergmann (1):
ARM: omap2: include linux/errno.h in hwmod_reset
Hebbar Gururaja (2):
ARM: OMAP2+: AM33xx: hwmod: add missing HWMOD_NO_IDLEST flags
ARM: OMAP2: am33xx-hwmod: Fix "register offset NULL check" bug
Jean-Sebastien A. Beaudry (1):
ARM: OMAP2+: AM33xx: Add SoC specific restart hook
Laurent Pinchart (2):
ARM: OMAP3: clock: Back-propagate rate change from cam_mclk to dpll4_m5
omap3isp: Set cam_mclk rate directly
Olof Johansson (5):
Merge tag 'omap-for-v3.9/soc-signed' of git://git.kernel.org/.../tmlind/linux-omap into late/omap
Merge tag 'omap-for-v3.9/am33xx-signed' of git://git.kernel.org/.../tmlind/linux-omap into late/omap
Merge tag 'omap-for-v3.9/pm-wfi-take2-signed-v2' of git://git.kernel.org/.../tmlind/linux-omap into late/omap
Merge tag 'omap-for-v3.9/clock-signed' of git://git.kernel.org/.../tmlind/linux-omap into late/omap
Merge tag 'omap-for-v3.9/pm-omap4-signed' of git://git.kernel.org/.../tmlind/linux-omap into late/omap
Paul Walmsley (10):
ARM: OMAP2xxx: PM: enter WFI via inline asm if CORE stays active
ARM: OMAP2+: hwmod: add support for blocking WFI when a device is active
ARM: OMAP2420: hwmod data/PM: use hwmod to block WFI when I2C active
ARM: OMAP AM3517/05: hwmod data: block WFI when EMAC active
Merge branch 'clock_misc_devel_a_3.9', remote-tracking branch 'remotes/pinchart/omap3isp/clock' into clock_devel_a_3.9
ARM: OMAP2+: hwmod: add enable_preprogram hook
ASoC: TI AESS: add autogating-enable function, callable from architecture code
ARM: OMAP4+: AESS: enable internal auto-gating during initial setup
Merge branches 'sg_aess_reset_devel_3.9' and 'omap4_pm_fixes_a_3.9' into omap4_prcm_devel_a_3.9
ARM: OMAP2+: fix some omap_device_build() calls that aren't compiled by default
Philip Avinash (2):
ARM: OMAP: AM33xx hwmod: Corrects PWM subsystem HWMOD entries
ARM: OMAP: AM33xx hwmod: Add parent-child relationship for PWM subsystem
Rajendra Nayak (2):
ARM: OMAP4: PM: Warn users about usage of older bootloaders
ARM: OMAP4: clock data: Add missing clkdm association for dpll_usb
Santosh Shilimkar (2):
ARM: OMAP2+: Get rid of custom OMAP_32K_TIMER_HZ
ARM: OMAP2+: PM: Fix the dt return condition in pm_late_init()
Sebastien Guiriec (2):
ARM: OMAP4: hwmod data: Update AESS data with memory bank area
ARM: OMAP4: hwmod data: Enable AESS hwmod device
Tony Lindgren (6):
Merge tag 'omap-devel-a-for-3.9' of git://git.kernel.org/.../pjw/omap-pending into omap-for-v3.9/am33xx
Merge tag 'omap-devel-e-for-3.9' of git://git.kernel.org/.../pjw/omap-pending into omap-for-v3.9/clock
Merge tag 'omap-for-v3.9/pm-signed' into omap-for-v3.9/pm-wfi-take2
Merge tag 'omap-devel-b-for-3.9' of git://git.kernel.org/.../pjw/omap-pending into omap-for-v3.9/pm-wfi-take2
Merge tag 'omap-devel-d2-for-3.9' of git://git.kernel.org/.../pjw/omap-pending into omap-for-v3.9/pm-omap4
Merge branch 'omap-for-v3.9/pm-fix' into omap-for-v3.9/pm-wfi-take2
Vaibhav Bedia (8):
ARM: OMAP2+: AM33XX: CM: Get rid of unnecessary header inclusions
ARM: OMAP2+: AM33XX: CM/PRM: Use __ASSEMBLER__ macros in header files
ARM: OMAP2+: AM33XX: hwmod: Register OCMC RAM hwmod
ARM: OMAP2+: AM33XX: hwmod: Update TPTC0 hwmod with the right flags
ARM: OMAP2+: AM33XX: hwmod: Fixup cpgmac0 hwmod entry
ARM: OMAP2+: AM33XX: hwmod: Update the WKUP-M3 hwmod with reset status bit
ARM: OMAP2+: AM33XX: Update the hardreset API
ARM: DTS: AM33XX: Add nodes for OCMC RAM and WKUP-M3
arch/arm/Kconfig | 1 -
arch/arm/boot/dts/am33xx.dtsi | 14 +
arch/arm/mach-omap2/Makefile | 3 +-
arch/arm/mach-omap2/am33xx-restart.c | 34 ++
arch/arm/mach-omap2/am35xx-emac.c | 3 +-
arch/arm/mach-omap2/board-generic.c | 1 +
arch/arm/mach-omap2/cclock33xx_data.c | 10 +-
arch/arm/mach-omap2/cclock3xxx_data.c | 10 +-
arch/arm/mach-omap2/cclock44xx_data.c | 13 +-
arch/arm/mach-omap2/clock.h | 11 +
arch/arm/mach-omap2/cm33xx.c | 3 -
arch/arm/mach-omap2/cm33xx.h | 9 +-
arch/arm/mach-omap2/common.h | 8 +
arch/arm/mach-omap2/devices.c | 2 +-
arch/arm/mach-omap2/dpll3xxx.c | 5 +-
arch/arm/mach-omap2/id.c | 14 +-
arch/arm/mach-omap2/omap_hwmod.c | 23 +-
arch/arm/mach-omap2/omap_hwmod.h | 8 +
arch/arm/mach-omap2/omap_hwmod_33xx_data.c | 443 +++++++++++++++---------
arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 7 +-
arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 51 ++-
arch/arm/mach-omap2/omap_hwmod_reset.c | 53 +++
arch/arm/mach-omap2/pm.c | 20 +-
arch/arm/mach-omap2/pm24xx.c | 12 +-
arch/arm/mach-omap2/pm44xx.c | 21 +-
arch/arm/mach-omap2/prm33xx.c | 11 +-
arch/arm/mach-omap2/prm33xx.h | 4 +-
arch/arm/mach-omap2/sleep24xx.S | 19 -
arch/arm/mach-omap2/soc.h | 1 +
arch/arm/mach-omap2/sr_device.c | 2 +-
arch/arm/plat-omap/Kconfig | 9 -
arch/arm/plat-omap/include/plat/timex.h | 8 -
drivers/media/platform/omap3isp/isp.c | 18 +-
drivers/media/platform/omap3isp/isp.h | 8 +-
include/sound/aess.h | 53 +++
35 files changed, 633 insertions(+), 279 deletions(-)
create mode 100644 arch/arm/mach-omap2/am33xx-restart.c
create mode 100644 arch/arm/mach-omap2/omap_hwmod_reset.c
create mode 100644 include/sound/aess.h
^ permalink raw reply [flat|nested] 8+ messages in thread* [GIT PULL 3/3] arm-soc: mvebu platform changes (not rebased)
2013-02-28 22:54 [GIT PULL 0/3] arm-soc: late changes for 3.9 Olof Johansson
2013-02-28 22:54 ` [GIT PULL 1/3] arm-soc: i.MX DT changes Olof Johansson
2013-02-28 22:54 ` [GIT PULL 2/3] arm-soc: late OMAP changes Olof Johansson
@ 2013-02-28 22:54 ` Olof Johansson
2013-02-28 22:54 ` [GIT PULL 3/3] arm-soc: mvebu platform changes (rebased) Olof Johansson
2013-03-01 4:18 ` [GIT PULL 0/3] arm-soc: late changes for 3.9 Linus Torvalds
4 siblings, 0 replies; 8+ messages in thread
From: Olof Johansson @ 2013-02-28 22:54 UTC (permalink / raw)
To: torvalds; +Cc: linux-arm-kernel, linux-kernel, arm, Olof Johansson
This series contains changes for the Marvell EBU platforms (mvebu,
orion, kirkwood, dove) that were not part of the first set of pull
requests because of dependencies on the MMC tree, and being submitted
a little late.
Notable changes are:
* More devices get moved out of board files into device tree
descriptions. The remaining devices listed in there have patches
that will get sent for 3.10, after which we can remove a lot of the
board files entirely. We are doing the pinctrl and mmc drivers here,
ethernet and PCI still remain.
* SMP support for mvebu is improved with support for the
local interrupt controller.
* The Guruplug board file gets replaced with a DT description.
----------------------------------------------------------------
The following changes since commit 280c50ec3b6e801b59311823fcd7d9c679354b6a:
Merge tag 'late-omap' into HEAD
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git tags/late-mvebu
for you to fetch changes up to 0ed30f3e6550706830959c6657c3f229334c9ccd:
Merge commit 'mmc-fsckup-merge' into late/mvebu
----------------------------------------------------------------
Andrew Lunn (7):
ARM: Kirkwood: Remove redundent USB clock alias
ARM: Kirkwood: Remove redundent SDIO clock alias
ARM: Kirkwood: Convert NSA310 to DT based regulators.
ARM: Kirkwood: Convert NSA310 to use gpio-poweroff driver
ARM: Kirkwood: Convert NSA310 I2C to device tree
ARM: Kirkwood: Convert NS2 to gpio-poweroff.
ARM: Kirkwood: topkick: Enable i2c bus.
Andy Shevchenko (1):
mmc: sdhci: introduce sdhci_update_clock helper to re-enable clock
Arnd Bergmann (7):
Merge branch 'mvebu/boards' into late/mvebu
Merge tag 'boards_for_v3.9_round2' of git://git.infradead.org/users/jcooper/linux into late/mvebu
Merge tag 'boards_for_v3.9_round3' of git://git.infradead.org/users/jcooper/linux into late/mvebu
Merge tag 'dt_for_v3.9_round2' of git://git.infradead.org/users/jcooper/linux into late/mvebu-dt
Merge commit 'upstream/mmc'; branch 'depends/mmc' into late/mvebu2
Merge branch 'late/mvebu-dt' into late/mvebu
Merge commit 'mmc-fsckup-merge' into late/mvebu
Chris Ball (1):
mmc: mvsdio: add pinctrl integration
Ezequiel Garcia (7):
arm: mvebu: Update defconfig to select USB support
arm: mvebu: Add support for USB host controllers in Armada 370/XP
arm: mvebu: Enable USB controllers on Armada 370/XP boards
ARM: mvebu: Update defconfig to select SPI support
ARM: mvebu: Update defconfig to select SPI flash and MTD support
arm: mvebu: Add support for SPI controller in Armada 370/XP
arm: mvebu: Add SPI flash on Armada XP-GP board
Florian Fainelli (2):
arm: mvebu: add DTS file for Marvell RD-A370-A1 board
arm: mvebu: enable the SD card slot on Armada 370 Reference Design board
Gregory CLEMENT (12):
arm: mvebu: Update defconfig with Marvell RTC support
arm: mvebu: Improve the SMP support of the interrupt controller
arm: mvebu: Add RTC support for Armada 370 and Armada XP
arm: mvebu: Add support for local interrupt
clocksource: time-armada-370-xp: add local timer support
arm: mvebu: update defconfig with local timer support
arm: mvebu: update DT to support local timers
clocksource: update and move armada-370-xp-timer documentation to timer directory
arm: mvebu: support for the new Armada XP development board(DB-MV784MP-GP)
arm: mvebu: Add SPI flash on Armada XP-DB board
arm: mvebu: Add SPI flash on Armada 370 DB board
arm: mvebu: update defconfig with ATAG support when using DT
Guennadi Liakhovetski (7):
mmc: sh-mmcif: fix missing and consolidate IO completion timeouts
mmc: sh-mmcif: (cosmetic) simplify boolean return blocks
mmc: sh-mmcif: fix a race, causing an Oops on SMP
mmc: sh-mmcif: reset error code for any opcode
mmc: sh-mmcif: reset DMA completion immediately before starting DMA
mmc: sh-mmcif: fix I/O errors
mmc: sh-mmcif: simplify IRQ processing
Jason Cooper (11):
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
Merge tag 'tags/boards_for_v3.9' into mvebu/dt
Merge branch 'mvebu/boards' into mvebu/dt
Merge branch 'mvebu/boards' into mvebu/dt
ARM: kirkwood: topkick: convert to pinctrl
ARM: kirkwood: nsa310: convert to pinctrl
ARM: kirkwood: topkick: init mvsdio via DT
Merge remote-tracking branch 'arm-soc/timer/cleanup' into mvebu/boards
Kevin Liu (3):
mmc: sdhci: disable interrupt before free_irq
mmc: sdhci: add IRQ wake up support
mmc: sdhci-pxav3: add IRQ wake up support
Konstantin Dorfman (1):
mmc: fix async request mechanism for sequential read scenarios
Nobuhiro Iwamatsu (3):
ARM: Kirkwood: Add pinctrl of TWSI1 to 88f6282
ARM: Kirkwood: Add pinctrl of NAND to 88f6282
ARM: Kirkwood: Convert openblocks A6 board to pinctrl
Olof Johansson (1):
ARM: dove: update dove_defconfig with a few useful options
Sebastian Hesselbarth (5):
ARM: Dove: split legacy and DT setup
ARM: Dove: move CuBox led pinctrl to gpio-leds node
ARM: Dove: add fixed regulator for CuBox USB power
ARM: Dove: convert usb host controller to DT
ARM: dove: convert serial DT nodes to clocks property
Seungwon Jeon (1):
mmc: queue: exclude asynchronous transfer for special request
Shawn Guo (5):
mmc: sdhci: query card presence from cd-gpio before asking SDHCI
mmc: slot-gpio: use devm_* managed functions to ease users
mmc: remove unncessary mmc_gpio_free_cd() call from slot-gpio users
mmc: sdhci-esdhc-imx: use slot-gpio helpers for CD and WP
mmc: sdhci-esdhc-imx: remove ESDHC_CD_GPIO handling from IO accessory
Shinya Kuribayashi (1):
mmc: sh_mmcif: add support for bundled MMCIF IRQs
Stephen Warren (1):
mmc: add BCM2835 driver
Subhash Jadavani (2):
mmc: sdio: fix resume failure due to lack of CMD52 reset
mmc: sdio: print correct UHS mode during card detection
Sujit Reddy Thumma (1):
mmc: sdio: Fix SDIO 3.0 UHS-I initialization sequence
Teppei Kamijou (7):
mmc: sh_mmcif: force to fail CMD52 immediately
mmc: sh_mmcif: ensure run-time suspend call is processed before suspend
mmc: sh_mmcif: Add support for eMMC Dual Data Rate
mmc: sh_mmcif: Use msecs_to_jiffies() for host->timeout
mmc: sh_mmcif: Avoid unnecessary mmc_delay() at mmc_card_sleepawake()
mmc: sh-mmcif: Terminate DMA transactions when detecting timeout or error
mmc: sh-mmcif: report all errors
Thomas Petazzoni (18):
mmc: mvsdio: use slot-gpio infrastructure for write protect gpio
mmc: mvsdio: use slot-gpio for card detect gpio
mmc: mvsdio: implement a Device Tree binding
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
arm: mvebu: add DT information for the SDIO interface of Armada 370/XP
arm: mvebu: add pin muxing options for the SDIO interface on Armada 370
arm: mvebu: add pin muxing options for the SDIO interface on Armada XP
arm: mvebu: enable the SD card slot on Armada XP DB board
arm: mvebu: enable the SD card slot on Armada 370 DB board
arm: mvebu: enable the SDIO interface on the Globalscale Mirabox
arm: kirkwood: add Device Tree informations for the SDIO controller
arm: kirkwood: dreamplug: use Device Tree to probe SDIO
arm: kirkwood: mplcec4: use Device Tree to probe SDIO
arm: kirkwood: add pinmux option for the SDIO interface on 88F6282
arm: mvebu: add button for OpenBlocks AX3-4
Willy Tarreau (1):
ARM: kirkwood: convert Guruplug Server Plus to use the device tree
.../marvell,armada-370-xp-timer.txt} | 11 +-
arch/arm/boot/dts/Makefile | 3 +
arch/arm/boot/dts/armada-370-db.dts | 35 +++++
arch/arm/boot/dts/armada-370-mirabox.dts | 18 +++
arch/arm/boot/dts/armada-370-rd.dts | 68 +++++++++
arch/arm/boot/dts/armada-370-xp.dtsi | 49 +++++-
arch/arm/boot/dts/armada-370.dtsi | 21 +++
arch/arm/boot/dts/armada-xp-db.dts | 31 ++++
arch/arm/boot/dts/armada-xp-gp.dts | 113 ++++++++++++++
arch/arm/boot/dts/armada-xp-mv78230.dtsi | 6 +
arch/arm/boot/dts/armada-xp-mv78260.dtsi | 6 +
arch/arm/boot/dts/armada-xp-mv78460.dtsi | 6 +
.../arm/boot/dts/armada-xp-openblocks-ax3-4.dts | 18 +++
arch/arm/boot/dts/armada-xp.dtsi | 19 ++-
arch/arm/boot/dts/dove-cubox.dts | 28 +++-
arch/arm/boot/dts/dove.dtsi | 24 ++-
arch/arm/boot/dts/kirkwood-6282.dtsi | 17 +++
arch/arm/boot/dts/kirkwood-dreamplug.dts | 7 +
.../boot/dts/kirkwood-guruplug-server-plus.dts | 94 ++++++++++++
arch/arm/boot/dts/kirkwood-mplcec4.dts | 11 +-
arch/arm/boot/dts/kirkwood-ns2-common.dtsi | 6 +
arch/arm/boot/dts/kirkwood-nsa310.dts | 126 ++++++++++++++++
arch/arm/boot/dts/kirkwood-openblocks_a6.dts | 116 ++++++++++++++
arch/arm/boot/dts/kirkwood-topkick.dts | 102 +++++++++++++
arch/arm/boot/dts/kirkwood.dtsi | 8 +
arch/arm/configs/dove_defconfig | 28 +---
arch/arm/configs/mvebu_defconfig | 26 +++-
arch/arm/mach-dove/Kconfig | 7 +
arch/arm/mach-dove/Makefile | 4 +-
arch/arm/mach-dove/board-dt.c | 92 ++++++++++++
arch/arm/mach-dove/common.c | 85 -----------
arch/arm/mach-kirkwood/Kconfig | 7 +
arch/arm/mach-kirkwood/Makefile | 1 +
arch/arm/mach-kirkwood/board-dreamplug.c | 6 -
arch/arm/mach-kirkwood/board-dt.c | 16 +-
arch/arm/mach-kirkwood/board-guruplug.c | 39 +++++
arch/arm/mach-kirkwood/board-mplcec4.c | 7 -
arch/arm/mach-kirkwood/board-ns2.c | 14 --
arch/arm/mach-kirkwood/board-nsa310.c | 69 ---------
arch/arm/mach-kirkwood/board-openblocks_a6.c | 44 ------
arch/arm/mach-kirkwood/board-usi_topkick.c | 48 ------
arch/arm/mach-kirkwood/common.h | 11 +-
arch/arm/mach-mvebu/irq-armada-370-xp.c | 87 ++++++++++-
drivers/clocksource/time-armada-370-xp.c | 150 ++++++++++++++-----
44 files changed, 1314 insertions(+), 370 deletions(-)
rename Documentation/devicetree/bindings/{arm/armada-370-xp-timer.txt => timer/marvell,armada-370-xp-timer.txt} (55%)
create mode 100644 arch/arm/boot/dts/armada-370-rd.dts
create mode 100644 arch/arm/boot/dts/armada-xp-gp.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
^ permalink raw reply [flat|nested] 8+ messages in thread* [GIT PULL 3/3] arm-soc: mvebu platform changes (rebased)
2013-02-28 22:54 [GIT PULL 0/3] arm-soc: late changes for 3.9 Olof Johansson
` (2 preceding siblings ...)
2013-02-28 22:54 ` [GIT PULL 3/3] arm-soc: mvebu platform changes (not rebased) Olof Johansson
@ 2013-02-28 22:54 ` Olof Johansson
2013-03-01 4:18 ` [GIT PULL 0/3] arm-soc: late changes for 3.9 Linus Torvalds
4 siblings, 0 replies; 8+ messages in thread
From: Olof Johansson @ 2013-02-28 22:54 UTC (permalink / raw)
To: torvalds; +Cc: linux-arm-kernel, linux-kernel, arm, Olof Johansson
This series contains changes for the Marvell EBU platforms (mvebu,
orion, kirkwood, dove) that were not part of the first set of pull
requests because of dependencies on the MMC tree, and being submitted
a little late.
Notable changes are:
* More devices get moved out of board files into device tree
descriptions. The remaining devices listed in there have patches
that will get sent for 3.10, after which we can remove a lot of the
board files entirely. We are doing the pinctrl and mmc drivers here,
ethernet and PCI still remain.
* SMP support for mvebu is improved with support for the
local interrupt controller.
* The Guruplug board file gets replaced with a DT description.
----------------------------------------------------------------
The following changes since commit 280c50ec3b6e801b59311823fcd7d9c679354b6a:
Merge tag 'late-omap' into HEAD
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git tags/late-mvebu-rebased
for you to fetch changes up to 564991205956d869db0e45dfabe23a31b596fa15:
arm: mvebu: enable the SD card slot on Armada 370 Reference Design board
----------------------------------------------------------------
Andrew Lunn (7):
ARM: Kirkwood: Remove redundent USB clock alias
ARM: Kirkwood: Remove redundent SDIO clock alias
ARM: Kirkwood: Convert NSA310 to DT based regulators.
ARM: Kirkwood: Convert NSA310 to use gpio-poweroff driver
ARM: Kirkwood: Convert NSA310 I2C to device tree
ARM: Kirkwood: Convert NS2 to gpio-poweroff.
ARM: Kirkwood: topkick: Enable i2c bus.
Arnd Bergmann (3):
Merge 'mmc/upstream' into late/mvebu2
Merge branch 'timer/cleanup' into late/mvebu2
ARM: Dove: split legacy and DT setup
Ezequiel Garcia (7):
arm: mvebu: Update defconfig to select USB support
ARM: mvebu: Update defconfig to select SPI support
ARM: mvebu: Update defconfig to select SPI flash and MTD support
arm: mvebu: Add support for USB host controllers in Armada 370/XP
arm: mvebu: Enable USB controllers on Armada 370/XP boards
arm: mvebu: Add support for SPI controller in Armada 370/XP
arm: mvebu: Add SPI flash on Armada XP-GP board
Florian Fainelli (2):
arm: mvebu: add DTS file for Marvell RD-A370-A1 board
arm: mvebu: enable the SD card slot on Armada 370 Reference Design board
Gregory CLEMENT (12):
arm: mvebu: Update defconfig with Marvell RTC support
arm: mvebu: Improve the SMP support of the interrupt controller
arm: mvebu: Add support for local interrupt
clocksource: time-armada-370-xp: add local timer support
arm: mvebu: update defconfig with local timer support
arm: mvebu: support for the new Armada XP development board(DB-MV784MP-GP)
arm: mvebu: update defconfig with ATAG support when using DT
arm: mvebu: Add RTC support for Armada 370 and Armada XP
arm: mvebu: update DT to support local timers
clocksource: update and move armada-370-xp-timer documentation to timer directory
arm: mvebu: Add SPI flash on Armada XP-DB board
arm: mvebu: Add SPI flash on Armada 370 DB board
Jason Cooper (7):
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
ARM: kirkwood: topkick: convert to pinctrl
ARM: kirkwood: nsa310: convert to pinctrl
ARM: kirkwood: topkick: init mvsdio via DT
Nobuhiro Iwamatsu (3):
ARM: Kirkwood: Add pinctrl of TWSI1 to 88f6282
ARM: Kirkwood: Add pinctrl of NAND to 88f6282
ARM: Kirkwood: Convert openblocks A6 board to pinctrl
Olof Johansson (1):
ARM: dove: update dove_defconfig with a few useful options
Sebastian Hesselbarth (4):
ARM: Dove: move CuBox led pinctrl to gpio-leds node
ARM: Dove: add fixed regulator for CuBox USB power
ARM: Dove: convert usb host controller to DT
ARM: dove: convert serial DT nodes to clocks property
Thomas Petazzoni (16):
mmc: mvsdio: implement a Device Tree binding
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
arm: mvebu: add DT information for the SDIO interface of Armada 370/XP
arm: mvebu: add pin muxing options for the SDIO interface on Armada 370
arm: mvebu: add pin muxing options for the SDIO interface on Armada XP
arm: mvebu: enable the SD card slot on Armada XP DB board
arm: mvebu: enable the SD card slot on Armada 370 DB board
arm: mvebu: enable the SDIO interface on the Globalscale Mirabox
arm: kirkwood: add Device Tree informations for the SDIO controller
arm: kirkwood: dreamplug: use Device Tree to probe SDIO
arm: kirkwood: mplcec4: use Device Tree to probe SDIO
arm: kirkwood: add pinmux option for the SDIO interface on 88F6282
arm: mvebu: add button for OpenBlocks AX3-4
Willy Tarreau (1):
ARM: kirkwood: convert Guruplug Server Plus to use the device tree
.../marvell,armada-370-xp-timer.txt} | 11 +-
arch/arm/boot/dts/Makefile | 3 +
arch/arm/boot/dts/armada-370-db.dts | 35 +++++
arch/arm/boot/dts/armada-370-mirabox.dts | 18 +++
arch/arm/boot/dts/armada-370-rd.dts | 68 +++++++++
arch/arm/boot/dts/armada-370-xp.dtsi | 49 +++++-
arch/arm/boot/dts/armada-370.dtsi | 21 +++
arch/arm/boot/dts/armada-xp-db.dts | 31 ++++
arch/arm/boot/dts/armada-xp-gp.dts | 113 ++++++++++++++
arch/arm/boot/dts/armada-xp-mv78230.dtsi | 6 +
arch/arm/boot/dts/armada-xp-mv78260.dtsi | 6 +
arch/arm/boot/dts/armada-xp-mv78460.dtsi | 6 +
.../arm/boot/dts/armada-xp-openblocks-ax3-4.dts | 18 +++
arch/arm/boot/dts/armada-xp.dtsi | 19 ++-
arch/arm/boot/dts/dove-cubox.dts | 28 +++-
arch/arm/boot/dts/dove.dtsi | 24 ++-
arch/arm/boot/dts/kirkwood-6282.dtsi | 17 +++
arch/arm/boot/dts/kirkwood-dreamplug.dts | 7 +
.../boot/dts/kirkwood-guruplug-server-plus.dts | 94 ++++++++++++
arch/arm/boot/dts/kirkwood-mplcec4.dts | 11 +-
arch/arm/boot/dts/kirkwood-ns2-common.dtsi | 6 +
arch/arm/boot/dts/kirkwood-nsa310.dts | 126 ++++++++++++++++
arch/arm/boot/dts/kirkwood-openblocks_a6.dts | 116 ++++++++++++++
arch/arm/boot/dts/kirkwood-topkick.dts | 102 +++++++++++++
arch/arm/boot/dts/kirkwood.dtsi | 8 +
arch/arm/configs/dove_defconfig | 28 +---
arch/arm/configs/mvebu_defconfig | 26 +++-
arch/arm/mach-dove/Kconfig | 7 +
arch/arm/mach-dove/Makefile | 4 +-
arch/arm/mach-dove/board-dt.c | 92 ++++++++++++
arch/arm/mach-dove/common.c | 85 -----------
arch/arm/mach-kirkwood/Kconfig | 7 +
arch/arm/mach-kirkwood/Makefile | 1 +
arch/arm/mach-kirkwood/board-dreamplug.c | 6 -
arch/arm/mach-kirkwood/board-dt.c | 16 +-
arch/arm/mach-kirkwood/board-guruplug.c | 39 +++++
arch/arm/mach-kirkwood/board-mplcec4.c | 7 -
arch/arm/mach-kirkwood/board-ns2.c | 14 --
arch/arm/mach-kirkwood/board-nsa310.c | 69 ---------
arch/arm/mach-kirkwood/board-openblocks_a6.c | 44 ------
arch/arm/mach-kirkwood/board-usi_topkick.c | 48 ------
arch/arm/mach-kirkwood/common.h | 11 +-
arch/arm/mach-mvebu/irq-armada-370-xp.c | 87 ++++++++++-
drivers/clocksource/time-armada-370-xp.c | 150 ++++++++++++++-----
44 files changed, 1314 insertions(+), 370 deletions(-)
rename Documentation/devicetree/bindings/{arm/armada-370-xp-timer.txt => timer/marvell,armada-370-xp-timer.txt} (55%)
create mode 100644 arch/arm/boot/dts/armada-370-rd.dts
create mode 100644 arch/arm/boot/dts/armada-xp-gp.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
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [GIT PULL 0/3] arm-soc: late changes for 3.9
2013-02-28 22:54 [GIT PULL 0/3] arm-soc: late changes for 3.9 Olof Johansson
` (3 preceding siblings ...)
2013-02-28 22:54 ` [GIT PULL 3/3] arm-soc: mvebu platform changes (rebased) Olof Johansson
@ 2013-03-01 4:18 ` Linus Torvalds
2013-03-01 6:19 ` Olof Johansson
2013-03-04 21:14 ` Arnd Bergmann
4 siblings, 2 replies; 8+ messages in thread
From: Linus Torvalds @ 2013-03-01 4:18 UTC (permalink / raw)
To: Olof Johansson, Chris Ball, Arnd Bergmann
Cc: linux-arm-kernel, Linux Kernel Mailing List, ARM SoC
On Thu, Feb 28, 2013 at 2:54 PM, Olof Johansson <olof@lixom.net> wrote:
>
> Final two pull requests are for the same code. As Arnd describes in the
> tags, they are for a set of mvebu patches that depend on contents in
> the MMC tree. We had pulled in part of the MMC branch as a dependency,
> but unfortunately Chris Ball rebased it.
Has Chris Ball been told what an incredible pain this kind of crap is,
and that there's a damn good reason why WE DO NOT REBASE PUBLIC TREES
THAT OTHERS MAY BE BASING THEIR DEVELOPMENT ON!
Chris, can you hear me shouting? Don't do that.
> We're giving you the choice of taking the rebased version, or a
> non-rebased-but-merged-and-fixed-up version to avoid dealing with the
> excessive conflicts. The rebased one has the obvious benefit of not
> having duplicate commits in the tree for the same changes, but, well,
> it's rebased. Actual tree contents is identical though.
I'm taking the rebased one, thanks for the explanation. I really don't
like rebasing, but you did it for a valid reason, and it wasn't your
mistake. And duplicating the commits just to be a pain is not worth
it.
> I've pushed a resolved branch for reference (late-branches-resolved)
> in case you want to compare conflict resolutions.
So Arnd's tag talked about removing the stale gpio.h, but I think it
was the i2c.h that was now also stale. So I removed both - even though
technically, the merge should have left i2c.h since it was in both
parents. You should double-check that, but I don't see how that
<linux/i2c.h> could *possibly* be valid any more, and people had tried
(unsuccessfully) to remove it once already, so...
Linus
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [GIT PULL 0/3] arm-soc: late changes for 3.9
2013-03-01 4:18 ` [GIT PULL 0/3] arm-soc: late changes for 3.9 Linus Torvalds
@ 2013-03-01 6:19 ` Olof Johansson
2013-03-04 21:14 ` Arnd Bergmann
1 sibling, 0 replies; 8+ messages in thread
From: Olof Johansson @ 2013-03-01 6:19 UTC (permalink / raw)
To: Linus Torvalds
Cc: Chris Ball, Arnd Bergmann, linux-arm-kernel,
Linux Kernel Mailing List, ARM SoC
On Thu, Feb 28, 2013 at 8:18 PM, Linus Torvalds
<torvalds@linux-foundation.org> wrote:
>> I've pushed a resolved branch for reference (late-branches-resolved)
>> in case you want to compare conflict resolutions.
>
> So Arnd's tag talked about removing the stale gpio.h, but I think it
> was the i2c.h that was now also stale. So I removed both - even though
> technically, the merge should have left i2c.h since it was in both
> parents. You should double-check that, but I don't see how that
> <linux/i2c.h> could *possibly* be valid any more, and people had tried
> (unsuccessfully) to remove it once already, so...
The i2c include is definitely unnecessary since there's no
i2c_board_info stuff left in the file. Thanks for catching that.
-Olof
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [GIT PULL 0/3] arm-soc: late changes for 3.9
2013-03-01 4:18 ` [GIT PULL 0/3] arm-soc: late changes for 3.9 Linus Torvalds
2013-03-01 6:19 ` Olof Johansson
@ 2013-03-04 21:14 ` Arnd Bergmann
1 sibling, 0 replies; 8+ messages in thread
From: Arnd Bergmann @ 2013-03-04 21:14 UTC (permalink / raw)
To: Linus Torvalds
Cc: Olof Johansson, Chris Ball, linux-arm-kernel,
Linux Kernel Mailing List, ARM SoC
On Friday 01 March 2013, Linus Torvalds wrote:
> On Thu, Feb 28, 2013 at 2:54 PM, Olof Johansson <olof@lixom.net> wrote:
> >
> > Final two pull requests are for the same code. As Arnd describes in the
> > tags, they are for a set of mvebu patches that depend on contents in
> > the MMC tree. We had pulled in part of the MMC branch as a dependency,
> > but unfortunately Chris Ball rebased it.
>
> Has Chris Ball been told what an incredible pain this kind of crap is,
> and that there's a damn good reason why WE DO NOT REBASE PUBLIC TREES
> THAT OTHERS MAY BE BASING THEIR DEVELOPMENT ON!
>
> Chris, can you hear me shouting? Don't do that.
I talked to Chris while I prepared the two branches, and he now understands
the consequences and won't do it again.
I also talked to Jason Cooper about it and he is going to do his branches
differently now to avoid building deep dependency chains on other trees.
We've had similar problems with other subsystem maintainers before, but
there are a lot more subsystems that one can depend on. We generally
try to do the branches in a way that we can drop a small part of the stuff
in arm-soc without rebasing when someone else screws up, but that did not
happen in this case.
Arnd
^ permalink raw reply [flat|nested] 8+ messages in thread