1672a11b7698e4e2d6de0413ef141cda593c8e61
[glsdk/meta-ti-glsdk.git] / recipes-kernel / linux / linux-ti33x-psp-3.2 / beaglebone / 0004-more-beaglebone-merges.patch
1 From b5158f58ced19e39423d3f12b01f67435a1029b0 Mon Sep 17 00:00:00 2001
2 From: Koen Kooi <koen@dominion.thruhere.net>
3 Date: Tue, 31 Jan 2012 10:04:03 +0100
4 Subject: [PATCH 04/56] more beaglebone merges
6 Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
7 ---
8 arch/arm/mach-omap2/board-am335xevm.c | 52 +++++++++++++++++++++++++++++++-
9 1 files changed, 50 insertions(+), 2 deletions(-)
11 diff --git a/arch/arm/mach-omap2/board-am335xevm.c b/arch/arm/mach-omap2/board-am335xevm.c
12 index 2741431..ffbecae 100644
13 --- a/arch/arm/mach-omap2/board-am335xevm.c
14 +++ b/arch/arm/mach-omap2/board-am335xevm.c
15 @@ -242,6 +242,11 @@ struct da8xx_lcdc_platform_data dvi_pdata = {
16 static struct tsc_data am335x_touchscreen_data = {
17 .wires = 4,
18 .x_plate_resistance = 200,
19 + .mode = TI_TSCADC_TSCMODE,
20 +};
21 +
22 +static struct tsc_data bone_touchscreen_data = {
23 + .mode = TI_TSCADC_GENMODE,
24 };
26 static u8 am335x_iis_serializer_direction1[] = {
27 @@ -429,6 +434,7 @@ static bool beaglebone_tsadcpins_free = 1;
30 #define GP_EVM_REV_IS_1_0 0x1
31 +#define GP_EVM_REV_IS_1_0A 0x1
32 #define GP_EVM_REV_IS_1_1A 0x2
33 #define GP_EVM_REV_IS_UNKNOWN 0xFF
34 #define GP_EVM_ACTUALLY_BEAGLEBONE 0xBB
35 @@ -1024,6 +1030,47 @@ static struct pinmux_config profibus_pin_mux[] = {
36 {NULL, 0},
37 };
39 +/* LEDS - gpio1_21 -> gpio1_24 */
40 +
41 +#define BEAGLEBONE_USR1_LED GPIO_TO_PIN(1, 21)
42 +#define BEAGLEBONE_USR2_LED GPIO_TO_PIN(1, 22)
43 +#define BEAGLEBONE_USR3_LED GPIO_TO_PIN(1, 23)
44 +#define BEAGLEBONE_USR4_LED GPIO_TO_PIN(1, 24)
45 +
46 +static struct gpio_led bone_gpio_leds[] = {
47 + {
48 + .name = "beaglebone::usr0",
49 + .default_trigger = "heartbeat",
50 + .gpio = BEAGLEBONE_USR1_LED,
51 + },
52 + {
53 + .name = "beaglebone::usr1",
54 + .default_trigger = "mmc0",
55 + .gpio = BEAGLEBONE_USR2_LED,
56 + },
57 + {
58 + .name = "beaglebone::usr2",
59 + .gpio = BEAGLEBONE_USR3_LED,
60 + },
61 + {
62 + .name = "beaglebone::usr3",
63 + .gpio = BEAGLEBONE_USR4_LED,
64 + },
65 +};
66 +
67 +static struct gpio_led_platform_data bone_gpio_led_info = {
68 + .leds = bone_gpio_leds,
69 + .num_leds = ARRAY_SIZE(bone_gpio_leds),
70 +};
71 +
72 +static struct platform_device bone_leds_gpio = {
73 + .name = "leds-gpio",
74 + .id = -1,
75 + .dev = {
76 + .platform_data = &bone_gpio_led_info,
77 + },
78 +};
79 +
81 #define BEAGLEBONEDVI_USR0_LED GPIO_TO_PIN(1, 18)
82 #define BEAGLEBONEDVI_USR1_LED GPIO_TO_PIN(1, 19)
83 @@ -1777,11 +1824,11 @@ static void beaglebone_cape_setup(struct memory_accessor *mem_acc, void *context
84 snprintf(tmp, sizeof(cape_config.partnumber) + 1, "%s", cape_config.partnumber);
85 pr_info("BeagleBone cape partnumber: %s\n", tmp);
87 - if (!strncmp("BB-BONE-DVID-01", cape_config.partnumber, 5)) {
88 + if (!strncmp("BB-BONE-DVID-01", cape_config.partnumber, 15)) {
89 pr_info("BeagleBone cape: initializing DVI cape\n");
90 dvi_init(0,0);
91 }
92 - if (!strncmp("LCD01", cape_config.partnumber, 5)) {
93 + if (!strncmp("BB-BONE-LCD7-01", cape_config.partnumber, 15)) {
94 pr_info("BeagleBone cape: initializing LCD cape\n");
95 bbtoys7lcd_init(0,0);
96 pr_info("BeagleBone cape: initializing LCD cape touchscreen\n");
97 @@ -2258,6 +2305,7 @@ static void setup_general_purpose_evm(void)
98 pr_info("The board is general purpose EVM in profile %d\n", prof_sel);
100 if (!strncmp("1.1A", config.version, 4)) {
101 + pr_info("EVM version is %s\n", config.version);
102 gp_evm_revision = GP_EVM_REV_IS_1_1A;
103 } else if (!strncmp("1.0", config.version, 3)) {
104 gp_evm_revision = GP_EVM_REV_IS_1_0;
105 --
106 1.7.7.6