summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKoen Kooi <koen@dominion.thruhere.net>2012-01-26 11:01:52 +0100
committerKoen Kooi <koen@dominion.thruhere.net>2012-01-26 11:01:52 +0100
commitec465d19cb4458e34f76011465e10406bdb101d6 (patch)
tree4cc0de10384c27827b4b08662979e7973b79d68a
parente10b485fe35e053c42648d40dcd57d13c91dd1b1 (diff)
downloadmeta-ti-ec465d19cb4458e34f76011465e10406bdb101d6.tar.gz
linux-ti33x-psp 3.1: fix beaglebone cape detection
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
-rw-r--r--recipes-kernel/linux/linux-ti33x-psp-3.1/0037-beaglebone-compare-complete-partnumber-not-the-first.patch45
-rw-r--r--recipes-kernel/linux/linux-ti33x-psp_3.1.bb3
2 files changed, 47 insertions, 1 deletions
diff --git a/recipes-kernel/linux/linux-ti33x-psp-3.1/0037-beaglebone-compare-complete-partnumber-not-the-first.patch b/recipes-kernel/linux/linux-ti33x-psp-3.1/0037-beaglebone-compare-complete-partnumber-not-the-first.patch
new file mode 100644
index 00000000..45168757
--- /dev/null
+++ b/recipes-kernel/linux/linux-ti33x-psp-3.1/0037-beaglebone-compare-complete-partnumber-not-the-first.patch
@@ -0,0 +1,45 @@
1From c97ae962c459f33b27800309b30f5ed8ebeba2c2 Mon Sep 17 00:00:00 2001
2From: Koen Kooi <koen@dominion.thruhere.net>
3Date: Thu, 26 Jan 2012 10:57:23 +0100
4Subject: [PATCH 37/37] beaglebone: compare complete partnumber, not the first 5 chars when detecting capes
5
6Otherwise it will init multiple capes when only one is present:
7
8[ 0.456913] BeagleBone cape EEPROM: found eeprom at address 0x56
9[ 0.456932] BeagleBone cape: Beagleboardtoys BeagleBone DVI-D CAPE
10[ 0.456948] BeagleBone cape partnumber: BB-BONE-DVID-01
11[ 0.456961] BeagleBone cape: initializing DVI cape
12[ 0.492772] BeagleBone cape: initializing LCD cape
13[ 0.502925] [<c0406e89>] (am33xx_register_lcdc+0xd/0x24) from [<c001c505>] (beaglebone_cape_setup+0x109/0x1dc)
14[ 0.502965] [<c001c505>] (beaglebone_cape_setup+0x109/0x1dc) from [<c0168b3b>] (at24_probe+0x2b3/0x34c)
15[ 0.503683] [<c0406e89>] (am33xx_register_lcdc+0xd/0x24) from [<c001c505>] (beaglebone_cape_setup+0x109/0x1dc)
16[ 0.503715] [<c001c505>] (beaglebone_cape_setup+0x109/0x1dc) from [<c0168b3b>] (at24_probe+0x2b3/0x34c)
17[ 0.509362] Failed to register Beagleboardtoys 7" LCD cape device
18[ 0.509390] BeagleBone cape: initializing LCD cape touchscreen
19
20Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
21---
22 arch/arm/mach-omap2/board-am335xevm.c | 4 ++--
23 1 files changed, 2 insertions(+), 2 deletions(-)
24
25diff --git a/arch/arm/mach-omap2/board-am335xevm.c b/arch/arm/mach-omap2/board-am335xevm.c
26index 6a0ace9..5c48d59 100644
27--- a/arch/arm/mach-omap2/board-am335xevm.c
28+++ b/arch/arm/mach-omap2/board-am335xevm.c
29@@ -1352,11 +1352,11 @@ static void beaglebone_cape_setup(struct memory_accessor *mem_acc, void *context
30 snprintf(tmp, sizeof(cape_config.partnumber) + 1, "%s", cape_config.partnumber);
31 pr_info("BeagleBone cape partnumber: %s\n", tmp);
32
33- if (!strncmp("BB-BONE-DVID-01", cape_config.partnumber, 5)) {
34+ if (!strncmp("BB-BONE-DVID-01", cape_config.partnumber, 15)) {
35 pr_info("BeagleBone cape: initializing DVI cape\n");
36 dvi_init(0,0);
37 }
38- if (!strncmp("BB-BONE-LCD7-01", cape_config.partnumber, 5)) {
39+ if (!strncmp("BB-BONE-LCD7-01", cape_config.partnumber, 15)) {
40 pr_info("BeagleBone cape: initializing LCD cape\n");
41 bbtoys7lcd_init(0,0);
42 pr_info("BeagleBone cape: initializing LCD cape touchscreen\n");
43--
441.7.2.5
45
diff --git a/recipes-kernel/linux/linux-ti33x-psp_3.1.bb b/recipes-kernel/linux/linux-ti33x-psp_3.1.bb
index 150a2823..84e5c3ba 100644
--- a/recipes-kernel/linux/linux-ti33x-psp_3.1.bb
+++ b/recipes-kernel/linux/linux-ti33x-psp_3.1.bb
@@ -11,7 +11,7 @@ MULTI_CONFIG_BASE_SUFFIX = ""
11 11
12BRANCH = "v3.1-meta-ti-r1r+gitr1d84d8853fa30cf3db2571a5aec572accca4e29d" 12BRANCH = "v3.1-meta-ti-r1r+gitr1d84d8853fa30cf3db2571a5aec572accca4e29d"
13SRCREV = "1d84d8853fa30cf3db2571a5aec572accca4e29d" 13SRCREV = "1d84d8853fa30cf3db2571a5aec572accca4e29d"
14MACHINE_KERNEL_PR_append = "j+gitr${SRCREV}" 14MACHINE_KERNEL_PR_append = "k+gitr${SRCREV}"
15 15
16COMPATIBLE_MACHINE = "(ti33x)" 16COMPATIBLE_MACHINE = "(ti33x)"
17 17
@@ -61,6 +61,7 @@ PATCHES_OVER_PSP = " \
61 file://0034-beaglebone-really-enable-i2c2-pullups-fixes-timeouts.patch \ 61 file://0034-beaglebone-really-enable-i2c2-pullups-fixes-timeouts.patch \
62 file://0035-beaglebone-add-structs-for-DVI-cape-LEDs.patch\ 62 file://0035-beaglebone-add-structs-for-DVI-cape-LEDs.patch\
63 file://0036-beaglebone-update-LCD-cape-partnumber.patch \ 63 file://0036-beaglebone-update-LCD-cape-partnumber.patch \
64 file://0037-beaglebone-compare-complete-partnumber-not-the-first.patch \
64 " 65 "
65 66
66SRC_URI += "${@base_contains('DISTRO_FEATURES', 'tipspkernel', "", "${PATCHES_OVER_PSP}", d)}" 67SRC_URI += "${@base_contains('DISTRO_FEATURES', 'tipspkernel', "", "${PATCHES_OVER_PSP}", d)}"