diff options
3 files changed, 101 insertions, 1 deletions
diff --git a/recipes-kernel/linux/linux-ti33x-psp-3.2/beaglebone/0074-beaglebone-add-support-for-DVI-audio-and-audio-only-.patch b/recipes-kernel/linux/linux-ti33x-psp-3.2/beaglebone/0074-beaglebone-add-support-for-DVI-audio-and-audio-only-.patch new file mode 100644 index 00000000..60d5be0f --- /dev/null +++ b/recipes-kernel/linux/linux-ti33x-psp-3.2/beaglebone/0074-beaglebone-add-support-for-DVI-audio-and-audio-only-.patch | |||
@@ -0,0 +1,63 @@ | |||
1 | From d87e8e9379764451de06b3f6d13d19424836f64c Mon Sep 17 00:00:00 2001 | ||
2 | From: Koen Kooi <koen@dominion.thruhere.net> | ||
3 | Date: Tue, 3 Jul 2012 08:45:47 +0200 | ||
4 | Subject: [PATCH] beaglebone: add support for DVI+audio and audio-only capes | ||
5 | |||
6 | Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> | ||
7 | --- | ||
8 | arch/arm/mach-omap2/board-am335xevm.c | 32 ++++++++++++++++++++++++++++++-- | ||
9 | 1 file changed, 30 insertions(+), 2 deletions(-) | ||
10 | |||
11 | diff --git a/arch/arm/mach-omap2/board-am335xevm.c b/arch/arm/mach-omap2/board-am335xevm.c | ||
12 | index 1680612..4b3f7d2 100644 | ||
13 | --- a/arch/arm/mach-omap2/board-am335xevm.c | ||
14 | +++ b/arch/arm/mach-omap2/board-am335xevm.c | ||
15 | @@ -2906,8 +2906,10 @@ static void beaglebone_cape_setup(struct memory_accessor *mem_acc, void *context | ||
16 | |||
17 | beaglebone_leds_free = 0; | ||
18 | dvileds_init(0,0); | ||
19 | - beaglebone_spi1_free = 0; | ||
20 | - mcasp0_init(0,0); | ||
21 | + | ||
22 | + // Uncomment these for custom DVI capes with audio populated | ||
23 | + //beaglebone_spi1_free = 0; | ||
24 | + //mcasp0_init(0,0); | ||
25 | |||
26 | if (!strncmp("00A1", cape_config.version, 4) || !strncmp("000A", cape_config.version, 4)) { | ||
27 | pr_info("BeagleBone cape: DVI init for revision A1 or older\n"); | ||
28 | @@ -2923,6 +2925,32 @@ static void beaglebone_cape_setup(struct memory_accessor *mem_acc, void *context | ||
29 | dvi_init(0,0); | ||
30 | } | ||
31 | } | ||
32 | + | ||
33 | + if (!strncmp("BB-BONE-DVID-02", cape_config.partnumber, 15)) { | ||
34 | + pr_info("BeagleBone cape: initializing DVI+audio cape\n"); | ||
35 | + | ||
36 | + beaglebone_leds_free = 0; | ||
37 | + dvileds_init(0,0); | ||
38 | + | ||
39 | + beaglebone_spi1_free = 0; | ||
40 | + mcasp0_init(0,0); | ||
41 | + | ||
42 | + setup_pin_mux(dvia2_pin_mux); | ||
43 | + gpio_request(BEAGLEBONEDVI_PDn_A2, "DVI_PDn"); | ||
44 | + gpio_direction_output(BEAGLEBONEDVI_PDn_A2, 1); | ||
45 | + dvi_init(0,0); | ||
46 | + } | ||
47 | + | ||
48 | + if (!strncmp("BB-BONE-AUDI-01", cape_config.partnumber, 15)) { | ||
49 | + pr_info("BeagleBone cape: initializing audio cape\n"); | ||
50 | + | ||
51 | + beaglebone_leds_free = 0; | ||
52 | + dvileds_init(0,0); | ||
53 | + | ||
54 | + beaglebone_spi1_free = 0; | ||
55 | + mcasp0_init(0,0); | ||
56 | + } | ||
57 | + | ||
58 | if (!strncmp("BB-BONE-LCD7-01", cape_config.partnumber, 15)) { | ||
59 | pr_info("BeagleBone cape: initializing LCD cape\n"); | ||
60 | |||
61 | -- | ||
62 | 1.7.10 | ||
63 | |||
diff --git a/recipes-kernel/linux/linux-ti33x-psp-3.2/beaglebone/0075-beaglebone-disable-LBO-GPIO-for-battery-cape.patch b/recipes-kernel/linux/linux-ti33x-psp-3.2/beaglebone/0075-beaglebone-disable-LBO-GPIO-for-battery-cape.patch new file mode 100644 index 00000000..641db757 --- /dev/null +++ b/recipes-kernel/linux/linux-ti33x-psp-3.2/beaglebone/0075-beaglebone-disable-LBO-GPIO-for-battery-cape.patch | |||
@@ -0,0 +1,35 @@ | |||
1 | From 9332627ac6b70511742208d6fa7c7042c203f852 Mon Sep 17 00:00:00 2001 | ||
2 | From: Koen Kooi <koen@dominion.thruhere.net> | ||
3 | Date: Tue, 3 Jul 2012 21:28:44 +0200 | ||
4 | Subject: [PATCH 75/75] beaglebone: disable LBO GPIO for battery cape | ||
5 | |||
6 | Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> | ||
7 | --- | ||
8 | arch/arm/mach-omap2/board-am335xevm.c | 4 +++- | ||
9 | 1 file changed, 3 insertions(+), 1 deletion(-) | ||
10 | |||
11 | diff --git a/arch/arm/mach-omap2/board-am335xevm.c b/arch/arm/mach-omap2/board-am335xevm.c | ||
12 | index af75c88..7d6ac77 100644 | ||
13 | --- a/arch/arm/mach-omap2/board-am335xevm.c | ||
14 | +++ b/arch/arm/mach-omap2/board-am335xevm.c | ||
15 | @@ -2999,7 +2999,8 @@ static void beaglebone_cape_setup(struct memory_accessor *mem_acc, void *context | ||
16 | pr_info("BeagleBone cape: initializing battery cape\n"); | ||
17 | // gpio1_6, P9_15 lowbat output | ||
18 | // AIN4, P9_33 vbat | ||
19 | - setup_pin_mux(batterycape_pin_mux); | ||
20 | + /* LBO doesn't work, so disable it for now | ||
21 | + setup_pin_mux(batterycape_pin_mux); | ||
22 | #if defined(CONFIG_CHARGER_GPIO) | ||
23 | int err; | ||
24 | err = platform_device_register(&beaglebone_charger_device); | ||
25 | @@ -3007,6 +3008,7 @@ static void beaglebone_cape_setup(struct memory_accessor *mem_acc, void *context | ||
26 | pr_err("failed to register BeagleBone battery cape gpio\n"); | ||
27 | |||
28 | #endif | ||
29 | + */ | ||
30 | } | ||
31 | |||
32 | if (!strncmp("BB-BONE-SERL-01", cape_config.partnumber, 15)) { | ||
33 | -- | ||
34 | 1.7.10 | ||
35 | |||
diff --git a/recipes-kernel/linux/linux-ti33x-psp_3.2.bb b/recipes-kernel/linux/linux-ti33x-psp_3.2.bb index 95175cbb..01bfc233 100644 --- a/recipes-kernel/linux/linux-ti33x-psp_3.2.bb +++ b/recipes-kernel/linux/linux-ti33x-psp_3.2.bb | |||
@@ -15,7 +15,7 @@ PV = "${@base_contains('DISTRO_FEATURES', 'tipspkernel', "3.2", "3.2.21", d)}" | |||
15 | 15 | ||
16 | BRANCH = "v3.2-staging" | 16 | BRANCH = "v3.2-staging" |
17 | SRCREV = "720e07b4c1f687b61b147b31c698cb6816d72f01" | 17 | SRCREV = "720e07b4c1f687b61b147b31c698cb6816d72f01" |
18 | MACHINE_KERNEL_PR_append = "d+gitr${SRCREV}" | 18 | MACHINE_KERNEL_PR_append = "f+gitr${SRCREV}" |
19 | 19 | ||
20 | COMPATIBLE_MACHINE = "(ti33x)" | 20 | COMPATIBLE_MACHINE = "(ti33x)" |
21 | 21 | ||
@@ -1538,4 +1538,6 @@ PATCHES_OVER_PSP = " \ | |||
1538 | file://beaglebone/0071-beaglebone-fix-LCD3-led-key-overlap.patch \ | 1538 | file://beaglebone/0071-beaglebone-fix-LCD3-led-key-overlap.patch \ |
1539 | file://beaglebone/0072-beaglebone-fix-audio-spi-clash.patch \ | 1539 | file://beaglebone/0072-beaglebone-fix-audio-spi-clash.patch \ |
1540 | file://beaglebone/0073-beaglebone-add-support-for-QuickLogic-Camera-interfa.patch \ | 1540 | file://beaglebone/0073-beaglebone-add-support-for-QuickLogic-Camera-interfa.patch \ |
1541 | file://beaglebone/0074-beaglebone-add-support-for-DVI-audio-and-audio-only-.patch \ | ||
1542 | file://beaglebone/0075-beaglebone-disable-LBO-GPIO-for-battery-cape.patch \ | ||
1541 | " | 1543 | " |