Skip to contentSkip to conversation

ARM: mvebu/kirkwood/dove fixes for v3.7

GIT PULL Jason Cooper 1 participant 4 messages Oct 17, 2012

lore
Share & tools
lore
#0 lore raw

The following changes since commit ddffeb8c4d0331609ef2581d84de4d763607bd37:

Linux 3.7-rc1 (2012-10-14 14:41:04 -0700)

are available in the git repository at:

git://git.infradead.org/users/jcooper/linux.git tags/mvebu_merge_test_for_v3.7

for you to fetch changes up to 624e773fdcb50ffc27dfb899644d5c0824ae506c:

Merge branch 'v3.7-rc1/mvebu/gpio-fixes' into v3.7-rc1/merge-test (2012-10-17 18:19:07 +0000)

----------------------------------------------------------------

Depends:
- Based on v3.7-rc1

Adds:
- late fixes for dove
- gpio fix for mvebu
- cache build fix for kirkwood

Merge conflicts:
- none observed

I'm trying out using a 'merge-test' branch as a kind of summary for when I send multiple pull requests. There's *no* need to pull this branch, it's purely informational.

----------------------------------------------------------------
Axel Lin (1):
gpio: mvebu: Add missing breaks in mvebu_gpio_irq_set_type

Jason Cooper (2):
Merge branch 'v3.7-rc1/kirkwood/cache-build-fix' into v3.7-rc1/merge-test Merge branch 'v3.7-rc1/mvebu/gpio-fixes' into v3.7-rc1/merge-test

Jason Gunthorpe (1):
Build failure CONFIG_ARCH_KIRKWOOD_DT relies on CACHE_FEROCEON_L2

Sebastian Hesselbarth (6):
ARM: dove: Add pcie clock support
ARM: dove: Fix tauros2 device tree init
ARM: dove: Fix clock names of sata and gbe
ARM: dove: Restructure SoC device tree descriptor
ARM: dove: Remove watchdog from DT
ARM: dove: Add crypto engine to DT

 arch/arm/boot/dts/dove.dtsi       | 49 +++++++++++++++++++++++++--------------
 arch/arm/mach-dove/common.c       |  8 +++----
 arch/arm/mach-dove/pcie.c         |  5 ++++
 arch/arm/mach-kirkwood/board-dt.c |  2 --
 arch/arm/mach-kirkwood/common.c   |  4 ++--
 drivers/gpio/gpio-mvebu.c         |  3 +++
 6 files changed, 46 insertions(+), 25 deletions(-)
#1 lore raw

[GIT PULL 1/3] ARM: Dove: fixes for v3.7

The following changes since commit ddffeb8c4d0331609ef2581d84de4d763607bd37:

Linux 3.7-rc1 (2012-10-14 14:41:04 -0700)

are available in the git repository at:

git://git.infradead.org/users/jcooper/linux.git tags/mvebu_dove_late_fixes_for_v3.7

for you to fetch changes up to a458926e16a37ef41a4fbf45957cb9faaeb6a6ef:

ARM: dove: Add crypto engine to DT (2012-10-17 17:20:01 +0000)

----------------------------------------------------------------
Depends:
- Based against v3.7-rc1
- Latest changes to arch/arm/mm/cache-tauros2.c c2b7e05 ARM: cache: add dt support for tauros2 cache

Misc. fixes for latest changes to mach-dove/
Fixes build breakage for mach-dove

----------------------------------------------------------------
Sebastian Hesselbarth (6):
ARM: dove: Add pcie clock support
ARM: dove: Fix tauros2 device tree init
ARM: dove: Fix clock names of sata and gbe
ARM: dove: Restructure SoC device tree descriptor
ARM: dove: Remove watchdog from DT
ARM: dove: Add crypto engine to DT

 arch/arm/boot/dts/dove.dtsi | 49 +++++++++++++++++++++++++++++----------------
 arch/arm/mach-dove/common.c |  8 ++++----
 arch/arm/mach-dove/pcie.c   |  5 +++++
 3 files changed, 41 insertions(+), 21 deletions(-)
#2 lore raw

[GIT PULL 2/3] ARM: mvebu: fix for v3.7

In reply to Jason Cooper

The following changes since commit ddffeb8c4d0331609ef2581d84de4d763607bd37:

Linux 3.7-rc1 (2012-10-14 14:41:04 -0700)

are available in the git repository at:

git://git.infradead.org/users/jcooper/linux.git tags/mvebu_gpio_fixes_for_v3.7

for you to fetch changes up to 7cf8c9f7810ec1b9feaaa7914aaec4fc73c0c5d5:

gpio: mvebu: Add missing breaks in mvebu_gpio_irq_set_type (2012-10-17 17:40:18 +0000)

----------------------------------------------------------------
Depends:
- Based on v3.7-rc1

Adds:
- missing break;s from converting if{}s to switch{}

----------------------------------------------------------------
Axel Lin (1):
gpio: mvebu: Add missing breaks in mvebu_gpio_irq_set_type

 drivers/gpio/gpio-mvebu.c | 3 +++
 1 file changed, 3 insertions(+)
#3 lore raw

[GIT PULL 3/3] ARM: Kirkwood: fix for v3.7

In reply to Jason Cooper

The following changes since commit ddffeb8c4d0331609ef2581d84de4d763607bd37:

Linux 3.7-rc1 (2012-10-14 14:41:04 -0700)

are available in the git repository at:

git://git.infradead.org/users/jcooper/linux.git tags/kirkwood_cache_build_fix_for_v3.7

for you to fetch changes up to f7d87d2726f823dc4a0d4900ac06446e4e485fdb:

Build failure CONFIG_ARCH_KIRKWOOD_DT relies on CACHE_FEROCEON_L2 (2012-10-17 17:56:37 +0000)

----------------------------------------------------------------
Depends:
- Based on v3.7-rc1

Adds:
- Better #ifdef logic for CACHE_FEROCEON_L2 to prevent linker errors

----------------------------------------------------------------
Jason Gunthorpe (1):
Build failure CONFIG_ARCH_KIRKWOOD_DT relies on CACHE_FEROCEON_L2

 arch/arm/mach-kirkwood/board-dt.c | 2 --
 arch/arm/mach-kirkwood/common.c   | 4 ++--
 2 files changed, 2 insertions(+), 4 deletions(-)