summaryrefslogtreecommitdiffstats
path: root/recipes-kernel/linux/linux-ti33x-psp-3.2
diff options
context:
space:
mode:
authorKoen Kooi <koen@dominion.thruhere.net>2012-04-09 18:06:43 +0200
committerDenys Dmytriyenko <denys@ti.com>2012-04-10 15:11:22 -0400
commitd0b69390399f6fa9602d158718d8d19cf7af4a1a (patch)
tree0dedb8d16e635617bf0bd58085a562590b128d78 /recipes-kernel/linux/linux-ti33x-psp-3.2
parent69102ec043838f6fcba9dd0df0cc07e74700b268 (diff)
downloadmeta-ti-d0b69390399f6fa9602d158718d8d19cf7af4a1a.tar.gz
linux-ti335x-psp 3.2: fix 3.5" cape support, turn on CONFIG_AUDIT
* bump MACHINE_KERNEL_PR for the CONFIG_AUDIT change Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> Signed-off-by: Denys Dmytriyenko <denys@ti.com>
Diffstat (limited to 'recipes-kernel/linux/linux-ti33x-psp-3.2')
-rw-r--r--recipes-kernel/linux/linux-ti33x-psp-3.2/beaglebone/0027-beaglebone-fix-direction-of-gpio-keys.patch107
-rw-r--r--recipes-kernel/linux/linux-ti33x-psp-3.2/beaglebone/0028-beaglebone-fix-3.5-lcd-cape-support.patch109
-rw-r--r--recipes-kernel/linux/linux-ti33x-psp-3.2/beaglebone/defconfig7
3 files changed, 220 insertions, 3 deletions
diff --git a/recipes-kernel/linux/linux-ti33x-psp-3.2/beaglebone/0027-beaglebone-fix-direction-of-gpio-keys.patch b/recipes-kernel/linux/linux-ti33x-psp-3.2/beaglebone/0027-beaglebone-fix-direction-of-gpio-keys.patch
new file mode 100644
index 00000000..330078ee
--- /dev/null
+++ b/recipes-kernel/linux/linux-ti33x-psp-3.2/beaglebone/0027-beaglebone-fix-direction-of-gpio-keys.patch
@@ -0,0 +1,107 @@
1From 06132a893d83cf2dc128ad9b37b56be6a6d4714c Mon Sep 17 00:00:00 2001
2From: Koen Kooi <koen@dominion.thruhere.net>
3Date: Mon, 26 Mar 2012 20:28:56 +0200
4Subject: [PATCH 27/28] beaglebone: fix direction of gpio-keys
5
6Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
7---
8 arch/arm/mach-omap2/board-am335xevm.c | 20 ++++++++++----------
9 1 files changed, 10 insertions(+), 10 deletions(-)
10
11diff --git a/arch/arm/mach-omap2/board-am335xevm.c b/arch/arm/mach-omap2/board-am335xevm.c
12index 5318c41..fdeed59 100644
13--- a/arch/arm/mach-omap2/board-am335xevm.c
14+++ b/arch/arm/mach-omap2/board-am335xevm.c
15@@ -995,7 +995,7 @@ static struct gpio_keys_button beaglebone_lcd7_gpio_keys[] = {
16 {
17 .code = KEY_LEFT,
18 .gpio = GPIO_TO_PIN(1, 16),
19- .active_low = false,
20+ .active_low = true,
21 .desc = "left",
22 .type = EV_KEY,
23 .wakeup = 1,
24@@ -1003,7 +1003,7 @@ static struct gpio_keys_button beaglebone_lcd7_gpio_keys[] = {
25 {
26 .code = KEY_RIGHT,
27 .gpio = GPIO_TO_PIN(1, 17),
28- .active_low = false,
29+ .active_low = true,
30 .desc = "right",
31 .type = EV_KEY,
32 .wakeup = 1,
33@@ -1011,7 +1011,7 @@ static struct gpio_keys_button beaglebone_lcd7_gpio_keys[] = {
34 {
35 .code = KEY_UP,
36 .gpio = GPIO_TO_PIN(1, 19),
37- .active_low = false,
38+ .active_low = true,
39 .desc = "up",
40 .type = EV_KEY,
41 .wakeup = 1,
42@@ -1019,7 +1019,7 @@ static struct gpio_keys_button beaglebone_lcd7_gpio_keys[] = {
43 {
44 .code = KEY_DOWN,
45 .gpio = GPIO_TO_PIN(3, 16),
46- .active_low = false,
47+ .active_low = true,
48 .desc = "down",
49 .type = EV_KEY,
50 .wakeup = 1,
51@@ -1027,7 +1027,7 @@ static struct gpio_keys_button beaglebone_lcd7_gpio_keys[] = {
52 {
53 .code = KEY_ENTER,
54 .gpio = GPIO_TO_PIN(3, 19),
55- .active_low = false,
56+ .active_low = true,
57 .desc = "enter",
58 .type = EV_KEY,
59 .wakeup = 1,
60@@ -1071,7 +1071,7 @@ static struct gpio_keys_button beaglebone_lcd3_gpio_keys[] = {
61 {
62 .code = KEY_LEFT,
63 .gpio = GPIO_TO_PIN(1, 16),
64- .active_low = false,
65+ .active_low = true,
66 .desc = "left",
67 .type = EV_KEY,
68 .wakeup = 1,
69@@ -1079,7 +1079,7 @@ static struct gpio_keys_button beaglebone_lcd3_gpio_keys[] = {
70 {
71 .code = KEY_RIGHT,
72 .gpio = GPIO_TO_PIN(1, 17),
73- .active_low = false,
74+ .active_low = true,
75 .desc = "right",
76 .type = EV_KEY,
77 .wakeup = 1,
78@@ -1087,7 +1087,7 @@ static struct gpio_keys_button beaglebone_lcd3_gpio_keys[] = {
79 {
80 .code = KEY_UP,
81 .gpio = GPIO_TO_PIN(3, 19),
82- .active_low = false,
83+ .active_low = true,
84 .desc = "up",
85 .type = EV_KEY,
86 .wakeup = 1,
87@@ -1095,7 +1095,7 @@ static struct gpio_keys_button beaglebone_lcd3_gpio_keys[] = {
88 {
89 .code = KEY_DOWN,
90 .gpio = GPIO_TO_PIN(1, 28),
91- .active_low = false,
92+ .active_low = true,
93 .desc = "down",
94 .type = EV_KEY,
95 .wakeup = 1,
96@@ -1103,7 +1103,7 @@ static struct gpio_keys_button beaglebone_lcd3_gpio_keys[] = {
97 {
98 .code = KEY_ENTER,
99 .gpio = GPIO_TO_PIN(0, 7),
100- .active_low = false,
101+ .active_low = true,
102 .desc = "down",
103 .type = EV_KEY,
104 .wakeup = 1,
105--
1061.7.2.5
107
diff --git a/recipes-kernel/linux/linux-ti33x-psp-3.2/beaglebone/0028-beaglebone-fix-3.5-lcd-cape-support.patch b/recipes-kernel/linux/linux-ti33x-psp-3.2/beaglebone/0028-beaglebone-fix-3.5-lcd-cape-support.patch
new file mode 100644
index 00000000..22e8cdf0
--- /dev/null
+++ b/recipes-kernel/linux/linux-ti33x-psp-3.2/beaglebone/0028-beaglebone-fix-3.5-lcd-cape-support.patch
@@ -0,0 +1,109 @@
1From ef33c4aefb684a67d1983803688a03826d33b80f Mon Sep 17 00:00:00 2001
2From: Koen Kooi <koen@dominion.thruhere.net>
3Date: Wed, 29 Feb 2012 17:25:22 +0100
4Subject: [PATCH 28/28] beaglebone: fix 3.5" lcd cape support
5
6* proper timings
7* fix gpio conflict
8
9Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
10---
11 arch/arm/mach-omap2/board-am335xevm.c | 42 ++++++++++++++++++++++++++++++++-
12 drivers/video/da8xx-fb.c | 14 +++++++++++
13 2 files changed, 55 insertions(+), 1 deletions(-)
14
15diff --git a/arch/arm/mach-omap2/board-am335xevm.c b/arch/arm/mach-omap2/board-am335xevm.c
16index fdeed59..f9057cc 100644
17--- a/arch/arm/mach-omap2/board-am335xevm.c
18+++ b/arch/arm/mach-omap2/board-am335xevm.c
19@@ -211,6 +211,29 @@ struct da8xx_lcdc_platform_data bbtoys7_pdata = {
20 .type = "TFC_S9700RTWV35TR_01B",
21 };
22
23+static struct lcd_ctrl_config bbtoys35_cfg = {
24+ &bbtoys7_panel,
25+ .ac_bias = 255,
26+ .ac_bias_intrpt = 0,
27+ .dma_burst_sz = 16,
28+ .bpp = 16,
29+ .fdd = 0x80,
30+ .tft_alt_mode = 0,
31+ .stn_565_mode = 0,
32+ .mono_8bit_mode = 0,
33+ .invert_line_clock = 1,
34+ .invert_frm_clock = 1,
35+ .sync_edge = 0,
36+ .sync_ctrl = 1,
37+ .raster_order = 0,
38+};
39+
40+struct da8xx_lcdc_platform_data bbtoys35_pdata = {
41+ .manu_name = "BBToys",
42+ .controller_data = &bbtoys35_cfg,
43+ .type = "CDTech_S035Q01",
44+};
45+
46 static const struct display_panel dvi_panel = {
47 WVGA,
48 16,
49@@ -1461,6 +1484,23 @@ static void bbtoys7lcd_init(int evm_id, int profile)
50 return;
51 }
52
53+static void bbtoys35lcd_init(int evm_id, int profile)
54+{
55+ setup_pin_mux(bbtoys7_pin_mux);
56+
57+ // we are being stupid and setting pixclock from here instead of da8xx-fb.c
58+ if (conf_disp_pll(16000000)) {
59+ pr_info("Failed to set pixclock to 16000000, not attempting to"
60+ "register LCD cape\n");
61+ return;
62+ }
63+
64+ if (am33xx_register_lcdc(&bbtoys35_pdata))
65+ pr_info("Failed to register Beagleboardtoys 3.5\" LCD cape device\n");
66+
67+ return;
68+}
69+
70 #define BEAGLEBONEDVI_PDn GPIO_TO_PIN(1, 7)
71
72 static void dvi_init(int evm_id, int profile)
73@@ -2039,7 +2079,7 @@ static void beaglebone_cape_setup(struct memory_accessor *mem_acc, void *context
74
75 if (!strncmp("BB-BONE-LCD3-01", cape_config.partnumber, 15)) {
76 pr_info("BeagleBone cape: initializing LCD cape\n");
77- bbtoys7lcd_init(0,0);
78+ bbtoys35lcd_init(0,0);
79 pr_info("BeagleBone cape: initializing LCD cape touchscreen\n");
80 tsc_init(0,0);
81 beaglebone_tsadcpins_free = 0;
82diff --git a/drivers/video/da8xx-fb.c b/drivers/video/da8xx-fb.c
83index dea8936..312c72c 100644
84--- a/drivers/video/da8xx-fb.c
85+++ b/drivers/video/da8xx-fb.c
86@@ -285,6 +285,20 @@ static struct da8xx_panel known_lcd_panels[] = {
87 .pxl_clk = 56000000,
88 .invert_pxl_clk = 0,
89 },
90+ [4] = {
91+ /* CDTech S035Q01 */
92+ .name = "CDTech_S035Q01",
93+ .width = 320,
94+ .height = 240,
95+ .hfp = 58,
96+ .hbp = 21,
97+ .hsw = 47,
98+ .vfp = 23,
99+ .vbp = 11,
100+ .vsw = 2,
101+ .pxl_clk = 8000000,
102+ .invert_pxl_clk = 0,
103+ },
104 };
105
106 /* Enable the Raster Engine of the LCD Controller */
107--
1081.7.2.5
109
diff --git a/recipes-kernel/linux/linux-ti33x-psp-3.2/beaglebone/defconfig b/recipes-kernel/linux/linux-ti33x-psp-3.2/beaglebone/defconfig
index 782f52da..8a6b9055 100644
--- a/recipes-kernel/linux/linux-ti33x-psp-3.2/beaglebone/defconfig
+++ b/recipes-kernel/linux/linux-ti33x-psp-3.2/beaglebone/defconfig
@@ -1,6 +1,6 @@
1# 1#
2# Automatically generated file; DO NOT EDIT. 2# Automatically generated file; DO NOT EDIT.
3# Linux/arm 3.2.6 Kernel Configuration 3# Linux/arm 3.2.14 Kernel Configuration
4# 4#
5CONFIG_ARM=y 5CONFIG_ARM=y
6CONFIG_HAVE_PWM=y 6CONFIG_HAVE_PWM=y
@@ -58,7 +58,7 @@ CONFIG_TASKSTATS=y
58CONFIG_TASK_DELAY_ACCT=y 58CONFIG_TASK_DELAY_ACCT=y
59CONFIG_TASK_XACCT=y 59CONFIG_TASK_XACCT=y
60CONFIG_TASK_IO_ACCOUNTING=y 60CONFIG_TASK_IO_ACCOUNTING=y
61# CONFIG_AUDIT is not set 61CONFIG_AUDIT=y
62CONFIG_HAVE_GENERIC_HARDIRQS=y 62CONFIG_HAVE_GENERIC_HARDIRQS=y
63 63
64# 64#
@@ -636,6 +636,7 @@ CONFIG_NETFILTER_XTABLES=m
636# 636#
637# Xtables targets 637# Xtables targets
638# 638#
639CONFIG_NETFILTER_XT_TARGET_AUDIT=m
639# CONFIG_NETFILTER_XT_TARGET_CLASSIFY is not set 640# CONFIG_NETFILTER_XT_TARGET_CLASSIFY is not set
640# CONFIG_NETFILTER_XT_TARGET_IDLETIMER is not set 641# CONFIG_NETFILTER_XT_TARGET_IDLETIMER is not set
641# CONFIG_NETFILTER_XT_TARGET_LED is not set 642# CONFIG_NETFILTER_XT_TARGET_LED is not set
@@ -2914,7 +2915,6 @@ CONFIG_PRISM2_USB=m
2914# CONFIG_ASUS_OLED is not set 2915# CONFIG_ASUS_OLED is not set
2915# CONFIG_PANEL is not set 2916# CONFIG_PANEL is not set
2916CONFIG_R8712U=m 2917CONFIG_R8712U=m
2917CONFIG_R8712_AP=y
2918CONFIG_RTS5139=m 2918CONFIG_RTS5139=m
2919# CONFIG_RTS5139_DEBUG is not set 2919# CONFIG_RTS5139_DEBUG is not set
2920# CONFIG_TRANZPORT is not set 2920# CONFIG_TRANZPORT is not set
@@ -3545,6 +3545,7 @@ CONFIG_CRC32=y
3545CONFIG_CRC7=y 3545CONFIG_CRC7=y
3546CONFIG_LIBCRC32C=y 3546CONFIG_LIBCRC32C=y
3547# CONFIG_CRC8 is not set 3547# CONFIG_CRC8 is not set
3548CONFIG_AUDIT_GENERIC=y
3548CONFIG_ZLIB_INFLATE=y 3549CONFIG_ZLIB_INFLATE=y
3549CONFIG_ZLIB_DEFLATE=y 3550CONFIG_ZLIB_DEFLATE=y
3550CONFIG_LZO_COMPRESS=y 3551CONFIG_LZO_COMPRESS=y
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-07-04 23:01:31 +0000