snowball/igloo-kernel.git/arch/arm/plat-nomadik, branch integration-linux-ux500

Merge topic branch 'input' into integration-linux-ux500

2012-06-04T11:45:28+00:00

Merge topic branch 'dma' into integration-linux-ux500

2012-06-04T11:45:26+00:00

Merge topic branch 'gpio' into integration-linux-ux500

2012-06-04T11:45:25+00:00

Merge topic branch 'mach-plat' into integration-linux-ux500

2012-06-04T11:45:25+00:00

Signed-off-by: Philippe Langlais

Nomadik ske: Support keypad smaller than 8x8

2012-05-22T09:03:39+00:00

Adds support to the driver for keypads with less than 8 rows and 8 columns. ST-Ericsson ID: 373774 ST-Ericsson FOSS-OUT ID: Trivial ST-Ericsson Linux next: NA Signed-off-by: Chris Blair Conflicts: drivers/input/keyboard/nomadik-ske-keypad.c Change-Id: Ib357ed6247c82dd326ce00fe826777fd459088b4 Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/46286 Reviewed-by: QATOOLS Reviewed-by: Michel JAOUEN Tested-by: Michel JAOUEN Reviewed-by: QATEST Reviewed-by: Christopher BLAIR Reviewed-by: Linus WALLEIJ

ske keypad: Proper regulator and clock framework support

2012-05-22T09:03:31+00:00

SKE keypad doesn't block the APSleep during CPU Idle by proper implementation of regulator and clock support for SKE. ST-Ericsson Id: ER 323894 Change-Id: I242f9618439e3004b5458981235b7079a97aa7dd Signed-off-by: Naveen Kumar Gaddipati Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/20127 Reviewed-by: Jonas ABERG

dma40: Add the needed functions for STE audio support

2012-05-22T09:02:56+00:00

Come from commit "dma40: update" Author: Rabin Vincent Signed-off-by: Philippe Langlais

gpio/nomadik: move the Nomadik GPIO header

2012-05-22T09:02:51+00:00

This takes the Nomadik GPIO header out of the plat-nomadik directory and pushes it down into where it belongs. Signed-off-by: Linus Walleij

ARM: plat-nomadik: Add alias to clarify settings

2012-05-22T09:02:23+00:00

PIN_SLPM_WAKEUP_ENABLE/DISABLE do something completely different than the name says. ST-Ericsson Linux next: - ST-Ericsson ID: - ST-Ericsson FOSS-OUT ID: Trivial Change-Id: Ib334d2772fa21f58ee84f22dddf34830300a4f86 Signed-off-by: Jonas Aaberg Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/33865 Reviewed-by: QABUILD Reviewed-by: Rabin VINCENT

plat-nomadik: gpio: nomadik: support low EMI mode

2012-05-22T09:02:16+00:00

Signed-off-by: Rabin Vincent Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/32354 Reviewed-by: Srinidhi KASAGAR