summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-nomadik
diff options
context:
space:
mode:
authorLinus Walleij2013-05-18 23:55:13 +0200
committerLinus Walleij2013-05-26 22:24:42 +0200
commit175210a842e2c05cb5dc606ad43a5dbefe12977f (patch)
tree2a17f6e76065300357260d27a73726c36e807980 /arch/arm/mach-nomadik
parentARM: nomadik: register clocksource from device tree (diff)
downloadkernel-qcow2-linux-175210a842e2c05cb5dc606ad43a5dbefe12977f.tar.gz
kernel-qcow2-linux-175210a842e2c05cb5dc606ad43a5dbefe12977f.tar.xz
kernel-qcow2-linux-175210a842e2c05cb5dc606ad43a5dbefe12977f.zip
ARM: nomadik: add led and key for S8815
This adds device tree hunks for the LED and userbutton on the USB S8815 board, and set up a heartbeat trigger on the LED and an escape key on the user button. Alter the defconfig to enable these standard DT-enabled GPIO drivers. Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'arch/arm/mach-nomadik')
-rw-r--r--arch/arm/mach-nomadik/cpu-8815.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/mach-nomadik/cpu-8815.c b/arch/arm/mach-nomadik/cpu-8815.c
index e73a71f78b4d..835161709c62 100644
--- a/arch/arm/mach-nomadik/cpu-8815.c
+++ b/arch/arm/mach-nomadik/cpu-8815.c
@@ -99,6 +99,10 @@ static unsigned long in_pullup[] = { PIN_INPUT_PULLUP };
static struct pinctrl_map __initdata nhk8815_pinmap[] = {
PIN_MAP_MUX_GROUP_DEFAULT("uart0", "pinctrl-stn8815", "u0_a_1", "u0"),
PIN_MAP_MUX_GROUP_DEFAULT("uart1", "pinctrl-stn8815", "u1_a_1", "u1"),
+ /* User LED on S8815 */
+ PIN_MAP_CONFIGS_PIN_HOG_DEFAULT("pinctrl-stn8815", "GPIO2_C5", out_high),
+ /* User button on S8815 */
+ PIN_MAP_CONFIGS_PIN_HOG_DEFAULT("pinctrl-stn8815", "GPIO3_A4", in_nopull),
/* Hog in MMC/SD card mux */
PIN_MAP_MUX_GROUP_HOG_DEFAULT("pinctrl-stn8815", "mmcsd_a_1", "mmcsd"),
/* MCCLK */