linux.git/arch/arm/boot, branch v3.7-rc2

Merge tag 'kirkwood_fixes_for_v3.7' of git://git.infradead.org/users/jcooper/linux into fixes

2012-10-19T23:17:51+00:00

From Jason Cooper:
 - improve #ifdef logic to prevent linker errors with CACHE_FEROCEON_L2
 - lsxl board dts fixes

* tag 'kirkwood_fixes_for_v3.7' of git://git.infradead.org/users/jcooper/linux:
  ARM: kirkwood: fix buttons on lsxl boards
  ARM: kirkwood: fix LEDs names for lsxl boards
  ARM: Kirkwood: fix disabling CACHE_FEROCEON_L2

ARM: kirkwood: fix buttons on lsxl boards

2012-10-18T17:07:23+00:00

Change event type to switch for the power and autopower switches.
Additionally, this patch aligns the keycodes with the other linkstation
boards already supported by linux.

Signed-off-by: Michael Walle 
Signed-off-by: Jason Cooper

ARM: kirkwood: fix LEDs names for lsxl boards

2012-10-18T17:07:14+00:00

Don't use the specific board name in a the common device tree include file.
Instead use the common name 'lsxl'.

Signed-off-by: Michael Walle 
Signed-off-by: Jason Cooper

Merge tag 'mvebu_dove_late_fixes_for_v3.7' of git://git.infradead.org/users/jcooper/linux into fixes

2012-10-18T00:09:37+00:00

From Jason Cooper:

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

* tag 'mvebu_dove_late_fixes_for_v3.7' of git://git.infradead.org/users/jcooper/linux:
  ARM: dove: Add crypto engine to DT
  ARM: dove: Remove watchdog from DT
  ARM: dove: Restructure SoC device tree descriptor
  ARM: dove: Fix clock names of sata and gbe
  ARM: dove: Fix tauros2 device tree init
  ARM: dove: Add pcie clock support

ARM: dove: Add crypto engine to DT

2012-10-17T17:20:01+00:00

Make use of DT support for the crypto engine on dove and remove
the obsolete init call.

Signed-off-by: Sebastian Hesselbarth 
Signed-off-by: Jason Cooper

ARM: dove: Remove watchdog from DT

2012-10-17T17:19:58+00:00

The watchdog on dove requires an interrupt that is not yet
available on DT. Therefore, the watchdog DT node is removed
until the corresponding chained intc is available.

Signed-off-by: Sebastian Hesselbarth 
Signed-off-by: Jason Cooper

ARM: dove: Restructure SoC device tree descriptor

2012-10-17T17:19:55+00:00

This patch adds proper ranges for all mapped addresses within
dove SoC and moves the interrupt controller node inside the simple-bus
node.

Signed-off-by: Sebastian Hesselbarth 
Signed-off-by: Jason Cooper

ARM: dove: Fix tauros2 device tree init

2012-10-17T17:19:50+00:00

During the review process of dove DT patches, Tauros2 cache
init call was changed and DT support added. This patch fixes
the call to Tauros2 init and adds a DT node. Moreover, plat/irq.h
include was missing from mach-dove/common.c.
Signed-off-by: Sebastian Hesselbarth 
Signed-off-by: Jason Cooper

ARM: dts: imx6q-arm2: move NANDF_CS pins out of 'hog'

2012-10-16T17:07:04+00:00

Commit 9e3c0066 (ARM: dts: imx6q-arm2: add pinctrl for uart and enet)
defines NANDF_CS pins as gpio in 'hog', assuming these two pins are
always used by usdhc3 in gpio mode as card-detection and
write-protection on ARM2 board.  But it's not true.  These pins are
shared by usdhc3 and gpmi-nand.  We should have the pins functional
for gpmi-nand when usdhc3 is disabled.

Move the pins out of 'hog', so that pins only work in gpio mode as CD
and WP when usdhc3 is enabled, and otherwise they are available for
gpmi-nand.

Reported-by: Huang Shijie 
Signed-off-by: Shawn Guo 
Tested-by: Huang Shijie 
Signed-off-by: Olof Johansson

dtb: fix interrupt assignment for ehci/uhci on wm8505

2012-10-16T04:12:52+00:00

EHCI and UHCI devices in wm8505.dtsi should use IRQ 1 & 0
respectively - not 43 as used on newer models.

Signed-off-by: Tony Prisk 
Signed-off-by: Olof Johansson