1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
|
From 2a148ebd4606ed6a5d24287aa7e5701de3259057 Mon Sep 17 00:00:00 2001
From: Damian <damian.eppel@teleca.com>
Date: Tue, 5 Jun 2012 23:14:58 +0200
Subject: [PATCH 70/79] beaglebone: fix LCD3 led/key overlap
Signed-off-by: Koen Kooi <koen@circuitco.com>
---
arch/arm/mach-omap2/board-am335xevm.c | 9 +--------
1 file changed, 1 insertion(+), 8 deletions(-)
diff --git a/arch/arm/mach-omap2/board-am335xevm.c b/arch/arm/mach-omap2/board-am335xevm.c
index 15ee8af..9a56a769 100644
--- a/arch/arm/mach-omap2/board-am335xevm.c
+++ b/arch/arm/mach-omap2/board-am335xevm.c
@@ -639,7 +639,6 @@ static struct pinmux_config dvia2_pin_mux[] = {
/* Module pin mux for Beagleboardtoys 3.5" LCD cape */
static struct pinmux_config bbtoys35_pin_mux[] = {
{"gpmc_a2.gpio1_18", OMAP_MUX_MODE7 | AM33XX_PIN_OUTPUT}, // USR0 LED
- {"gpmc_a3.gpio1_19", OMAP_MUX_MODE7 | AM33XX_PIN_OUTPUT}, // USR1 LED
{NULL, 0},
};
@@ -1196,7 +1195,7 @@ static struct platform_device beaglebone_lcd3_keys = {
static struct pinmux_config lcd3a1_keys_pin_mux[] = {
{"gpmc_a0.gpio1_16", OMAP_MUX_MODE7 | AM33XX_PIN_INPUT}, // Left
{"gpmc_a1.gpio1_17", OMAP_MUX_MODE7 | AM33XX_PIN_INPUT}, //Right
- {"gpmc_a3.gpio1_19", OMAP_MUX_MODE7 | AM33XX_PIN_OUTPUT}, // Up
+ {"gpmc_a3.gpio1_19", OMAP_MUX_MODE7 | AM33XX_PIN_INPUT}, // Up
{"mcasp0_axr0.gpio3_16", OMAP_MUX_MODE7 | AM33XX_PIN_INPUT}, //Down
{"mcasp0_fsr.gpio3_19", OMAP_MUX_MODE7 | AM33XX_PIN_INPUT}, // Enter
{NULL, 0},
@@ -1424,7 +1423,6 @@ static struct platform_device dvi_leds_gpio = {
};
#define BEAGLEBONELCD3_USR0_LED GPIO_TO_PIN(1, 18)
-#define BEAGLEBONELCD3_USR1_LED GPIO_TO_PIN(1, 19)
static struct gpio_led lcd3_gpio_leds[] = {
{
@@ -1450,11 +1448,6 @@ static struct gpio_led lcd3_gpio_leds[] = {
.default_trigger = "heartbeat",
.gpio = BEAGLEBONELCD3_USR0_LED,
},
- {
- .name = "lcd3::usr1",
- .default_trigger = "mmc0",
- .gpio = BEAGLEBONELCD3_USR1_LED,
- },
};
static struct gpio_led_platform_data lcd3_gpio_led_info = {
--
1.7.10
|
