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