diff options
author | Koen Kooi <koen@dominion.thruhere.net> | 2012-04-17 14:47:44 +0200 |
---|---|---|
committer | Denys Dmytriyenko <denys@ti.com> | 2012-04-18 12:19:55 -0400 |
commit | 415f8b2c33cc3a7d2856fa0c6063f30fcbdad442 (patch) | |
tree | b5afd85c0c5a3510d2bf164cd30b7436742b9a86 | |
parent | 62e713b1b309e9e38e2de288da8470f10c61fbc3 (diff) | |
download | meta-ti-415f8b2c33cc3a7d2856fa0c6063f30fcbdad442.tar.gz |
linux-ti33x-psp 3.2: rebase onto latest PSP
This fixes most PM operations: cpufreq, cpuidle and suspend. Resume does not
work on beaglebone, but 3 out of 4 ain't bad :)
The M3 firmware needed for suspend/resume is used as a binary, building it
from source and including it from sysroots is planned for future commits.
Beaglebone patches have been forward ported and runtime tested.
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Signed-off-by: Denys Dmytriyenko <denys@ti.com>
51 files changed, 364 insertions, 519 deletions
diff --git a/conf/machine/include/ti33x.inc b/conf/machine/include/ti33x.inc index 1ede65c2..c5926a80 100644 --- a/conf/machine/include/ti33x.inc +++ b/conf/machine/include/ti33x.inc | |||
@@ -4,7 +4,7 @@ require conf/machine/include/soc-family.inc | |||
4 | require conf/machine/include/tune-cortexa8.inc | 4 | require conf/machine/include/tune-cortexa8.inc |
5 | PREFERRED_PROVIDER_virtual/kernel = "linux-ti33x-psp" | 5 | PREFERRED_PROVIDER_virtual/kernel = "linux-ti33x-psp" |
6 | # Increase this everytime you change something in the kernel | 6 | # Increase this everytime you change something in the kernel |
7 | MACHINE_KERNEL_PR = "r9" | 7 | MACHINE_KERNEL_PR = "r10" |
8 | 8 | ||
9 | KERNEL_IMAGETYPE = "uImage" | 9 | KERNEL_IMAGETYPE = "uImage" |
10 | 10 | ||
diff --git a/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.2/0113-I2C-OMAP-correct-SYSC-register-offset-for-OMAP4.patch b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.2/0113-I2C-OMAP-correct-SYSC-register-offset-for-OMAP4.patch deleted file mode 100644 index 3c2c1b4d..00000000 --- a/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.2/0113-I2C-OMAP-correct-SYSC-register-offset-for-OMAP4.patch +++ /dev/null | |||
@@ -1,34 +0,0 @@ | |||
1 | From f7455ca607fd743b247e01c51d4558ff4f4b0e23 Mon Sep 17 00:00:00 2001 | ||
2 | From: Alexander Aring <a.aring@phytec.de> | ||
3 | Date: Thu, 8 Dec 2011 15:43:53 +0100 | ||
4 | Subject: [PATCH 113/130] I2C: OMAP: correct SYSC register offset for OMAP4 | ||
5 | |||
6 | commit 2727b1753934e154931d6b3bdf20c9b2398457a2 upstream. | ||
7 | |||
8 | Correct OMAP_I2C_SYSC_REG offset in omap4 register map. | ||
9 | Offset 0x20 is reserved and OMAP_I2C_SYSC_REG has 0x10 as offset. | ||
10 | |||
11 | Signed-off-by: Alexander Aring <a.aring@phytec.de> | ||
12 | [khilman@ti.com: minor changelog edits] | ||
13 | Signed-off-by: Kevin Hilman <khilman@ti.com> | ||
14 | Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> | ||
15 | --- | ||
16 | drivers/i2c/busses/i2c-omap.c | 2 +- | ||
17 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
18 | |||
19 | diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c | ||
20 | index 82fff06..e0733b7 100644 | ||
21 | --- a/drivers/i2c/busses/i2c-omap.c | ||
22 | +++ b/drivers/i2c/busses/i2c-omap.c | ||
23 | @@ -235,7 +235,7 @@ static const u8 reg_map_ip_v2[] = { | ||
24 | [OMAP_I2C_BUF_REG] = 0x94, | ||
25 | [OMAP_I2C_CNT_REG] = 0x98, | ||
26 | [OMAP_I2C_DATA_REG] = 0x9c, | ||
27 | - [OMAP_I2C_SYSC_REG] = 0x20, | ||
28 | + [OMAP_I2C_SYSC_REG] = 0x10, | ||
29 | [OMAP_I2C_CON_REG] = 0xa4, | ||
30 | [OMAP_I2C_OA_REG] = 0xa8, | ||
31 | [OMAP_I2C_SA_REG] = 0xac, | ||
32 | -- | ||
33 | 1.7.9.4 | ||
34 | |||
diff --git a/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.2/0114-x86-UV2-Fix-new-UV2-hardware-by-using-native-UV2-bro.patch b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.2/0113-x86-UV2-Fix-new-UV2-hardware-by-using-native-UV2-bro.patch index bf54d90f..29557a49 100644 --- a/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.2/0114-x86-UV2-Fix-new-UV2-hardware-by-using-native-UV2-bro.patch +++ b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.2/0113-x86-UV2-Fix-new-UV2-hardware-by-using-native-UV2-bro.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 15259eb18bbb73a316954965e66a8a85a9e12635 Mon Sep 17 00:00:00 2001 | 1 | From ec2a416f6ce2e5b896074a6e8c86fda4d1d21466 Mon Sep 17 00:00:00 2001 |
2 | From: Cliff Wickman <cpw@sgi.com> | 2 | From: Cliff Wickman <cpw@sgi.com> |
3 | Date: Mon, 16 Jan 2012 15:17:50 -0600 | 3 | Date: Mon, 16 Jan 2012 15:17:50 -0600 |
4 | Subject: [PATCH 114/130] x86/UV2: Fix new UV2 hardware by using native UV2 | 4 | Subject: [PATCH 113/129] x86/UV2: Fix new UV2 hardware by using native UV2 |
5 | broadcast mode | 5 | broadcast mode |
6 | 6 | ||
7 | commit da87c937e5a2374686edd58df06cfd5050b125fa upstream. | 7 | commit da87c937e5a2374686edd58df06cfd5050b125fa upstream. |
@@ -346,5 +346,5 @@ index 5b55219..1341a2e 100644 | |||
346 | } | 346 | } |
347 | 347 | ||
348 | -- | 348 | -- |
349 | 1.7.9.4 | 349 | 1.7.9.5 |
350 | 350 | ||
diff --git a/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.2/0115-x86-UV2-Fix-BAU-destination-timeout-initialization.patch b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.2/0114-x86-UV2-Fix-BAU-destination-timeout-initialization.patch index aa154c94..a7502511 100644 --- a/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.2/0115-x86-UV2-Fix-BAU-destination-timeout-initialization.patch +++ b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.2/0114-x86-UV2-Fix-BAU-destination-timeout-initialization.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From b92c8d886296debcaf5af9cceb74f02bbce4d83d Mon Sep 17 00:00:00 2001 | 1 | From 0b3a1f5aefb71777fec89809de87c49b917a88e7 Mon Sep 17 00:00:00 2001 |
2 | From: Cliff Wickman <cpw@sgi.com> | 2 | From: Cliff Wickman <cpw@sgi.com> |
3 | Date: Mon, 16 Jan 2012 15:18:48 -0600 | 3 | Date: Mon, 16 Jan 2012 15:18:48 -0600 |
4 | Subject: [PATCH 115/130] x86/UV2: Fix BAU destination timeout initialization | 4 | Subject: [PATCH 114/129] x86/UV2: Fix BAU destination timeout initialization |
5 | 5 | ||
6 | commit d059f9fa84a30e04279c6ff615e9e2cf3b260191 upstream. | 6 | commit d059f9fa84a30e04279c6ff615e9e2cf3b260191 upstream. |
7 | 7 | ||
@@ -62,5 +62,5 @@ index 1341a2e..c425ff1 100644 | |||
62 | 62 | ||
63 | for_each_possible_blade(uvhub) { | 63 | for_each_possible_blade(uvhub) { |
64 | -- | 64 | -- |
65 | 1.7.9.4 | 65 | 1.7.9.5 |
66 | 66 | ||
diff --git a/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.2/0116-x86-UV2-Work-around-BAU-bug.patch b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.2/0115-x86-UV2-Work-around-BAU-bug.patch index 387d19e3..bfcab134 100644 --- a/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.2/0116-x86-UV2-Work-around-BAU-bug.patch +++ b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.2/0115-x86-UV2-Work-around-BAU-bug.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 67963c536b1b1f4304913ad0d1b32821510f690d Mon Sep 17 00:00:00 2001 | 1 | From d1eaa067ea8545101d57f6d484519722ee8c3783 Mon Sep 17 00:00:00 2001 |
2 | From: Cliff Wickman <cpw@sgi.com> | 2 | From: Cliff Wickman <cpw@sgi.com> |
3 | Date: Mon, 16 Jan 2012 15:19:47 -0600 | 3 | Date: Mon, 16 Jan 2012 15:19:47 -0600 |
4 | Subject: [PATCH 116/130] x86/UV2: Work around BAU bug | 4 | Subject: [PATCH 115/129] x86/UV2: Work around BAU bug |
5 | 5 | ||
6 | commit c5d35d399e685acccc85a675e8765c26b2a9813a upstream. | 6 | commit c5d35d399e685acccc85a675e8765c26b2a9813a upstream. |
7 | 7 | ||
@@ -566,5 +566,5 @@ index c425ff1..9010ca7 100644 | |||
566 | printk(KERN_EMERG "%d cpus per uvhub invalid\n", | 566 | printk(KERN_EMERG "%d cpus per uvhub invalid\n", |
567 | bcp->uvhub_cpu); | 567 | bcp->uvhub_cpu); |
568 | -- | 568 | -- |
569 | 1.7.9.4 | 569 | 1.7.9.5 |
570 | 570 | ||
diff --git a/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.2/0117-ath9k_hw-fix-interpretation-of-the-rx-KeyMiss-flag.patch b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.2/0116-ath9k_hw-fix-interpretation-of-the-rx-KeyMiss-flag.patch index b89b863e..bde74d7f 100644 --- a/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.2/0117-ath9k_hw-fix-interpretation-of-the-rx-KeyMiss-flag.patch +++ b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.2/0116-ath9k_hw-fix-interpretation-of-the-rx-KeyMiss-flag.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 414c945630702378c3477085517e8c24e2eb3a57 Mon Sep 17 00:00:00 2001 | 1 | From 28cfb4fe93728e07bee3b360682f3a4b2ca6f1f0 Mon Sep 17 00:00:00 2001 |
2 | From: Felix Fietkau <nbd@openwrt.org> | 2 | From: Felix Fietkau <nbd@openwrt.org> |
3 | Date: Sat, 14 Jan 2012 15:08:34 +0100 | 3 | Date: Sat, 14 Jan 2012 15:08:34 +0100 |
4 | Subject: [PATCH 117/130] ath9k_hw: fix interpretation of the rx KeyMiss flag | 4 | Subject: [PATCH 116/129] ath9k_hw: fix interpretation of the rx KeyMiss flag |
5 | 5 | ||
6 | commit 7a532fe7131216a02c81a6c1b1f8632da1195a58 upstream. | 6 | commit 7a532fe7131216a02c81a6c1b1f8632da1195a58 upstream. |
7 | 7 | ||
@@ -57,5 +57,5 @@ index ecdb6fd..bbcb777 100644 | |||
57 | } | 57 | } |
58 | EXPORT_SYMBOL(ath9k_hw_rxprocdesc); | 58 | EXPORT_SYMBOL(ath9k_hw_rxprocdesc); |
59 | -- | 59 | -- |
60 | 1.7.9.4 | 60 | 1.7.9.5 |
61 | 61 | ||
diff --git a/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.2/0118-rt2800pci-fix-spurious-interrupts-generation.patch b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.2/0117-rt2800pci-fix-spurious-interrupts-generation.patch index 526265b9..2911cede 100644 --- a/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.2/0118-rt2800pci-fix-spurious-interrupts-generation.patch +++ b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.2/0117-rt2800pci-fix-spurious-interrupts-generation.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 5feb9896b1fbfcb0ccd73789f3deeef7a53e19c4 Mon Sep 17 00:00:00 2001 | 1 | From 021083c5844b20210ced59ad5b760d2a7cb97cd2 Mon Sep 17 00:00:00 2001 |
2 | From: Stanislaw Gruszka <sgruszka@redhat.com> | 2 | From: Stanislaw Gruszka <sgruszka@redhat.com> |
3 | Date: Fri, 13 Jan 2012 12:59:32 +0100 | 3 | Date: Fri, 13 Jan 2012 12:59:32 +0100 |
4 | Subject: [PATCH 118/130] rt2800pci: fix spurious interrupts generation | 4 | Subject: [PATCH 117/129] rt2800pci: fix spurious interrupts generation |
5 | 5 | ||
6 | commit dfd00c4c8f3dfa1fd7cec45f83d98b2a49743dcd upstream. | 6 | commit dfd00c4c8f3dfa1fd7cec45f83d98b2a49743dcd upstream. |
7 | 7 | ||
@@ -82,5 +82,5 @@ index da48c8a..837b460 100644 | |||
82 | spin_unlock_irqrestore(&rt2x00dev->irqmask_lock, flags); | 82 | spin_unlock_irqrestore(&rt2x00dev->irqmask_lock, flags); |
83 | 83 | ||
84 | -- | 84 | -- |
85 | 1.7.9.4 | 85 | 1.7.9.5 |
86 | 86 | ||
diff --git a/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.2/0119-xfs-fix-endian-conversion-issue-in-discard-code.patch b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.2/0118-xfs-fix-endian-conversion-issue-in-discard-code.patch index 6a7583d6..fda910b7 100644 --- a/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.2/0119-xfs-fix-endian-conversion-issue-in-discard-code.patch +++ b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.2/0118-xfs-fix-endian-conversion-issue-in-discard-code.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From ddef510f3f47839e2c1c9498aba0ed5ef09fd792 Mon Sep 17 00:00:00 2001 | 1 | From 40713843ccb84ed06d4799763c3832376d6cd5cb Mon Sep 17 00:00:00 2001 |
2 | From: Dave Chinner <dchinner@redhat.com> | 2 | From: Dave Chinner <dchinner@redhat.com> |
3 | Date: Wed, 18 Jan 2012 14:41:45 -0600 | 3 | Date: Wed, 18 Jan 2012 14:41:45 -0600 |
4 | Subject: [PATCH 119/130] xfs: fix endian conversion issue in discard code | 4 | Subject: [PATCH 118/129] xfs: fix endian conversion issue in discard code |
5 | 5 | ||
6 | commit b1c770c273a4787069306fc82aab245e9ac72e9d upstream | 6 | commit b1c770c273a4787069306fc82aab245e9ac72e9d upstream |
7 | 7 | ||
@@ -41,5 +41,5 @@ index 8a24f0c..286a051 100644 | |||
41 | /* | 41 | /* |
42 | * Too small? Give up. | 42 | * Too small? Give up. |
43 | -- | 43 | -- |
44 | 1.7.9.4 | 44 | 1.7.9.5 |
45 | 45 | ||
diff --git a/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.2/0120-i2c-eg20t-modified-the-setting-of-transfer-rate.patch b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.2/0119-i2c-eg20t-modified-the-setting-of-transfer-rate.patch index c57ba9ca..839253c1 100644 --- a/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.2/0120-i2c-eg20t-modified-the-setting-of-transfer-rate.patch +++ b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.2/0119-i2c-eg20t-modified-the-setting-of-transfer-rate.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 8d6915d8e53d9b080f079af5891d109011c6b112 Mon Sep 17 00:00:00 2001 | 1 | From 072d0e473d1a1d4adc67a7d39be9f71fea4fadad Mon Sep 17 00:00:00 2001 |
2 | From: Toshiharu Okada <toshiharu-linux@dsn.okisemi.com> | 2 | From: Toshiharu Okada <toshiharu-linux@dsn.okisemi.com> |
3 | Date: Mon, 26 Sep 2011 16:16:23 +0900 | 3 | Date: Mon, 26 Sep 2011 16:16:23 +0900 |
4 | Subject: [PATCH 120/130] i2c-eg20t: modified the setting of transfer rate. | 4 | Subject: [PATCH 119/129] i2c-eg20t: modified the setting of transfer rate. |
5 | 5 | ||
6 | commit ff35e8b18984ad2a82cbd259fc07f0be4b34b1aa upstream. | 6 | commit ff35e8b18984ad2a82cbd259fc07f0be4b34b1aa upstream. |
7 | 7 | ||
@@ -29,5 +29,5 @@ index 18936ac..730215e 100644 | |||
29 | iowrite32(pch_i2cbc, p + PCH_I2CBC); | 29 | iowrite32(pch_i2cbc, p + PCH_I2CBC); |
30 | 30 | ||
31 | -- | 31 | -- |
32 | 1.7.9.4 | 32 | 1.7.9.5 |
33 | 33 | ||
diff --git a/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.2/0121-score-fix-off-by-one-index-into-syscall-table.patch b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.2/0120-score-fix-off-by-one-index-into-syscall-table.patch index 22208696..32a8d963 100644 --- a/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.2/0121-score-fix-off-by-one-index-into-syscall-table.patch +++ b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.2/0120-score-fix-off-by-one-index-into-syscall-table.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 9e5123c755ee15680df171b9b871533faa20bd70 Mon Sep 17 00:00:00 2001 | 1 | From 9ed6d95eba2ead578e1fa4e5be8cb16b185c8c97 Mon Sep 17 00:00:00 2001 |
2 | From: Dan Rosenberg <drosenberg@vsecurity.com> | 2 | From: Dan Rosenberg <drosenberg@vsecurity.com> |
3 | Date: Fri, 20 Jan 2012 14:34:27 -0800 | 3 | Date: Fri, 20 Jan 2012 14:34:27 -0800 |
4 | Subject: [PATCH 121/130] score: fix off-by-one index into syscall table | 4 | Subject: [PATCH 120/129] score: fix off-by-one index into syscall table |
5 | 5 | ||
6 | commit c25a785d6647984505fa165b5cd84cfc9a95970b upstream. | 6 | commit c25a785d6647984505fa165b5cd84cfc9a95970b upstream. |
7 | 7 | ||
@@ -42,5 +42,5 @@ index 577abba..83bb960 100644 | |||
42 | slli r8, r27, 2 # get syscall routine | 42 | slli r8, r27, 2 # get syscall routine |
43 | la r11, sys_call_table | 43 | la r11, sys_call_table |
44 | -- | 44 | -- |
45 | 1.7.9.4 | 45 | 1.7.9.5 |
46 | 46 | ||
diff --git a/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.2/0122-cifs-lower-default-wsize-when-unix-extensions-are-no.patch b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.2/0121-cifs-lower-default-wsize-when-unix-extensions-are-no.patch index 3f2abcef..fb4af96b 100644 --- a/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.2/0122-cifs-lower-default-wsize-when-unix-extensions-are-no.patch +++ b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.2/0121-cifs-lower-default-wsize-when-unix-extensions-are-no.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From bc39faacff1307f46e6e0738f9b73ec9e3f06dc9 Mon Sep 17 00:00:00 2001 | 1 | From ac9426f8233d76fd80412576fb53a26a7b1bd7ea Mon Sep 17 00:00:00 2001 |
2 | From: Jeff Layton <jlayton@redhat.com> | 2 | From: Jeff Layton <jlayton@redhat.com> |
3 | Date: Tue, 17 Jan 2012 16:08:51 -0500 | 3 | Date: Tue, 17 Jan 2012 16:08:51 -0500 |
4 | Subject: [PATCH 122/130] cifs: lower default wsize when unix extensions are | 4 | Subject: [PATCH 121/129] cifs: lower default wsize when unix extensions are |
5 | not used | 5 | not used |
6 | 6 | ||
7 | commit ce91acb3acae26f4163c5a6f1f695d1a1e8d9009 upstream. | 7 | commit ce91acb3acae26f4163c5a6f1f695d1a1e8d9009 upstream. |
@@ -63,5 +63,5 @@ index f3670cf..63e4be4 100644 | |||
63 | /* can server support 24-bit write sizes? (via UNIX extensions) */ | 63 | /* can server support 24-bit write sizes? (via UNIX extensions) */ |
64 | if (!tcon->unix_ext || !(unix_cap & CIFS_UNIX_LARGE_WRITE_CAP)) | 64 | if (!tcon->unix_ext || !(unix_cap & CIFS_UNIX_LARGE_WRITE_CAP)) |
65 | -- | 65 | -- |
66 | 1.7.9.4 | 66 | 1.7.9.5 |
67 | 67 | ||
diff --git a/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.2/0123-kprobes-initialize-before-using-a-hlist.patch b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.2/0122-kprobes-initialize-before-using-a-hlist.patch index e5167230..3d055c3c 100644 --- a/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.2/0123-kprobes-initialize-before-using-a-hlist.patch +++ b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.2/0122-kprobes-initialize-before-using-a-hlist.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 7e71cd56cf6675bb6ffebddbc6fae6cc1bc17d4d Mon Sep 17 00:00:00 2001 | 1 | From d159bea43eb9f0ba806a4ddc7e03dbb218b88136 Mon Sep 17 00:00:00 2001 |
2 | From: Ananth N Mavinakayanahalli <ananth@in.ibm.com> | 2 | From: Ananth N Mavinakayanahalli <ananth@in.ibm.com> |
3 | Date: Fri, 20 Jan 2012 14:34:04 -0800 | 3 | Date: Fri, 20 Jan 2012 14:34:04 -0800 |
4 | Subject: [PATCH 123/130] kprobes: initialize before using a hlist | 4 | Subject: [PATCH 122/129] kprobes: initialize before using a hlist |
5 | 5 | ||
6 | commit d496aab567e7e52b3e974c9192a5de6e77dce32c upstream. | 6 | commit d496aab567e7e52b3e974c9192a5de6e77dce32c upstream. |
7 | 7 | ||
@@ -45,5 +45,5 @@ index e5d8464..52fd049 100644 | |||
45 | hlist_del(&ri->hlist); | 45 | hlist_del(&ri->hlist); |
46 | kfree(ri); | 46 | kfree(ri); |
47 | -- | 47 | -- |
48 | 1.7.9.4 | 48 | 1.7.9.5 |
49 | 49 | ||
diff --git a/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.2/0124-proc-clear_refs-do-not-clear-reserved-pages.patch b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.2/0123-proc-clear_refs-do-not-clear-reserved-pages.patch index a4405c08..23678bde 100644 --- a/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.2/0124-proc-clear_refs-do-not-clear-reserved-pages.patch +++ b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.2/0123-proc-clear_refs-do-not-clear-reserved-pages.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 669ae9fcf0f482983eed166dd9edc06ce3e1f1e9 Mon Sep 17 00:00:00 2001 | 1 | From 1740c878a52dd4afc5b6e927d9b157d6db230184 Mon Sep 17 00:00:00 2001 |
2 | From: Will Deacon <will.deacon@arm.com> | 2 | From: Will Deacon <will.deacon@arm.com> |
3 | Date: Fri, 20 Jan 2012 14:34:09 -0800 | 3 | Date: Fri, 20 Jan 2012 14:34:09 -0800 |
4 | Subject: [PATCH 124/130] proc: clear_refs: do not clear reserved pages | 4 | Subject: [PATCH 123/129] proc: clear_refs: do not clear reserved pages |
5 | 5 | ||
6 | commit 85e72aa5384b1a614563ad63257ded0e91d1a620 upstream. | 6 | commit 85e72aa5384b1a614563ad63257ded0e91d1a620 upstream. |
7 | 7 | ||
@@ -60,5 +60,5 @@ index e418c5a..7dcd2a2 100644 | |||
60 | ptep_test_and_clear_young(vma, addr, pte); | 60 | ptep_test_and_clear_young(vma, addr, pte); |
61 | ClearPageReferenced(page); | 61 | ClearPageReferenced(page); |
62 | -- | 62 | -- |
63 | 1.7.9.4 | 63 | 1.7.9.5 |
64 | 64 | ||
diff --git a/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.2/0125-mm-fix-NULL-ptr-dereference-in-__count_immobile_page.patch b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.2/0124-mm-fix-NULL-ptr-dereference-in-__count_immobile_page.patch index 498a147c..ca05e3e3 100644 --- a/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.2/0125-mm-fix-NULL-ptr-dereference-in-__count_immobile_page.patch +++ b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.2/0124-mm-fix-NULL-ptr-dereference-in-__count_immobile_page.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From a59b11463ac1c9a0baf19cf3e713a6dd5c2e5509 Mon Sep 17 00:00:00 2001 | 1 | From ddcb13eadda3bcb23d81672ea705d6bfa313bbf8 Mon Sep 17 00:00:00 2001 |
2 | From: Michal Hocko <mhocko@suse.cz> | 2 | From: Michal Hocko <mhocko@suse.cz> |
3 | Date: Fri, 20 Jan 2012 14:33:55 -0800 | 3 | Date: Fri, 20 Jan 2012 14:33:55 -0800 |
4 | Subject: [PATCH 125/130] mm: fix NULL ptr dereference in | 4 | Subject: [PATCH 124/129] mm: fix NULL ptr dereference in |
5 | __count_immobile_pages | 5 | __count_immobile_pages |
6 | 6 | ||
7 | commit 687875fb7de4a95223af20ee024282fa9099f860 upstream. | 7 | commit 687875fb7de4a95223af20ee024282fa9099f860 upstream. |
@@ -87,5 +87,5 @@ index 2b8ba3a..485be89 100644 | |||
87 | } | 87 | } |
88 | 88 | ||
89 | -- | 89 | -- |
90 | 1.7.9.4 | 90 | 1.7.9.5 |
91 | 91 | ||
diff --git a/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.2/0126-iwlagn-check-for-SMPS-mode.patch b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.2/0125-iwlagn-check-for-SMPS-mode.patch index 1691f6a1..a3fffd51 100644 --- a/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.2/0126-iwlagn-check-for-SMPS-mode.patch +++ b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.2/0125-iwlagn-check-for-SMPS-mode.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 3a12635bc47f7e3cd83525ce9e6e98dd3c58b31a Mon Sep 17 00:00:00 2001 | 1 | From cd3b4541cb6b11e119007268e0890a1a38e68f8e Mon Sep 17 00:00:00 2001 |
2 | From: Wey-Yi Guy <wey-yi.w.guy@intel.com> | 2 | From: Wey-Yi Guy <wey-yi.w.guy@intel.com> |
3 | Date: Thu, 10 Nov 2011 06:55:04 -0800 | 3 | Date: Thu, 10 Nov 2011 06:55:04 -0800 |
4 | Subject: [PATCH 126/130] iwlagn: check for SMPS mode | 4 | Subject: [PATCH 125/129] iwlagn: check for SMPS mode |
5 | 5 | ||
6 | commit b2ccccdca46273c7b321ecf5041c362cd950da20 upstream. | 6 | commit b2ccccdca46273c7b321ecf5041c362cd950da20 upstream. |
7 | 7 | ||
@@ -46,5 +46,5 @@ index 5c7c17c..d552fa3 100644 | |||
46 | IWL_DEBUG_MAC80211(priv, "leave - scanning\n"); | 46 | IWL_DEBUG_MAC80211(priv, "leave - scanning\n"); |
47 | goto out; | 47 | goto out; |
48 | -- | 48 | -- |
49 | 1.7.9.4 | 49 | 1.7.9.5 |
50 | 50 | ||
diff --git a/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.2/0127-iwlegacy-3945-fix-hw-passive-scan-on-radar-channels.patch b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.2/0126-iwlegacy-3945-fix-hw-passive-scan-on-radar-channels.patch index 03ec19d1..7cbd3d8d 100644 --- a/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.2/0127-iwlegacy-3945-fix-hw-passive-scan-on-radar-channels.patch +++ b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.2/0126-iwlegacy-3945-fix-hw-passive-scan-on-radar-channels.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 5be98e8ad61eb5fb868590255329e30408707c1b Mon Sep 17 00:00:00 2001 | 1 | From 98214e3fab80dbfdf54c908de2ae0c9730d6430d Mon Sep 17 00:00:00 2001 |
2 | From: Stanislaw Gruszka <sgruszka@redhat.com> | 2 | From: Stanislaw Gruszka <sgruszka@redhat.com> |
3 | Date: Fri, 23 Dec 2011 08:13:50 +0100 | 3 | Date: Fri, 23 Dec 2011 08:13:50 +0100 |
4 | Subject: [PATCH 127/130] iwlegacy: 3945: fix hw passive scan on radar | 4 | Subject: [PATCH 126/129] iwlegacy: 3945: fix hw passive scan on radar |
5 | channels | 5 | channels |
6 | 6 | ||
7 | commit 68acc4afb040d98ddfd2cae0de09e2f4e1ee127f upstream. | 7 | commit 68acc4afb040d98ddfd2cae0de09e2f4e1ee127f upstream. |
@@ -56,5 +56,5 @@ index b282d86..05f2ad1 100644 | |||
56 | len = iwl_legacy_fill_probe_req(priv, (struct ieee80211_mgmt *)scan->data, | 56 | len = iwl_legacy_fill_probe_req(priv, (struct ieee80211_mgmt *)scan->data, |
57 | vif->addr, priv->scan_request->ie, | 57 | vif->addr, priv->scan_request->ie, |
58 | -- | 58 | -- |
59 | 1.7.9.4 | 59 | 1.7.9.5 |
60 | 60 | ||
diff --git a/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.2/0128-SHM_UNLOCK-fix-long-unpreemptible-section.patch b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.2/0127-SHM_UNLOCK-fix-long-unpreemptible-section.patch index d2eb914e..3731f657 100644 --- a/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.2/0128-SHM_UNLOCK-fix-long-unpreemptible-section.patch +++ b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.2/0127-SHM_UNLOCK-fix-long-unpreemptible-section.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 1d36f35b70322d93b6ed8e39ef38fdd9a895962e Mon Sep 17 00:00:00 2001 | 1 | From 5e2208d9c6ce1c5e57ad5fe56adc5b8f349ce23a Mon Sep 17 00:00:00 2001 |
2 | From: Hugh Dickins <hughd@google.com> | 2 | From: Hugh Dickins <hughd@google.com> |
3 | Date: Fri, 20 Jan 2012 14:34:19 -0800 | 3 | Date: Fri, 20 Jan 2012 14:34:19 -0800 |
4 | Subject: [PATCH 128/130] SHM_UNLOCK: fix long unpreemptible section | 4 | Subject: [PATCH 127/129] SHM_UNLOCK: fix long unpreemptible section |
5 | 5 | ||
6 | commit 85046579bde15e532983438f86b36856e358f417 upstream. | 6 | commit 85046579bde15e532983438f86b36856e358f417 upstream. |
7 | 7 | ||
@@ -118,7 +118,7 @@ index 02ecf2c..854ab58 100644 | |||
118 | } | 118 | } |
119 | case IPC_RMID: | 119 | case IPC_RMID: |
120 | diff --git a/mm/shmem.c b/mm/shmem.c | 120 | diff --git a/mm/shmem.c b/mm/shmem.c |
121 | index d672250..cc6d40b2 100644 | 121 | index d6722506..cc6d40b2 100644 |
122 | --- a/mm/shmem.c | 122 | --- a/mm/shmem.c |
123 | +++ b/mm/shmem.c | 123 | +++ b/mm/shmem.c |
124 | @@ -1068,13 +1068,6 @@ int shmem_lock(struct file *file, int lock, struct user_struct *user) | 124 | @@ -1068,13 +1068,6 @@ int shmem_lock(struct file *file, int lock, struct user_struct *user) |
@@ -182,5 +182,5 @@ index f54a05b..824676a 100644 | |||
182 | static void warn_scan_unevictable_pages(void) | 182 | static void warn_scan_unevictable_pages(void) |
183 | { | 183 | { |
184 | -- | 184 | -- |
185 | 1.7.9.4 | 185 | 1.7.9.5 |
186 | 186 | ||
diff --git a/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.2/0129-SHM_UNLOCK-fix-Unevictable-pages-stranded-after-swap.patch b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.2/0128-SHM_UNLOCK-fix-Unevictable-pages-stranded-after-swap.patch index 9371b39b..e7adafc9 100644 --- a/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.2/0129-SHM_UNLOCK-fix-Unevictable-pages-stranded-after-swap.patch +++ b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.2/0128-SHM_UNLOCK-fix-Unevictable-pages-stranded-after-swap.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From ab3abbd7cc331621031a1c603fc6be86c5a72430 Mon Sep 17 00:00:00 2001 | 1 | From 8704b3941de0865d7c11921ee2dd7abbc04a0081 Mon Sep 17 00:00:00 2001 |
2 | From: Hugh Dickins <hughd@google.com> | 2 | From: Hugh Dickins <hughd@google.com> |
3 | Date: Fri, 20 Jan 2012 14:34:21 -0800 | 3 | Date: Fri, 20 Jan 2012 14:34:21 -0800 |
4 | Subject: [PATCH 129/130] SHM_UNLOCK: fix Unevictable pages stranded after | 4 | Subject: [PATCH 128/129] SHM_UNLOCK: fix Unevictable pages stranded after |
5 | swap | 5 | swap |
6 | 6 | ||
7 | commit 245132643e1cfcd145bbc86a716c1818371fcb93 upstream. | 7 | commit 245132643e1cfcd145bbc86a716c1818371fcb93 upstream. |
@@ -338,5 +338,5 @@ index 824676a..cb33d9c 100644 | |||
338 | 338 | ||
339 | static void warn_scan_unevictable_pages(void) | 339 | static void warn_scan_unevictable_pages(void) |
340 | -- | 340 | -- |
341 | 1.7.9.4 | 341 | 1.7.9.5 |
342 | 342 | ||
diff --git a/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.2/0130-Linux-3.2.2.patch b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.2/0129-Linux-3.2.2.patch index 4b7bd534..f4e3ff56 100644 --- a/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.2/0130-Linux-3.2.2.patch +++ b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.2/0129-Linux-3.2.2.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 43a16c537c58047f07f1700cb0b15982ab68c6b8 Mon Sep 17 00:00:00 2001 | 1 | From 8e03b0ed729407fef72578c24148208a079e7f2c Mon Sep 17 00:00:00 2001 |
2 | From: Greg Kroah-Hartman <gregkh@suse.de> | 2 | From: Greg Kroah-Hartman <gregkh@suse.de> |
3 | Date: Wed, 25 Jan 2012 16:39:32 -0800 | 3 | Date: Wed, 25 Jan 2012 16:39:32 -0800 |
4 | Subject: [PATCH 130/130] Linux 3.2.2 | 4 | Subject: [PATCH 129/129] Linux 3.2.2 |
5 | 5 | ||
6 | --- | 6 | --- |
7 | Makefile | 2 +- | 7 | Makefile | 2 +- |
@@ -20,5 +20,5 @@ index c5edffa..2f684da 100644 | |||
20 | NAME = Saber-toothed Squirrel | 20 | NAME = Saber-toothed Squirrel |
21 | 21 | ||
22 | -- | 22 | -- |
23 | 1.7.9.4 | 23 | 1.7.9.5 |
24 | 24 | ||
diff --git a/recipes-kernel/linux/linux-ti33x-psp-3.2/am335x-pm-firmware.bin b/recipes-kernel/linux/linux-ti33x-psp-3.2/am335x-pm-firmware.bin new file mode 100644 index 00000000..571d377d --- /dev/null +++ b/recipes-kernel/linux/linux-ti33x-psp-3.2/am335x-pm-firmware.bin | |||
Binary files differ | |||
diff --git a/recipes-kernel/linux/linux-ti33x-psp-3.2/beaglebone/0001-f_rndis-HACK-around-undefined-variables.patch b/recipes-kernel/linux/linux-ti33x-psp-3.2/beaglebone/0001-f_rndis-HACK-around-undefined-variables.patch index 99ab48f7..6676539f 100644 --- a/recipes-kernel/linux/linux-ti33x-psp-3.2/beaglebone/0001-f_rndis-HACK-around-undefined-variables.patch +++ b/recipes-kernel/linux/linux-ti33x-psp-3.2/beaglebone/0001-f_rndis-HACK-around-undefined-variables.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From d325c3f83e6f42536678dbf317f1bbf0e3f8efc7 Mon Sep 17 00:00:00 2001 | 1 | From 0a4a06fdba20b76d03dde619a4dec0e88cdad6c3 Mon Sep 17 00:00:00 2001 |
2 | From: Koen Kooi <koen@dominion.thruhere.net> | 2 | From: Koen Kooi <koen@dominion.thruhere.net> |
3 | Date: Fri, 7 Oct 2011 15:29:28 +0200 | 3 | Date: Fri, 7 Oct 2011 15:29:28 +0200 |
4 | Subject: [PATCH 01/22] f_rndis: HACK around undefined variables | 4 | Subject: [PATCH 01/26] f_rndis: HACK around undefined variables |
5 | 5 | ||
6 | Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> | 6 | Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> |
7 | --- | 7 | --- |
@@ -27,5 +27,5 @@ index 6614490..d2f1b6f 100644 | |||
27 | * the network link ... which is unavailable to this code | 27 | * the network link ... which is unavailable to this code |
28 | * until we're activated via set_alt(). | 28 | * until we're activated via set_alt(). |
29 | -- | 29 | -- |
30 | 1.7.9.4 | 30 | 1.7.9.5 |
31 | 31 | ||
diff --git a/recipes-kernel/linux/linux-ti33x-psp-3.2/beaglebone/0002-da8xx-fb-add-DVI-support-for-beaglebone.patch b/recipes-kernel/linux/linux-ti33x-psp-3.2/beaglebone/0002-da8xx-fb-add-DVI-support-for-beaglebone.patch index 1cc88e44..23b7aaf5 100644 --- a/recipes-kernel/linux/linux-ti33x-psp-3.2/beaglebone/0002-da8xx-fb-add-DVI-support-for-beaglebone.patch +++ b/recipes-kernel/linux/linux-ti33x-psp-3.2/beaglebone/0002-da8xx-fb-add-DVI-support-for-beaglebone.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 94e7b8b9535e83ad46a523bb5020bd9fdb352f54 Mon Sep 17 00:00:00 2001 | 1 | From a89b2d3cdef2af0baa57f31da5e39537d22c247c Mon Sep 17 00:00:00 2001 |
2 | From: Koen Kooi <koen@dominion.thruhere.net> | 2 | From: Koen Kooi <koen@dominion.thruhere.net> |
3 | Date: Thu, 3 Nov 2011 17:35:50 +0100 | 3 | Date: Thu, 3 Nov 2011 17:35:50 +0100 |
4 | Subject: [PATCH 02/22] da8xx-fb: add DVI support for beaglebone | 4 | Subject: [PATCH 02/26] da8xx-fb: add DVI support for beaglebone |
5 | 5 | ||
6 | Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> | 6 | Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> |
7 | --- | 7 | --- |
@@ -9,10 +9,10 @@ Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> | |||
9 | 1 file changed, 14 insertions(+) | 9 | 1 file changed, 14 insertions(+) |
10 | 10 | ||
11 | diff --git a/drivers/video/da8xx-fb.c b/drivers/video/da8xx-fb.c | 11 | diff --git a/drivers/video/da8xx-fb.c b/drivers/video/da8xx-fb.c |
12 | index 85eda33..dea8936 100644 | 12 | index 2e69278..b01f15b 100644 |
13 | --- a/drivers/video/da8xx-fb.c | 13 | --- a/drivers/video/da8xx-fb.c |
14 | +++ b/drivers/video/da8xx-fb.c | 14 | +++ b/drivers/video/da8xx-fb.c |
15 | @@ -271,6 +271,20 @@ static struct da8xx_panel known_lcd_panels[] = { | 15 | @@ -272,6 +272,20 @@ static struct da8xx_panel known_lcd_panels[] = { |
16 | .pxl_clk = 30000000, | 16 | .pxl_clk = 30000000, |
17 | .invert_pxl_clk = 0, | 17 | .invert_pxl_clk = 0, |
18 | }, | 18 | }, |
@@ -34,5 +34,5 @@ index 85eda33..dea8936 100644 | |||
34 | 34 | ||
35 | /* Enable the Raster Engine of the LCD Controller */ | 35 | /* Enable the Raster Engine of the LCD Controller */ |
36 | -- | 36 | -- |
37 | 1.7.9.4 | 37 | 1.7.9.5 |
38 | 38 | ||
diff --git a/recipes-kernel/linux/linux-ti33x-psp-3.2/beaglebone/0003-beaglebone-rebase-everything-onto-3.2-WARNING-MEGAPA.patch b/recipes-kernel/linux/linux-ti33x-psp-3.2/beaglebone/0003-beaglebone-rebase-everything-onto-3.2-WARNING-MEGAPA.patch index c5b1ce0d..4b682c5c 100644 --- a/recipes-kernel/linux/linux-ti33x-psp-3.2/beaglebone/0003-beaglebone-rebase-everything-onto-3.2-WARNING-MEGAPA.patch +++ b/recipes-kernel/linux/linux-ti33x-psp-3.2/beaglebone/0003-beaglebone-rebase-everything-onto-3.2-WARNING-MEGAPA.patch | |||
@@ -1,15 +1,16 @@ | |||
1 | From 839c23bffe07e2c955904ce3e9e3c776c1b2f88b Mon Sep 17 00:00:00 2001 | 1 | From 5b5413023290ed7f79ef3018eeee046c7736d7d0 Mon Sep 17 00:00:00 2001 |
2 | From: Koen Kooi <koen@dominion.thruhere.net> | 2 | From: Koen Kooi <koen@dominion.thruhere.net> |
3 | Date: Mon, 30 Jan 2012 21:30:09 +0100 | 3 | Date: Mon, 30 Jan 2012 21:30:09 +0100 |
4 | Subject: [PATCH 03/22] beaglebone: rebase everything onto 3.2 - WARNING | 4 | Subject: [PATCH 03/26] beaglebone: rebase everything onto 3.2 - WARNING |
5 | MEGAPATCH | 5 | MEGAPATCH |
6 | 6 | ||
7 | Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> | ||
7 | --- | 8 | --- |
8 | arch/arm/mach-omap2/board-am335xevm.c | 425 ++++++++++++++++++++++++++++++++- | 9 | arch/arm/mach-omap2/board-am335xevm.c | 426 ++++++++++++++++++++++++++++++++- |
9 | 1 file changed, 414 insertions(+), 11 deletions(-) | 10 | 1 file changed, 415 insertions(+), 11 deletions(-) |
10 | 11 | ||
11 | diff --git a/arch/arm/mach-omap2/board-am335xevm.c b/arch/arm/mach-omap2/board-am335xevm.c | 12 | diff --git a/arch/arm/mach-omap2/board-am335xevm.c b/arch/arm/mach-omap2/board-am335xevm.c |
12 | index 8aa7e10..e0c20c5 100644 | 13 | index 70aa3a9..12a269f 100644 |
13 | --- a/arch/arm/mach-omap2/board-am335xevm.c | 14 | --- a/arch/arm/mach-omap2/board-am335xevm.c |
14 | +++ b/arch/arm/mach-omap2/board-am335xevm.c | 15 | +++ b/arch/arm/mach-omap2/board-am335xevm.c |
15 | @@ -19,6 +19,7 @@ | 16 | @@ -19,6 +19,7 @@ |
@@ -20,7 +21,15 @@ index 8aa7e10..e0c20c5 100644 | |||
20 | #include <linux/spi/spi.h> | 21 | #include <linux/spi/spi.h> |
21 | #include <linux/spi/flash.h> | 22 | #include <linux/spi/flash.h> |
22 | #include <linux/gpio_keys.h> | 23 | #include <linux/gpio_keys.h> |
23 | @@ -167,6 +168,66 @@ struct da8xx_lcdc_platform_data TFC_S9700RTWV35TR_01B_pdata = { | 24 | @@ -35,7 +36,6 @@ |
25 | #include <linux/mfd/tps65910.h> | ||
26 | #include <linux/mfd/tps65217.h> | ||
27 | #include <linux/pwm_backlight.h> | ||
28 | -#include <linux/input/ti_tscadc.h> | ||
29 | #include <linux/reboot.h> | ||
30 | #include <linux/pwm/pwm.h> | ||
31 | |||
32 | @@ -172,6 +172,68 @@ struct da8xx_lcdc_platform_data TFC_S9700RTWV35TR_01B_pdata = { | ||
24 | 33 | ||
25 | #include "common.h" | 34 | #include "common.h" |
26 | 35 | ||
@@ -84,14 +93,15 @@ index 8aa7e10..e0c20c5 100644 | |||
84 | + .type = "1024x768@60", | 93 | + .type = "1024x768@60", |
85 | +}; | 94 | +}; |
86 | + | 95 | + |
87 | /* TSc controller */ | 96 | +/* TSc controller */ |
88 | #include <linux/input/ti_tscadc.h> | 97 | +#include <linux/input/ti_tscadc.h> |
89 | #include <linux/lis3lv02d.h> | 98 | #include <linux/lis3lv02d.h> |
90 | @@ -320,9 +381,34 @@ struct am335x_evm_eeprom_config { | 99 | |
91 | static struct am335x_evm_eeprom_config config; | 100 | /* TSc controller */ |
101 | @@ -340,9 +402,34 @@ static struct am335x_evm_eeprom_config config; | ||
102 | static struct am335x_eeprom_config1 config1; | ||
92 | static bool daughter_brd_detected; | 103 | static bool daughter_brd_detected; |
93 | 104 | ||
94 | -#define GP_EVM_REV_IS_1_0 0x1 | ||
95 | +struct beaglebone_cape_eeprom_config { | 105 | +struct beaglebone_cape_eeprom_config { |
96 | + u32 header; | 106 | + u32 header; |
97 | + char format_revision[2]; | 107 | + char format_revision[2]; |
@@ -116,14 +126,14 @@ index 8aa7e10..e0c20c5 100644 | |||
116 | +static bool beaglebone_tsadcpins_free = 1; | 126 | +static bool beaglebone_tsadcpins_free = 1; |
117 | + | 127 | + |
118 | + | 128 | + |
119 | +#define GP_EVM_REV_IS_1_0A 0x1 | 129 | #define GP_EVM_REV_IS_1_0 0x1 |
120 | #define GP_EVM_REV_IS_1_1A 0x2 | 130 | #define GP_EVM_REV_IS_1_1A 0x2 |
121 | #define GP_EVM_REV_IS_UNKNOWN 0xFF | 131 | #define GP_EVM_REV_IS_UNKNOWN 0xFF |
122 | +#define GP_EVM_ACTUALLY_BEAGLEBONE 0xBB | 132 | +#define GP_EVM_ACTUALLY_BEAGLEBONE 0xBB |
123 | static unsigned int gp_evm_revision = GP_EVM_REV_IS_UNKNOWN; | 133 | static unsigned int gp_evm_revision = GP_EVM_REV_IS_UNKNOWN; |
124 | unsigned int gigabit_enable = 1; | ||
125 | 134 | ||
126 | @@ -404,11 +490,102 @@ static struct pinmux_config lcdc_pin_mux[] = { | 135 | unsigned int gigabit_enable = 1; |
136 | @@ -425,11 +512,102 @@ static struct pinmux_config lcdc_pin_mux[] = { | ||
127 | {NULL, 0}, | 137 | {NULL, 0}, |
128 | }; | 138 | }; |
129 | 139 | ||
@@ -226,7 +236,7 @@ index 8aa7e10..e0c20c5 100644 | |||
226 | {"vrefp.vrefp", OMAP_MUX_MODE0 | AM33XX_INPUT_EN}, | 236 | {"vrefp.vrefp", OMAP_MUX_MODE0 | AM33XX_INPUT_EN}, |
227 | {"vrefn.vrefn", OMAP_MUX_MODE0 | AM33XX_INPUT_EN}, | 237 | {"vrefn.vrefn", OMAP_MUX_MODE0 | AM33XX_INPUT_EN}, |
228 | {NULL, 0}, | 238 | {NULL, 0}, |
229 | @@ -543,9 +720,9 @@ static struct pinmux_config i2c1_pin_mux[] = { | 239 | @@ -564,9 +742,9 @@ static struct pinmux_config i2c1_pin_mux[] = { |
230 | 240 | ||
231 | static struct pinmux_config i2c2_pin_mux[] = { | 241 | static struct pinmux_config i2c2_pin_mux[] = { |
232 | {"uart1_ctsn.i2c2_sda", OMAP_MUX_MODE3 | AM33XX_SLEWCTRL_SLOW | | 242 | {"uart1_ctsn.i2c2_sda", OMAP_MUX_MODE3 | AM33XX_SLEWCTRL_SLOW | |
@@ -238,7 +248,7 @@ index 8aa7e10..e0c20c5 100644 | |||
238 | {NULL, 0}, | 248 | {NULL, 0}, |
239 | }; | 249 | }; |
240 | 250 | ||
241 | @@ -823,6 +1000,64 @@ static struct pinmux_config profibus_pin_mux[] = { | 251 | @@ -844,6 +1022,64 @@ static struct pinmux_config profibus_pin_mux[] = { |
242 | {NULL, 0}, | 252 | {NULL, 0}, |
243 | }; | 253 | }; |
244 | 254 | ||
@@ -303,7 +313,7 @@ index 8aa7e10..e0c20c5 100644 | |||
303 | /* Module pin mux for eCAP0 */ | 313 | /* Module pin mux for eCAP0 */ |
304 | static struct pinmux_config ecap0_pin_mux[] = { | 314 | static struct pinmux_config ecap0_pin_mux[] = { |
305 | {"ecap0_in_pwm0_out.ecap0_in_pwm0_out", | 315 | {"ecap0_in_pwm0_out.ecap0_in_pwm0_out", |
306 | @@ -932,6 +1167,51 @@ static void lcdc_init(int evm_id, int profile) | 316 | @@ -966,6 +1202,51 @@ static void lcdc_init(int evm_id, int profile) |
307 | return; | 317 | return; |
308 | } | 318 | } |
309 | 319 | ||
@@ -355,7 +365,7 @@ index 8aa7e10..e0c20c5 100644 | |||
355 | static void tsc_init(int evm_id, int profile) | 365 | static void tsc_init(int evm_id, int profile) |
356 | { | 366 | { |
357 | int err; | 367 | int err; |
358 | @@ -939,16 +1219,48 @@ static void tsc_init(int evm_id, int profile) | 368 | @@ -973,10 +1254,15 @@ static void tsc_init(int evm_id, int profile) |
359 | if (gp_evm_revision == GP_EVM_REV_IS_1_1A) { | 369 | if (gp_evm_revision == GP_EVM_REV_IS_1_1A) { |
360 | am335x_touchscreen_data.analog_input = 1; | 370 | am335x_touchscreen_data.analog_input = 1; |
361 | pr_info("TSC connected to beta GP EVM\n"); | 371 | pr_info("TSC connected to beta GP EVM\n"); |
@@ -370,8 +380,9 @@ index 8aa7e10..e0c20c5 100644 | |||
370 | + pr_info("TSC connected to BeagleBone\n");; | 380 | + pr_info("TSC connected to BeagleBone\n");; |
371 | + } | 381 | + } |
372 | setup_pin_mux(tsc_pin_mux); | 382 | setup_pin_mux(tsc_pin_mux); |
373 | err = platform_device_register(&tsc_device); | 383 | |
374 | if (err) | 384 | err = am33xx_register_tsc(&am335x_touchscreen_data); |
385 | @@ -984,6 +1270,33 @@ static void tsc_init(int evm_id, int profile) | ||
375 | pr_err("failed to register touchscreen device\n"); | 386 | pr_err("failed to register touchscreen device\n"); |
376 | } | 387 | } |
377 | 388 | ||
@@ -379,7 +390,7 @@ index 8aa7e10..e0c20c5 100644 | |||
379 | +{ | 390 | +{ |
380 | + int err; | 391 | + int err; |
381 | + setup_pin_mux(tsc_pin_mux); | 392 | + setup_pin_mux(tsc_pin_mux); |
382 | + err = platform_device_register(&bone_tsc_device); | 393 | + err = am33xx_register_tsc(&bone_touchscreen_data); |
383 | + if (err) | 394 | + if (err) |
384 | + pr_err("failed to register touchscreen device\n"); | 395 | + pr_err("failed to register touchscreen device\n"); |
385 | +} | 396 | +} |
@@ -405,7 +416,7 @@ index 8aa7e10..e0c20c5 100644 | |||
405 | static void rgmii1_init(int evm_id, int profile) | 416 | static void rgmii1_init(int evm_id, int profile) |
406 | { | 417 | { |
407 | setup_pin_mux(rgmii1_pin_mux); | 418 | setup_pin_mux(rgmii1_pin_mux); |
408 | @@ -1358,18 +1670,106 @@ static void i2c1_init(int evm_id, int profile) | 419 | @@ -1429,18 +1742,106 @@ static void i2c1_init(int evm_id, int profile) |
409 | return; | 420 | return; |
410 | } | 421 | } |
411 | 422 | ||
@@ -517,7 +528,7 @@ index 8aa7e10..e0c20c5 100644 | |||
517 | /* Setup McASP 1 */ | 528 | /* Setup McASP 1 */ |
518 | static void mcasp1_init(int evm_id, int profile) | 529 | static void mcasp1_init(int evm_id, int profile) |
519 | { | 530 | { |
520 | @@ -1723,8 +2123,9 @@ static struct evm_dev_cfg beaglebone_old_dev_cfg[] = { | 531 | @@ -1794,8 +2195,9 @@ static struct evm_dev_cfg beaglebone_old_dev_cfg[] = { |
521 | {rmii1_init, DEV_ON_BASEBOARD, PROFILE_NONE}, | 532 | {rmii1_init, DEV_ON_BASEBOARD, PROFILE_NONE}, |
522 | {usb0_init, DEV_ON_BASEBOARD, PROFILE_NONE}, | 533 | {usb0_init, DEV_ON_BASEBOARD, PROFILE_NONE}, |
523 | {usb1_init, DEV_ON_BASEBOARD, PROFILE_NONE}, | 534 | {usb1_init, DEV_ON_BASEBOARD, PROFILE_NONE}, |
@@ -528,7 +539,7 @@ index 8aa7e10..e0c20c5 100644 | |||
528 | {NULL, 0, 0}, | 539 | {NULL, 0, 0}, |
529 | }; | 540 | }; |
530 | 541 | ||
531 | @@ -1734,8 +2135,9 @@ static struct evm_dev_cfg beaglebone_dev_cfg[] = { | 542 | @@ -1805,8 +2207,9 @@ static struct evm_dev_cfg beaglebone_dev_cfg[] = { |
532 | {mii1_init, DEV_ON_BASEBOARD, PROFILE_NONE}, | 543 | {mii1_init, DEV_ON_BASEBOARD, PROFILE_NONE}, |
533 | {usb0_init, DEV_ON_BASEBOARD, PROFILE_NONE}, | 544 | {usb0_init, DEV_ON_BASEBOARD, PROFILE_NONE}, |
534 | {usb1_init, DEV_ON_BASEBOARD, PROFILE_NONE}, | 545 | {usb1_init, DEV_ON_BASEBOARD, PROFILE_NONE}, |
@@ -539,7 +550,7 @@ index 8aa7e10..e0c20c5 100644 | |||
539 | {NULL, 0, 0}, | 550 | {NULL, 0, 0}, |
540 | }; | 551 | }; |
541 | 552 | ||
542 | @@ -1822,6 +2224,7 @@ static void setup_beaglebone_old(void) | 553 | @@ -1893,6 +2296,7 @@ static void setup_beaglebone_old(void) |
543 | static void setup_beaglebone(void) | 554 | static void setup_beaglebone(void) |
544 | { | 555 | { |
545 | pr_info("The board is a AM335x Beaglebone.\n"); | 556 | pr_info("The board is a AM335x Beaglebone.\n"); |
@@ -548,5 +559,5 @@ index 8aa7e10..e0c20c5 100644 | |||
548 | /* Beagle Bone has Micro-SD slot which doesn't have Write Protect pin */ | 559 | /* Beagle Bone has Micro-SD slot which doesn't have Write Protect pin */ |
549 | am335x_mmc[0].gpio_wp = -EINVAL; | 560 | am335x_mmc[0].gpio_wp = -EINVAL; |
550 | -- | 561 | -- |
551 | 1.7.9.4 | 562 | 1.7.9.5 |
552 | 563 | ||
diff --git a/recipes-kernel/linux/linux-ti33x-psp-3.2/beaglebone/0004-more-beaglebone-merges.patch b/recipes-kernel/linux/linux-ti33x-psp-3.2/beaglebone/0004-more-beaglebone-merges.patch index eb79ebb9..e8ef8eeb 100644 --- a/recipes-kernel/linux/linux-ti33x-psp-3.2/beaglebone/0004-more-beaglebone-merges.patch +++ b/recipes-kernel/linux/linux-ti33x-psp-3.2/beaglebone/0004-more-beaglebone-merges.patch | |||
@@ -1,18 +1,18 @@ | |||
1 | From e32e80d4258b45a8b59306c3cf2ab35e6ec19ac2 Mon Sep 17 00:00:00 2001 | 1 | From f5d99c334bedef5b0213118590ea2ad7dbc2e29a Mon Sep 17 00:00:00 2001 |
2 | From: Koen Kooi <koen@dominion.thruhere.net> | 2 | From: Koen Kooi <koen@dominion.thruhere.net> |
3 | Date: Tue, 31 Jan 2012 10:04:03 +0100 | 3 | Date: Tue, 31 Jan 2012 10:04:03 +0100 |
4 | Subject: [PATCH 04/22] more beaglebone merges | 4 | Subject: [PATCH 04/26] more beaglebone merges |
5 | 5 | ||
6 | Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> | 6 | Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> |
7 | --- | 7 | --- |
8 | arch/arm/mach-omap2/board-am335xevm.c | 63 +++++++++++++++++++++++++++++++-- | 8 | arch/arm/mach-omap2/board-am335xevm.c | 52 +++++++++++++++++++++++++++++++-- |
9 | 1 file changed, 60 insertions(+), 3 deletions(-) | 9 | 1 file changed, 50 insertions(+), 2 deletions(-) |
10 | 10 | ||
11 | diff --git a/arch/arm/mach-omap2/board-am335xevm.c b/arch/arm/mach-omap2/board-am335xevm.c | 11 | diff --git a/arch/arm/mach-omap2/board-am335xevm.c b/arch/arm/mach-omap2/board-am335xevm.c |
12 | index e0c20c5..177ab9e 100644 | 12 | index 12a269f..3c67e94 100644 |
13 | --- a/arch/arm/mach-omap2/board-am335xevm.c | 13 | --- a/arch/arm/mach-omap2/board-am335xevm.c |
14 | +++ b/arch/arm/mach-omap2/board-am335xevm.c | 14 | +++ b/arch/arm/mach-omap2/board-am335xevm.c |
15 | @@ -248,6 +248,11 @@ static struct resource tsc_resources[] = { | 15 | @@ -240,6 +240,11 @@ struct da8xx_lcdc_platform_data dvi_pdata = { |
16 | static struct tsc_data am335x_touchscreen_data = { | 16 | static struct tsc_data am335x_touchscreen_data = { |
17 | .wires = 4, | 17 | .wires = 4, |
18 | .x_plate_resistance = 200, | 18 | .x_plate_resistance = 200, |
@@ -23,34 +23,16 @@ index e0c20c5..177ab9e 100644 | |||
23 | + .mode = TI_TSCADC_GENMODE, | 23 | + .mode = TI_TSCADC_GENMODE, |
24 | }; | 24 | }; |
25 | 25 | ||
26 | static struct platform_device tsc_device = { | ||
27 | @@ -260,6 +265,16 @@ static struct platform_device tsc_device = { | ||
28 | .resource = tsc_resources, | ||
29 | }; | ||
30 | |||
31 | +static struct platform_device bone_tsc_device = { | ||
32 | + .name = "tsc", | ||
33 | + .id = -1, | ||
34 | + .dev = { | ||
35 | + .platform_data = &bone_touchscreen_data, | ||
36 | + }, | ||
37 | + .num_resources = ARRAY_SIZE(tsc_resources), | ||
38 | + .resource = tsc_resources, | ||
39 | +}; | ||
40 | + | ||
41 | static u8 am335x_iis_serializer_direction1[] = { | 26 | static u8 am335x_iis_serializer_direction1[] = { |
42 | INACTIVE_MODE, INACTIVE_MODE, TX_MODE, RX_MODE, | 27 | @@ -427,6 +432,7 @@ static bool beaglebone_tsadcpins_free = 1; |
43 | INACTIVE_MODE, INACTIVE_MODE, INACTIVE_MODE, INACTIVE_MODE, | 28 | |
44 | @@ -404,7 +419,7 @@ static bool beaglebone_cape_detected; | ||
45 | static int capecount = 0; | ||
46 | static bool beaglebone_tsadcpins_free = 1; | ||
47 | 29 | ||
48 | - | 30 | #define GP_EVM_REV_IS_1_0 0x1 |
49 | +#define GP_EVM_REV_IS_1_0 0x1 | 31 | +#define GP_EVM_REV_IS_1_0A 0x1 |
50 | #define GP_EVM_REV_IS_1_0A 0x1 | ||
51 | #define GP_EVM_REV_IS_1_1A 0x2 | 32 | #define GP_EVM_REV_IS_1_1A 0x2 |
52 | #define GP_EVM_REV_IS_UNKNOWN 0xFF | 33 | #define GP_EVM_REV_IS_UNKNOWN 0xFF |
53 | @@ -1000,6 +1015,47 @@ static struct pinmux_config profibus_pin_mux[] = { | 34 | #define GP_EVM_ACTUALLY_BEAGLEBONE 0xBB |
35 | @@ -1022,6 +1028,47 @@ static struct pinmux_config profibus_pin_mux[] = { | ||
54 | {NULL, 0}, | 36 | {NULL, 0}, |
55 | }; | 37 | }; |
56 | 38 | ||
@@ -98,7 +80,7 @@ index e0c20c5..177ab9e 100644 | |||
98 | 80 | ||
99 | #define BEAGLEBONEDVI_USR0_LED GPIO_TO_PIN(1, 18) | 81 | #define BEAGLEBONEDVI_USR0_LED GPIO_TO_PIN(1, 18) |
100 | #define BEAGLEBONEDVI_USR1_LED GPIO_TO_PIN(1, 19) | 82 | #define BEAGLEBONEDVI_USR1_LED GPIO_TO_PIN(1, 19) |
101 | @@ -1703,11 +1759,11 @@ static void beaglebone_cape_setup(struct memory_accessor *mem_acc, void *context | 83 | @@ -1775,11 +1822,11 @@ static void beaglebone_cape_setup(struct memory_accessor *mem_acc, void *context |
102 | snprintf(tmp, sizeof(cape_config.partnumber) + 1, "%s", cape_config.partnumber); | 84 | snprintf(tmp, sizeof(cape_config.partnumber) + 1, "%s", cape_config.partnumber); |
103 | pr_info("BeagleBone cape partnumber: %s\n", tmp); | 85 | pr_info("BeagleBone cape partnumber: %s\n", tmp); |
104 | 86 | ||
@@ -112,7 +94,7 @@ index e0c20c5..177ab9e 100644 | |||
112 | pr_info("BeagleBone cape: initializing LCD cape\n"); | 94 | pr_info("BeagleBone cape: initializing LCD cape\n"); |
113 | bbtoys7lcd_init(0,0); | 95 | bbtoys7lcd_init(0,0); |
114 | pr_info("BeagleBone cape: initializing LCD cape touchscreen\n"); | 96 | pr_info("BeagleBone cape: initializing LCD cape touchscreen\n"); |
115 | @@ -2154,6 +2210,7 @@ static void setup_general_purpose_evm(void) | 97 | @@ -2226,6 +2273,7 @@ static void setup_general_purpose_evm(void) |
116 | pr_info("The board is general purpose EVM in profile %d\n", prof_sel); | 98 | pr_info("The board is general purpose EVM in profile %d\n", prof_sel); |
117 | 99 | ||
118 | if (!strncmp("1.1A", config.version, 4)) { | 100 | if (!strncmp("1.1A", config.version, 4)) { |
@@ -121,5 +103,5 @@ index e0c20c5..177ab9e 100644 | |||
121 | } else if (!strncmp("1.0", config.version, 3)) { | 103 | } else if (!strncmp("1.0", config.version, 3)) { |
122 | gp_evm_revision = GP_EVM_REV_IS_1_0; | 104 | gp_evm_revision = GP_EVM_REV_IS_1_0; |
123 | -- | 105 | -- |
124 | 1.7.9.4 | 106 | 1.7.9.5 |
125 | 107 | ||
diff --git a/recipes-kernel/linux/linux-ti33x-psp-3.2/beaglebone/0005-beaglebone-disable-tsadc.patch b/recipes-kernel/linux/linux-ti33x-psp-3.2/beaglebone/0005-beaglebone-disable-tsadc.patch index 5b60b4c7..a7f53852 100644 --- a/recipes-kernel/linux/linux-ti33x-psp-3.2/beaglebone/0005-beaglebone-disable-tsadc.patch +++ b/recipes-kernel/linux/linux-ti33x-psp-3.2/beaglebone/0005-beaglebone-disable-tsadc.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 622a15ae235de585d3223384828d68ed6faa7730 Mon Sep 17 00:00:00 2001 | 1 | From ca13fa5f840198db430a21a643f3df4788f21b85 Mon Sep 17 00:00:00 2001 |
2 | From: Koen Kooi <koen@dominion.thruhere.net> | 2 | From: Koen Kooi <koen@dominion.thruhere.net> |
3 | Date: Tue, 31 Jan 2012 10:09:06 +0100 | 3 | Date: Tue, 31 Jan 2012 10:09:06 +0100 |
4 | Subject: [PATCH 05/22] beaglebone: disable tsadc | 4 | Subject: [PATCH 05/26] beaglebone: disable tsadc |
5 | 5 | ||
6 | Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> | 6 | Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> |
7 | --- | 7 | --- |
@@ -9,10 +9,10 @@ Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> | |||
9 | 1 file changed, 2 insertions(+), 2 deletions(-) | 9 | 1 file changed, 2 insertions(+), 2 deletions(-) |
10 | 10 | ||
11 | diff --git a/arch/arm/mach-omap2/board-am335xevm.c b/arch/arm/mach-omap2/board-am335xevm.c | 11 | diff --git a/arch/arm/mach-omap2/board-am335xevm.c b/arch/arm/mach-omap2/board-am335xevm.c |
12 | index 177ab9e..87ccf14 100644 | 12 | index 3c67e94..b0f5ce3 100644 |
13 | --- a/arch/arm/mach-omap2/board-am335xevm.c | 13 | --- a/arch/arm/mach-omap2/board-am335xevm.c |
14 | +++ b/arch/arm/mach-omap2/board-am335xevm.c | 14 | +++ b/arch/arm/mach-omap2/board-am335xevm.c |
15 | @@ -248,11 +248,11 @@ static struct resource tsc_resources[] = { | 15 | @@ -240,11 +240,11 @@ struct da8xx_lcdc_platform_data dvi_pdata = { |
16 | static struct tsc_data am335x_touchscreen_data = { | 16 | static struct tsc_data am335x_touchscreen_data = { |
17 | .wires = 4, | 17 | .wires = 4, |
18 | .x_plate_resistance = 200, | 18 | .x_plate_resistance = 200, |
@@ -25,7 +25,7 @@ index 177ab9e..87ccf14 100644 | |||
25 | +// .mode = TI_TSCADC_GENMODE, | 25 | +// .mode = TI_TSCADC_GENMODE, |
26 | }; | 26 | }; |
27 | 27 | ||
28 | static struct platform_device tsc_device = { | 28 | static u8 am335x_iis_serializer_direction1[] = { |
29 | -- | 29 | -- |
30 | 1.7.9.4 | 30 | 1.7.9.5 |
31 | 31 | ||
diff --git a/recipes-kernel/linux/linux-ti33x-psp-3.2/beaglebone/0006-tscadc-Add-general-purpose-mode-untested-with-touchs.patch b/recipes-kernel/linux/linux-ti33x-psp-3.2/beaglebone/0006-tscadc-Add-general-purpose-mode-untested-with-touchs.patch index 69f2e4e0..01c309d1 100644 --- a/recipes-kernel/linux/linux-ti33x-psp-3.2/beaglebone/0006-tscadc-Add-general-purpose-mode-untested-with-touchs.patch +++ b/recipes-kernel/linux/linux-ti33x-psp-3.2/beaglebone/0006-tscadc-Add-general-purpose-mode-untested-with-touchs.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From cd5378a9341cb6c5ea511a95ec8ebbfeb2aae44d Mon Sep 17 00:00:00 2001 | 1 | From 529eb4be71f6387842a1823c7dcac803cc31d8f9 Mon Sep 17 00:00:00 2001 |
2 | From: Joel A Fernandes <joelagnel@ti.com> | 2 | From: Joel A Fernandes <joelagnel@ti.com> |
3 | Date: Wed, 30 Nov 2011 15:00:40 +0100 | 3 | Date: Wed, 30 Nov 2011 15:00:40 +0100 |
4 | Subject: [PATCH 06/22] tscadc: Add general purpose mode, untested with | 4 | Subject: [PATCH 06/26] tscadc: Add general purpose mode, untested with |
5 | touchscreen functionality | 5 | touchscreen functionality |
6 | 6 | ||
7 | Signed-off-by: Joel A Fernandes <joelagnel@ti.com> | 7 | Signed-off-by: Joel A Fernandes <joelagnel@ti.com> |
@@ -14,15 +14,15 @@ Conflicts: | |||
14 | arch/arm/mach-omap2/board-am335xevm.c | 2 + | 14 | arch/arm/mach-omap2/board-am335xevm.c | 2 + |
15 | arch/arm/mach-omap2/mux33xx.c | 12 ++ | 15 | arch/arm/mach-omap2/mux33xx.c | 12 ++ |
16 | arch/arm/mach-omap2/mux33xx.h | 4 + | 16 | arch/arm/mach-omap2/mux33xx.h | 4 + |
17 | drivers/input/touchscreen/ti_tscadc.c | 209 +++++++++++++++++++++++++-------- | 17 | drivers/input/touchscreen/ti_tscadc.c | 205 +++++++++++++++++++++++++-------- |
18 | include/linux/input/ti_tscadc.h | 4 + | 18 | include/linux/input/ti_tscadc.h | 4 + |
19 | 5 files changed, 180 insertions(+), 51 deletions(-) | 19 | 5 files changed, 178 insertions(+), 49 deletions(-) |
20 | 20 | ||
21 | diff --git a/arch/arm/mach-omap2/board-am335xevm.c b/arch/arm/mach-omap2/board-am335xevm.c | 21 | diff --git a/arch/arm/mach-omap2/board-am335xevm.c b/arch/arm/mach-omap2/board-am335xevm.c |
22 | index 87ccf14..c7bb091 100644 | 22 | index b0f5ce3..5ab9c18 100644 |
23 | --- a/arch/arm/mach-omap2/board-am335xevm.c | 23 | --- a/arch/arm/mach-omap2/board-am335xevm.c |
24 | +++ b/arch/arm/mach-omap2/board-am335xevm.c | 24 | +++ b/arch/arm/mach-omap2/board-am335xevm.c |
25 | @@ -2182,6 +2182,7 @@ static struct evm_dev_cfg beaglebone_old_dev_cfg[] = { | 25 | @@ -2245,6 +2245,7 @@ static struct evm_dev_cfg beaglebone_old_dev_cfg[] = { |
26 | {i2c2_init, DEV_ON_BASEBOARD, PROFILE_NONE}, | 26 | {i2c2_init, DEV_ON_BASEBOARD, PROFILE_NONE}, |
27 | {mmc0_init, DEV_ON_BASEBOARD, PROFILE_NONE}, | 27 | {mmc0_init, DEV_ON_BASEBOARD, PROFILE_NONE}, |
28 | {boneleds_init, DEV_ON_BASEBOARD, PROFILE_ALL}, | 28 | {boneleds_init, DEV_ON_BASEBOARD, PROFILE_ALL}, |
@@ -30,7 +30,7 @@ index 87ccf14..c7bb091 100644 | |||
30 | {NULL, 0, 0}, | 30 | {NULL, 0, 0}, |
31 | }; | 31 | }; |
32 | 32 | ||
33 | @@ -2194,6 +2195,7 @@ static struct evm_dev_cfg beaglebone_dev_cfg[] = { | 33 | @@ -2257,6 +2258,7 @@ static struct evm_dev_cfg beaglebone_dev_cfg[] = { |
34 | {i2c2_init, DEV_ON_BASEBOARD, PROFILE_NONE}, | 34 | {i2c2_init, DEV_ON_BASEBOARD, PROFILE_NONE}, |
35 | {mmc0_init, DEV_ON_BASEBOARD, PROFILE_NONE}, | 35 | {mmc0_init, DEV_ON_BASEBOARD, PROFILE_NONE}, |
36 | {boneleds_init, DEV_ON_BASEBOARD, PROFILE_ALL}, | 36 | {boneleds_init, DEV_ON_BASEBOARD, PROFILE_ALL}, |
@@ -39,7 +39,7 @@ index 87ccf14..c7bb091 100644 | |||
39 | }; | 39 | }; |
40 | 40 | ||
41 | diff --git a/arch/arm/mach-omap2/mux33xx.c b/arch/arm/mach-omap2/mux33xx.c | 41 | diff --git a/arch/arm/mach-omap2/mux33xx.c b/arch/arm/mach-omap2/mux33xx.c |
42 | index 8df8fa9..14ef129 100644 | 42 | index 59e51e0..572ed16 100644 |
43 | --- a/arch/arm/mach-omap2/mux33xx.c | 43 | --- a/arch/arm/mach-omap2/mux33xx.c |
44 | +++ b/arch/arm/mach-omap2/mux33xx.c | 44 | +++ b/arch/arm/mach-omap2/mux33xx.c |
45 | @@ -584,6 +584,18 @@ static struct omap_mux __initdata am33xx_muxmodes[] = { | 45 | @@ -584,6 +584,18 @@ static struct omap_mux __initdata am33xx_muxmodes[] = { |
@@ -77,23 +77,22 @@ index 70a3012..348c8e5 100644 | |||
77 | #define AM33XX_CONTROL_PADCONF_AIN2_OFFSET 0x0B24 | 77 | #define AM33XX_CONTROL_PADCONF_AIN2_OFFSET 0x0B24 |
78 | #define AM33XX_CONTROL_PADCONF_AIN1_OFFSET 0x0B28 | 78 | #define AM33XX_CONTROL_PADCONF_AIN1_OFFSET 0x0B28 |
79 | diff --git a/drivers/input/touchscreen/ti_tscadc.c b/drivers/input/touchscreen/ti_tscadc.c | 79 | diff --git a/drivers/input/touchscreen/ti_tscadc.c b/drivers/input/touchscreen/ti_tscadc.c |
80 | index e3b5775..699503d 100644 | 80 | index 950c07f..2f38c0c 100644 |
81 | --- a/drivers/input/touchscreen/ti_tscadc.c | 81 | --- a/drivers/input/touchscreen/ti_tscadc.c |
82 | +++ b/drivers/input/touchscreen/ti_tscadc.c | 82 | +++ b/drivers/input/touchscreen/ti_tscadc.c |
83 | @@ -27,6 +27,8 @@ | 83 | @@ -28,6 +28,8 @@ |
84 | #include <linux/input/ti_tscadc.h> | ||
85 | #include <linux/delay.h> | 84 | #include <linux/delay.h> |
85 | #include <linux/pm_runtime.h> | ||
86 | 86 | ||
87 | +/* Memory mapped registers here have incorrect offsets! | 87 | +/* Memory mapped registers here have incorrect offsets! |
88 | + * Correct after referring TRM */ | 88 | + * Correct after referring TRM */ |
89 | #define TSCADC_REG_IRQEOI 0x020 | 89 | #define TSCADC_REG_IRQEOI 0x020 |
90 | #define TSCADC_REG_RAWIRQSTATUS 0x024 | 90 | #define TSCADC_REG_RAWIRQSTATUS 0x024 |
91 | #define TSCADC_REG_IRQSTATUS 0x028 | 91 | #define TSCADC_REG_IRQSTATUS 0x028 |
92 | @@ -54,12 +56,18 @@ | 92 | @@ -58,12 +60,19 @@ |
93 | |||
94 | /* Register Bitfields */ | ||
95 | #define TSCADC_IRQWKUP_ENB BIT(0) | 93 | #define TSCADC_IRQWKUP_ENB BIT(0) |
96 | -#define TSCADC_STPENB_STEPENB 0x7FFF | 94 | #define TSCADC_IRQWKUP_DISABLE 0x00 |
95 | #define TSCADC_STPENB_STEPENB 0x7FFF | ||
97 | +#define TSCADC_STPENB_STEPENB_TOUCHSCREEN 0x7FFF | 96 | +#define TSCADC_STPENB_STEPENB_TOUCHSCREEN 0x7FFF |
98 | +#define TSCADC_STPENB_STEPENB_GENERAL 0x0400 | 97 | +#define TSCADC_STPENB_STEPENB_GENERAL 0x0400 |
99 | #define TSCADC_IRQENB_FIFO0THRES BIT(2) | 98 | #define TSCADC_IRQENB_FIFO0THRES BIT(2) |
@@ -101,8 +100,8 @@ index e3b5775..699503d 100644 | |||
101 | #define TSCADC_IRQENB_FIFO1THRES BIT(5) | 100 | #define TSCADC_IRQENB_FIFO1THRES BIT(5) |
102 | +#define TSCADC_IRQENB_EOS BIT(1) | 101 | +#define TSCADC_IRQENB_EOS BIT(1) |
103 | #define TSCADC_IRQENB_PENUP BIT(9) | 102 | #define TSCADC_IRQENB_PENUP BIT(9) |
104 | -#define TSCADC_STEPCONFIG_MODE_HWSYNC 0x2 | 103 | #define TSCADC_IRQENB_HW_PEN BIT(0) |
105 | +#define TSCADC_STEPCONFIG_MODE_HWSYNC 0x2 | 104 | #define TSCADC_STEPCONFIG_MODE_HWSYNC 0x2 |
106 | +#define TSCADC_STEPCONFIG_MODE_SWCONT 0x1 | 105 | +#define TSCADC_STEPCONFIG_MODE_SWCONT 0x1 |
107 | +#define TSCADC_STEPCONFIG_MODE_SWONESHOT 0x0 | 106 | +#define TSCADC_STEPCONFIG_MODE_SWONESHOT 0x0 |
108 | #define TSCADC_STEPCONFIG_2SAMPLES_AVG (1 << 4) | 107 | #define TSCADC_STEPCONFIG_2SAMPLES_AVG (1 << 4) |
@@ -110,15 +109,15 @@ index e3b5775..699503d 100644 | |||
110 | #define TSCADC_STEPCONFIG_XPP BIT(5) | 109 | #define TSCADC_STEPCONFIG_XPP BIT(5) |
111 | #define TSCADC_STEPCONFIG_XNN BIT(6) | 110 | #define TSCADC_STEPCONFIG_XNN BIT(6) |
112 | #define TSCADC_STEPCONFIG_YPP BIT(7) | 111 | #define TSCADC_STEPCONFIG_YPP BIT(7) |
113 | @@ -105,6 +113,7 @@ struct tscadc { | 112 | @@ -108,6 +117,7 @@ struct tscadc { |
113 | int wires; | ||
114 | int analog_input; | 114 | int analog_input; |
115 | int x_plate_resistance; | 115 | int x_plate_resistance; |
116 | struct clk *tsc_ick; | ||
117 | + int mode; | 116 | + int mode; |
118 | int irq; | 117 | int irq; |
119 | void __iomem *tsc_base; | 118 | void __iomem *tsc_base; |
120 | }; | 119 | unsigned int ctrl; |
121 | @@ -120,6 +129,86 @@ static void tscadc_writel(struct tscadc *tsc, unsigned int reg, | 120 | @@ -124,6 +134,86 @@ static void tscadc_writel(struct tscadc *tsc, unsigned int reg, |
122 | writel(val, tsc->tsc_base + reg); | 121 | writel(val, tsc->tsc_base + reg); |
123 | } | 122 | } |
124 | 123 | ||
@@ -205,7 +204,7 @@ index e3b5775..699503d 100644 | |||
205 | static void tsc_step_config(struct tscadc *ts_dev) | 204 | static void tsc_step_config(struct tscadc *ts_dev) |
206 | { | 205 | { |
207 | unsigned int stepconfigx = 0, stepconfigy = 0; | 206 | unsigned int stepconfigx = 0, stepconfigy = 0; |
208 | @@ -224,7 +313,7 @@ static void tsc_step_config(struct tscadc *ts_dev) | 207 | @@ -228,7 +318,7 @@ static void tsc_step_config(struct tscadc *ts_dev) |
209 | tscadc_writel(ts_dev, TSCADC_REG_STEPCONFIG14, stepconfigz2); | 208 | tscadc_writel(ts_dev, TSCADC_REG_STEPCONFIG14, stepconfigz2); |
210 | tscadc_writel(ts_dev, TSCADC_REG_STEPDELAY14, delay); | 209 | tscadc_writel(ts_dev, TSCADC_REG_STEPDELAY14, delay); |
211 | 210 | ||
@@ -214,7 +213,7 @@ index e3b5775..699503d 100644 | |||
214 | } | 213 | } |
215 | 214 | ||
216 | static void tsc_idle_config(struct tscadc *ts_config) | 215 | static void tsc_idle_config(struct tscadc *ts_config) |
217 | @@ -242,7 +331,7 @@ static void tsc_idle_config(struct tscadc *ts_config) | 216 | @@ -246,7 +336,7 @@ static void tsc_idle_config(struct tscadc *ts_config) |
218 | tscadc_writel(ts_config, TSCADC_REG_IDLECONFIG, idleconfig); | 217 | tscadc_writel(ts_config, TSCADC_REG_IDLECONFIG, idleconfig); |
219 | } | 218 | } |
220 | 219 | ||
@@ -223,7 +222,7 @@ index e3b5775..699503d 100644 | |||
223 | { | 222 | { |
224 | struct tscadc *ts_dev = (struct tscadc *)dev; | 223 | struct tscadc *ts_dev = (struct tscadc *)dev; |
225 | struct input_dev *input_dev = ts_dev->input; | 224 | struct input_dev *input_dev = ts_dev->input; |
226 | @@ -362,7 +451,7 @@ static irqreturn_t tscadc_interrupt(int irq, void *dev) | 225 | @@ -367,7 +457,7 @@ static irqreturn_t tscadc_interrupt(int irq, void *dev) |
227 | /* check pending interrupts */ | 226 | /* check pending interrupts */ |
228 | tscadc_writel(ts_dev, TSCADC_REG_IRQEOI, 0x0); | 227 | tscadc_writel(ts_dev, TSCADC_REG_IRQEOI, 0x0); |
229 | 228 | ||
@@ -232,7 +231,7 @@ index e3b5775..699503d 100644 | |||
232 | return IRQ_HANDLED; | 231 | return IRQ_HANDLED; |
233 | } | 232 | } |
234 | 233 | ||
235 | @@ -400,13 +489,15 @@ static int __devinit tscadc_probe(struct platform_device *pdev) | 234 | @@ -405,13 +495,15 @@ static int __devinit tscadc_probe(struct platform_device *pdev) |
236 | return -ENODEV; | 235 | return -ENODEV; |
237 | } | 236 | } |
238 | 237 | ||
@@ -254,7 +253,7 @@ index e3b5775..699503d 100644 | |||
254 | 253 | ||
255 | res = request_mem_region(res->start, resource_size(res), pdev->name); | 254 | res = request_mem_region(res->start, resource_size(res), pdev->name); |
256 | if (!res) { | 255 | if (!res) { |
257 | @@ -422,8 +513,15 @@ static int __devinit tscadc_probe(struct platform_device *pdev) | 256 | @@ -427,8 +519,15 @@ static int __devinit tscadc_probe(struct platform_device *pdev) |
258 | goto err_release_mem; | 257 | goto err_release_mem; |
259 | } | 258 | } |
260 | 259 | ||
@@ -272,7 +271,7 @@ index e3b5775..699503d 100644 | |||
272 | if (err) { | 271 | if (err) { |
273 | dev_err(&pdev->dev, "failed to allocate irq.\n"); | 272 | dev_err(&pdev->dev, "failed to allocate irq.\n"); |
274 | goto err_unmap_regs; | 273 | goto err_unmap_regs; |
275 | @@ -443,11 +541,17 @@ static int __devinit tscadc_probe(struct platform_device *pdev) | 274 | @@ -444,12 +543,18 @@ static int __devinit tscadc_probe(struct platform_device *pdev) |
276 | goto err_free_irq; | 275 | goto err_free_irq; |
277 | } | 276 | } |
278 | clock_rate = clk_get_rate(clk); | 277 | clock_rate = clk_get_rate(clk); |
@@ -284,13 +283,14 @@ index e3b5775..699503d 100644 | |||
284 | clk_value = clock_rate / ADC_CLK; | 283 | clk_value = clock_rate / ADC_CLK; |
285 | if (clk_value < 7) { | 284 | if (clk_value < 7) { |
286 | dev_err(&pdev->dev, "clock input less than min clock requirement\n"); | 285 | dev_err(&pdev->dev, "clock input less than min clock requirement\n"); |
286 | err = -EINVAL; | ||
287 | goto err_fail; | 287 | goto err_fail; |
288 | } | 288 | } |
289 | + | 289 | + |
290 | /* TSCADC_CLKDIV needs to be configured to the value minus 1 */ | 290 | /* TSCADC_CLKDIV needs to be configured to the value minus 1 */ |
291 | clk_value = clk_value - 1; | 291 | clk_value = clk_value - 1; |
292 | tscadc_writel(ts_dev, TSCADC_REG_CLKDIV, clk_value); | 292 | tscadc_writel(ts_dev, TSCADC_REG_CLKDIV, clk_value); |
293 | @@ -458,57 +562,60 @@ static int __devinit tscadc_probe(struct platform_device *pdev) | 293 | @@ -457,53 +562,55 @@ static int __devinit tscadc_probe(struct platform_device *pdev) |
294 | ts_dev->wires = pdata->wires; | 294 | ts_dev->wires = pdata->wires; |
295 | ts_dev->analog_input = pdata->analog_input; | 295 | ts_dev->analog_input = pdata->analog_input; |
296 | ts_dev->x_plate_resistance = pdata->x_plate_resistance; | 296 | ts_dev->x_plate_resistance = pdata->x_plate_resistance; |
@@ -327,6 +327,7 @@ index e3b5775..699503d 100644 | |||
327 | + } | 327 | + } |
328 | } | 328 | } |
329 | tscadc_writel(ts_dev, TSCADC_REG_CTRL, ctrl); | 329 | tscadc_writel(ts_dev, TSCADC_REG_CTRL, ctrl); |
330 | ts_dev->ctrl = ctrl; | ||
330 | 331 | ||
331 | - /* Set register bits for Idel Config Mode */ | 332 | - /* Set register bits for Idel Config Mode */ |
332 | - tsc_idle_config(ts_dev); | 333 | - tsc_idle_config(ts_dev); |
@@ -381,14 +382,8 @@ index e3b5775..699503d 100644 | |||
381 | - goto err_fail; | 382 | - goto err_fail; |
382 | + tscadc_writel(ts_dev, TSCADC_REG_CTRL, ctrl); /* Turn on TSC_ADC */ | 383 | + tscadc_writel(ts_dev, TSCADC_REG_CTRL, ctrl); /* Turn on TSC_ADC */ |
383 | 384 | ||
385 | device_init_wakeup(&pdev->dev, true); | ||
384 | platform_set_drvdata(pdev, ts_dev); | 386 | platform_set_drvdata(pdev, ts_dev); |
385 | return 0; | ||
386 | |||
387 | err_fail: | ||
388 | + printk(KERN_ERR "Fatal error, shutting down TSC_ADC\n"); | ||
389 | clk_disable(ts_dev->tsc_ick); | ||
390 | clk_put(ts_dev->tsc_ick); | ||
391 | err_free_irq: | ||
392 | diff --git a/include/linux/input/ti_tscadc.h b/include/linux/input/ti_tscadc.h | 387 | diff --git a/include/linux/input/ti_tscadc.h b/include/linux/input/ti_tscadc.h |
393 | index 2c547bb..850cd4b 100644 | 388 | index 2c547bb..850cd4b 100644 |
394 | --- a/include/linux/input/ti_tscadc.h | 389 | --- a/include/linux/input/ti_tscadc.h |
@@ -407,5 +402,5 @@ index 2c547bb..850cd4b 100644 | |||
407 | + int mode; | 402 | + int mode; |
408 | }; | 403 | }; |
409 | -- | 404 | -- |
410 | 1.7.9.4 | 405 | 1.7.9.5 |
411 | 406 | ||
diff --git a/recipes-kernel/linux/linux-ti33x-psp-3.2/beaglebone/0007-tscadc-Add-board-file-mfd-support-fix-warning.patch b/recipes-kernel/linux/linux-ti33x-psp-3.2/beaglebone/0007-tscadc-Add-board-file-mfd-support-fix-warning.patch index 6f37ba61..81192703 100644 --- a/recipes-kernel/linux/linux-ti33x-psp-3.2/beaglebone/0007-tscadc-Add-board-file-mfd-support-fix-warning.patch +++ b/recipes-kernel/linux/linux-ti33x-psp-3.2/beaglebone/0007-tscadc-Add-board-file-mfd-support-fix-warning.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From f6e6f6bf5e460f5294b4f0f05af14506db631b55 Mon Sep 17 00:00:00 2001 | 1 | From 3d2d69999a7de330c9c1e85fcedb094d4f160e16 Mon Sep 17 00:00:00 2001 |
2 | From: Joel A Fernandes <joelagnel@ti.com> | 2 | From: Joel A Fernandes <joelagnel@ti.com> |
3 | Date: Wed, 30 Nov 2011 15:02:17 +0100 | 3 | Date: Wed, 30 Nov 2011 15:02:17 +0100 |
4 | Subject: [PATCH 07/22] tscadc: Add board file mfd support, fix warning | 4 | Subject: [PATCH 07/26] tscadc: Add board file mfd support, fix warning |
5 | 5 | ||
6 | Signed-off-by: Joel A Fernandes <joelagnel@ti.com> | 6 | Signed-off-by: Joel A Fernandes <joelagnel@ti.com> |
7 | 7 | ||
@@ -14,10 +14,10 @@ Conflicts: | |||
14 | 2 files changed, 2 insertions(+), 2 deletions(-) | 14 | 2 files changed, 2 insertions(+), 2 deletions(-) |
15 | 15 | ||
16 | diff --git a/arch/arm/mach-omap2/board-am335xevm.c b/arch/arm/mach-omap2/board-am335xevm.c | 16 | diff --git a/arch/arm/mach-omap2/board-am335xevm.c b/arch/arm/mach-omap2/board-am335xevm.c |
17 | index c7bb091..17705b3 100644 | 17 | index 5ab9c18..2597650 100644 |
18 | --- a/arch/arm/mach-omap2/board-am335xevm.c | 18 | --- a/arch/arm/mach-omap2/board-am335xevm.c |
19 | +++ b/arch/arm/mach-omap2/board-am335xevm.c | 19 | +++ b/arch/arm/mach-omap2/board-am335xevm.c |
20 | @@ -2182,7 +2182,7 @@ static struct evm_dev_cfg beaglebone_old_dev_cfg[] = { | 20 | @@ -2245,7 +2245,7 @@ static struct evm_dev_cfg beaglebone_old_dev_cfg[] = { |
21 | {i2c2_init, DEV_ON_BASEBOARD, PROFILE_NONE}, | 21 | {i2c2_init, DEV_ON_BASEBOARD, PROFILE_NONE}, |
22 | {mmc0_init, DEV_ON_BASEBOARD, PROFILE_NONE}, | 22 | {mmc0_init, DEV_ON_BASEBOARD, PROFILE_NONE}, |
23 | {boneleds_init, DEV_ON_BASEBOARD, PROFILE_ALL}, | 23 | {boneleds_init, DEV_ON_BASEBOARD, PROFILE_ALL}, |
@@ -27,10 +27,10 @@ index c7bb091..17705b3 100644 | |||
27 | }; | 27 | }; |
28 | 28 | ||
29 | diff --git a/drivers/input/touchscreen/ti_tscadc.c b/drivers/input/touchscreen/ti_tscadc.c | 29 | diff --git a/drivers/input/touchscreen/ti_tscadc.c b/drivers/input/touchscreen/ti_tscadc.c |
30 | index 699503d..f813564 100644 | 30 | index 2f38c0c..5070450 100644 |
31 | --- a/drivers/input/touchscreen/ti_tscadc.c | 31 | --- a/drivers/input/touchscreen/ti_tscadc.c |
32 | +++ b/drivers/input/touchscreen/ti_tscadc.c | 32 | +++ b/drivers/input/touchscreen/ti_tscadc.c |
33 | @@ -462,7 +462,7 @@ static irqreturn_t tsc_interrupt(int irq, void *dev) | 33 | @@ -468,7 +468,7 @@ static irqreturn_t tsc_interrupt(int irq, void *dev) |
34 | static int __devinit tscadc_probe(struct platform_device *pdev) | 34 | static int __devinit tscadc_probe(struct platform_device *pdev) |
35 | { | 35 | { |
36 | struct tscadc *ts_dev; | 36 | struct tscadc *ts_dev; |
@@ -40,5 +40,5 @@ index 699503d..f813564 100644 | |||
40 | int clk_value; | 40 | int clk_value; |
41 | int clock_rate, irqenable, ctrl; | 41 | int clock_rate, irqenable, ctrl; |
42 | -- | 42 | -- |
43 | 1.7.9.4 | 43 | 1.7.9.5 |
44 | 44 | ||
diff --git a/recipes-kernel/linux/linux-ti33x-psp-3.2/beaglebone/0008-AM335X-init-tsc-bone-style-for-new-boards.patch b/recipes-kernel/linux/linux-ti33x-psp-3.2/beaglebone/0008-AM335X-init-tsc-bone-style-for-new-boards.patch index 6f499185..2cf1fec4 100644 --- a/recipes-kernel/linux/linux-ti33x-psp-3.2/beaglebone/0008-AM335X-init-tsc-bone-style-for-new-boards.patch +++ b/recipes-kernel/linux/linux-ti33x-psp-3.2/beaglebone/0008-AM335X-init-tsc-bone-style-for-new-boards.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From d27f8ff05d04b9191f70eb8a7cb4d901d3ab50f7 Mon Sep 17 00:00:00 2001 | 1 | From 165b0cfffef915ca0efc4f55bc7078c55893ef3e Mon Sep 17 00:00:00 2001 |
2 | From: Joel A Fernandes <joelagnel@ti.com> | 2 | From: Joel A Fernandes <joelagnel@ti.com> |
3 | Date: Wed, 30 Nov 2011 15:03:59 +0100 | 3 | Date: Wed, 30 Nov 2011 15:03:59 +0100 |
4 | Subject: [PATCH 08/22] AM335X: init tsc bone style for new boards | 4 | Subject: [PATCH 08/26] AM335X: init tsc bone style for new boards |
5 | 5 | ||
6 | Signed-off-by: Joel A Fernandes <joelagnel@ti.com> | 6 | Signed-off-by: Joel A Fernandes <joelagnel@ti.com> |
7 | --- | 7 | --- |
@@ -9,10 +9,10 @@ Signed-off-by: Joel A Fernandes <joelagnel@ti.com> | |||
9 | 1 file changed, 1 insertion(+), 1 deletion(-) | 9 | 1 file changed, 1 insertion(+), 1 deletion(-) |
10 | 10 | ||
11 | diff --git a/arch/arm/mach-omap2/board-am335xevm.c b/arch/arm/mach-omap2/board-am335xevm.c | 11 | diff --git a/arch/arm/mach-omap2/board-am335xevm.c b/arch/arm/mach-omap2/board-am335xevm.c |
12 | index 17705b3..ac4f78f 100644 | 12 | index 2597650..5bac604 100644 |
13 | --- a/arch/arm/mach-omap2/board-am335xevm.c | 13 | --- a/arch/arm/mach-omap2/board-am335xevm.c |
14 | +++ b/arch/arm/mach-omap2/board-am335xevm.c | 14 | +++ b/arch/arm/mach-omap2/board-am335xevm.c |
15 | @@ -2195,7 +2195,7 @@ static struct evm_dev_cfg beaglebone_dev_cfg[] = { | 15 | @@ -2258,7 +2258,7 @@ static struct evm_dev_cfg beaglebone_dev_cfg[] = { |
16 | {i2c2_init, DEV_ON_BASEBOARD, PROFILE_NONE}, | 16 | {i2c2_init, DEV_ON_BASEBOARD, PROFILE_NONE}, |
17 | {mmc0_init, DEV_ON_BASEBOARD, PROFILE_NONE}, | 17 | {mmc0_init, DEV_ON_BASEBOARD, PROFILE_NONE}, |
18 | {boneleds_init, DEV_ON_BASEBOARD, PROFILE_ALL}, | 18 | {boneleds_init, DEV_ON_BASEBOARD, PROFILE_ALL}, |
@@ -22,5 +22,5 @@ index 17705b3..ac4f78f 100644 | |||
22 | }; | 22 | }; |
23 | 23 | ||
24 | -- | 24 | -- |
25 | 1.7.9.4 | 25 | 1.7.9.5 |
26 | 26 | ||
diff --git a/recipes-kernel/linux/linux-ti33x-psp-3.2/beaglebone/0009-tscadc-make-stepconfig-channel-configurable.patch b/recipes-kernel/linux/linux-ti33x-psp-3.2/beaglebone/0009-tscadc-make-stepconfig-channel-configurable.patch index 47d9b248..d1dadf20 100644 --- a/recipes-kernel/linux/linux-ti33x-psp-3.2/beaglebone/0009-tscadc-make-stepconfig-channel-configurable.patch +++ b/recipes-kernel/linux/linux-ti33x-psp-3.2/beaglebone/0009-tscadc-make-stepconfig-channel-configurable.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 750ca3e9b053119b867d3630bf5c891b845144b3 Mon Sep 17 00:00:00 2001 | 1 | From f7e890d43fd383c48e75bbdc363e5ce44bd5eb04 Mon Sep 17 00:00:00 2001 |
2 | From: Joel A Fernandes <joelagnel@ti.com> | 2 | From: Joel A Fernandes <joelagnel@ti.com> |
3 | Date: Mon, 28 Nov 2011 18:18:04 -0600 | 3 | Date: Mon, 28 Nov 2011 18:18:04 -0600 |
4 | Subject: [PATCH 09/22] tscadc: make stepconfig channel-configurable | 4 | Subject: [PATCH 09/26] tscadc: make stepconfig channel-configurable |
5 | 5 | ||
6 | Signed-off-by: Joel A Fernandes <joelagnel@ti.com> | 6 | Signed-off-by: Joel A Fernandes <joelagnel@ti.com> |
7 | --- | 7 | --- |
@@ -9,10 +9,10 @@ Signed-off-by: Joel A Fernandes <joelagnel@ti.com> | |||
9 | 1 file changed, 5 insertions(+), 3 deletions(-) | 9 | 1 file changed, 5 insertions(+), 3 deletions(-) |
10 | 10 | ||
11 | diff --git a/drivers/input/touchscreen/ti_tscadc.c b/drivers/input/touchscreen/ti_tscadc.c | 11 | diff --git a/drivers/input/touchscreen/ti_tscadc.c b/drivers/input/touchscreen/ti_tscadc.c |
12 | index f813564..0b91bdc 100644 | 12 | index 5070450..3950696 100644 |
13 | --- a/drivers/input/touchscreen/ti_tscadc.c | 13 | --- a/drivers/input/touchscreen/ti_tscadc.c |
14 | +++ b/drivers/input/touchscreen/ti_tscadc.c | 14 | +++ b/drivers/input/touchscreen/ti_tscadc.c |
15 | @@ -129,7 +129,9 @@ static void tscadc_writel(struct tscadc *tsc, unsigned int reg, | 15 | @@ -134,7 +134,9 @@ static void tscadc_writel(struct tscadc *tsc, unsigned int reg, |
16 | writel(val, tsc->tsc_base + reg); | 16 | writel(val, tsc->tsc_base + reg); |
17 | } | 17 | } |
18 | 18 | ||
@@ -23,7 +23,7 @@ index f813564..0b91bdc 100644 | |||
23 | { | 23 | { |
24 | unsigned int stepconfig = 0, delay = 0, chargeconfig = 0; | 24 | unsigned int stepconfig = 0, delay = 0, chargeconfig = 0; |
25 | 25 | ||
26 | @@ -141,7 +143,7 @@ static void tsc_adc_step_config(struct tscadc *ts_dev) | 26 | @@ -146,7 +148,7 @@ static void tsc_adc_step_config(struct tscadc *ts_dev) |
27 | */ | 27 | */ |
28 | stepconfig = TSCADC_STEPCONFIG_MODE_SWONESHOT | | 28 | stepconfig = TSCADC_STEPCONFIG_MODE_SWONESHOT | |
29 | TSCADC_STEPCONFIG_2SAMPLES_AVG | | 29 | TSCADC_STEPCONFIG_2SAMPLES_AVG | |
@@ -32,7 +32,7 @@ index f813564..0b91bdc 100644 | |||
32 | 32 | ||
33 | delay = TSCADC_STEPCONFIG_SAMPLEDLY | TSCADC_STEPCONFIG_OPENDLY; | 33 | delay = TSCADC_STEPCONFIG_SAMPLEDLY | TSCADC_STEPCONFIG_OPENDLY; |
34 | 34 | ||
35 | @@ -602,7 +604,7 @@ static int __devinit tscadc_probe(struct platform_device *pdev) | 35 | @@ -603,7 +605,7 @@ static int __devinit tscadc_probe(struct platform_device *pdev) |
36 | goto err_fail; | 36 | goto err_fail; |
37 | } | 37 | } |
38 | else { | 38 | else { |
@@ -42,5 +42,5 @@ index f813564..0b91bdc 100644 | |||
42 | irqenable = TSCADC_IRQENB_FIFO0THRES; | 42 | irqenable = TSCADC_IRQENB_FIFO0THRES; |
43 | } | 43 | } |
44 | -- | 44 | -- |
45 | 1.7.9.4 | 45 | 1.7.9.5 |
46 | 46 | ||
diff --git a/recipes-kernel/linux/linux-ti33x-psp-3.2/beaglebone/0010-tscadc-Trigger-through-sysfs.patch b/recipes-kernel/linux/linux-ti33x-psp-3.2/beaglebone/0010-tscadc-Trigger-through-sysfs.patch index a008eb56..a0765427 100644 --- a/recipes-kernel/linux/linux-ti33x-psp-3.2/beaglebone/0010-tscadc-Trigger-through-sysfs.patch +++ b/recipes-kernel/linux/linux-ti33x-psp-3.2/beaglebone/0010-tscadc-Trigger-through-sysfs.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From fb718df2afa6f3876c22d830c55de70943d95812 Mon Sep 17 00:00:00 2001 | 1 | From 50c698d37ac59a4ba4cec9d6b844444e312e1a26 Mon Sep 17 00:00:00 2001 |
2 | From: Joel A Fernandes <joelagnel@ti.com> | 2 | From: Joel A Fernandes <joelagnel@ti.com> |
3 | Date: Mon, 28 Nov 2011 20:55:25 -0600 | 3 | Date: Mon, 28 Nov 2011 20:55:25 -0600 |
4 | Subject: [PATCH 10/22] tscadc: Trigger through sysfs | 4 | Subject: [PATCH 10/26] tscadc: Trigger through sysfs |
5 | 5 | ||
6 | Signed-off-by: Joel A Fernandes <joelagnel@ti.com> | 6 | Signed-off-by: Joel A Fernandes <joelagnel@ti.com> |
7 | 7 | ||
@@ -14,15 +14,16 @@ Conflicts: | |||
14 | 2 files changed, 56 insertions(+), 5 deletions(-) | 14 | 2 files changed, 56 insertions(+), 5 deletions(-) |
15 | 15 | ||
16 | diff --git a/drivers/input/touchscreen/ti_tscadc.c b/drivers/input/touchscreen/ti_tscadc.c | 16 | diff --git a/drivers/input/touchscreen/ti_tscadc.c b/drivers/input/touchscreen/ti_tscadc.c |
17 | index 0b91bdc..a74d9ba 100644 | 17 | index 3950696..8661b3a 100644 |
18 | --- a/drivers/input/touchscreen/ti_tscadc.c | 18 | --- a/drivers/input/touchscreen/ti_tscadc.c |
19 | +++ b/drivers/input/touchscreen/ti_tscadc.c | 19 | +++ b/drivers/input/touchscreen/ti_tscadc.c |
20 | @@ -26,6 +26,17 @@ | 20 | @@ -26,8 +26,19 @@ |
21 | #include <linux/io.h> | 21 | #include <linux/io.h> |
22 | #include <linux/input/ti_tscadc.h> | 22 | #include <linux/input/ti_tscadc.h> |
23 | #include <linux/delay.h> | 23 | #include <linux/delay.h> |
24 | +#include <linux/device.h> | 24 | +#include <linux/device.h> |
25 | + | 25 | #include <linux/pm_runtime.h> |
26 | |||
26 | +size_t do_adc_sample(struct kobject *, struct attribute *, char *); | 27 | +size_t do_adc_sample(struct kobject *, struct attribute *, char *); |
27 | +static DEVICE_ATTR(ain1, S_IRUGO, do_adc_sample, NULL); | 28 | +static DEVICE_ATTR(ain1, S_IRUGO, do_adc_sample, NULL); |
28 | +static DEVICE_ATTR(ain2, S_IRUGO, do_adc_sample, NULL); | 29 | +static DEVICE_ATTR(ain2, S_IRUGO, do_adc_sample, NULL); |
@@ -32,10 +33,11 @@ index 0b91bdc..a74d9ba 100644 | |||
32 | +static DEVICE_ATTR(ain6, S_IRUGO, do_adc_sample, NULL); | 33 | +static DEVICE_ATTR(ain6, S_IRUGO, do_adc_sample, NULL); |
33 | +static DEVICE_ATTR(ain7, S_IRUGO, do_adc_sample, NULL); | 34 | +static DEVICE_ATTR(ain7, S_IRUGO, do_adc_sample, NULL); |
34 | +static DEVICE_ATTR(ain8, S_IRUGO, do_adc_sample, NULL); | 35 | +static DEVICE_ATTR(ain8, S_IRUGO, do_adc_sample, NULL); |
35 | 36 | + | |
36 | /* Memory mapped registers here have incorrect offsets! | 37 | /* Memory mapped registers here have incorrect offsets! |
37 | * Correct after referring TRM */ | 38 | * Correct after referring TRM */ |
38 | @@ -144,12 +155,12 @@ static void tsc_adc_step_config(struct tscadc *ts_dev, int channel) | 39 | #define TSCADC_REG_IRQEOI 0x020 |
40 | @@ -149,12 +160,12 @@ static void tsc_adc_step_config(struct tscadc *ts_dev, int channel) | ||
39 | stepconfig = TSCADC_STEPCONFIG_MODE_SWONESHOT | | 41 | stepconfig = TSCADC_STEPCONFIG_MODE_SWONESHOT | |
40 | TSCADC_STEPCONFIG_2SAMPLES_AVG | | 42 | TSCADC_STEPCONFIG_2SAMPLES_AVG | |
41 | ((channel-1) << 19); | 43 | ((channel-1) << 19); |
@@ -50,7 +52,7 @@ index 0b91bdc..a74d9ba 100644 | |||
50 | /* Get the ball rolling, this will trigger the FSM to step through | 52 | /* Get the ball rolling, this will trigger the FSM to step through |
51 | * as soon as TSC_ADC_SS is turned on */ | 53 | * as soon as TSC_ADC_SS is turned on */ |
52 | tscadc_writel(ts_dev, TSCADC_REG_SE, TSCADC_STPENB_STEPENB_GENERAL); | 54 | tscadc_writel(ts_dev, TSCADC_REG_SE, TSCADC_STPENB_STEPENB_GENERAL); |
53 | @@ -199,7 +210,7 @@ static irqreturn_t tsc_adc_interrupt(int irq, void *dev) | 55 | @@ -204,7 +215,7 @@ static irqreturn_t tsc_adc_interrupt(int irq, void *dev) |
54 | irqclr |= TSCADC_IRQENB_FIFO1THRES; | 56 | irqclr |= TSCADC_IRQENB_FIFO1THRES; |
55 | } | 57 | } |
56 | 58 | ||
@@ -59,7 +61,7 @@ index 0b91bdc..a74d9ba 100644 | |||
59 | 61 | ||
60 | tscadc_writel(ts_dev, TSCADC_REG_IRQSTATUS, irqclr); | 62 | tscadc_writel(ts_dev, TSCADC_REG_IRQSTATUS, irqclr); |
61 | 63 | ||
62 | @@ -207,7 +218,7 @@ static irqreturn_t tsc_adc_interrupt(int irq, void *dev) | 64 | @@ -212,7 +223,7 @@ static irqreturn_t tsc_adc_interrupt(int irq, void *dev) |
63 | tscadc_writel(ts_dev, TSCADC_REG_IRQEOI, 0x0); | 65 | tscadc_writel(ts_dev, TSCADC_REG_IRQEOI, 0x0); |
64 | 66 | ||
65 | /* Turn on Step 1 again */ | 67 | /* Turn on Step 1 again */ |
@@ -68,7 +70,7 @@ index 0b91bdc..a74d9ba 100644 | |||
68 | return IRQ_HANDLED; | 70 | return IRQ_HANDLED; |
69 | } | 71 | } |
70 | 72 | ||
71 | @@ -461,6 +472,34 @@ static irqreturn_t tsc_interrupt(int irq, void *dev) | 73 | @@ -467,6 +478,34 @@ static irqreturn_t tsc_interrupt(int irq, void *dev) |
72 | * The functions for inserting/removing driver as a module. | 74 | * The functions for inserting/removing driver as a module. |
73 | */ | 75 | */ |
74 | 76 | ||
@@ -103,7 +105,7 @@ index 0b91bdc..a74d9ba 100644 | |||
103 | static int __devinit tscadc_probe(struct platform_device *pdev) | 105 | static int __devinit tscadc_probe(struct platform_device *pdev) |
104 | { | 106 | { |
105 | struct tscadc *ts_dev; | 107 | struct tscadc *ts_dev; |
106 | @@ -472,6 +511,18 @@ static int __devinit tscadc_probe(struct platform_device *pdev) | 108 | @@ -478,6 +517,18 @@ static int __devinit tscadc_probe(struct platform_device *pdev) |
107 | struct resource *res; | 109 | struct resource *res; |
108 | struct clk *clk; | 110 | struct clk *clk; |
109 | 111 | ||
@@ -122,7 +124,7 @@ index 0b91bdc..a74d9ba 100644 | |||
122 | res = platform_get_resource(pdev, IORESOURCE_MEM, 0); | 124 | res = platform_get_resource(pdev, IORESOURCE_MEM, 0); |
123 | if (!res) { | 125 | if (!res) { |
124 | dev_err(&pdev->dev, "no memory resource defined.\n"); | 126 | dev_err(&pdev->dev, "no memory resource defined.\n"); |
125 | @@ -604,7 +655,6 @@ static int __devinit tscadc_probe(struct platform_device *pdev) | 127 | @@ -605,7 +656,6 @@ static int __devinit tscadc_probe(struct platform_device *pdev) |
126 | goto err_fail; | 128 | goto err_fail; |
127 | } | 129 | } |
128 | else { | 130 | else { |
@@ -143,5 +145,5 @@ index 850cd4b..fc239c6 100644 | |||
143 | #define TI_TSCADC_TSCMODE 0 | 145 | #define TI_TSCADC_TSCMODE 0 |
144 | #define TI_TSCADC_GENMODE 1 | 146 | #define TI_TSCADC_GENMODE 1 |
145 | -- | 147 | -- |
146 | 1.7.9.4 | 148 | 1.7.9.5 |
147 | 149 | ||
diff --git a/recipes-kernel/linux/linux-ti33x-psp-3.2/beaglebone/0011-meta-ti-Remove-debug-messages-for-meta-ti.patch b/recipes-kernel/linux/linux-ti33x-psp-3.2/beaglebone/0011-meta-ti-Remove-debug-messages-for-meta-ti.patch index 9470d398..c7c1c373 100644 --- a/recipes-kernel/linux/linux-ti33x-psp-3.2/beaglebone/0011-meta-ti-Remove-debug-messages-for-meta-ti.patch +++ b/recipes-kernel/linux/linux-ti33x-psp-3.2/beaglebone/0011-meta-ti-Remove-debug-messages-for-meta-ti.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From f3e413faef836c5f9357f091d7149a8924ffabdd Mon Sep 17 00:00:00 2001 | 1 | From 92c8dd2fe6e62db7bcb07a9010c5eb9b757f2446 Mon Sep 17 00:00:00 2001 |
2 | From: Joel A Fernandes <joelagnel@ti.com> | 2 | From: Joel A Fernandes <joelagnel@ti.com> |
3 | Date: Mon, 28 Nov 2011 20:56:48 -0600 | 3 | Date: Mon, 28 Nov 2011 20:56:48 -0600 |
4 | Subject: [PATCH 11/22] meta-ti: Remove debug messages for meta-ti | 4 | Subject: [PATCH 11/26] meta-ti: Remove debug messages for meta-ti |
5 | 5 | ||
6 | Signed-off-by: Joel A Fernandes <joelagnel@ti.com> | 6 | Signed-off-by: Joel A Fernandes <joelagnel@ti.com> |
7 | --- | 7 | --- |
@@ -9,10 +9,10 @@ Signed-off-by: Joel A Fernandes <joelagnel@ti.com> | |||
9 | 1 file changed, 2 insertions(+), 2 deletions(-) | 9 | 1 file changed, 2 insertions(+), 2 deletions(-) |
10 | 10 | ||
11 | diff --git a/drivers/input/touchscreen/ti_tscadc.c b/drivers/input/touchscreen/ti_tscadc.c | 11 | diff --git a/drivers/input/touchscreen/ti_tscadc.c b/drivers/input/touchscreen/ti_tscadc.c |
12 | index a74d9ba..1f9cbf5 100644 | 12 | index 8661b3a..c82f9bf 100644 |
13 | --- a/drivers/input/touchscreen/ti_tscadc.c | 13 | --- a/drivers/input/touchscreen/ti_tscadc.c |
14 | +++ b/drivers/input/touchscreen/ti_tscadc.c | 14 | +++ b/drivers/input/touchscreen/ti_tscadc.c |
15 | @@ -181,14 +181,14 @@ static irqreturn_t tsc_adc_interrupt(int irq, void *dev) | 15 | @@ -186,14 +186,14 @@ static irqreturn_t tsc_adc_interrupt(int irq, void *dev) |
16 | 16 | ||
17 | status = tscadc_readl(ts_dev, TSCADC_REG_IRQSTATUS); | 17 | status = tscadc_readl(ts_dev, TSCADC_REG_IRQSTATUS); |
18 | 18 | ||
@@ -30,5 +30,5 @@ index a74d9ba..1f9cbf5 100644 | |||
30 | for (i = 0; i < fifo1count; i++) { | 30 | for (i = 0; i < fifo1count; i++) { |
31 | read_sample = tscadc_readl(ts_dev, TSCADC_REG_FIFO0); | 31 | read_sample = tscadc_readl(ts_dev, TSCADC_REG_FIFO0); |
32 | -- | 32 | -- |
33 | 1.7.9.4 | 33 | 1.7.9.5 |
34 | 34 | ||
diff --git a/recipes-kernel/linux/linux-ti33x-psp-3.2/beaglebone/0012-tscadc-switch-to-polling-instead-of-interrupts.patch b/recipes-kernel/linux/linux-ti33x-psp-3.2/beaglebone/0012-tscadc-switch-to-polling-instead-of-interrupts.patch index d1456ada..d08d8d5a 100644 --- a/recipes-kernel/linux/linux-ti33x-psp-3.2/beaglebone/0012-tscadc-switch-to-polling-instead-of-interrupts.patch +++ b/recipes-kernel/linux/linux-ti33x-psp-3.2/beaglebone/0012-tscadc-switch-to-polling-instead-of-interrupts.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 994bbaf10e91e859c54ba238e72e8f6f496c14e0 Mon Sep 17 00:00:00 2001 | 1 | From a1bedb47197c154069710b8f0f2258a7651cc05c Mon Sep 17 00:00:00 2001 |
2 | From: Joel A Fernandes <joelagnel@ti.com> | 2 | From: Joel A Fernandes <joelagnel@ti.com> |
3 | Date: Tue, 29 Nov 2011 09:44:22 -0600 | 3 | Date: Tue, 29 Nov 2011 09:44:22 -0600 |
4 | Subject: [PATCH 12/22] tscadc: switch to polling instead of interrupts | 4 | Subject: [PATCH 12/26] tscadc: switch to polling instead of interrupts |
5 | 5 | ||
6 | Signed-off-by: Joel A Fernandes <joelagnel@ti.com> | 6 | Signed-off-by: Joel A Fernandes <joelagnel@ti.com> |
7 | --- | 7 | --- |
@@ -9,10 +9,10 @@ Signed-off-by: Joel A Fernandes <joelagnel@ti.com> | |||
9 | 1 file changed, 14 insertions(+), 2 deletions(-) | 9 | 1 file changed, 14 insertions(+), 2 deletions(-) |
10 | 10 | ||
11 | diff --git a/drivers/input/touchscreen/ti_tscadc.c b/drivers/input/touchscreen/ti_tscadc.c | 11 | diff --git a/drivers/input/touchscreen/ti_tscadc.c b/drivers/input/touchscreen/ti_tscadc.c |
12 | index 1f9cbf5..8e2a994 100644 | 12 | index c82f9bf..3082e5c 100644 |
13 | --- a/drivers/input/touchscreen/ti_tscadc.c | 13 | --- a/drivers/input/touchscreen/ti_tscadc.c |
14 | +++ b/drivers/input/touchscreen/ti_tscadc.c | 14 | +++ b/drivers/input/touchscreen/ti_tscadc.c |
15 | @@ -477,6 +477,8 @@ size_t do_adc_sample(struct kobject *kobj, struct attribute *attr, char *buf) { | 15 | @@ -483,6 +483,8 @@ size_t do_adc_sample(struct kobject *kobj, struct attribute *attr, char *buf) { |
16 | struct device *dev; | 16 | struct device *dev; |
17 | struct tscadc *ts_dev; | 17 | struct tscadc *ts_dev; |
18 | int channel_num; | 18 | int channel_num; |
@@ -21,7 +21,7 @@ index 1f9cbf5..8e2a994 100644 | |||
21 | 21 | ||
22 | pdev = (struct platform_device *)container_of(kobj, struct device, kobj); | 22 | pdev = (struct platform_device *)container_of(kobj, struct device, kobj); |
23 | dev = &pdev->dev; | 23 | dev = &pdev->dev; |
24 | @@ -496,7 +498,17 @@ size_t do_adc_sample(struct kobject *kobj, struct attribute *attr, char *buf) { | 24 | @@ -502,7 +504,17 @@ size_t do_adc_sample(struct kobject *kobj, struct attribute *attr, char *buf) { |
25 | 25 | ||
26 | tsc_adc_step_config(ts_dev, channel_num); | 26 | tsc_adc_step_config(ts_dev, channel_num); |
27 | 27 | ||
@@ -40,7 +40,7 @@ index 1f9cbf5..8e2a994 100644 | |||
40 | return strlen(attr->name); | 40 | return strlen(attr->name); |
41 | } | 41 | } |
42 | 42 | ||
43 | @@ -656,7 +668,7 @@ static int __devinit tscadc_probe(struct platform_device *pdev) | 43 | @@ -657,7 +669,7 @@ static int __devinit tscadc_probe(struct platform_device *pdev) |
44 | } | 44 | } |
45 | else { | 45 | else { |
46 | tscadc_writel(ts_dev, TSCADC_REG_FIFO0THR, 0); | 46 | tscadc_writel(ts_dev, TSCADC_REG_FIFO0THR, 0); |
@@ -50,5 +50,5 @@ index 1f9cbf5..8e2a994 100644 | |||
50 | tscadc_writel(ts_dev, TSCADC_REG_IRQENABLE, irqenable); | 50 | tscadc_writel(ts_dev, TSCADC_REG_IRQENABLE, irqenable); |
51 | 51 | ||
52 | -- | 52 | -- |
53 | 1.7.9.4 | 53 | 1.7.9.5 |
54 | 54 | ||
diff --git a/recipes-kernel/linux/linux-ti33x-psp-3.2/beaglebone/0013-beaglebone-fix-ADC-init.patch b/recipes-kernel/linux/linux-ti33x-psp-3.2/beaglebone/0013-beaglebone-fix-ADC-init.patch index 97367382..59318299 100644 --- a/recipes-kernel/linux/linux-ti33x-psp-3.2/beaglebone/0013-beaglebone-fix-ADC-init.patch +++ b/recipes-kernel/linux/linux-ti33x-psp-3.2/beaglebone/0013-beaglebone-fix-ADC-init.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 045193b61f57d4244e569800b252fff5e6e91a4b Mon Sep 17 00:00:00 2001 | 1 | From 1d54ffc655a7d22e1477e3bc0d72c0593049d83b Mon Sep 17 00:00:00 2001 |
2 | From: Koen Kooi <koen@dominion.thruhere.net> | 2 | From: Koen Kooi <koen@dominion.thruhere.net> |
3 | Date: Tue, 31 Jan 2012 14:50:55 +0100 | 3 | Date: Tue, 31 Jan 2012 14:50:55 +0100 |
4 | Subject: [PATCH 13/22] beaglebone: fix ADC init | 4 | Subject: [PATCH 13/26] beaglebone: fix ADC init |
5 | 5 | ||
6 | Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> | 6 | Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> |
7 | --- | 7 | --- |
@@ -9,10 +9,10 @@ Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> | |||
9 | 1 file changed, 2 insertions(+), 4 deletions(-) | 9 | 1 file changed, 2 insertions(+), 4 deletions(-) |
10 | 10 | ||
11 | diff --git a/arch/arm/mach-omap2/board-am335xevm.c b/arch/arm/mach-omap2/board-am335xevm.c | 11 | diff --git a/arch/arm/mach-omap2/board-am335xevm.c b/arch/arm/mach-omap2/board-am335xevm.c |
12 | index ac4f78f..177ab9e 100644 | 12 | index 5bac604..3c67e94 100644 |
13 | --- a/arch/arm/mach-omap2/board-am335xevm.c | 13 | --- a/arch/arm/mach-omap2/board-am335xevm.c |
14 | +++ b/arch/arm/mach-omap2/board-am335xevm.c | 14 | +++ b/arch/arm/mach-omap2/board-am335xevm.c |
15 | @@ -248,11 +248,11 @@ static struct resource tsc_resources[] = { | 15 | @@ -240,11 +240,11 @@ struct da8xx_lcdc_platform_data dvi_pdata = { |
16 | static struct tsc_data am335x_touchscreen_data = { | 16 | static struct tsc_data am335x_touchscreen_data = { |
17 | .wires = 4, | 17 | .wires = 4, |
18 | .x_plate_resistance = 200, | 18 | .x_plate_resistance = 200, |
@@ -25,8 +25,8 @@ index ac4f78f..177ab9e 100644 | |||
25 | + .mode = TI_TSCADC_GENMODE, | 25 | + .mode = TI_TSCADC_GENMODE, |
26 | }; | 26 | }; |
27 | 27 | ||
28 | static struct platform_device tsc_device = { | 28 | static u8 am335x_iis_serializer_direction1[] = { |
29 | @@ -2182,7 +2182,6 @@ static struct evm_dev_cfg beaglebone_old_dev_cfg[] = { | 29 | @@ -2245,7 +2245,6 @@ static struct evm_dev_cfg beaglebone_old_dev_cfg[] = { |
30 | {i2c2_init, DEV_ON_BASEBOARD, PROFILE_NONE}, | 30 | {i2c2_init, DEV_ON_BASEBOARD, PROFILE_NONE}, |
31 | {mmc0_init, DEV_ON_BASEBOARD, PROFILE_NONE}, | 31 | {mmc0_init, DEV_ON_BASEBOARD, PROFILE_NONE}, |
32 | {boneleds_init, DEV_ON_BASEBOARD, PROFILE_ALL}, | 32 | {boneleds_init, DEV_ON_BASEBOARD, PROFILE_ALL}, |
@@ -34,7 +34,7 @@ index ac4f78f..177ab9e 100644 | |||
34 | {NULL, 0, 0}, | 34 | {NULL, 0, 0}, |
35 | }; | 35 | }; |
36 | 36 | ||
37 | @@ -2195,7 +2194,6 @@ static struct evm_dev_cfg beaglebone_dev_cfg[] = { | 37 | @@ -2258,7 +2257,6 @@ static struct evm_dev_cfg beaglebone_dev_cfg[] = { |
38 | {i2c2_init, DEV_ON_BASEBOARD, PROFILE_NONE}, | 38 | {i2c2_init, DEV_ON_BASEBOARD, PROFILE_NONE}, |
39 | {mmc0_init, DEV_ON_BASEBOARD, PROFILE_NONE}, | 39 | {mmc0_init, DEV_ON_BASEBOARD, PROFILE_NONE}, |
40 | {boneleds_init, DEV_ON_BASEBOARD, PROFILE_ALL}, | 40 | {boneleds_init, DEV_ON_BASEBOARD, PROFILE_ALL}, |
@@ -43,5 +43,5 @@ index ac4f78f..177ab9e 100644 | |||
43 | }; | 43 | }; |
44 | 44 | ||
45 | -- | 45 | -- |
46 | 1.7.9.4 | 46 | 1.7.9.5 |
47 | 47 | ||
diff --git a/recipes-kernel/linux/linux-ti33x-psp-3.2/beaglebone/0014-AM335x-MUX-add-ehrpwm1A.patch b/recipes-kernel/linux/linux-ti33x-psp-3.2/beaglebone/0014-AM335x-MUX-add-ehrpwm1A.patch index 15aebe50..44c50520 100644 --- a/recipes-kernel/linux/linux-ti33x-psp-3.2/beaglebone/0014-AM335x-MUX-add-ehrpwm1A.patch +++ b/recipes-kernel/linux/linux-ti33x-psp-3.2/beaglebone/0014-AM335x-MUX-add-ehrpwm1A.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From bc405fc66657f9275bcdfe82c46e78ab71195f93 Mon Sep 17 00:00:00 2001 | 1 | From c150d02db78ceb0ec05774b834bf2001c6427552 Mon Sep 17 00:00:00 2001 |
2 | From: Koen Kooi <koen@dominion.thruhere.net> | 2 | From: Koen Kooi <koen@dominion.thruhere.net> |
3 | Date: Tue, 31 Jan 2012 16:49:52 +0100 | 3 | Date: Tue, 31 Jan 2012 16:49:52 +0100 |
4 | Subject: [PATCH 14/22] AM335x: MUX: add ehrpwm1A | 4 | Subject: [PATCH 14/26] AM335x: MUX: add ehrpwm1A |
5 | 5 | ||
6 | Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> | 6 | Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> |
7 | --- | 7 | --- |
@@ -9,7 +9,7 @@ Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> | |||
9 | 1 file changed, 1 insertion(+), 1 deletion(-) | 9 | 1 file changed, 1 insertion(+), 1 deletion(-) |
10 | 10 | ||
11 | diff --git a/arch/arm/mach-omap2/mux33xx.c b/arch/arm/mach-omap2/mux33xx.c | 11 | diff --git a/arch/arm/mach-omap2/mux33xx.c b/arch/arm/mach-omap2/mux33xx.c |
12 | index 14ef129..fcb81ec 100644 | 12 | index 572ed16..0f71646 100644 |
13 | --- a/arch/arm/mach-omap2/mux33xx.c | 13 | --- a/arch/arm/mach-omap2/mux33xx.c |
14 | +++ b/arch/arm/mach-omap2/mux33xx.c | 14 | +++ b/arch/arm/mach-omap2/mux33xx.c |
15 | @@ -85,7 +85,7 @@ static struct omap_mux __initdata am33xx_muxmodes[] = { | 15 | @@ -85,7 +85,7 @@ static struct omap_mux __initdata am33xx_muxmodes[] = { |
@@ -22,5 +22,5 @@ index 14ef129..fcb81ec 100644 | |||
22 | "gpmc_a3", "mii2_txd2", "rgmii2_td2", "mmc2_dat2", | 22 | "gpmc_a3", "mii2_txd2", "rgmii2_td2", "mmc2_dat2", |
23 | NULL, NULL, NULL, "gpio1_19"), | 23 | NULL, NULL, NULL, "gpio1_19"), |
24 | -- | 24 | -- |
25 | 1.7.9.4 | 25 | 1.7.9.5 |
26 | 26 | ||
diff --git a/recipes-kernel/linux/linux-ti33x-psp-3.2/beaglebone/0015-beaglebone-enable-PWM-for-lcd-backlight-backlight-is.patch b/recipes-kernel/linux/linux-ti33x-psp-3.2/beaglebone/0015-beaglebone-enable-PWM-for-lcd-backlight-backlight-is.patch index b98a95cf..ba2b3060 100644 --- a/recipes-kernel/linux/linux-ti33x-psp-3.2/beaglebone/0015-beaglebone-enable-PWM-for-lcd-backlight-backlight-is.patch +++ b/recipes-kernel/linux/linux-ti33x-psp-3.2/beaglebone/0015-beaglebone-enable-PWM-for-lcd-backlight-backlight-is.patch | |||
@@ -1,38 +1,19 @@ | |||
1 | From b1340250f872964ced2298fc4e0ae4d39469cf12 Mon Sep 17 00:00:00 2001 | 1 | From 46c7fc0ed1ad0e5da431d15a4333a4fb5bb0ff0e Mon Sep 17 00:00:00 2001 |
2 | From: Koen Kooi <koen@dominion.thruhere.net> | 2 | From: Koen Kooi <koen@dominion.thruhere.net> |
3 | Date: Tue, 31 Jan 2012 17:02:10 +0100 | 3 | Date: Tue, 31 Jan 2012 17:02:10 +0100 |
4 | Subject: [PATCH 15/22] beaglebone: enable PWM for lcd backlight <- backlight | 4 | Subject: [PATCH 15/26] beaglebone: enable PWM for lcd backlight <- backlight |
5 | is inverted | 5 | is inverted |
6 | 6 | ||
7 | Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> | 7 | Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> |
8 | --- | 8 | --- |
9 | arch/arm/mach-omap2/board-am335xevm.c | 54 +++++++++++++++++++++++++++------ | 9 | arch/arm/mach-omap2/board-am335xevm.c | 51 +++++++++++++++++++++++++++------ |
10 | arch/arm/mach-omap2/devices.c | 13 ++++++++ | 10 | 1 file changed, 42 insertions(+), 9 deletions(-) |
11 | arch/arm/mach-omap2/devices.h | 1 + | ||
12 | 3 files changed, 58 insertions(+), 10 deletions(-) | ||
13 | 11 | ||
14 | diff --git a/arch/arm/mach-omap2/board-am335xevm.c b/arch/arm/mach-omap2/board-am335xevm.c | 12 | diff --git a/arch/arm/mach-omap2/board-am335xevm.c b/arch/arm/mach-omap2/board-am335xevm.c |
15 | index 177ab9e..6a77194 100644 | 13 | index 3c67e94..23b59c2 100644 |
16 | --- a/arch/arm/mach-omap2/board-am335xevm.c | 14 | --- a/arch/arm/mach-omap2/board-am335xevm.c |
17 | +++ b/arch/arm/mach-omap2/board-am335xevm.c | 15 | +++ b/arch/arm/mach-omap2/board-am335xevm.c |
18 | @@ -36,6 +36,7 @@ | 16 | @@ -179,6 +179,16 @@ static const struct display_panel bbtoys7_panel = { |
19 | #include <linux/mfd/tps65910.h> | ||
20 | #include <linux/mfd/tps65217.h> | ||
21 | #include <linux/pwm_backlight.h> | ||
22 | +#include <linux/pwm/pwm.h> | ||
23 | |||
24 | /* LCD controller is similar to DA850 */ | ||
25 | #include <video/da8xx-fb.h> | ||
26 | @@ -131,7 +132,7 @@ static const struct display_panel disp_panel = { | ||
27 | /* LCD backlight platform Data */ | ||
28 | #define AM335X_BACKLIGHT_MAX_BRIGHTNESS 100 | ||
29 | #define AM335X_BACKLIGHT_DEFAULT_BRIGHTNESS 100 | ||
30 | -#define AM335X_PWM_PERIOD_NANO_SECONDS (1000000 * 10) | ||
31 | +#define AM335X_PWM_PERIOD_NANO_SECONDS (1000000 * 5) | ||
32 | |||
33 | #define PWM_DEVICE_ID "ecap.0" | ||
34 | |||
35 | @@ -175,6 +176,16 @@ static const struct display_panel bbtoys7_panel = { | ||
36 | COLOR_ACTIVE, | 17 | COLOR_ACTIVE, |
37 | }; | 18 | }; |
38 | 19 | ||
@@ -49,7 +30,7 @@ index 177ab9e..6a77194 100644 | |||
49 | static struct lcd_ctrl_config bbtoys7_cfg = { | 30 | static struct lcd_ctrl_config bbtoys7_cfg = { |
50 | &bbtoys7_panel, | 31 | &bbtoys7_panel, |
51 | .ac_bias = 255, | 32 | .ac_bias = 255, |
52 | @@ -586,9 +597,9 @@ static struct pinmux_config bbtoys7_pin_mux[] = { | 33 | @@ -599,9 +609,9 @@ static struct pinmux_config bbtoys7_pin_mux[] = { |
53 | {"lcd_vsync.lcd_vsync", OMAP_MUX_MODE0 | AM33XX_PIN_OUTPUT}, | 34 | {"lcd_vsync.lcd_vsync", OMAP_MUX_MODE0 | AM33XX_PIN_OUTPUT}, |
54 | {"lcd_hsync.lcd_hsync", OMAP_MUX_MODE0 | AM33XX_PIN_OUTPUT}, | 35 | {"lcd_hsync.lcd_hsync", OMAP_MUX_MODE0 | AM33XX_PIN_OUTPUT}, |
55 | {"lcd_pclk.lcd_pclk", OMAP_MUX_MODE0 | AM33XX_PIN_OUTPUT}, | 36 | {"lcd_pclk.lcd_pclk", OMAP_MUX_MODE0 | AM33XX_PIN_OUTPUT}, |
@@ -61,7 +42,7 @@ index 177ab9e..6a77194 100644 | |||
61 | {NULL, 0}, | 42 | {NULL, 0}, |
62 | }; | 43 | }; |
63 | 44 | ||
64 | @@ -1121,6 +1132,7 @@ static struct pinmux_config ecap0_pin_mux[] = { | 45 | @@ -1134,6 +1144,7 @@ static struct pinmux_config ecap0_pin_mux[] = { |
65 | {NULL, 0}, | 46 | {NULL, 0}, |
66 | }; | 47 | }; |
67 | 48 | ||
@@ -69,7 +50,7 @@ index 177ab9e..6a77194 100644 | |||
69 | static int backlight_enable; | 50 | static int backlight_enable; |
70 | 51 | ||
71 | #define AM335XEVM_WLAN_PMENA_GPIO GPIO_TO_PIN(1, 30) | 52 | #define AM335XEVM_WLAN_PMENA_GPIO GPIO_TO_PIN(1, 30) |
72 | @@ -1190,6 +1202,30 @@ static int __init ecap0_init(void) | 53 | @@ -1216,6 +1227,30 @@ static int __init ecap0_init(void) |
73 | } | 54 | } |
74 | late_initcall(ecap0_init); | 55 | late_initcall(ecap0_init); |
75 | 56 | ||
@@ -100,7 +81,7 @@ index 177ab9e..6a77194 100644 | |||
100 | static int __init conf_disp_pll(int rate) | 81 | static int __init conf_disp_pll(int rate) |
101 | { | 82 | { |
102 | struct clk *disp_pll; | 83 | struct clk *disp_pll; |
103 | @@ -1224,11 +1260,12 @@ static void lcdc_init(int evm_id, int profile) | 84 | @@ -1250,11 +1285,12 @@ static void lcdc_init(int evm_id, int profile) |
104 | } | 85 | } |
105 | 86 | ||
106 | #define BEAGLEBONE_LCD_AVDD_EN GPIO_TO_PIN(0, 7) | 87 | #define BEAGLEBONE_LCD_AVDD_EN GPIO_TO_PIN(0, 7) |
@@ -114,7 +95,7 @@ index 177ab9e..6a77194 100644 | |||
114 | 95 | ||
115 | // we are being stupid and setting pixclock from here instead of da8xx-fb.c | 96 | // we are being stupid and setting pixclock from here instead of da8xx-fb.c |
116 | if (conf_disp_pll(300000000)) { | 97 | if (conf_disp_pll(300000000)) { |
117 | @@ -1239,12 +1276,7 @@ static void bbtoys7lcd_init(int evm_id, int profile) | 98 | @@ -1265,12 +1301,7 @@ static void bbtoys7lcd_init(int evm_id, int profile) |
118 | 99 | ||
119 | if (am33xx_register_lcdc(&bbtoys7_pdata)) | 100 | if (am33xx_register_lcdc(&bbtoys7_pdata)) |
120 | pr_info("Failed to register Beagleboardtoys 7\" LCD cape device\n"); | 101 | pr_info("Failed to register Beagleboardtoys 7\" LCD cape device\n"); |
@@ -128,7 +109,7 @@ index 177ab9e..6a77194 100644 | |||
128 | return; | 109 | return; |
129 | } | 110 | } |
130 | 111 | ||
131 | @@ -1768,6 +1800,8 @@ static void beaglebone_cape_setup(struct memory_accessor *mem_acc, void *context | 112 | @@ -1831,6 +1862,8 @@ static void beaglebone_cape_setup(struct memory_accessor *mem_acc, void *context |
132 | bbtoys7lcd_init(0,0); | 113 | bbtoys7lcd_init(0,0); |
133 | pr_info("BeagleBone cape: initializing LCD cape touchscreen\n"); | 114 | pr_info("BeagleBone cape: initializing LCD cape touchscreen\n"); |
134 | tsc_init(0,0); | 115 | tsc_init(0,0); |
@@ -137,41 +118,6 @@ index 177ab9e..6a77194 100644 | |||
137 | beaglebone_tsadcpins_free = 0; | 118 | beaglebone_tsadcpins_free = 0; |
138 | } | 119 | } |
139 | 120 | ||
140 | diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c | ||
141 | index 198df7b..8cd2523 100644 | ||
142 | --- a/arch/arm/mach-omap2/devices.c | ||
143 | +++ b/arch/arm/mach-omap2/devices.c | ||
144 | @@ -1278,6 +1278,19 @@ void register_ehrpwm(int max_freq) | ||
145 | platform_device_register(&am335x_epwm2_device); | ||
146 | } | ||
147 | |||
148 | +void register_ehrpwm1(int max_freq) | ||
149 | +{ | ||
150 | + int val; | ||
151 | + | ||
152 | + val = __raw_readw(AM33XX_CTRL_REGADDR(AM33XX_PWMSS_CTRL)); | ||
153 | + val |= PWMSS1_TBCLKEN; | ||
154 | + __raw_writew(val, AM33XX_CTRL_REGADDR(AM33XX_PWMSS_CTRL)); | ||
155 | + am335x_pwmss_config1.chan_attrib[1].max_freq = max_freq; | ||
156 | + sema_init(&am335x_pwmss_config1.config_semaphore, 1); | ||
157 | + am335x_pwmss_config1.version = PWM_VERSION_1; | ||
158 | + platform_device_register(&am335x_epwm1_device); | ||
159 | +} | ||
160 | + | ||
161 | static struct resource am335x_ecap0_resurce[] = { | ||
162 | { | ||
163 | .start = AM33XX_EPWMSS0_BASE , | ||
164 | diff --git a/arch/arm/mach-omap2/devices.h b/arch/arm/mach-omap2/devices.h | ||
165 | index e086839..5161eb4 100644 | ||
166 | --- a/arch/arm/mach-omap2/devices.h | ||
167 | +++ b/arch/arm/mach-omap2/devices.h | ||
168 | @@ -18,5 +18,6 @@ int omap3_init_camera(struct isp_platform_data *pdata); | ||
169 | |||
170 | void __init am335x_register_mcasp1(struct snd_platform_data *pdata); | ||
171 | extern void register_ehrpwm(int max_freq); | ||
172 | +extern void register_ehrpwm1(int max_freq); | ||
173 | |||
174 | #endif | ||
175 | -- | 121 | -- |
176 | 1.7.9.4 | 122 | 1.7.9.5 |
177 | 123 | ||
diff --git a/recipes-kernel/linux/linux-ti33x-psp-3.2/beaglebone/0016-omap_hsmmc-Set-dto-to-max-value-of-14-to-avoid-SD-Ca.patch b/recipes-kernel/linux/linux-ti33x-psp-3.2/beaglebone/0016-omap_hsmmc-Set-dto-to-max-value-of-14-to-avoid-SD-Ca.patch index fb61077c..42e342b8 100644 --- a/recipes-kernel/linux/linux-ti33x-psp-3.2/beaglebone/0016-omap_hsmmc-Set-dto-to-max-value-of-14-to-avoid-SD-Ca.patch +++ b/recipes-kernel/linux/linux-ti33x-psp-3.2/beaglebone/0016-omap_hsmmc-Set-dto-to-max-value-of-14-to-avoid-SD-Ca.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 0cc4e8a341f58683ee26bceb27e43cbb7bb3dc30 Mon Sep 17 00:00:00 2001 | 1 | From 96debb4a5199afb9ad47e8c94292540e99d4050f Mon Sep 17 00:00:00 2001 |
2 | From: Steve Sakoman <steve@sakoman.com> | 2 | From: Steve Sakoman <steve@sakoman.com> |
3 | Date: Mon, 18 Jul 2011 23:13:41 -0500 | 3 | Date: Mon, 18 Jul 2011 23:13:41 -0500 |
4 | Subject: [PATCH 16/22] omap_hsmmc: Set dto to max value of 14 to avoid SD | 4 | Subject: [PATCH 16/26] omap_hsmmc: Set dto to max value of 14 to avoid SD |
5 | Card timeouts | 5 | Card timeouts |
6 | 6 | ||
7 | This fixes MMC errors due to timeouts on certain SD Cards following suggestions | 7 | This fixes MMC errors due to timeouts on certain SD Cards following suggestions |
@@ -16,12 +16,12 @@ This fix was originally proposed by Sukumar Ghoral of TI. | |||
16 | 1 file changed, 3 insertions(+) | 16 | 1 file changed, 3 insertions(+) |
17 | 17 | ||
18 | diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c | 18 | diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c |
19 | index 703013c..554237f 100644 | 19 | index 1f938d9..ace26f7 100644 |
20 | --- a/drivers/mmc/host/omap_hsmmc.c | 20 | --- a/drivers/mmc/host/omap_hsmmc.c |
21 | +++ b/drivers/mmc/host/omap_hsmmc.c | 21 | +++ b/drivers/mmc/host/omap_hsmmc.c |
22 | @@ -1562,6 +1562,9 @@ static void set_data_timeout(struct omap_hsmmc_host *host, | 22 | @@ -1542,6 +1542,9 @@ static void set_data_timeout(struct omap_hsmmc_host *host) |
23 | dto = 14; | 23 | /* Use the maximum timeout value allowed in the standard of 14 or 0xE */ |
24 | } | 24 | dto = 14; |
25 | 25 | ||
26 | + /* Set dto to max value of 14 to avoid SD Card timeouts */ | 26 | + /* Set dto to max value of 14 to avoid SD Card timeouts */ |
27 | + dto = 14; | 27 | + dto = 14; |
@@ -30,5 +30,5 @@ index 703013c..554237f 100644 | |||
30 | reg |= dto << DTO_SHIFT; | 30 | reg |= dto << DTO_SHIFT; |
31 | OMAP_HSMMC_WRITE(host->base, SYSCTL, reg); | 31 | OMAP_HSMMC_WRITE(host->base, SYSCTL, reg); |
32 | -- | 32 | -- |
33 | 1.7.9.4 | 33 | 1.7.9.5 |
34 | 34 | ||
diff --git a/recipes-kernel/linux/linux-ti33x-psp-3.2/beaglebone/0017-beaglebone-set-default-brightness-to-50-for-pwm-back.patch b/recipes-kernel/linux/linux-ti33x-psp-3.2/beaglebone/0017-beaglebone-set-default-brightness-to-50-for-pwm-back.patch index d170569f..a52ff8c7 100644 --- a/recipes-kernel/linux/linux-ti33x-psp-3.2/beaglebone/0017-beaglebone-set-default-brightness-to-50-for-pwm-back.patch +++ b/recipes-kernel/linux/linux-ti33x-psp-3.2/beaglebone/0017-beaglebone-set-default-brightness-to-50-for-pwm-back.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From f4574c67479c3c86f5eb78a1806f627740c91483 Mon Sep 17 00:00:00 2001 | 1 | From 55315e3442ea08e4bd0d676921f968dc1fccf588 Mon Sep 17 00:00:00 2001 |
2 | From: Koen Kooi <koen@dominion.thruhere.net> | 2 | From: Koen Kooi <koen@dominion.thruhere.net> |
3 | Date: Wed, 1 Feb 2012 14:10:38 +0100 | 3 | Date: Wed, 1 Feb 2012 14:10:38 +0100 |
4 | Subject: [PATCH 17/22] beaglebone: set default brightness to 50% for pwm | 4 | Subject: [PATCH 17/26] beaglebone: set default brightness to 50% for pwm |
5 | backlights | 5 | backlights |
6 | 6 | ||
7 | Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> | 7 | Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> |
@@ -10,18 +10,18 @@ Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> | |||
10 | 1 file changed, 1 insertion(+), 1 deletion(-) | 10 | 1 file changed, 1 insertion(+), 1 deletion(-) |
11 | 11 | ||
12 | diff --git a/arch/arm/mach-omap2/board-am335xevm.c b/arch/arm/mach-omap2/board-am335xevm.c | 12 | diff --git a/arch/arm/mach-omap2/board-am335xevm.c b/arch/arm/mach-omap2/board-am335xevm.c |
13 | index 6a77194..c31c0aa 100644 | 13 | index 23b59c2..9294af5 100644 |
14 | --- a/arch/arm/mach-omap2/board-am335xevm.c | 14 | --- a/arch/arm/mach-omap2/board-am335xevm.c |
15 | +++ b/arch/arm/mach-omap2/board-am335xevm.c | 15 | +++ b/arch/arm/mach-omap2/board-am335xevm.c |
16 | @@ -131,7 +131,7 @@ static const struct display_panel disp_panel = { | 16 | @@ -133,7 +133,7 @@ static const struct display_panel disp_panel = { |
17 | 17 | ||
18 | /* LCD backlight platform Data */ | 18 | /* LCD backlight platform Data */ |
19 | #define AM335X_BACKLIGHT_MAX_BRIGHTNESS 100 | 19 | #define AM335X_BACKLIGHT_MAX_BRIGHTNESS 100 |
20 | -#define AM335X_BACKLIGHT_DEFAULT_BRIGHTNESS 100 | 20 | -#define AM335X_BACKLIGHT_DEFAULT_BRIGHTNESS 100 |
21 | +#define AM335X_BACKLIGHT_DEFAULT_BRIGHTNESS 50 | 21 | +#define AM335X_BACKLIGHT_DEFAULT_BRIGHTNESS 50 |
22 | #define AM335X_PWM_PERIOD_NANO_SECONDS (1000000 * 5) | 22 | #define AM335X_PWM_PERIOD_NANO_SECONDS (5000 * 10) |
23 | 23 | ||
24 | #define PWM_DEVICE_ID "ecap.0" | 24 | #define PWM_DEVICE_ID "ecap.0" |
25 | -- | 25 | -- |
26 | 1.7.9.4 | 26 | 1.7.9.5 |
27 | 27 | ||
diff --git a/recipes-kernel/linux/linux-ti33x-psp-3.2/beaglebone/0018-st7735fb-WIP-framebuffer-driver-supporting-Adafruit-.patch b/recipes-kernel/linux/linux-ti33x-psp-3.2/beaglebone/0018-st7735fb-WIP-framebuffer-driver-supporting-Adafruit-.patch index fbd442c8..9f60391f 100644 --- a/recipes-kernel/linux/linux-ti33x-psp-3.2/beaglebone/0018-st7735fb-WIP-framebuffer-driver-supporting-Adafruit-.patch +++ b/recipes-kernel/linux/linux-ti33x-psp-3.2/beaglebone/0018-st7735fb-WIP-framebuffer-driver-supporting-Adafruit-.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From dd3b1a497531a579e80656f298bf8adf7a789f43 Mon Sep 17 00:00:00 2001 | 1 | From 87a3d78cceff02796574ec9c0e5ee9c81372cd29 Mon Sep 17 00:00:00 2001 |
2 | From: Matt Porter <mporter@ti.com> | 2 | From: Matt Porter <mporter@ti.com> |
3 | Date: Mon, 21 Nov 2011 12:55:23 -0500 | 3 | Date: Mon, 21 Nov 2011 12:55:23 -0500 |
4 | Subject: [PATCH 18/22] st7735fb: WIP framebuffer driver supporting Adafruit | 4 | Subject: [PATCH 18/26] st7735fb: WIP framebuffer driver supporting Adafruit |
5 | 1.8" SPI LCD | 5 | 1.8" SPI LCD |
6 | 6 | ||
7 | Signed-off-by: Matt Porter <mporter@ti.com> | 7 | Signed-off-by: Matt Porter <mporter@ti.com> |
@@ -664,5 +664,5 @@ index 0000000..250f036 | |||
664 | + | 664 | + |
665 | + | 665 | + |
666 | -- | 666 | -- |
667 | 1.7.9.4 | 667 | 1.7.9.5 |
668 | 668 | ||
diff --git a/recipes-kernel/linux/linux-ti33x-psp-3.2/beaglebone/0019-beaglebone-use-P8_6-gpio1_3-as-w1-bus.patch b/recipes-kernel/linux/linux-ti33x-psp-3.2/beaglebone/0019-beaglebone-use-P8_6-gpio1_3-as-w1-bus.patch index 8986fd8c..c165721c 100644 --- a/recipes-kernel/linux/linux-ti33x-psp-3.2/beaglebone/0019-beaglebone-use-P8_6-gpio1_3-as-w1-bus.patch +++ b/recipes-kernel/linux/linux-ti33x-psp-3.2/beaglebone/0019-beaglebone-use-P8_6-gpio1_3-as-w1-bus.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From a2282555e35f8f3278d0d4b2fd67348152dde883 Mon Sep 17 00:00:00 2001 | 1 | From 4f40b3e2d3fa97add575cfd398fc76595d2c2141 Mon Sep 17 00:00:00 2001 |
2 | From: Koen Kooi <koen@dominion.thruhere.net> | 2 | From: Koen Kooi <koen@dominion.thruhere.net> |
3 | Date: Tue, 7 Feb 2012 11:01:13 +0100 | 3 | Date: Tue, 7 Feb 2012 11:01:13 +0100 |
4 | Subject: [PATCH 19/22] beaglebone: use P8_6 (gpio1_3) as w1 bus | 4 | Subject: [PATCH 19/26] beaglebone: use P8_6 (gpio1_3) as w1 bus |
5 | 5 | ||
6 | Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> | 6 | Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> |
7 | --- | 7 | --- |
@@ -9,18 +9,18 @@ Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> | |||
9 | 1 file changed, 31 insertions(+) | 9 | 1 file changed, 31 insertions(+) |
10 | 10 | ||
11 | diff --git a/arch/arm/mach-omap2/board-am335xevm.c b/arch/arm/mach-omap2/board-am335xevm.c | 11 | diff --git a/arch/arm/mach-omap2/board-am335xevm.c b/arch/arm/mach-omap2/board-am335xevm.c |
12 | index c31c0aa..538466d 100644 | 12 | index 9294af5..88f07e3 100644 |
13 | --- a/arch/arm/mach-omap2/board-am335xevm.c | 13 | --- a/arch/arm/mach-omap2/board-am335xevm.c |
14 | +++ b/arch/arm/mach-omap2/board-am335xevm.c | 14 | +++ b/arch/arm/mach-omap2/board-am335xevm.c |
15 | @@ -37,6 +37,7 @@ | 15 | @@ -38,6 +38,7 @@ |
16 | #include <linux/mfd/tps65217.h> | ||
17 | #include <linux/pwm_backlight.h> | 16 | #include <linux/pwm_backlight.h> |
17 | #include <linux/reboot.h> | ||
18 | #include <linux/pwm/pwm.h> | 18 | #include <linux/pwm/pwm.h> |
19 | +#include <linux/w1-gpio.h> | 19 | +#include <linux/w1-gpio.h> |
20 | 20 | ||
21 | /* LCD controller is similar to DA850 */ | 21 | /* LCD controller is similar to DA850 */ |
22 | #include <video/da8xx-fb.h> | 22 | #include <video/da8xx-fb.h> |
23 | @@ -603,6 +604,11 @@ static struct pinmux_config bbtoys7_pin_mux[] = { | 23 | @@ -615,6 +616,11 @@ static struct pinmux_config bbtoys7_pin_mux[] = { |
24 | {NULL, 0}, | 24 | {NULL, 0}, |
25 | }; | 25 | }; |
26 | 26 | ||
@@ -32,7 +32,7 @@ index c31c0aa..538466d 100644 | |||
32 | static struct pinmux_config tsc_pin_mux[] = { | 32 | static struct pinmux_config tsc_pin_mux[] = { |
33 | {"ain0.ain0", OMAP_MUX_MODE0 | AM33XX_INPUT_EN}, | 33 | {"ain0.ain0", OMAP_MUX_MODE0 | AM33XX_INPUT_EN}, |
34 | {"ain1.ain1", OMAP_MUX_MODE0 | AM33XX_INPUT_EN}, | 34 | {"ain1.ain1", OMAP_MUX_MODE0 | AM33XX_INPUT_EN}, |
35 | @@ -1026,6 +1032,19 @@ static struct pinmux_config profibus_pin_mux[] = { | 35 | @@ -1038,6 +1044,19 @@ static struct pinmux_config profibus_pin_mux[] = { |
36 | {NULL, 0}, | 36 | {NULL, 0}, |
37 | }; | 37 | }; |
38 | 38 | ||
@@ -52,7 +52,7 @@ index c31c0aa..538466d 100644 | |||
52 | /* LEDS - gpio1_21 -> gpio1_24 */ | 52 | /* LEDS - gpio1_21 -> gpio1_24 */ |
53 | 53 | ||
54 | #define BEAGLEBONE_USR1_LED GPIO_TO_PIN(1, 21) | 54 | #define BEAGLEBONE_USR1_LED GPIO_TO_PIN(1, 21) |
55 | @@ -1349,6 +1368,17 @@ static void dvileds_init(int evm_id, int profile ) | 55 | @@ -1375,6 +1394,17 @@ static void dvileds_init(int evm_id, int profile ) |
56 | pr_err("failed to register BeagleBone DVI cape LEDS\n"); | 56 | pr_err("failed to register BeagleBone DVI cape LEDS\n"); |
57 | } | 57 | } |
58 | 58 | ||
@@ -70,7 +70,7 @@ index c31c0aa..538466d 100644 | |||
70 | static void rgmii1_init(int evm_id, int profile) | 70 | static void rgmii1_init(int evm_id, int profile) |
71 | { | 71 | { |
72 | setup_pin_mux(rgmii1_pin_mux); | 72 | setup_pin_mux(rgmii1_pin_mux); |
73 | @@ -2228,6 +2258,7 @@ static struct evm_dev_cfg beaglebone_dev_cfg[] = { | 73 | @@ -2290,6 +2320,7 @@ static struct evm_dev_cfg beaglebone_dev_cfg[] = { |
74 | {i2c2_init, DEV_ON_BASEBOARD, PROFILE_NONE}, | 74 | {i2c2_init, DEV_ON_BASEBOARD, PROFILE_NONE}, |
75 | {mmc0_init, DEV_ON_BASEBOARD, PROFILE_NONE}, | 75 | {mmc0_init, DEV_ON_BASEBOARD, PROFILE_NONE}, |
76 | {boneleds_init, DEV_ON_BASEBOARD, PROFILE_ALL}, | 76 | {boneleds_init, DEV_ON_BASEBOARD, PROFILE_ALL}, |
@@ -79,5 +79,5 @@ index c31c0aa..538466d 100644 | |||
79 | }; | 79 | }; |
80 | 80 | ||
81 | -- | 81 | -- |
82 | 1.7.9.4 | 82 | 1.7.9.5 |
83 | 83 | ||
diff --git a/recipes-kernel/linux/linux-ti33x-psp-3.2/beaglebone/0020-beaglebone-add-support-for-Towertech-TT3201-CAN-cape.patch b/recipes-kernel/linux/linux-ti33x-psp-3.2/beaglebone/0020-beaglebone-add-support-for-Towertech-TT3201-CAN-cape.patch index 9baf0c0d..59b86076 100644 --- a/recipes-kernel/linux/linux-ti33x-psp-3.2/beaglebone/0020-beaglebone-add-support-for-Towertech-TT3201-CAN-cape.patch +++ b/recipes-kernel/linux/linux-ti33x-psp-3.2/beaglebone/0020-beaglebone-add-support-for-Towertech-TT3201-CAN-cape.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 9d67d32b9f1132157cd96a2e126a5b667b3640f1 Mon Sep 17 00:00:00 2001 | 1 | From 89028c4350be00850cb58b9dcb82d93dcb6373c4 Mon Sep 17 00:00:00 2001 |
2 | From: Alessandro Zummo <a.zummo@towertech.it> | 2 | From: Alessandro Zummo <a.zummo@towertech.it> |
3 | Date: Thu, 9 Feb 2012 12:46:52 +0100 | 3 | Date: Thu, 9 Feb 2012 12:46:52 +0100 |
4 | Subject: [PATCH 20/22] beaglebone: add support for Towertech TT3201 CAN cape | 4 | Subject: [PATCH 20/26] beaglebone: add support for Towertech TT3201 CAN cape |
5 | 5 | ||
6 | Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> | 6 | Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> |
7 | --- | 7 | --- |
@@ -12,18 +12,18 @@ Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> | |||
12 | 4 files changed, 98 insertions(+), 19 deletions(-) | 12 | 4 files changed, 98 insertions(+), 19 deletions(-) |
13 | 13 | ||
14 | diff --git a/arch/arm/mach-omap2/board-am335xevm.c b/arch/arm/mach-omap2/board-am335xevm.c | 14 | diff --git a/arch/arm/mach-omap2/board-am335xevm.c b/arch/arm/mach-omap2/board-am335xevm.c |
15 | index 538466d..36efca1 100644 | 15 | index 88f07e3..a30689f 100644 |
16 | --- a/arch/arm/mach-omap2/board-am335xevm.c | 16 | --- a/arch/arm/mach-omap2/board-am335xevm.c |
17 | +++ b/arch/arm/mach-omap2/board-am335xevm.c | 17 | +++ b/arch/arm/mach-omap2/board-am335xevm.c |
18 | @@ -38,6 +38,7 @@ | 18 | @@ -39,6 +39,7 @@ |
19 | #include <linux/pwm_backlight.h> | 19 | #include <linux/reboot.h> |
20 | #include <linux/pwm/pwm.h> | 20 | #include <linux/pwm/pwm.h> |
21 | #include <linux/w1-gpio.h> | 21 | #include <linux/w1-gpio.h> |
22 | +#include <linux/can/platform/mcp251x.h> | 22 | +#include <linux/can/platform/mcp251x.h> |
23 | 23 | ||
24 | /* LCD controller is similar to DA850 */ | 24 | /* LCD controller is similar to DA850 */ |
25 | #include <video/da8xx-fb.h> | 25 | #include <video/da8xx-fb.h> |
26 | @@ -829,6 +830,15 @@ static struct pinmux_config d_can_ia_pin_mux[] = { | 26 | @@ -841,6 +842,15 @@ static struct pinmux_config d_can_ia_pin_mux[] = { |
27 | {NULL, 0}, | 27 | {NULL, 0}, |
28 | }; | 28 | }; |
29 | 29 | ||
@@ -39,7 +39,7 @@ index 538466d..36efca1 100644 | |||
39 | /* Module pin mux for uart2 */ | 39 | /* Module pin mux for uart2 */ |
40 | static struct pinmux_config uart2_pin_mux[] = { | 40 | static struct pinmux_config uart2_pin_mux[] = { |
41 | {"spi0_sclk.uart2_rxd", OMAP_MUX_MODE1 | AM33XX_SLEWCTRL_SLOW | | 41 | {"spi0_sclk.uart2_rxd", OMAP_MUX_MODE1 | AM33XX_SLEWCTRL_SLOW | |
42 | @@ -1788,6 +1798,44 @@ static void i2c1_init(int evm_id, int profile) | 42 | @@ -1850,6 +1860,44 @@ static void i2c1_init(int evm_id, int profile) |
43 | return; | 43 | return; |
44 | } | 44 | } |
45 | 45 | ||
@@ -84,7 +84,7 @@ index 538466d..36efca1 100644 | |||
84 | static void beaglebone_cape_setup(struct memory_accessor *mem_acc, void *context) | 84 | static void beaglebone_cape_setup(struct memory_accessor *mem_acc, void *context) |
85 | { | 85 | { |
86 | capecount++; | 86 | capecount++; |
87 | @@ -1835,7 +1883,11 @@ static void beaglebone_cape_setup(struct memory_accessor *mem_acc, void *context | 87 | @@ -1897,7 +1945,11 @@ static void beaglebone_cape_setup(struct memory_accessor *mem_acc, void *context |
88 | beaglebone_tsadcpins_free = 0; | 88 | beaglebone_tsadcpins_free = 0; |
89 | } | 89 | } |
90 | 90 | ||
@@ -98,7 +98,7 @@ index 538466d..36efca1 100644 | |||
98 | pr_info("BeagleBone cape: exporting ADC pins to sysfs\n"); | 98 | pr_info("BeagleBone cape: exporting ADC pins to sysfs\n"); |
99 | bone_tsc_init(0,0); | 99 | bone_tsc_init(0,0); |
100 | diff --git a/arch/arm/mach-omap2/mux33xx.c b/arch/arm/mach-omap2/mux33xx.c | 100 | diff --git a/arch/arm/mach-omap2/mux33xx.c b/arch/arm/mach-omap2/mux33xx.c |
101 | index fcb81ec..2de76e3 100644 | 101 | index 0f71646..25dcedb 100644 |
102 | --- a/arch/arm/mach-omap2/mux33xx.c | 102 | --- a/arch/arm/mach-omap2/mux33xx.c |
103 | +++ b/arch/arm/mach-omap2/mux33xx.c | 103 | +++ b/arch/arm/mach-omap2/mux33xx.c |
104 | @@ -312,16 +312,16 @@ static struct omap_mux __initdata am33xx_muxmodes[] = { | 104 | @@ -312,16 +312,16 @@ static struct omap_mux __initdata am33xx_muxmodes[] = { |
@@ -316,5 +316,5 @@ index 330140e..b3e231c 100644 | |||
316 | } | 316 | } |
317 | error_probe: | 317 | error_probe: |
318 | -- | 318 | -- |
319 | 1.7.9.4 | 319 | 1.7.9.5 |
320 | 320 | ||
diff --git a/recipes-kernel/linux/linux-ti33x-psp-3.2/beaglebone/0021-ARM-OMAP2-am33xx-fix-serial-mux-warnings-for-am33xx.patch b/recipes-kernel/linux/linux-ti33x-psp-3.2/beaglebone/0021-ARM-OMAP2-am33xx-fix-serial-mux-warnings-for-am33xx.patch deleted file mode 100644 index 2d37f2c2..00000000 --- a/recipes-kernel/linux/linux-ti33x-psp-3.2/beaglebone/0021-ARM-OMAP2-am33xx-fix-serial-mux-warnings-for-am33xx.patch +++ /dev/null | |||
@@ -1,40 +0,0 @@ | |||
1 | From 6a1eef2a91f39da5bcca2e6b11f60298a9f15831 Mon Sep 17 00:00:00 2001 | ||
2 | From: "Hebbar, Gururaja" <gururaja.hebbar@ti.com> | ||
3 | Date: Tue, 24 Jan 2012 19:45:12 +0530 | ||
4 | Subject: [PATCH 21/22] ARM: OMAP2+: am33xx: fix serial mux warnings for | ||
5 | am33xx | ||
6 | |||
7 | The patch removes below warning in serial mux setup on AM335x platform | ||
8 | |||
9 | [ 0.162052] _omap_mux_get_by_name: Could not find signal | ||
10 | uart1_cts.uart1_cts | ||
11 | [ 0.169437] omap_hwmod_mux_init: Could not allocate device mux entry | ||
12 | [ 0.176384] _omap_mux_get_by_name: Could not find signal | ||
13 | uart2_cts.uart2_cts | ||
14 | [ 0.183735] omap_hwmod_mux_init: Could not allocate device mux entry | ||
15 | [ 0.190663] _omap_mux_get_by_name: Could not find signal | ||
16 | uart3_cts_rctx.uart3_cts_rctx | ||
17 | [ 0.198926] omap_hwmod_mux_init: Could not allocate device mux entry | ||
18 | |||
19 | Signed-off-by: Hebbar, Gururaja <gururaja.hebbar@ti.com> | ||
20 | --- | ||
21 | arch/arm/mach-omap2/serial.c | 3 ++- | ||
22 | 1 file changed, 2 insertions(+), 1 deletion(-) | ||
23 | |||
24 | diff --git a/arch/arm/mach-omap2/serial.c b/arch/arm/mach-omap2/serial.c | ||
25 | index ad5bed3..bfa8ae3 100644 | ||
26 | --- a/arch/arm/mach-omap2/serial.c | ||
27 | +++ b/arch/arm/mach-omap2/serial.c | ||
28 | @@ -409,7 +409,8 @@ void __init omap_serial_board_init(struct omap_uart_port_info *info) | ||
29 | bdata.pads = NULL; | ||
30 | bdata.pads_cnt = 0; | ||
31 | |||
32 | - if (cpu_is_omap44xx() || cpu_is_omap34xx()) | ||
33 | + if (cpu_is_omap44xx() || (cpu_is_omap34xx() && | ||
34 | + !cpu_is_am33xx())) | ||
35 | omap_serial_fill_default_pads(&bdata); | ||
36 | |||
37 | if (!info) | ||
38 | -- | ||
39 | 1.7.9.4 | ||
40 | |||
diff --git a/recipes-kernel/linux/linux-ti33x-psp-3.2/beaglebone/0023-beaglebone-add-more-beagleboardtoys-cape-partnumbers.patch b/recipes-kernel/linux/linux-ti33x-psp-3.2/beaglebone/0021-beaglebone-add-more-beagleboardtoys-cape-partnumbers.patch index 748386a8..0067a5ea 100644 --- a/recipes-kernel/linux/linux-ti33x-psp-3.2/beaglebone/0023-beaglebone-add-more-beagleboardtoys-cape-partnumbers.patch +++ b/recipes-kernel/linux/linux-ti33x-psp-3.2/beaglebone/0021-beaglebone-add-more-beagleboardtoys-cape-partnumbers.patch | |||
@@ -1,18 +1,18 @@ | |||
1 | From a0bf4fec50d8a0690e6f4ded292d24fb00d9e01a Mon Sep 17 00:00:00 2001 | 1 | From 6f8cb102c35b2770f11da5fc4ad9585b529c0bf2 Mon Sep 17 00:00:00 2001 |
2 | From: Koen Kooi <koen@dominion.thruhere.net> | 2 | From: Koen Kooi <koen@dominion.thruhere.net> |
3 | Date: Mon, 19 Mar 2012 12:01:35 +0100 | 3 | Date: Mon, 19 Mar 2012 12:01:35 +0100 |
4 | Subject: [PATCH 23/27] beaglebone: add more beagleboardtoys cape partnumbers | 4 | Subject: [PATCH 21/26] beaglebone: add more beagleboardtoys cape partnumbers |
5 | 5 | ||
6 | Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> | 6 | Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> |
7 | --- | 7 | --- |
8 | arch/arm/mach-omap2/board-am335xevm.c | 25 ++++++++++++++++++++++++- | 8 | arch/arm/mach-omap2/board-am335xevm.c | 25 ++++++++++++++++++++++++- |
9 | 1 files changed, 24 insertions(+), 1 deletions(-) | 9 | 1 file changed, 24 insertions(+), 1 deletion(-) |
10 | 10 | ||
11 | diff --git a/arch/arm/mach-omap2/board-am335xevm.c b/arch/arm/mach-omap2/board-am335xevm.c | 11 | diff --git a/arch/arm/mach-omap2/board-am335xevm.c b/arch/arm/mach-omap2/board-am335xevm.c |
12 | index 36efca1..58a0e77 100644 | 12 | index a30689f..73d9dd9 100644 |
13 | --- a/arch/arm/mach-omap2/board-am335xevm.c | 13 | --- a/arch/arm/mach-omap2/board-am335xevm.c |
14 | +++ b/arch/arm/mach-omap2/board-am335xevm.c | 14 | +++ b/arch/arm/mach-omap2/board-am335xevm.c |
15 | @@ -1883,11 +1883,34 @@ static void beaglebone_cape_setup(struct memory_accessor *mem_acc, void *context | 15 | @@ -1945,11 +1945,34 @@ static void beaglebone_cape_setup(struct memory_accessor *mem_acc, void *context |
16 | beaglebone_tsadcpins_free = 0; | 16 | beaglebone_tsadcpins_free = 0; |
17 | } | 17 | } |
18 | 18 | ||
@@ -49,5 +49,5 @@ index 36efca1..58a0e77 100644 | |||
49 | pr_info("BeagleBone cape: exporting ADC pins to sysfs\n"); | 49 | pr_info("BeagleBone cape: exporting ADC pins to sysfs\n"); |
50 | bone_tsc_init(0,0); | 50 | bone_tsc_init(0,0); |
51 | -- | 51 | -- |
52 | 1.7.2.5 | 52 | 1.7.9.5 |
53 | 53 | ||
diff --git a/recipes-kernel/linux/linux-ti33x-psp-3.2/beaglebone/0022-ARM-OMAP2-am335x-correct-McASP0-pin-mux-detail.patch b/recipes-kernel/linux/linux-ti33x-psp-3.2/beaglebone/0022-ARM-OMAP2-am335x-correct-McASP0-pin-mux-detail.patch deleted file mode 100644 index 7615d69b..00000000 --- a/recipes-kernel/linux/linux-ti33x-psp-3.2/beaglebone/0022-ARM-OMAP2-am335x-correct-McASP0-pin-mux-detail.patch +++ /dev/null | |||
@@ -1,29 +0,0 @@ | |||
1 | From d03a78bdff2f490d20510d0a90214a0b75f81639 Mon Sep 17 00:00:00 2001 | ||
2 | From: "Hebbar, Gururaja" <gururaja.hebbar@ti.com> | ||
3 | Date: Mon, 27 Feb 2012 11:56:39 +0530 | ||
4 | Subject: [PATCH 22/22] ARM: OMAP2+: am335x: correct McASP0 pin mux detail | ||
5 | |||
6 | McASP0 AXR3 pin mux-mode was incorrect specified in mux file. This | ||
7 | patch corrects the same. | ||
8 | |||
9 | Signed-off-by: Hebbar, Gururaja <gururaja.hebbar@ti.com> | ||
10 | --- | ||
11 | arch/arm/mach-omap2/mux33xx.c | 2 +- | ||
12 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
13 | |||
14 | diff --git a/arch/arm/mach-omap2/mux33xx.c b/arch/arm/mach-omap2/mux33xx.c | ||
15 | index 2de76e3..25dcedb 100644 | ||
16 | --- a/arch/arm/mach-omap2/mux33xx.c | ||
17 | +++ b/arch/arm/mach-omap2/mux33xx.c | ||
18 | @@ -351,7 +351,7 @@ static struct omap_mux __initdata am33xx_muxmodes[] = { | ||
19 | "mcasp0_axr1", NULL, NULL, "mcasp1_axr0", | ||
20 | NULL, NULL, NULL, "gpio3_20"), | ||
21 | _AM33XX_MUXENTRY(MCASP0_AHCLKX, 0, | ||
22 | - "mcasp0_ahclkx", "mcasp0_axr3", NULL, "mcasp1_axr1", | ||
23 | + "mcasp0_ahclkx", NULL, "mcasp0_axr3", "mcasp1_axr1", | ||
24 | NULL, NULL, NULL, "gpio3_21"), | ||
25 | _AM33XX_MUXENTRY(XDMA_EVENT_INTR0, 0, | ||
26 | "xdma_event_intr0", NULL, NULL, NULL, | ||
27 | -- | ||
28 | 1.7.9.4 | ||
29 | |||
diff --git a/recipes-kernel/linux/linux-ti33x-psp-3.2/beaglebone/0024-beaglebone-add-gpio-keys-for-lcd7-add-notes-for-miss.patch b/recipes-kernel/linux/linux-ti33x-psp-3.2/beaglebone/0022-beaglebone-add-gpio-keys-for-lcd7-add-notes-for-miss.patch index 4d44ae08..7b8d2422 100644 --- a/recipes-kernel/linux/linux-ti33x-psp-3.2/beaglebone/0024-beaglebone-add-gpio-keys-for-lcd7-add-notes-for-miss.patch +++ b/recipes-kernel/linux/linux-ti33x-psp-3.2/beaglebone/0022-beaglebone-add-gpio-keys-for-lcd7-add-notes-for-miss.patch | |||
@@ -1,18 +1,19 @@ | |||
1 | From 58f1b0546b2831d9ed15e8bf43f709085a60b2e9 Mon Sep 17 00:00:00 2001 | 1 | From fd358035f83d5edab1130ea569be580960a0dce7 Mon Sep 17 00:00:00 2001 |
2 | From: Koen Kooi <koen@dominion.thruhere.net> | 2 | From: Koen Kooi <koen@dominion.thruhere.net> |
3 | Date: Mon, 19 Mar 2012 13:32:43 +0100 | 3 | Date: Mon, 19 Mar 2012 13:32:43 +0100 |
4 | Subject: [PATCH 24/27] beaglebone: add gpio-keys for lcd7, add notes for missing functionality for other capes | 4 | Subject: [PATCH 22/26] beaglebone: add gpio-keys for lcd7, add notes for |
5 | missing functionality for other capes | ||
5 | 6 | ||
6 | Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> | 7 | Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> |
7 | --- | 8 | --- |
8 | arch/arm/mach-omap2/board-am335xevm.c | 79 +++++++++++++++++++++++++++++++++ | 9 | arch/arm/mach-omap2/board-am335xevm.c | 79 +++++++++++++++++++++++++++++++++ |
9 | 1 files changed, 79 insertions(+), 0 deletions(-) | 10 | 1 file changed, 79 insertions(+) |
10 | 11 | ||
11 | diff --git a/arch/arm/mach-omap2/board-am335xevm.c b/arch/arm/mach-omap2/board-am335xevm.c | 12 | diff --git a/arch/arm/mach-omap2/board-am335xevm.c b/arch/arm/mach-omap2/board-am335xevm.c |
12 | index 58a0e77..7a2b851 100644 | 13 | index 73d9dd9..a3d7846 100644 |
13 | --- a/arch/arm/mach-omap2/board-am335xevm.c | 14 | --- a/arch/arm/mach-omap2/board-am335xevm.c |
14 | +++ b/arch/arm/mach-omap2/board-am335xevm.c | 15 | +++ b/arch/arm/mach-omap2/board-am335xevm.c |
15 | @@ -980,6 +980,73 @@ static void volume_keys_init(int evm_id, int profile) | 16 | @@ -992,6 +992,73 @@ static void volume_keys_init(int evm_id, int profile) |
16 | pr_err("failed to register matrix keypad (2x3) device\n"); | 17 | pr_err("failed to register matrix keypad (2x3) device\n"); |
17 | } | 18 | } |
18 | 19 | ||
@@ -86,7 +87,7 @@ index 58a0e77..7a2b851 100644 | |||
86 | /* | 87 | /* |
87 | * @evm_id - evm id which needs to be configured | 88 | * @evm_id - evm id which needs to be configured |
88 | * @dev_cfg - single evm structure which includes | 89 | * @dev_cfg - single evm structure which includes |
89 | @@ -1881,6 +1948,8 @@ static void beaglebone_cape_setup(struct memory_accessor *mem_acc, void *context | 90 | @@ -1943,6 +2010,8 @@ static void beaglebone_cape_setup(struct memory_accessor *mem_acc, void *context |
90 | pr_info("BeagleBone cape: Registering PWM backlight for LCD cape\n"); | 91 | pr_info("BeagleBone cape: Registering PWM backlight for LCD cape\n"); |
91 | enable_ehrpwm1(0,0); | 92 | enable_ehrpwm1(0,0); |
92 | beaglebone_tsadcpins_free = 0; | 93 | beaglebone_tsadcpins_free = 0; |
@@ -95,7 +96,7 @@ index 58a0e77..7a2b851 100644 | |||
95 | } | 96 | } |
96 | 97 | ||
97 | if (!strncmp("BB-BONE-LCD3-01", cape_config.partnumber, 15)) { | 98 | if (!strncmp("BB-BONE-LCD3-01", cape_config.partnumber, 15)) { |
98 | @@ -1889,6 +1958,10 @@ static void beaglebone_cape_setup(struct memory_accessor *mem_acc, void *context | 99 | @@ -1951,6 +2020,10 @@ static void beaglebone_cape_setup(struct memory_accessor *mem_acc, void *context |
99 | pr_info("BeagleBone cape: initializing LCD cape touchscreen\n"); | 100 | pr_info("BeagleBone cape: initializing LCD cape touchscreen\n"); |
100 | tsc_init(0,0); | 101 | tsc_init(0,0); |
101 | beaglebone_tsadcpins_free = 0; | 102 | beaglebone_tsadcpins_free = 0; |
@@ -106,7 +107,7 @@ index 58a0e77..7a2b851 100644 | |||
106 | } | 107 | } |
107 | 108 | ||
108 | if (!strncmp("BB-BONE-VGA-01", cape_config.partnumber, 15)) { | 109 | if (!strncmp("BB-BONE-VGA-01", cape_config.partnumber, 15)) { |
109 | @@ -1898,11 +1971,17 @@ static void beaglebone_cape_setup(struct memory_accessor *mem_acc, void *context | 110 | @@ -1960,11 +2033,17 @@ static void beaglebone_cape_setup(struct memory_accessor *mem_acc, void *context |
110 | 111 | ||
111 | if (!strncmp("BB-BONE-BATT-01", cape_config.partnumber, 15)) { | 112 | if (!strncmp("BB-BONE-BATT-01", cape_config.partnumber, 15)) { |
112 | pr_info("BeagleBone cape: initializing battery cape\n"); | 113 | pr_info("BeagleBone cape: initializing battery cape\n"); |
@@ -125,5 +126,5 @@ index 58a0e77..7a2b851 100644 | |||
125 | } | 126 | } |
126 | 127 | ||
127 | -- | 128 | -- |
128 | 1.7.2.5 | 129 | 1.7.9.5 |
129 | 130 | ||
diff --git a/recipes-kernel/linux/linux-ti33x-psp-3.2/beaglebone/0025-beaglebone-add-enter-key-for-lcd7-cape.patch b/recipes-kernel/linux/linux-ti33x-psp-3.2/beaglebone/0023-beaglebone-add-enter-key-for-lcd7-cape.patch index 7e93d619..332b8629 100644 --- a/recipes-kernel/linux/linux-ti33x-psp-3.2/beaglebone/0025-beaglebone-add-enter-key-for-lcd7-cape.patch +++ b/recipes-kernel/linux/linux-ti33x-psp-3.2/beaglebone/0023-beaglebone-add-enter-key-for-lcd7-cape.patch | |||
@@ -1,18 +1,18 @@ | |||
1 | From 18a371473e99ca637dafe68d9d77ebae4585b873 Mon Sep 17 00:00:00 2001 | 1 | From 2eb2e497cb55889497801ac263d7aa309656ff89 Mon Sep 17 00:00:00 2001 |
2 | From: Koen Kooi <koen@dominion.thruhere.net> | 2 | From: Koen Kooi <koen@dominion.thruhere.net> |
3 | Date: Mon, 19 Mar 2012 14:26:37 +0100 | 3 | Date: Mon, 19 Mar 2012 14:26:37 +0100 |
4 | Subject: [PATCH 25/27] beaglebone: add enter key for lcd7 cape | 4 | Subject: [PATCH 23/26] beaglebone: add enter key for lcd7 cape |
5 | 5 | ||
6 | Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> | 6 | Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> |
7 | --- | 7 | --- |
8 | arch/arm/mach-omap2/board-am335xevm.c | 9 +++++++++ | 8 | arch/arm/mach-omap2/board-am335xevm.c | 9 +++++++++ |
9 | 1 files changed, 9 insertions(+), 0 deletions(-) | 9 | 1 file changed, 9 insertions(+) |
10 | 10 | ||
11 | diff --git a/arch/arm/mach-omap2/board-am335xevm.c b/arch/arm/mach-omap2/board-am335xevm.c | 11 | diff --git a/arch/arm/mach-omap2/board-am335xevm.c b/arch/arm/mach-omap2/board-am335xevm.c |
12 | index 7a2b851..ed2ff18 100644 | 12 | index a3d7846..e77bcd6 100644 |
13 | --- a/arch/arm/mach-omap2/board-am335xevm.c | 13 | --- a/arch/arm/mach-omap2/board-am335xevm.c |
14 | +++ b/arch/arm/mach-omap2/board-am335xevm.c | 14 | +++ b/arch/arm/mach-omap2/board-am335xevm.c |
15 | @@ -986,6 +986,7 @@ static struct pinmux_config lcd7_keys_pin_mux[] = { | 15 | @@ -998,6 +998,7 @@ static struct pinmux_config lcd7_keys_pin_mux[] = { |
16 | {"gpmc_a1.gpio1_17", OMAP_MUX_MODE7 | AM33XX_PIN_INPUT}, | 16 | {"gpmc_a1.gpio1_17", OMAP_MUX_MODE7 | AM33XX_PIN_INPUT}, |
17 | {"gpmc_a3.gpio1_19", OMAP_MUX_MODE7 | AM33XX_PIN_INPUT}, | 17 | {"gpmc_a3.gpio1_19", OMAP_MUX_MODE7 | AM33XX_PIN_INPUT}, |
18 | {"mcasp0_axr0.gpio3_16", OMAP_MUX_MODE7 | AM33XX_PIN_INPUT}, | 18 | {"mcasp0_axr0.gpio3_16", OMAP_MUX_MODE7 | AM33XX_PIN_INPUT}, |
@@ -20,7 +20,7 @@ index 7a2b851..ed2ff18 100644 | |||
20 | {NULL, 0}, | 20 | {NULL, 0}, |
21 | }; | 21 | }; |
22 | 22 | ||
23 | @@ -1023,6 +1024,14 @@ static struct gpio_keys_button beaglebone_lcd7_gpio_keys[] = { | 23 | @@ -1035,6 +1036,14 @@ static struct gpio_keys_button beaglebone_lcd7_gpio_keys[] = { |
24 | .type = EV_KEY, | 24 | .type = EV_KEY, |
25 | .wakeup = 1, | 25 | .wakeup = 1, |
26 | }, | 26 | }, |
@@ -36,5 +36,5 @@ index 7a2b851..ed2ff18 100644 | |||
36 | 36 | ||
37 | static struct gpio_keys_platform_data beaglebone_lcd7_gpio_key_info = { | 37 | static struct gpio_keys_platform_data beaglebone_lcd7_gpio_key_info = { |
38 | -- | 38 | -- |
39 | 1.7.2.5 | 39 | 1.7.9.5 |
40 | 40 | ||
diff --git a/recipes-kernel/linux/linux-ti33x-psp-3.2/beaglebone/0026-beaglebone-add-gpio-keys-for-lcd.patch b/recipes-kernel/linux/linux-ti33x-psp-3.2/beaglebone/0024-beaglebone-add-gpio-keys-for-lcd.patch index 2d8270ea..44ebfda7 100644 --- a/recipes-kernel/linux/linux-ti33x-psp-3.2/beaglebone/0026-beaglebone-add-gpio-keys-for-lcd.patch +++ b/recipes-kernel/linux/linux-ti33x-psp-3.2/beaglebone/0024-beaglebone-add-gpio-keys-for-lcd.patch | |||
@@ -1,18 +1,18 @@ | |||
1 | From ac98d63f016be414cbb91d283b0ef48f3c7c5b92 Mon Sep 17 00:00:00 2001 | 1 | From d76d09ea8918a1aa315b44d4e12b71a522545da8 Mon Sep 17 00:00:00 2001 |
2 | From: Koen Kooi <koen@dominion.thruhere.net> | 2 | From: Koen Kooi <koen@dominion.thruhere.net> |
3 | Date: Mon, 19 Mar 2012 15:15:06 +0100 | 3 | Date: Mon, 19 Mar 2012 15:15:06 +0100 |
4 | Subject: [PATCH 26/26] beaglebone: add gpio-keys for lcd | 4 | Subject: [PATCH 24/26] beaglebone: add gpio-keys for lcd |
5 | 5 | ||
6 | Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> | 6 | Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> |
7 | --- | 7 | --- |
8 | arch/arm/mach-omap2/board-am335xevm.c | 82 +++++++++++++++++++++++++++++++-- | 8 | arch/arm/mach-omap2/board-am335xevm.c | 82 +++++++++++++++++++++++++++++++-- |
9 | 1 files changed, 78 insertions(+), 4 deletions(-) | 9 | 1 file changed, 78 insertions(+), 4 deletions(-) |
10 | 10 | ||
11 | diff --git a/arch/arm/mach-omap2/board-am335xevm.c b/arch/arm/mach-omap2/board-am335xevm.c | 11 | diff --git a/arch/arm/mach-omap2/board-am335xevm.c b/arch/arm/mach-omap2/board-am335xevm.c |
12 | index ed2ff18..badee96 100644 | 12 | index e77bcd6..ed2ea68 100644 |
13 | --- a/arch/arm/mach-omap2/board-am335xevm.c | 13 | --- a/arch/arm/mach-omap2/board-am335xevm.c |
14 | +++ b/arch/arm/mach-omap2/board-am335xevm.c | 14 | +++ b/arch/arm/mach-omap2/board-am335xevm.c |
15 | @@ -1056,6 +1056,82 @@ static void beaglebone_lcd7_keys_init(int evm_id, int profile) | 15 | @@ -1068,6 +1068,82 @@ static void beaglebone_lcd7_keys_init(int evm_id, int profile) |
16 | pr_err("failed to register gpio keys for LCD7 cape\n"); | 16 | pr_err("failed to register gpio keys for LCD7 cape\n"); |
17 | } | 17 | } |
18 | 18 | ||
@@ -95,7 +95,7 @@ index ed2ff18..badee96 100644 | |||
95 | /* | 95 | /* |
96 | * @evm_id - evm id which needs to be configured | 96 | * @evm_id - evm id which needs to be configured |
97 | * @dev_cfg - single evm structure which includes | 97 | * @dev_cfg - single evm structure which includes |
98 | @@ -1967,10 +2043,8 @@ static void beaglebone_cape_setup(struct memory_accessor *mem_acc, void *context | 98 | @@ -2029,10 +2105,8 @@ static void beaglebone_cape_setup(struct memory_accessor *mem_acc, void *context |
99 | pr_info("BeagleBone cape: initializing LCD cape touchscreen\n"); | 99 | pr_info("BeagleBone cape: initializing LCD cape touchscreen\n"); |
100 | tsc_init(0,0); | 100 | tsc_init(0,0); |
101 | beaglebone_tsadcpins_free = 0; | 101 | beaglebone_tsadcpins_free = 0; |
@@ -109,5 +109,5 @@ index ed2ff18..badee96 100644 | |||
109 | 109 | ||
110 | if (!strncmp("BB-BONE-VGA-01", cape_config.partnumber, 15)) { | 110 | if (!strncmp("BB-BONE-VGA-01", cape_config.partnumber, 15)) { |
111 | -- | 111 | -- |
112 | 1.7.2.5 | 112 | 1.7.9.5 |
113 | 113 | ||
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/0025-beaglebone-fix-direction-of-gpio-keys.patch index 330078ee..8fa656a3 100644 --- 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/0025-beaglebone-fix-direction-of-gpio-keys.patch | |||
@@ -1,18 +1,18 @@ | |||
1 | From 06132a893d83cf2dc128ad9b37b56be6a6d4714c Mon Sep 17 00:00:00 2001 | 1 | From e979180175348c0118f7e461fefa44dcc78e124a Mon Sep 17 00:00:00 2001 |
2 | From: Koen Kooi <koen@dominion.thruhere.net> | 2 | From: Koen Kooi <koen@dominion.thruhere.net> |
3 | Date: Mon, 26 Mar 2012 20:28:56 +0200 | 3 | Date: Mon, 26 Mar 2012 20:28:56 +0200 |
4 | Subject: [PATCH 27/28] beaglebone: fix direction of gpio-keys | 4 | Subject: [PATCH 25/26] beaglebone: fix direction of gpio-keys |
5 | 5 | ||
6 | Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> | 6 | Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> |
7 | --- | 7 | --- |
8 | arch/arm/mach-omap2/board-am335xevm.c | 20 ++++++++++---------- | 8 | arch/arm/mach-omap2/board-am335xevm.c | 20 ++++++++++---------- |
9 | 1 files changed, 10 insertions(+), 10 deletions(-) | 9 | 1 file changed, 10 insertions(+), 10 deletions(-) |
10 | 10 | ||
11 | diff --git a/arch/arm/mach-omap2/board-am335xevm.c b/arch/arm/mach-omap2/board-am335xevm.c | 11 | diff --git a/arch/arm/mach-omap2/board-am335xevm.c b/arch/arm/mach-omap2/board-am335xevm.c |
12 | index 5318c41..fdeed59 100644 | 12 | index ed2ea68..ed03e14 100644 |
13 | --- a/arch/arm/mach-omap2/board-am335xevm.c | 13 | --- a/arch/arm/mach-omap2/board-am335xevm.c |
14 | +++ b/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[] = { | 15 | @@ -1007,7 +1007,7 @@ static struct gpio_keys_button beaglebone_lcd7_gpio_keys[] = { |
16 | { | 16 | { |
17 | .code = KEY_LEFT, | 17 | .code = KEY_LEFT, |
18 | .gpio = GPIO_TO_PIN(1, 16), | 18 | .gpio = GPIO_TO_PIN(1, 16), |
@@ -21,7 +21,7 @@ index 5318c41..fdeed59 100644 | |||
21 | .desc = "left", | 21 | .desc = "left", |
22 | .type = EV_KEY, | 22 | .type = EV_KEY, |
23 | .wakeup = 1, | 23 | .wakeup = 1, |
24 | @@ -1003,7 +1003,7 @@ static struct gpio_keys_button beaglebone_lcd7_gpio_keys[] = { | 24 | @@ -1015,7 +1015,7 @@ static struct gpio_keys_button beaglebone_lcd7_gpio_keys[] = { |
25 | { | 25 | { |
26 | .code = KEY_RIGHT, | 26 | .code = KEY_RIGHT, |
27 | .gpio = GPIO_TO_PIN(1, 17), | 27 | .gpio = GPIO_TO_PIN(1, 17), |
@@ -30,7 +30,7 @@ index 5318c41..fdeed59 100644 | |||
30 | .desc = "right", | 30 | .desc = "right", |
31 | .type = EV_KEY, | 31 | .type = EV_KEY, |
32 | .wakeup = 1, | 32 | .wakeup = 1, |
33 | @@ -1011,7 +1011,7 @@ static struct gpio_keys_button beaglebone_lcd7_gpio_keys[] = { | 33 | @@ -1023,7 +1023,7 @@ static struct gpio_keys_button beaglebone_lcd7_gpio_keys[] = { |
34 | { | 34 | { |
35 | .code = KEY_UP, | 35 | .code = KEY_UP, |
36 | .gpio = GPIO_TO_PIN(1, 19), | 36 | .gpio = GPIO_TO_PIN(1, 19), |
@@ -39,7 +39,7 @@ index 5318c41..fdeed59 100644 | |||
39 | .desc = "up", | 39 | .desc = "up", |
40 | .type = EV_KEY, | 40 | .type = EV_KEY, |
41 | .wakeup = 1, | 41 | .wakeup = 1, |
42 | @@ -1019,7 +1019,7 @@ static struct gpio_keys_button beaglebone_lcd7_gpio_keys[] = { | 42 | @@ -1031,7 +1031,7 @@ static struct gpio_keys_button beaglebone_lcd7_gpio_keys[] = { |
43 | { | 43 | { |
44 | .code = KEY_DOWN, | 44 | .code = KEY_DOWN, |
45 | .gpio = GPIO_TO_PIN(3, 16), | 45 | .gpio = GPIO_TO_PIN(3, 16), |
@@ -48,7 +48,7 @@ index 5318c41..fdeed59 100644 | |||
48 | .desc = "down", | 48 | .desc = "down", |
49 | .type = EV_KEY, | 49 | .type = EV_KEY, |
50 | .wakeup = 1, | 50 | .wakeup = 1, |
51 | @@ -1027,7 +1027,7 @@ static struct gpio_keys_button beaglebone_lcd7_gpio_keys[] = { | 51 | @@ -1039,7 +1039,7 @@ static struct gpio_keys_button beaglebone_lcd7_gpio_keys[] = { |
52 | { | 52 | { |
53 | .code = KEY_ENTER, | 53 | .code = KEY_ENTER, |
54 | .gpio = GPIO_TO_PIN(3, 19), | 54 | .gpio = GPIO_TO_PIN(3, 19), |
@@ -57,7 +57,7 @@ index 5318c41..fdeed59 100644 | |||
57 | .desc = "enter", | 57 | .desc = "enter", |
58 | .type = EV_KEY, | 58 | .type = EV_KEY, |
59 | .wakeup = 1, | 59 | .wakeup = 1, |
60 | @@ -1071,7 +1071,7 @@ static struct gpio_keys_button beaglebone_lcd3_gpio_keys[] = { | 60 | @@ -1083,7 +1083,7 @@ static struct gpio_keys_button beaglebone_lcd3_gpio_keys[] = { |
61 | { | 61 | { |
62 | .code = KEY_LEFT, | 62 | .code = KEY_LEFT, |
63 | .gpio = GPIO_TO_PIN(1, 16), | 63 | .gpio = GPIO_TO_PIN(1, 16), |
@@ -66,7 +66,7 @@ index 5318c41..fdeed59 100644 | |||
66 | .desc = "left", | 66 | .desc = "left", |
67 | .type = EV_KEY, | 67 | .type = EV_KEY, |
68 | .wakeup = 1, | 68 | .wakeup = 1, |
69 | @@ -1079,7 +1079,7 @@ static struct gpio_keys_button beaglebone_lcd3_gpio_keys[] = { | 69 | @@ -1091,7 +1091,7 @@ static struct gpio_keys_button beaglebone_lcd3_gpio_keys[] = { |
70 | { | 70 | { |
71 | .code = KEY_RIGHT, | 71 | .code = KEY_RIGHT, |
72 | .gpio = GPIO_TO_PIN(1, 17), | 72 | .gpio = GPIO_TO_PIN(1, 17), |
@@ -75,7 +75,7 @@ index 5318c41..fdeed59 100644 | |||
75 | .desc = "right", | 75 | .desc = "right", |
76 | .type = EV_KEY, | 76 | .type = EV_KEY, |
77 | .wakeup = 1, | 77 | .wakeup = 1, |
78 | @@ -1087,7 +1087,7 @@ static struct gpio_keys_button beaglebone_lcd3_gpio_keys[] = { | 78 | @@ -1099,7 +1099,7 @@ static struct gpio_keys_button beaglebone_lcd3_gpio_keys[] = { |
79 | { | 79 | { |
80 | .code = KEY_UP, | 80 | .code = KEY_UP, |
81 | .gpio = GPIO_TO_PIN(3, 19), | 81 | .gpio = GPIO_TO_PIN(3, 19), |
@@ -84,7 +84,7 @@ index 5318c41..fdeed59 100644 | |||
84 | .desc = "up", | 84 | .desc = "up", |
85 | .type = EV_KEY, | 85 | .type = EV_KEY, |
86 | .wakeup = 1, | 86 | .wakeup = 1, |
87 | @@ -1095,7 +1095,7 @@ static struct gpio_keys_button beaglebone_lcd3_gpio_keys[] = { | 87 | @@ -1107,7 +1107,7 @@ static struct gpio_keys_button beaglebone_lcd3_gpio_keys[] = { |
88 | { | 88 | { |
89 | .code = KEY_DOWN, | 89 | .code = KEY_DOWN, |
90 | .gpio = GPIO_TO_PIN(1, 28), | 90 | .gpio = GPIO_TO_PIN(1, 28), |
@@ -93,7 +93,7 @@ index 5318c41..fdeed59 100644 | |||
93 | .desc = "down", | 93 | .desc = "down", |
94 | .type = EV_KEY, | 94 | .type = EV_KEY, |
95 | .wakeup = 1, | 95 | .wakeup = 1, |
96 | @@ -1103,7 +1103,7 @@ static struct gpio_keys_button beaglebone_lcd3_gpio_keys[] = { | 96 | @@ -1115,7 +1115,7 @@ static struct gpio_keys_button beaglebone_lcd3_gpio_keys[] = { |
97 | { | 97 | { |
98 | .code = KEY_ENTER, | 98 | .code = KEY_ENTER, |
99 | .gpio = GPIO_TO_PIN(0, 7), | 99 | .gpio = GPIO_TO_PIN(0, 7), |
@@ -103,5 +103,5 @@ index 5318c41..fdeed59 100644 | |||
103 | .type = EV_KEY, | 103 | .type = EV_KEY, |
104 | .wakeup = 1, | 104 | .wakeup = 1, |
105 | -- | 105 | -- |
106 | 1.7.2.5 | 106 | 1.7.9.5 |
107 | 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/0026-beaglebone-fix-3.5-lcd-cape-support.patch index 22e8cdf0..ecae4d63 100644 --- 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/0026-beaglebone-fix-3.5-lcd-cape-support.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From ef33c4aefb684a67d1983803688a03826d33b80f Mon Sep 17 00:00:00 2001 | 1 | From a40eb4d0e3ca83642a3035f7385de0ddf9421b08 Mon Sep 17 00:00:00 2001 |
2 | From: Koen Kooi <koen@dominion.thruhere.net> | 2 | From: Koen Kooi <koen@dominion.thruhere.net> |
3 | Date: Wed, 29 Feb 2012 17:25:22 +0100 | 3 | Date: Wed, 29 Feb 2012 17:25:22 +0100 |
4 | Subject: [PATCH 28/28] beaglebone: fix 3.5" lcd cape support | 4 | Subject: [PATCH 26/26] beaglebone: fix 3.5" lcd cape support |
5 | 5 | ||
6 | * proper timings | 6 | * proper timings |
7 | * fix gpio conflict | 7 | * fix gpio conflict |
@@ -10,13 +10,13 @@ Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> | |||
10 | --- | 10 | --- |
11 | arch/arm/mach-omap2/board-am335xevm.c | 42 ++++++++++++++++++++++++++++++++- | 11 | arch/arm/mach-omap2/board-am335xevm.c | 42 ++++++++++++++++++++++++++++++++- |
12 | drivers/video/da8xx-fb.c | 14 +++++++++++ | 12 | drivers/video/da8xx-fb.c | 14 +++++++++++ |
13 | 2 files changed, 55 insertions(+), 1 deletions(-) | 13 | 2 files changed, 55 insertions(+), 1 deletion(-) |
14 | 14 | ||
15 | diff --git a/arch/arm/mach-omap2/board-am335xevm.c b/arch/arm/mach-omap2/board-am335xevm.c | 15 | diff --git a/arch/arm/mach-omap2/board-am335xevm.c b/arch/arm/mach-omap2/board-am335xevm.c |
16 | index fdeed59..f9057cc 100644 | 16 | index ed03e14..74a7e91 100644 |
17 | --- a/arch/arm/mach-omap2/board-am335xevm.c | 17 | --- a/arch/arm/mach-omap2/board-am335xevm.c |
18 | +++ b/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 = { | 19 | @@ -214,6 +214,29 @@ struct da8xx_lcdc_platform_data bbtoys7_pdata = { |
20 | .type = "TFC_S9700RTWV35TR_01B", | 20 | .type = "TFC_S9700RTWV35TR_01B", |
21 | }; | 21 | }; |
22 | 22 | ||
@@ -46,7 +46,7 @@ index fdeed59..f9057cc 100644 | |||
46 | static const struct display_panel dvi_panel = { | 46 | static const struct display_panel dvi_panel = { |
47 | WVGA, | 47 | WVGA, |
48 | 16, | 48 | 16, |
49 | @@ -1461,6 +1484,23 @@ static void bbtoys7lcd_init(int evm_id, int profile) | 49 | @@ -1486,6 +1509,23 @@ static void bbtoys7lcd_init(int evm_id, int profile) |
50 | return; | 50 | return; |
51 | } | 51 | } |
52 | 52 | ||
@@ -70,7 +70,7 @@ index fdeed59..f9057cc 100644 | |||
70 | #define BEAGLEBONEDVI_PDn GPIO_TO_PIN(1, 7) | 70 | #define BEAGLEBONEDVI_PDn GPIO_TO_PIN(1, 7) |
71 | 71 | ||
72 | static void dvi_init(int evm_id, int profile) | 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 | 73 | @@ -2101,7 +2141,7 @@ static void beaglebone_cape_setup(struct memory_accessor *mem_acc, void *context |
74 | 74 | ||
75 | if (!strncmp("BB-BONE-LCD3-01", cape_config.partnumber, 15)) { | 75 | if (!strncmp("BB-BONE-LCD3-01", cape_config.partnumber, 15)) { |
76 | pr_info("BeagleBone cape: initializing LCD cape\n"); | 76 | pr_info("BeagleBone cape: initializing LCD cape\n"); |
@@ -80,10 +80,10 @@ index fdeed59..f9057cc 100644 | |||
80 | tsc_init(0,0); | 80 | tsc_init(0,0); |
81 | beaglebone_tsadcpins_free = 0; | 81 | beaglebone_tsadcpins_free = 0; |
82 | diff --git a/drivers/video/da8xx-fb.c b/drivers/video/da8xx-fb.c | 82 | diff --git a/drivers/video/da8xx-fb.c b/drivers/video/da8xx-fb.c |
83 | index dea8936..312c72c 100644 | 83 | index b01f15b..86b19ac 100644 |
84 | --- a/drivers/video/da8xx-fb.c | 84 | --- a/drivers/video/da8xx-fb.c |
85 | +++ b/drivers/video/da8xx-fb.c | 85 | +++ b/drivers/video/da8xx-fb.c |
86 | @@ -285,6 +285,20 @@ static struct da8xx_panel known_lcd_panels[] = { | 86 | @@ -286,6 +286,20 @@ static struct da8xx_panel known_lcd_panels[] = { |
87 | .pxl_clk = 56000000, | 87 | .pxl_clk = 56000000, |
88 | .invert_pxl_clk = 0, | 88 | .invert_pxl_clk = 0, |
89 | }, | 89 | }, |
@@ -105,5 +105,5 @@ index dea8936..312c72c 100644 | |||
105 | 105 | ||
106 | /* Enable the Raster Engine of the LCD Controller */ | 106 | /* Enable the Raster Engine of the LCD Controller */ |
107 | -- | 107 | -- |
108 | 1.7.2.5 | 108 | 1.7.9.5 |
109 | 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 8a6b9055..605a3242 100644 --- a/recipes-kernel/linux/linux-ti33x-psp-3.2/beaglebone/defconfig +++ b/recipes-kernel/linux/linux-ti33x-psp-3.2/beaglebone/defconfig | |||
@@ -345,7 +345,7 @@ CONFIG_MACH_OMAP3_BEAGLE=y | |||
345 | # CONFIG_MACH_OMAP_ZOOM3 is not set | 345 | # CONFIG_MACH_OMAP_ZOOM3 is not set |
346 | # CONFIG_MACH_CM_T35 is not set | 346 | # CONFIG_MACH_CM_T35 is not set |
347 | # CONFIG_MACH_CM_T3517 is not set | 347 | # CONFIG_MACH_CM_T3517 is not set |
348 | CONFIG_MACH_IGEP0020=y | 348 | # CONFIG_MACH_IGEP0020 is not set |
349 | # CONFIG_MACH_IGEP0030 is not set | 349 | # CONFIG_MACH_IGEP0030 is not set |
350 | # CONFIG_MACH_SBC3530 is not set | 350 | # CONFIG_MACH_SBC3530 is not set |
351 | # CONFIG_MACH_OMAP_3630SDP is not set | 351 | # CONFIG_MACH_OMAP_3630SDP is not set |
@@ -481,10 +481,10 @@ CONFIG_CPU_FREQ_STAT=y | |||
481 | CONFIG_CPU_FREQ_STAT_DETAILS=y | 481 | CONFIG_CPU_FREQ_STAT_DETAILS=y |
482 | # CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set | 482 | # CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set |
483 | # CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set | 483 | # CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set |
484 | CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE=y | 484 | # CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set |
485 | # CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set | 485 | CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y |
486 | # CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set | 486 | # CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set |
487 | # CONFIG_CPU_FREQ_GOV_PERFORMANCE is not set | 487 | CONFIG_CPU_FREQ_GOV_PERFORMANCE=y |
488 | CONFIG_CPU_FREQ_GOV_POWERSAVE=y | 488 | CONFIG_CPU_FREQ_GOV_POWERSAVE=y |
489 | CONFIG_CPU_FREQ_GOV_USERSPACE=y | 489 | CONFIG_CPU_FREQ_GOV_USERSPACE=y |
490 | CONFIG_CPU_FREQ_GOV_ONDEMAND=y | 490 | CONFIG_CPU_FREQ_GOV_ONDEMAND=y |
@@ -493,7 +493,9 @@ CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y | |||
493 | # | 493 | # |
494 | # ARM CPU frequency scaling drivers | 494 | # ARM CPU frequency scaling drivers |
495 | # | 495 | # |
496 | # CONFIG_CPU_IDLE is not set | 496 | CONFIG_CPU_IDLE=y |
497 | CONFIG_CPU_IDLE_GOV_LADDER=y | ||
498 | CONFIG_CPU_IDLE_GOV_MENU=y | ||
497 | 499 | ||
498 | # | 500 | # |
499 | # Floating point emulation | 501 | # Floating point emulation |
@@ -518,15 +520,20 @@ CONFIG_BINFMT_MISC=y | |||
518 | # | 520 | # |
519 | # Power management options | 521 | # Power management options |
520 | # | 522 | # |
521 | # CONFIG_SUSPEND is not set | 523 | CONFIG_SUSPEND=y |
524 | CONFIG_SUSPEND_FREEZER=y | ||
525 | CONFIG_PM_SLEEP=y | ||
522 | CONFIG_PM_RUNTIME=y | 526 | CONFIG_PM_RUNTIME=y |
523 | CONFIG_PM=y | 527 | CONFIG_PM=y |
524 | CONFIG_PM_DEBUG=y | 528 | CONFIG_PM_DEBUG=y |
525 | # CONFIG_PM_ADVANCED_DEBUG is not set | 529 | # CONFIG_PM_ADVANCED_DEBUG is not set |
530 | # CONFIG_PM_TEST_SUSPEND is not set | ||
531 | CONFIG_CAN_PM_TRACE=y | ||
526 | # CONFIG_APM_EMULATION is not set | 532 | # CONFIG_APM_EMULATION is not set |
527 | CONFIG_ARCH_HAS_OPP=y | 533 | CONFIG_ARCH_HAS_OPP=y |
528 | CONFIG_PM_OPP=y | 534 | CONFIG_PM_OPP=y |
529 | CONFIG_PM_CLK=y | 535 | CONFIG_PM_CLK=y |
536 | CONFIG_CPU_PM=y | ||
530 | CONFIG_ARCH_SUSPEND_POSSIBLE=y | 537 | CONFIG_ARCH_SUSPEND_POSSIBLE=y |
531 | CONFIG_ARM_CPU_SUSPEND=y | 538 | CONFIG_ARM_CPU_SUSPEND=y |
532 | CONFIG_NET=y | 539 | CONFIG_NET=y |
@@ -936,7 +943,8 @@ CONFIG_STANDALONE=y | |||
936 | CONFIG_PREVENT_FIRMWARE_BUILD=y | 943 | CONFIG_PREVENT_FIRMWARE_BUILD=y |
937 | CONFIG_FW_LOADER=y | 944 | CONFIG_FW_LOADER=y |
938 | CONFIG_FIRMWARE_IN_KERNEL=y | 945 | CONFIG_FIRMWARE_IN_KERNEL=y |
939 | CONFIG_EXTRA_FIRMWARE="" | 946 | CONFIG_EXTRA_FIRMWARE="am335x-pm-firmware.bin" |
947 | CONFIG_EXTRA_FIRMWARE_DIR="firmware" | ||
940 | # CONFIG_DEBUG_DRIVER is not set | 948 | # CONFIG_DEBUG_DRIVER is not set |
941 | # CONFIG_DEBUG_DEVRES is not set | 949 | # CONFIG_DEBUG_DEVRES is not set |
942 | # CONFIG_SYS_HYPERVISOR is not set | 950 | # CONFIG_SYS_HYPERVISOR is not set |
@@ -1443,6 +1451,7 @@ CONFIG_SERIO_LIBPS2=y | |||
1443 | CONFIG_VT=y | 1451 | CONFIG_VT=y |
1444 | CONFIG_CONSOLE_TRANSLATIONS=y | 1452 | CONFIG_CONSOLE_TRANSLATIONS=y |
1445 | CONFIG_VT_CONSOLE=y | 1453 | CONFIG_VT_CONSOLE=y |
1454 | CONFIG_VT_CONSOLE_SLEEP=y | ||
1446 | CONFIG_HW_CONSOLE=y | 1455 | CONFIG_HW_CONSOLE=y |
1447 | CONFIG_VT_HW_CONSOLE_BINDING=y | 1456 | CONFIG_VT_HW_CONSOLE_BINDING=y |
1448 | CONFIG_UNIX98_PTYS=y | 1457 | CONFIG_UNIX98_PTYS=y |
@@ -2565,11 +2574,10 @@ CONFIG_USB_MUSB_TI81XX_GLUE=y | |||
2565 | CONFIG_USB_MUSB_TI81XX=y | 2574 | CONFIG_USB_MUSB_TI81XX=y |
2566 | # CONFIG_USB_MUSB_BLACKFIN is not set | 2575 | # CONFIG_USB_MUSB_BLACKFIN is not set |
2567 | # CONFIG_USB_MUSB_UX500 is not set | 2576 | # CONFIG_USB_MUSB_UX500 is not set |
2568 | CONFIG_USB_TI_CPPI41_DMA_HW=y | 2577 | CONFIG_MUSB_PIO_ONLY=y |
2569 | # CONFIG_MUSB_PIO_ONLY is not set | ||
2570 | # CONFIG_USB_INVENTRA_DMA is not set | 2578 | # CONFIG_USB_INVENTRA_DMA is not set |
2571 | # CONFIG_USB_TI_CPPI_DMA is not set | 2579 | # CONFIG_USB_TI_CPPI_DMA is not set |
2572 | CONFIG_USB_TI_CPPI41_DMA=y | 2580 | # CONFIG_USB_TI_CPPI41_DMA is not set |
2573 | # CONFIG_USB_TUSB_OMAP_DMA is not set | 2581 | # CONFIG_USB_TUSB_OMAP_DMA is not set |
2574 | # CONFIG_USB_UX500_DMA is not set | 2582 | # CONFIG_USB_UX500_DMA is not set |
2575 | # CONFIG_USB_RENESAS_USBHS is not set | 2583 | # CONFIG_USB_RENESAS_USBHS is not set |
@@ -3411,7 +3419,7 @@ CONFIG_KEYS=y | |||
3411 | # CONFIG_KEYS_DEBUG_PROC_KEYS is not set | 3419 | # CONFIG_KEYS_DEBUG_PROC_KEYS is not set |
3412 | # CONFIG_SECURITY_DMESG_RESTRICT is not set | 3420 | # CONFIG_SECURITY_DMESG_RESTRICT is not set |
3413 | CONFIG_SECURITY=y | 3421 | CONFIG_SECURITY=y |
3414 | # CONFIG_SECURITYFS is not set | 3422 | CONFIG_SECURITYFS=y |
3415 | # CONFIG_SECURITY_NETWORK is not set | 3423 | # CONFIG_SECURITY_NETWORK is not set |
3416 | # CONFIG_SECURITY_PATH is not set | 3424 | # CONFIG_SECURITY_PATH is not set |
3417 | # CONFIG_SECURITY_TOMOYO is not set | 3425 | # CONFIG_SECURITY_TOMOYO is not set |
diff --git a/recipes-kernel/linux/linux-ti33x-psp-3.2/patch.sh b/recipes-kernel/linux/linux-ti33x-psp-3.2/patch.sh index 20d590af..5215d44b 100755 --- a/recipes-kernel/linux/linux-ti33x-psp-3.2/patch.sh +++ b/recipes-kernel/linux/linux-ti33x-psp-3.2/patch.sh | |||
@@ -7,7 +7,8 @@ set -e | |||
7 | # don't use builtin 'echo' from /bin/sh | 7 | # don't use builtin 'echo' from /bin/sh |
8 | export ECHO="$(which echo)" | 8 | export ECHO="$(which echo)" |
9 | 9 | ||
10 | git tag -f beaglebone-v3.2 09e9651bcf2ee8d86685f2a8075bc6557b1d3b91 | 10 | #git tag -f beaglebone-v3.2 09e9651bcf2ee8d86685f2a8075bc6557b1d3b91 |
11 | git tag -f beaglebone-v3.2 88dcc46017b970660ff113c1bb4e7d832c5a3693 | ||
11 | 12 | ||
12 | TAG="beaglebone-v3.2" | 13 | TAG="beaglebone-v3.2" |
13 | EXTRATAG="" | 14 | EXTRATAG="" |
@@ -19,13 +20,13 @@ git reset --hard ${TAG} | |||
19 | rm -Rf export | 20 | rm -Rf export |
20 | 21 | ||
21 | previous=${TAG} | 22 | previous=${TAG} |
22 | PATCHSET="3.2.1 3.2.2 3.2.3 3.2.4 3.2.5 3.2.6 3.2.7 3.2.8 3.2.9 3.2.10 3.2.11 3.2.12 3.2.13 beaglebone" | 23 | PATCHSET="3.2.1 3.2.2 3.2.3 3.2.4 3.2.5 3.2.6 3.2.7 3.2.8 3.2.9 3.2.10 3.2.11 3.2.12 3.2.13 3.2.14 beaglebone" |
23 | 24 | ||
24 | # apply patches | 25 | # apply patches |
25 | for patchset in ${PATCHSET} ; do | 26 | for patchset in ${PATCHSET} ; do |
26 | for patch in $(ls -1 $PATCHPATH/$patchset/* | sort -n) ; do | 27 | for patch in $(ls -1 $PATCHPATH/$patchset/* | sort -n) ; do |
27 | $ECHO -n "$patch: " | 28 | $ECHO -n "$patch: " |
28 | git am -q $patch && echo applied | 29 | git am -q $patch && echo applied || exit 1 |
29 | done | 30 | done |
30 | git tag "${TAG}-${patchset}${EXTRATAG}" -f | 31 | git tag "${TAG}-${patchset}${EXTRATAG}" -f |
31 | done | 32 | done |
diff --git a/recipes-kernel/linux/linux-ti33x-psp_3.2.bb b/recipes-kernel/linux/linux-ti33x-psp_3.2.bb index 93753722..082c73cc 100644 --- a/recipes-kernel/linux/linux-ti33x-psp_3.2.bb +++ b/recipes-kernel/linux/linux-ti33x-psp_3.2.bb | |||
@@ -11,16 +11,21 @@ S = "${WORKDIR}/git" | |||
11 | MULTI_CONFIG_BASE_SUFFIX = "" | 11 | MULTI_CONFIG_BASE_SUFFIX = "" |
12 | 12 | ||
13 | BRANCH = "v3.2-staging" | 13 | BRANCH = "v3.2-staging" |
14 | SRCREV = "09e9651bcf2ee8d86685f2a8075bc6557b1d3b91" | 14 | SRCREV = "88dcc46017b970660ff113c1bb4e7d832c5a3693" |
15 | MACHINE_KERNEL_PR_append = "a+gitr${SRCREV}" | 15 | MACHINE_KERNEL_PR_append = "a+gitr${SRCREV}" |
16 | 16 | ||
17 | COMPATIBLE_MACHINE = "(ti33x)" | 17 | COMPATIBLE_MACHINE = "(ti33x)" |
18 | 18 | ||
19 | SRC_URI += "git://arago-project.org/git/projects/linux-am33x.git;protocol=http;branch=${BRANCH} \ | 19 | SRC_URI += "git://arago-project.org/git/projects/linux-am33x.git;protocol=http;branch=${BRANCH} \ |
20 | file://am335x-pm-firmware.bin \ | ||
20 | file://defconfig" | 21 | file://defconfig" |
21 | 22 | ||
22 | SRC_URI_append_beaglebone = " file://logo_linux_clut224.ppm" | 23 | SRC_URI_append_beaglebone = " file://logo_linux_clut224.ppm" |
23 | 24 | ||
25 | do_compile_prepend() { | ||
26 | cp ${WORKDIR}/am335x-pm-firmware.bin ${S}/firmware/ | ||
27 | } | ||
28 | |||
24 | PATCHES_OVER_PSP = " \ | 29 | PATCHES_OVER_PSP = " \ |
25 | file://3.2.1/0001-MAINTAINERS-stable-Update-address.patch \ | 30 | file://3.2.1/0001-MAINTAINERS-stable-Update-address.patch \ |
26 | file://3.2.1/0002-Documentation-Update-stable-address.patch \ | 31 | file://3.2.1/0002-Documentation-Update-stable-address.patch \ |
@@ -183,24 +188,23 @@ PATCHES_OVER_PSP = " \ | |||
183 | file://3.2.2/0110-cx88-fix-don-t-duplicate-xc4000-entry-for-radio.patch \ | 188 | file://3.2.2/0110-cx88-fix-don-t-duplicate-xc4000-entry-for-radio.patch \ |
184 | file://3.2.2/0111-tuner-Fix-numberspace-conflict-between-xc4000-and-pt.patch \ | 189 | file://3.2.2/0111-tuner-Fix-numberspace-conflict-between-xc4000-and-pt.patch \ |
185 | file://3.2.2/0112-tracepoints-module-Fix-disabling-tracepoints-with-ta.patch \ | 190 | file://3.2.2/0112-tracepoints-module-Fix-disabling-tracepoints-with-ta.patch \ |
186 | file://3.2.2/0113-I2C-OMAP-correct-SYSC-register-offset-for-OMAP4.patch \ | 191 | file://3.2.2/0113-x86-UV2-Fix-new-UV2-hardware-by-using-native-UV2-bro.patch \ |
187 | file://3.2.2/0114-x86-UV2-Fix-new-UV2-hardware-by-using-native-UV2-bro.patch \ | 192 | file://3.2.2/0114-x86-UV2-Fix-BAU-destination-timeout-initialization.patch \ |
188 | file://3.2.2/0115-x86-UV2-Fix-BAU-destination-timeout-initialization.patch \ | 193 | file://3.2.2/0115-x86-UV2-Work-around-BAU-bug.patch \ |
189 | file://3.2.2/0116-x86-UV2-Work-around-BAU-bug.patch \ | 194 | file://3.2.2/0116-ath9k_hw-fix-interpretation-of-the-rx-KeyMiss-flag.patch \ |
190 | file://3.2.2/0117-ath9k_hw-fix-interpretation-of-the-rx-KeyMiss-flag.patch \ | 195 | file://3.2.2/0117-rt2800pci-fix-spurious-interrupts-generation.patch \ |
191 | file://3.2.2/0118-rt2800pci-fix-spurious-interrupts-generation.patch \ | 196 | file://3.2.2/0118-xfs-fix-endian-conversion-issue-in-discard-code.patch \ |
192 | file://3.2.2/0119-xfs-fix-endian-conversion-issue-in-discard-code.patch \ | 197 | file://3.2.2/0119-i2c-eg20t-modified-the-setting-of-transfer-rate.patch \ |
193 | file://3.2.2/0120-i2c-eg20t-modified-the-setting-of-transfer-rate.patch \ | 198 | file://3.2.2/0120-score-fix-off-by-one-index-into-syscall-table.patch \ |
194 | file://3.2.2/0121-score-fix-off-by-one-index-into-syscall-table.patch \ | 199 | file://3.2.2/0121-cifs-lower-default-wsize-when-unix-extensions-are-no.patch \ |
195 | file://3.2.2/0122-cifs-lower-default-wsize-when-unix-extensions-are-no.patch \ | 200 | file://3.2.2/0122-kprobes-initialize-before-using-a-hlist.patch \ |
196 | file://3.2.2/0123-kprobes-initialize-before-using-a-hlist.patch \ | 201 | file://3.2.2/0123-proc-clear_refs-do-not-clear-reserved-pages.patch \ |
197 | file://3.2.2/0124-proc-clear_refs-do-not-clear-reserved-pages.patch \ | 202 | file://3.2.2/0124-mm-fix-NULL-ptr-dereference-in-__count_immobile_page.patch \ |
198 | file://3.2.2/0125-mm-fix-NULL-ptr-dereference-in-__count_immobile_page.patch \ | 203 | file://3.2.2/0125-iwlagn-check-for-SMPS-mode.patch \ |
199 | file://3.2.2/0126-iwlagn-check-for-SMPS-mode.patch \ | 204 | file://3.2.2/0126-iwlegacy-3945-fix-hw-passive-scan-on-radar-channels.patch \ |
200 | file://3.2.2/0127-iwlegacy-3945-fix-hw-passive-scan-on-radar-channels.patch \ | 205 | file://3.2.2/0127-SHM_UNLOCK-fix-long-unpreemptible-section.patch \ |
201 | file://3.2.2/0128-SHM_UNLOCK-fix-long-unpreemptible-section.patch \ | 206 | file://3.2.2/0128-SHM_UNLOCK-fix-Unevictable-pages-stranded-after-swap.patch \ |
202 | file://3.2.2/0129-SHM_UNLOCK-fix-Unevictable-pages-stranded-after-swap.patch \ | 207 | file://3.2.2/0129-Linux-3.2.2.patch \ |
203 | file://3.2.2/0130-Linux-3.2.2.patch \ | ||
204 | file://3.2.3/0001-ALSA-hda-Fix-buffer-alignment-regression-with-Nvidia.patch \ | 208 | file://3.2.3/0001-ALSA-hda-Fix-buffer-alignment-regression-with-Nvidia.patch \ |
205 | file://3.2.3/0002-ALSA-hda-Fix-silent-outputs-from-docking-station-jac.patch \ | 209 | file://3.2.3/0002-ALSA-hda-Fix-silent-outputs-from-docking-station-jac.patch \ |
206 | file://3.2.3/0003-eCryptfs-Sanitize-write-counts-of-dev-ecryptfs.patch \ | 210 | file://3.2.3/0003-eCryptfs-Sanitize-write-counts-of-dev-ecryptfs.patch \ |
@@ -812,12 +816,10 @@ PATCHES_OVER_PSP = " \ | |||
812 | file://beaglebone/0018-st7735fb-WIP-framebuffer-driver-supporting-Adafruit-.patch \ | 816 | file://beaglebone/0018-st7735fb-WIP-framebuffer-driver-supporting-Adafruit-.patch \ |
813 | file://beaglebone/0019-beaglebone-use-P8_6-gpio1_3-as-w1-bus.patch \ | 817 | file://beaglebone/0019-beaglebone-use-P8_6-gpio1_3-as-w1-bus.patch \ |
814 | file://beaglebone/0020-beaglebone-add-support-for-Towertech-TT3201-CAN-cape.patch \ | 818 | file://beaglebone/0020-beaglebone-add-support-for-Towertech-TT3201-CAN-cape.patch \ |
815 | file://beaglebone/0021-ARM-OMAP2-am33xx-fix-serial-mux-warnings-for-am33xx.patch \ | 819 | file://beaglebone/0021-beaglebone-add-more-beagleboardtoys-cape-partnumbers.patch \ |
816 | file://beaglebone/0022-ARM-OMAP2-am335x-correct-McASP0-pin-mux-detail.patch \ | 820 | file://beaglebone/0022-beaglebone-add-gpio-keys-for-lcd7-add-notes-for-miss.patch \ |
817 | file://beaglebone/0023-beaglebone-add-more-beagleboardtoys-cape-partnumbers.patch \ | 821 | file://beaglebone/0023-beaglebone-add-enter-key-for-lcd7-cape.patch \ |
818 | file://beaglebone/0024-beaglebone-add-gpio-keys-for-lcd7-add-notes-for-miss.patch \ | 822 | file://beaglebone/0024-beaglebone-add-gpio-keys-for-lcd.patch \ |
819 | file://beaglebone/0025-beaglebone-add-enter-key-for-lcd7-cape.patch \ | 823 | file://beaglebone/0025-beaglebone-fix-direction-of-gpio-keys.patch \ |
820 | file://beaglebone/0026-beaglebone-add-gpio-keys-for-lcd.patch \ | 824 | file://beaglebone/0026-beaglebone-fix-3.5-lcd-cape-support.patch \ |
821 | file://beaglebone/0027-beaglebone-fix-direction-of-gpio-keys.patch \ | ||
822 | file://beaglebone/0028-beaglebone-fix-3.5-lcd-cape-support.patch \ | ||
823 | " | 825 | " |