diff options
author | Koen Kooi <koen@dominion.thruhere.net> | 2012-05-08 16:29:09 +0200 |
---|---|---|
committer | Denys Dmytriyenko <denys@ti.com> | 2012-05-10 15:35:51 -0400 |
commit | aefc6c8c3c2d49ef0338004ed90da987f7cf6101 (patch) | |
tree | 674cb3f45a3f907a7169912a389d487bfd2c1a91 | |
parent | 12bf8f2f92dfdb7050e4cb92a9968cc94c733f7e (diff) | |
download | meta-ti-aefc6c8c3c2d49ef0338004ed90da987f7cf6101.tar.gz |
linux-ti33x-psp 3.2: rebase patches onto latest git
The psp tree added a patch to limit the beaglebone to 500MHz when powered by USB, which triggered conflicts in the patches. The 3.2.16 series has been rediffed as well, no functional changes.
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Signed-off-by: Denys Dmytriyenko <denys@ti.com>
104 files changed, 499 insertions, 557 deletions
diff --git a/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0001-drm-i915-mask-transcoder-select-bits-before-setting-.patch b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0001-drm-i915-mask-transcoder-select-bits-before-setting-.patch index 4dcea848..2aae4327 100644 --- a/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0001-drm-i915-mask-transcoder-select-bits-before-setting-.patch +++ b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0001-drm-i915-mask-transcoder-select-bits-before-setting-.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 0e9a6694305d6e8a9afd0e0f67e9fa430f4a913d Mon Sep 17 00:00:00 2001 | 1 | From 23bf11c621c4c3acfdf83cf7f5587a2463d039ec Mon Sep 17 00:00:00 2001 |
2 | From: Jesse Barnes <jbarnes@virtuousgeek.org> | 2 | From: Jesse Barnes <jbarnes@virtuousgeek.org> |
3 | Date: Thu, 12 Jan 2012 14:51:17 -0800 | 3 | Date: Thu, 12 Jan 2012 14:51:17 -0800 |
4 | Subject: [PATCH 01/69] drm/i915: mask transcoder select bits before setting | 4 | Subject: [PATCH 01/68] drm/i915: mask transcoder select bits before setting |
5 | them on LVDS | 5 | them on LVDS |
6 | 6 | ||
7 | commit 7885d2052bd94395e337709cfba093a41f273ff1 upstream. | 7 | commit 7885d2052bd94395e337709cfba093a41f273ff1 upstream. |
@@ -46,5 +46,5 @@ index 9011f48..390768f 100644 | |||
46 | /* set the corresponsding LVDS_BORDER bit */ | 46 | /* set the corresponsding LVDS_BORDER bit */ |
47 | temp |= dev_priv->lvds_border_bits; | 47 | temp |= dev_priv->lvds_border_bits; |
48 | -- | 48 | -- |
49 | 1.7.9.5 | 49 | 1.7.10 |
50 | 50 | ||
diff --git a/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0002-drm-radeon-kms-fix-DVO-setup-on-some-r4xx-chips.patch b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0002-drm-radeon-kms-fix-DVO-setup-on-some-r4xx-chips.patch index 7ac071f7..aa7ef083 100644 --- a/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0002-drm-radeon-kms-fix-DVO-setup-on-some-r4xx-chips.patch +++ b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0002-drm-radeon-kms-fix-DVO-setup-on-some-r4xx-chips.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 039999fecc9cd2243a2322a5b2ba153f6bfe6703 Mon Sep 17 00:00:00 2001 | 1 | From 7943d755c7abd153158d25f50e2d35cec9bf7e73 Mon Sep 17 00:00:00 2001 |
2 | From: Alex Deucher <alexander.deucher@amd.com> | 2 | From: Alex Deucher <alexander.deucher@amd.com> |
3 | Date: Tue, 3 Apr 2012 17:05:41 -0400 | 3 | Date: Tue, 3 Apr 2012 17:05:41 -0400 |
4 | Subject: [PATCH 02/69] drm/radeon/kms: fix DVO setup on some r4xx chips | 4 | Subject: [PATCH 02/68] drm/radeon/kms: fix DVO setup on some r4xx chips |
5 | 5 | ||
6 | commit afceb9319f21b18ee3bc15ee9a5f92e18ef8a8c9 upstream. | 6 | commit afceb9319f21b18ee3bc15ee9a5f92e18ef8a8c9 upstream. |
7 | 7 | ||
@@ -35,5 +35,5 @@ index 0f8eb48..5351ee1 100644 | |||
35 | case 1: | 35 | case 1: |
36 | switch (crev) { | 36 | switch (crev) { |
37 | -- | 37 | -- |
38 | 1.7.9.5 | 38 | 1.7.10 |
39 | 39 | ||
diff --git a/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0003-drm-i915-ringbuffer-Exclude-last-2-cachlines-of-ring.patch b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0003-drm-i915-ringbuffer-Exclude-last-2-cachlines-of-ring.patch index db337c42..a4d95285 100644 --- a/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0003-drm-i915-ringbuffer-Exclude-last-2-cachlines-of-ring.patch +++ b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0003-drm-i915-ringbuffer-Exclude-last-2-cachlines-of-ring.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 6905e24cc8b935ca1db7f0af4ec3fe95ffd30122 Mon Sep 17 00:00:00 2001 | 1 | From 283aa265f1ec642ce070bb3f1d3d69777b544144 Mon Sep 17 00:00:00 2001 |
2 | From: Chris Wilson <chris@chris-wilson.co.uk> | 2 | From: Chris Wilson <chris@chris-wilson.co.uk> |
3 | Date: Mon, 9 Apr 2012 13:59:46 +0100 | 3 | Date: Mon, 9 Apr 2012 13:59:46 +0100 |
4 | Subject: [PATCH 03/69] drm/i915/ringbuffer: Exclude last 2 cachlines of ring | 4 | Subject: [PATCH 03/68] drm/i915/ringbuffer: Exclude last 2 cachlines of ring |
5 | on 845g | 5 | on 845g |
6 | 6 | ||
7 | commit 27c1cbd06a7620b354cbb363834f3bb8df4f410d upstream. | 7 | commit 27c1cbd06a7620b354cbb363834f3bb8df4f410d upstream. |
@@ -30,5 +30,5 @@ index 30a9af9..8673581 100644 | |||
30 | 30 | ||
31 | return 0; | 31 | return 0; |
32 | -- | 32 | -- |
33 | 1.7.9.5 | 33 | 1.7.10 |
34 | 34 | ||
diff --git a/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0004-drm-radeon-only-add-the-mm-i2c-bus-if-the-hw_i2c-mod.patch b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0004-drm-radeon-only-add-the-mm-i2c-bus-if-the-hw_i2c-mod.patch index 323eb1be..ff612c56 100644 --- a/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0004-drm-radeon-only-add-the-mm-i2c-bus-if-the-hw_i2c-mod.patch +++ b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0004-drm-radeon-only-add-the-mm-i2c-bus-if-the-hw_i2c-mod.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 3168f6f46758c36d5b33ed5e77329bffed67033f Mon Sep 17 00:00:00 2001 | 1 | From 40d10e38c38f6f39e29b78688a4bcb368e265b5c Mon Sep 17 00:00:00 2001 |
2 | From: Alex Deucher <alexander.deucher@amd.com> | 2 | From: Alex Deucher <alexander.deucher@amd.com> |
3 | Date: Tue, 10 Apr 2012 12:14:27 -0400 | 3 | Date: Tue, 10 Apr 2012 12:14:27 -0400 |
4 | Subject: [PATCH 04/69] drm/radeon: only add the mm i2c bus if the hw_i2c | 4 | Subject: [PATCH 04/68] drm/radeon: only add the mm i2c bus if the hw_i2c |
5 | module param is set | 5 | module param is set |
6 | 6 | ||
7 | commit 46783150a6552f9513f08e62cfcc07125d6e502b upstream. | 7 | commit 46783150a6552f9513f08e62cfcc07125d6e502b upstream. |
@@ -37,5 +37,5 @@ index 7bb1b07..1441b00 100644 | |||
37 | if (i2c == NULL) | 37 | if (i2c == NULL) |
38 | return NULL; | 38 | return NULL; |
39 | -- | 39 | -- |
40 | 1.7.9.5 | 40 | 1.7.10 |
41 | 41 | ||
diff --git a/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0005-drm-i915-properly-compute-dp-dithering-for-user-crea.patch b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0005-drm-i915-properly-compute-dp-dithering-for-user-crea.patch index 45e685a4..d1b02ef1 100644 --- a/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0005-drm-i915-properly-compute-dp-dithering-for-user-crea.patch +++ b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0005-drm-i915-properly-compute-dp-dithering-for-user-crea.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 95523fb19e6eea48b9c0632b81780268f386b22f Mon Sep 17 00:00:00 2001 | 1 | From bfbf01f9468232ac6856b46665b6998afa45e4a6 Mon Sep 17 00:00:00 2001 |
2 | From: Daniel Vetter <daniel.vetter@ffwll.ch> | 2 | From: Daniel Vetter <daniel.vetter@ffwll.ch> |
3 | Date: Tue, 10 Apr 2012 10:42:36 +0200 | 3 | Date: Tue, 10 Apr 2012 10:42:36 +0200 |
4 | Subject: [PATCH 05/69] drm/i915: properly compute dp dithering for | 4 | Subject: [PATCH 05/68] drm/i915: properly compute dp dithering for |
5 | user-created modes | 5 | user-created modes |
6 | 6 | ||
7 | commit c4867936474183332db4c19791a65fdad6474fd5 upstream. | 7 | commit c4867936474183332db4c19791a65fdad6474fd5 upstream. |
@@ -126,5 +126,5 @@ index 94f860c..12eb789 100644 | |||
126 | for (clock = 0; clock <= max_clock; clock++) { | 126 | for (clock = 0; clock <= max_clock; clock++) { |
127 | int link_avail = intel_dp_max_data_rate(intel_dp_link_clock(bws[clock]), lane_count); | 127 | int link_avail = intel_dp_max_data_rate(intel_dp_link_clock(bws[clock]), lane_count); |
128 | -- | 128 | -- |
129 | 1.7.9.5 | 129 | 1.7.10 |
130 | 130 | ||
diff --git a/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0006-drm-i915-make-rc6-module-parameter-read-only.patch b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0006-drm-i915-make-rc6-module-parameter-read-only.patch index 79340e1e..12db79ca 100644 --- a/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0006-drm-i915-make-rc6-module-parameter-read-only.patch +++ b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0006-drm-i915-make-rc6-module-parameter-read-only.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From f6810569f5eea5dd63a4be4fdcf052ab08d4f7fa Mon Sep 17 00:00:00 2001 | 1 | From c4e630199ffb5b9fd2b25dbb222316f092915a14 Mon Sep 17 00:00:00 2001 |
2 | From: Jesse Barnes <jbarnes@virtuousgeek.org> | 2 | From: Jesse Barnes <jbarnes@virtuousgeek.org> |
3 | Date: Wed, 11 Apr 2012 09:39:02 -0700 | 3 | Date: Wed, 11 Apr 2012 09:39:02 -0700 |
4 | Subject: [PATCH 06/69] drm/i915: make rc6 module parameter read-only | 4 | Subject: [PATCH 06/68] drm/i915: make rc6 module parameter read-only |
5 | 5 | ||
6 | commit f57f9c167af7cb3fd315e6a8ebe194a8aea0832a upstream. | 6 | commit f57f9c167af7cb3fd315e6a8ebe194a8aea0832a upstream. |
7 | 7 | ||
@@ -28,5 +28,5 @@ index e52b705..d0f8830 100644 | |||
28 | "Enable power-saving render C-state 6 (default: -1 (use per-chip default)"); | 28 | "Enable power-saving render C-state 6 (default: -1 (use per-chip default)"); |
29 | 29 | ||
30 | -- | 30 | -- |
31 | 1.7.9.5 | 31 | 1.7.10 |
32 | 32 | ||
diff --git a/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0007-rtlwifi-Add-missing-DMA-buffer-unmapping-for-PCI-dri.patch b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0007-rtlwifi-Add-missing-DMA-buffer-unmapping-for-PCI-dri.patch index 550db2eb..2c7668ce 100644 --- a/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0007-rtlwifi-Add-missing-DMA-buffer-unmapping-for-PCI-dri.patch +++ b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0007-rtlwifi-Add-missing-DMA-buffer-unmapping-for-PCI-dri.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From a8c85bb6818c1e5d3fec8904cae9a851ed700bb6 Mon Sep 17 00:00:00 2001 | 1 | From 98861c7257e3ce6dd351c07abed856e73add7858 Mon Sep 17 00:00:00 2001 |
2 | From: Larry Finger <Larry.Finger@lwfinger.net> | 2 | From: Larry Finger <Larry.Finger@lwfinger.net> |
3 | Date: Mon, 26 Mar 2012 10:48:20 -0500 | 3 | Date: Mon, 26 Mar 2012 10:48:20 -0500 |
4 | Subject: [PATCH 07/69] rtlwifi: Add missing DMA buffer unmapping for PCI | 4 | Subject: [PATCH 07/68] rtlwifi: Add missing DMA buffer unmapping for PCI |
5 | drivers | 5 | drivers |
6 | 6 | ||
7 | commit 673f7786e205c87b5d978c62827b9a66d097bebb upstream. | 7 | commit 673f7786e205c87b5d978c62827b9a66d097bebb upstream. |
@@ -41,5 +41,5 @@ index 9afcad3..d44d398 100644 | |||
41 | /*NB: the beacon data buffer must be 32-bit aligned. */ | 41 | /*NB: the beacon data buffer must be 32-bit aligned. */ |
42 | pskb = ieee80211_beacon_get(hw, mac->vif); | 42 | pskb = ieee80211_beacon_get(hw, mac->vif); |
43 | -- | 43 | -- |
44 | 1.7.9.5 | 44 | 1.7.10 |
45 | 45 | ||
diff --git a/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0008-ARM-7379-1-DT-fix-atags_to_fdt-second-call-site.patch b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0008-ARM-7379-1-DT-fix-atags_to_fdt-second-call-site.patch index 4f0dc10a..77b44aed 100644 --- a/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0008-ARM-7379-1-DT-fix-atags_to_fdt-second-call-site.patch +++ b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0008-ARM-7379-1-DT-fix-atags_to_fdt-second-call-site.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From a1e9b9702554dae713f7344f8d357ac261a3a0d7 Mon Sep 17 00:00:00 2001 | 1 | From 2c1b118701f57e31e048458bae612029472c768d Mon Sep 17 00:00:00 2001 |
2 | From: Marc Zyngier <Marc.Zyngier@arm.com> | 2 | From: Marc Zyngier <Marc.Zyngier@arm.com> |
3 | Date: Wed, 11 Apr 2012 14:52:55 +0100 | 3 | Date: Wed, 11 Apr 2012 14:52:55 +0100 |
4 | Subject: [PATCH 08/69] ARM: 7379/1: DT: fix atags_to_fdt() second call site | 4 | Subject: [PATCH 08/68] ARM: 7379/1: DT: fix atags_to_fdt() second call site |
5 | 5 | ||
6 | commit 9c5fd9e85f574d9d0361b2b878f55732290afe5b upstream. | 6 | commit 9c5fd9e85f574d9d0361b2b878f55732290afe5b upstream. |
7 | 7 | ||
@@ -33,5 +33,5 @@ index c2effc9..9c18ebd 100644 | |||
33 | ldmfd sp!, {r0-r3, ip, lr} | 33 | ldmfd sp!, {r0-r3, ip, lr} |
34 | sub sp, sp, #0x10000 | 34 | sub sp, sp, #0x10000 |
35 | -- | 35 | -- |
36 | 1.7.9.5 | 36 | 1.7.10 |
37 | 37 | ||
diff --git a/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0009-ARM-7384-1-ThumbEE-Disable-userspace-TEEHBR-access-f.patch b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0009-ARM-7384-1-ThumbEE-Disable-userspace-TEEHBR-access-f.patch index 19d9a23d..d4c1734d 100644 --- a/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0009-ARM-7384-1-ThumbEE-Disable-userspace-TEEHBR-access-f.patch +++ b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0009-ARM-7384-1-ThumbEE-Disable-userspace-TEEHBR-access-f.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From f57d472183a16e61832110d6cdb7a410802c0c34 Mon Sep 17 00:00:00 2001 | 1 | From a950b5b3f82c7cfd682ccc62b65b269268772fff Mon Sep 17 00:00:00 2001 |
2 | From: Jonathan Austin <Jonathan.Austin@arm.com> | 2 | From: Jonathan Austin <Jonathan.Austin@arm.com> |
3 | Date: Thu, 12 Apr 2012 17:45:25 +0100 | 3 | Date: Thu, 12 Apr 2012 17:45:25 +0100 |
4 | Subject: [PATCH 09/69] ARM: 7384/1: ThumbEE: Disable userspace TEEHBR access | 4 | Subject: [PATCH 09/68] ARM: 7384/1: ThumbEE: Disable userspace TEEHBR access |
5 | for !CONFIG_ARM_THUMBEE | 5 | for !CONFIG_ARM_THUMBEE |
6 | 6 | ||
7 | commit 078c04545ba56da21567728a909a496df5ff730d upstream. | 7 | commit 078c04545ba56da21567728a909a496df5ff730d upstream. |
@@ -50,5 +50,5 @@ index 82ef81d..785365e 100644 | |||
50 | ldmia r5, {r5, r6} | 50 | ldmia r5, {r5, r6} |
51 | #ifdef CONFIG_CPU_ENDIAN_BE8 | 51 | #ifdef CONFIG_CPU_ENDIAN_BE8 |
52 | -- | 52 | -- |
53 | 1.7.9.5 | 53 | 1.7.10 |
54 | 54 | ||
diff --git a/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0010-md-bitmap-prevent-bitmap_daemon_work-running-while-i.patch b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0010-md-bitmap-prevent-bitmap_daemon_work-running-while-i.patch index a80aa008..4970e441 100644 --- a/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0010-md-bitmap-prevent-bitmap_daemon_work-running-while-i.patch +++ b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0010-md-bitmap-prevent-bitmap_daemon_work-running-while-i.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 814a0921c841d7bb82d27dfccdafea9982420c24 Mon Sep 17 00:00:00 2001 | 1 | From b694e091929929c8b56fcb1fbf28cba81dc2fe04 Mon Sep 17 00:00:00 2001 |
2 | From: NeilBrown <neilb@suse.de> | 2 | From: NeilBrown <neilb@suse.de> |
3 | Date: Thu, 12 Apr 2012 16:05:06 +1000 | 3 | Date: Thu, 12 Apr 2012 16:05:06 +1000 |
4 | Subject: [PATCH 10/69] md/bitmap: prevent bitmap_daemon_work running while | 4 | Subject: [PATCH 10/68] md/bitmap: prevent bitmap_daemon_work running while |
5 | initialising bitmap | 5 | initialising bitmap |
6 | 6 | ||
7 | commit afbaa90b80b1ec66e5137cc3824746bfdf559b18 upstream. | 7 | commit afbaa90b80b1ec66e5137cc3824746bfdf559b18 upstream. |
@@ -38,5 +38,5 @@ index 2a8722b..62a8e68 100644 | |||
38 | if (err) | 38 | if (err) |
39 | goto out; | 39 | goto out; |
40 | -- | 40 | -- |
41 | 1.7.9.5 | 41 | 1.7.10 |
42 | 42 | ||
diff --git a/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0011-Bluetooth-uart-ldisc-Fix-memory-leak.patch b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0011-Bluetooth-uart-ldisc-Fix-memory-leak.patch index a6ef289a..7efdc23a 100644 --- a/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0011-Bluetooth-uart-ldisc-Fix-memory-leak.patch +++ b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0011-Bluetooth-uart-ldisc-Fix-memory-leak.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From afeb2c0d484fb63fc8de83308f3ae74c9a607ad0 Mon Sep 17 00:00:00 2001 | 1 | From b69f7a1d24573678da4e44e9f2f7028640a6d592 Mon Sep 17 00:00:00 2001 |
2 | From: Johan Hovold <jhovold@gmail.com> | 2 | From: Johan Hovold <jhovold@gmail.com> |
3 | Date: Wed, 11 Apr 2012 11:24:35 +0200 | 3 | Date: Wed, 11 Apr 2012 11:24:35 +0200 |
4 | Subject: [PATCH 11/69] Bluetooth: uart-ldisc: Fix memory leak | 4 | Subject: [PATCH 11/68] Bluetooth: uart-ldisc: Fix memory leak |
5 | 5 | ||
6 | This is a partial, self-contained, minimal backport of commit | 6 | This is a partial, self-contained, minimal backport of commit |
7 | 797fe796c4335b35d95d5326824513befdb5d1e9 upstream which fixes the memory | 7 | 797fe796c4335b35d95d5326824513befdb5d1e9 upstream which fixes the memory |
@@ -47,5 +47,5 @@ index 48ad2a7..36dafef 100644 | |||
47 | } | 47 | } |
48 | 48 | ||
49 | -- | 49 | -- |
50 | 1.7.9.5 | 50 | 1.7.10 |
51 | 51 | ||
diff --git a/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0012-Bluetooth-hci_ldisc-fix-NULL-pointer-dereference-on-.patch b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0012-Bluetooth-hci_ldisc-fix-NULL-pointer-dereference-on-.patch index fdf52354..bf4047a6 100644 --- a/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0012-Bluetooth-hci_ldisc-fix-NULL-pointer-dereference-on-.patch +++ b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0012-Bluetooth-hci_ldisc-fix-NULL-pointer-dereference-on-.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 96e70b85a81d0c38ed66c1861711855a15428870 Mon Sep 17 00:00:00 2001 | 1 | From 37a8e3758523b47f282d19502ea361f1d5c2a033 Mon Sep 17 00:00:00 2001 |
2 | From: Johan Hovold <jhovold@gmail.com> | 2 | From: Johan Hovold <jhovold@gmail.com> |
3 | Date: Thu, 15 Mar 2012 14:48:40 +0100 | 3 | Date: Thu, 15 Mar 2012 14:48:40 +0100 |
4 | Subject: [PATCH 12/69] Bluetooth: hci_ldisc: fix NULL-pointer dereference on | 4 | Subject: [PATCH 12/68] Bluetooth: hci_ldisc: fix NULL-pointer dereference on |
5 | tty_close | 5 | tty_close |
6 | 6 | ||
7 | commit 33b69bf80a3704d45341928e4ff68b6ebd470686 upstream. | 7 | commit 33b69bf80a3704d45341928e4ff68b6ebd470686 upstream. |
@@ -103,5 +103,5 @@ index 36dafef..8f3d6db 100644 | |||
103 | kfree(hu); | 103 | kfree(hu); |
104 | } | 104 | } |
105 | -- | 105 | -- |
106 | 1.7.9.5 | 106 | 1.7.10 |
107 | 107 | ||
diff --git a/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0013-ext4-address-scalability-issue-by-removing-extent-ca.patch b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0013-ext4-address-scalability-issue-by-removing-extent-ca.patch index f084adcd..cbf03c56 100644 --- a/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0013-ext4-address-scalability-issue-by-removing-extent-ca.patch +++ b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0013-ext4-address-scalability-issue-by-removing-extent-ca.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From f1c04355902ab71e60c67f39ea29822d0eea062f Mon Sep 17 00:00:00 2001 | 1 | From bc445f05f44d9e21294eaa8686837b588a27a66a Mon Sep 17 00:00:00 2001 |
2 | From: Theodore Ts'o <tytso@mit.edu> | 2 | From: Theodore Ts'o <tytso@mit.edu> |
3 | Date: Mon, 16 Apr 2012 12:16:20 -0400 | 3 | Date: Mon, 16 Apr 2012 12:16:20 -0400 |
4 | Subject: [PATCH 13/69] ext4: address scalability issue by removing extent | 4 | Subject: [PATCH 13/68] ext4: address scalability issue by removing extent |
5 | cache statistics | 5 | cache statistics |
6 | 6 | ||
7 | commit 9cd70b347e9761ea2d2ac3d758c529a48a8193e6 upstream. | 7 | commit 9cd70b347e9761ea2d2ac3d758c529a48a8193e6 upstream. |
@@ -89,5 +89,5 @@ index 9281dbe..961059b 100644 | |||
89 | ATTR_LIST(inode_goal), | 89 | ATTR_LIST(inode_goal), |
90 | ATTR_LIST(mb_stats), | 90 | ATTR_LIST(mb_stats), |
91 | -- | 91 | -- |
92 | 1.7.9.5 | 92 | 1.7.10 |
93 | 93 | ||
diff --git a/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0014-ia64-fix-futex_atomic_cmpxchg_inatomic.patch b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0014-ia64-fix-futex_atomic_cmpxchg_inatomic.patch index ac9d27d7..9175698d 100644 --- a/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0014-ia64-fix-futex_atomic_cmpxchg_inatomic.patch +++ b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0014-ia64-fix-futex_atomic_cmpxchg_inatomic.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 31a9ac5149ad2b11b591eb704f3132d0d344e7e0 Mon Sep 17 00:00:00 2001 | 1 | From 75d50bfacb4322a1259307cfa50aa0f87a02f160 Mon Sep 17 00:00:00 2001 |
2 | From: "Luck, Tony" <tony.luck@intel.com> | 2 | From: "Luck, Tony" <tony.luck@intel.com> |
3 | Date: Mon, 16 Apr 2012 16:28:01 -0700 | 3 | Date: Mon, 16 Apr 2012 16:28:01 -0700 |
4 | Subject: [PATCH 14/69] ia64: fix futex_atomic_cmpxchg_inatomic() | 4 | Subject: [PATCH 14/68] ia64: fix futex_atomic_cmpxchg_inatomic() |
5 | 5 | ||
6 | commit c76f39bddb84f93f70a5520d9253ec0317bec216 upstream. | 6 | commit c76f39bddb84f93f70a5520d9253ec0317bec216 upstream. |
7 | 7 | ||
@@ -54,5 +54,5 @@ index 8428525..21ab376 100644 | |||
54 | "rO" ((long) (unsigned) oldval) | 54 | "rO" ((long) (unsigned) oldval) |
55 | : "memory"); | 55 | : "memory"); |
56 | -- | 56 | -- |
57 | 1.7.9.5 | 57 | 1.7.10 |
58 | 58 | ||
diff --git a/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0015-drivers-rtc-rtc-pl031.c-enable-clock-on-all-ST-varia.patch b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0015-drivers-rtc-rtc-pl031.c-enable-clock-on-all-ST-varia.patch index 7990dfe2..a8611016 100644 --- a/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0015-drivers-rtc-rtc-pl031.c-enable-clock-on-all-ST-varia.patch +++ b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0015-drivers-rtc-rtc-pl031.c-enable-clock-on-all-ST-varia.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From a5333b50b8a4297f3b9959366fb26ad9b9c55314 Mon Sep 17 00:00:00 2001 | 1 | From 4886a34fc21445895de3bc2584c46792d1a11bec Mon Sep 17 00:00:00 2001 |
2 | From: Linus Walleij <linus.walleij@linaro.org> | 2 | From: Linus Walleij <linus.walleij@linaro.org> |
3 | Date: Thu, 12 Apr 2012 12:49:16 -0700 | 3 | Date: Thu, 12 Apr 2012 12:49:16 -0700 |
4 | Subject: [PATCH 15/69] drivers/rtc/rtc-pl031.c: enable clock on all ST | 4 | Subject: [PATCH 15/68] drivers/rtc/rtc-pl031.c: enable clock on all ST |
5 | variants | 5 | variants |
6 | 6 | ||
7 | commit 2f3972168353d355854d6381f1f360ce83b723e5 upstream. | 7 | commit 2f3972168353d355854d6381f1f360ce83b723e5 upstream. |
@@ -35,5 +35,5 @@ index ff1b84b..e86edfc 100644 | |||
35 | ldata->base + RTC_CR); | 35 | ldata->base + RTC_CR); |
36 | 36 | ||
37 | -- | 37 | -- |
38 | 1.7.9.5 | 38 | 1.7.10 |
39 | 39 | ||
diff --git a/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0016-hugetlb-fix-race-condition-in-hugetlb_fault.patch b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0016-hugetlb-fix-race-condition-in-hugetlb_fault.patch index 5b93b531..2b5f8b14 100644 --- a/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0016-hugetlb-fix-race-condition-in-hugetlb_fault.patch +++ b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0016-hugetlb-fix-race-condition-in-hugetlb_fault.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 7295297274cc9506d1600eb09ab93f203e860f48 Mon Sep 17 00:00:00 2001 | 1 | From cabab70ca89f34dacc965ea927f0f67706fcc22b Mon Sep 17 00:00:00 2001 |
2 | From: Chris Metcalf <cmetcalf@tilera.com> | 2 | From: Chris Metcalf <cmetcalf@tilera.com> |
3 | Date: Thu, 12 Apr 2012 12:49:15 -0700 | 3 | Date: Thu, 12 Apr 2012 12:49:15 -0700 |
4 | Subject: [PATCH 16/69] hugetlb: fix race condition in hugetlb_fault() | 4 | Subject: [PATCH 16/68] hugetlb: fix race condition in hugetlb_fault() |
5 | 5 | ||
6 | commit 66aebce747eaf9bc456bf1f1b217d8db843031d0 upstream. | 6 | commit 66aebce747eaf9bc456bf1f1b217d8db843031d0 upstream. |
7 | 7 | ||
@@ -85,5 +85,5 @@ index 2316840..bd936ed 100644 | |||
85 | out_mutex: | 85 | out_mutex: |
86 | mutex_unlock(&hugetlb_instantiation_mutex); | 86 | mutex_unlock(&hugetlb_instantiation_mutex); |
87 | -- | 87 | -- |
88 | 1.7.9.5 | 88 | 1.7.10 |
89 | 89 | ||
diff --git a/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0017-staging-iio-hmc5843-Fix-crash-in-probe-function.patch b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0017-staging-iio-hmc5843-Fix-crash-in-probe-function.patch index 0bd53054..a1b99a98 100644 --- a/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0017-staging-iio-hmc5843-Fix-crash-in-probe-function.patch +++ b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0017-staging-iio-hmc5843-Fix-crash-in-probe-function.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 67d0ef228b571d53087923471cdd9de8281b7545 Mon Sep 17 00:00:00 2001 | 1 | From 0bc2590c85b786aa29761b2471415c7b159c142c Mon Sep 17 00:00:00 2001 |
2 | From: Marek Belisko <marek.belisko@open-nandra.com> | 2 | From: Marek Belisko <marek.belisko@open-nandra.com> |
3 | Date: Thu, 12 Apr 2012 21:48:03 +0200 | 3 | Date: Thu, 12 Apr 2012 21:48:03 +0200 |
4 | Subject: [PATCH 17/69] staging: iio: hmc5843: Fix crash in probe function. | 4 | Subject: [PATCH 17/68] staging: iio: hmc5843: Fix crash in probe function. |
5 | 5 | ||
6 | commit 62d2feb9803f18c4e3c8a1a2c7e30a54df8a1d72 upstream. | 6 | commit 62d2feb9803f18c4e3c8a1a2c7e30a54df8a1d72 upstream. |
7 | 7 | ||
@@ -103,5 +103,5 @@ index fc9ee97..870db4f 100644 | |||
103 | hmc5843_set_rate(client, data->rate); | 103 | hmc5843_set_rate(client, data->rate); |
104 | hmc5843_configure(client, data->operating_mode); | 104 | hmc5843_configure(client, data->operating_mode); |
105 | -- | 105 | -- |
106 | 1.7.9.5 | 106 | 1.7.10 |
107 | 107 | ||
diff --git a/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0018-tty-serial-altera_uart-Check-for-NULL-platform_data-.patch b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0018-tty-serial-altera_uart-Check-for-NULL-platform_data-.patch index e24a472b..3a39598c 100644 --- a/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0018-tty-serial-altera_uart-Check-for-NULL-platform_data-.patch +++ b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0018-tty-serial-altera_uart-Check-for-NULL-platform_data-.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From da80dc7cc4c7ed0823fe75f54cefabc42ac56996 Mon Sep 17 00:00:00 2001 | 1 | From 33fbe982ec60fd99d02c6bf3cca78e10ad49a46a Mon Sep 17 00:00:00 2001 |
2 | From: Yuriy Kozlov <ykozlov@ptcusa.com> | 2 | From: Yuriy Kozlov <ykozlov@ptcusa.com> |
3 | Date: Thu, 29 Mar 2012 09:55:27 +0200 | 3 | Date: Thu, 29 Mar 2012 09:55:27 +0200 |
4 | Subject: [PATCH 18/69] tty: serial: altera_uart: Check for NULL platform_data | 4 | Subject: [PATCH 18/68] tty: serial: altera_uart: Check for NULL platform_data |
5 | in probe. | 5 | in probe. |
6 | 6 | ||
7 | commit acede70d6561f2d042d9dbb153d9a3469479c0ed upstream. | 7 | commit acede70d6561f2d042d9dbb153d9a3469479c0ed upstream. |
@@ -38,5 +38,5 @@ index 1d04c50..5ba0898 100644 | |||
38 | 38 | ||
39 | /* Check platform data first so we can override device node data */ | 39 | /* Check platform data first so we can override device node data */ |
40 | -- | 40 | -- |
41 | 1.7.9.5 | 41 | 1.7.10 |
42 | 42 | ||
diff --git a/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0019-sparc64-Eliminate-obsolete-__handle_softirq-function.patch b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0019-sparc64-Eliminate-obsolete-__handle_softirq-function.patch index d81ec8e2..f974fd99 100644 --- a/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0019-sparc64-Eliminate-obsolete-__handle_softirq-function.patch +++ b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0019-sparc64-Eliminate-obsolete-__handle_softirq-function.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From d219e7abf51d7e4784a127d79d5806b9c49c672b Mon Sep 17 00:00:00 2001 | 1 | From 05ab1d059eb55460d5bafab622493a9c7d2b879f Mon Sep 17 00:00:00 2001 |
2 | From: "Paul E. McKenney" <paulmck@linux.vnet.ibm.com> | 2 | From: "Paul E. McKenney" <paulmck@linux.vnet.ibm.com> |
3 | Date: Fri, 13 Apr 2012 03:35:13 +0000 | 3 | Date: Fri, 13 Apr 2012 03:35:13 +0000 |
4 | Subject: [PATCH 19/69] sparc64: Eliminate obsolete __handle_softirq() | 4 | Subject: [PATCH 19/68] sparc64: Eliminate obsolete __handle_softirq() |
5 | function | 5 | function |
6 | 6 | ||
7 | commit 3d3eeb2ef26112a200785e5fca58ec58dd33bf1e upstream. | 7 | commit 3d3eeb2ef26112a200785e5fca58ec58dd33bf1e upstream. |
@@ -59,5 +59,5 @@ index 77f1b95..9171fc2 100644 | |||
59 | sethi %hi(0xf << 20), %l4 | 59 | sethi %hi(0xf << 20), %l4 |
60 | and %l1, %l4, %l4 | 60 | and %l1, %l4, %l4 |
61 | -- | 61 | -- |
62 | 1.7.9.5 | 62 | 1.7.10 |
63 | 63 | ||
diff --git a/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0020-sparc64-Fix-bootup-crash-on-sun4v.patch b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0020-sparc64-Fix-bootup-crash-on-sun4v.patch index 9aa5993e..ef068599 100644 --- a/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0020-sparc64-Fix-bootup-crash-on-sun4v.patch +++ b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0020-sparc64-Fix-bootup-crash-on-sun4v.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 19e418644c8801bf98b7c058825bd632f2a92f1f Mon Sep 17 00:00:00 2001 | 1 | From bfc4ac59222dd446f647b3d38cd706a55a3f2320 Mon Sep 17 00:00:00 2001 |
2 | From: "David S. Miller" <davem@davemloft.net> | 2 | From: "David S. Miller" <davem@davemloft.net> |
3 | Date: Fri, 13 Apr 2012 11:56:22 -0700 | 3 | Date: Fri, 13 Apr 2012 11:56:22 -0700 |
4 | Subject: [PATCH 20/69] sparc64: Fix bootup crash on sun4v. | 4 | Subject: [PATCH 20/68] sparc64: Fix bootup crash on sun4v. |
5 | 5 | ||
6 | commit 9e0daff30fd7ecf698e5d20b0fa7f851e427cca5 upstream. | 6 | commit 9e0daff30fd7ecf698e5d20b0fa7f851e427cca5 upstream. |
7 | 7 | ||
@@ -29,5 +29,5 @@ index 381edcd..27728e1 100644 | |||
29 | -subsys_initcall(ds_init); | 29 | -subsys_initcall(ds_init); |
30 | +fs_initcall(ds_init); | 30 | +fs_initcall(ds_init); |
31 | -- | 31 | -- |
32 | 1.7.9.5 | 32 | 1.7.10 |
33 | 33 | ||
diff --git a/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0021-cciss-Initialize-scsi-host-max_sectors-for-tape-driv.patch b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0021-cciss-Initialize-scsi-host-max_sectors-for-tape-driv.patch index 3291bc53..0d950ee6 100644 --- a/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0021-cciss-Initialize-scsi-host-max_sectors-for-tape-driv.patch +++ b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0021-cciss-Initialize-scsi-host-max_sectors-for-tape-driv.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From c8b1bb9d2383126d121f36795771ca734bc73003 Mon Sep 17 00:00:00 2001 | 1 | From 21ffb8a828b59cb70af522e6560a975c0e5ddae4 Mon Sep 17 00:00:00 2001 |
2 | From: "Stephen M. Cameron" <scameron@beardog.cce.hp.com> | 2 | From: "Stephen M. Cameron" <scameron@beardog.cce.hp.com> |
3 | Date: Thu, 22 Mar 2012 21:40:08 +0100 | 3 | Date: Thu, 22 Mar 2012 21:40:08 +0100 |
4 | Subject: [PATCH 21/69] cciss: Initialize scsi host max_sectors for tape drive | 4 | Subject: [PATCH 21/68] cciss: Initialize scsi host max_sectors for tape drive |
5 | support | 5 | support |
6 | 6 | ||
7 | commit 395d287526bb60411ff37b19ad9dd38b58ba8732 upstream. | 7 | commit 395d287526bb60411ff37b19ad9dd38b58ba8732 upstream. |
@@ -31,5 +31,5 @@ index e820b68..f510a9c 100644 | |||
31 | ((struct cciss_scsi_adapter_data_t *) | 31 | ((struct cciss_scsi_adapter_data_t *) |
32 | h->scsi_ctlr)->scsi_host = sh; | 32 | h->scsi_ctlr)->scsi_host = sh; |
33 | -- | 33 | -- |
34 | 1.7.9.5 | 34 | 1.7.10 |
35 | 35 | ||
diff --git a/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0022-cciss-Fix-scsi-tape-io-with-more-than-255-scatter-ga.patch b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0022-cciss-Fix-scsi-tape-io-with-more-than-255-scatter-ga.patch index df9a8fea..6ab9a4e2 100644 --- a/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0022-cciss-Fix-scsi-tape-io-with-more-than-255-scatter-ga.patch +++ b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0022-cciss-Fix-scsi-tape-io-with-more-than-255-scatter-ga.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 80461d138d8963f19b97fda7126455f12ba70bc8 Mon Sep 17 00:00:00 2001 | 1 | From 3c8f69ec2a543e0b0c3f0f2a84663629ea0a1711 Mon Sep 17 00:00:00 2001 |
2 | From: "Stephen M. Cameron" <scameron@beardog.cce.hp.com> | 2 | From: "Stephen M. Cameron" <scameron@beardog.cce.hp.com> |
3 | Date: Thu, 22 Mar 2012 21:40:09 +0100 | 3 | Date: Thu, 22 Mar 2012 21:40:09 +0100 |
4 | Subject: [PATCH 22/69] cciss: Fix scsi tape io with more than 255 scatter | 4 | Subject: [PATCH 22/68] cciss: Fix scsi tape io with more than 255 scatter |
5 | gather elements | 5 | gather elements |
6 | 6 | ||
7 | commit bc67f63650fad6b3478d9ddfd5406d45a95987c9 upstream. | 7 | commit bc67f63650fad6b3478d9ddfd5406d45a95987c9 upstream. |
@@ -34,5 +34,5 @@ index f510a9c..acda773 100644 | |||
34 | c->Header.SGList = h->max_cmd_sgentries; | 34 | c->Header.SGList = h->max_cmd_sgentries; |
35 | else | 35 | else |
36 | -- | 36 | -- |
37 | 1.7.9.5 | 37 | 1.7.10 |
38 | 38 | ||
diff --git a/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0023-perf-hists-Catch-and-handle-out-of-date-hist-entry-m.patch b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0023-perf-hists-Catch-and-handle-out-of-date-hist-entry-m.patch deleted file mode 100644 index 42495dd2..00000000 --- a/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0023-perf-hists-Catch-and-handle-out-of-date-hist-entry-m.patch +++ /dev/null | |||
@@ -1,59 +0,0 @@ | |||
1 | From 49bb9ef1ae7951ed1a193e4473cb617d7a89fbdb Mon Sep 17 00:00:00 2001 | ||
2 | From: David Miller <davem@davemloft.net> | ||
3 | Date: Tue, 27 Mar 2012 03:14:18 -0400 | ||
4 | Subject: [PATCH 23/69] perf hists: Catch and handle out-of-date hist entry | ||
5 | maps. | ||
6 | |||
7 | commit 63fa471dd49e9c9ce029d910d1024330d9b1b145 upstream. | ||
8 | |||
9 | When a process exec()'s, all the maps are retired, but we keep the hist | ||
10 | entries around which hold references to those outdated maps. | ||
11 | |||
12 | If the same library gets mapped in for which we have hist entries, a new | ||
13 | map will be created. But when we take a perf entry hit within that map, | ||
14 | we'll find the existing hist entry with the older map. | ||
15 | |||
16 | This causes symbol translations to be done incorrectly. For example, | ||
17 | the perf entry processing will lookup the correct uptodate map entry and | ||
18 | use that to calculate the symbol and DSO relative address. But later | ||
19 | when we update the histogram we'll translate the address using the | ||
20 | outdated map file instead leading to conditions such as out-of-range | ||
21 | offsets in symbol__inc_addr_samples(). | ||
22 | |||
23 | Therefore, update the map of the hist_entry dynamically at lookup/ | ||
24 | creation time. | ||
25 | |||
26 | Signed-off-by: David S. Miller <davem@davemloft.net> | ||
27 | Link: http://lkml.kernel.org/r/20120327.031418.1220315351537060808.davem@davemloft.net | ||
28 | Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> | ||
29 | Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> | ||
30 | --- | ||
31 | tools/perf/util/hist.c | 12 ++++++++++++ | ||
32 | 1 file changed, 12 insertions(+) | ||
33 | |||
34 | diff --git a/tools/perf/util/hist.c b/tools/perf/util/hist.c | ||
35 | index 216e33a..adb372d 100644 | ||
36 | --- a/tools/perf/util/hist.c | ||
37 | +++ b/tools/perf/util/hist.c | ||
38 | @@ -230,6 +230,18 @@ struct hist_entry *__hists__add_entry(struct hists *hists, | ||
39 | if (!cmp) { | ||
40 | he->period += period; | ||
41 | ++he->nr_events; | ||
42 | + | ||
43 | + /* If the map of an existing hist_entry has | ||
44 | + * become out-of-date due to an exec() or | ||
45 | + * similar, update it. Otherwise we will | ||
46 | + * mis-adjust symbol addresses when computing | ||
47 | + * the history counter to increment. | ||
48 | + */ | ||
49 | + if (he->ms.map != entry->ms.map) { | ||
50 | + he->ms.map = entry->ms.map; | ||
51 | + if (he->ms.map) | ||
52 | + he->ms.map->referenced = true; | ||
53 | + } | ||
54 | goto out; | ||
55 | } | ||
56 | |||
57 | -- | ||
58 | 1.7.9.5 | ||
59 | |||
diff --git a/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0024-video-uvesafb-Fix-oops-that-uvesafb-try-to-execute-N.patch b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0023-video-uvesafb-Fix-oops-that-uvesafb-try-to-execute-N.patch index bfe3ac54..6fe1c741 100644 --- a/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0024-video-uvesafb-Fix-oops-that-uvesafb-try-to-execute-N.patch +++ b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0023-video-uvesafb-Fix-oops-that-uvesafb-try-to-execute-N.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From c89ee4a69b7ed875adac55c2929903acc5001d3b Mon Sep 17 00:00:00 2001 | 1 | From f60922f4d15cda62654f28c209b6123e7abe0b69 Mon Sep 17 00:00:00 2001 |
2 | From: Wang YanQing <udknight@gmail.com> | 2 | From: Wang YanQing <udknight@gmail.com> |
3 | Date: Sun, 1 Apr 2012 08:54:02 +0800 | 3 | Date: Sun, 1 Apr 2012 08:54:02 +0800 |
4 | Subject: [PATCH 24/69] video:uvesafb: Fix oops that uvesafb try to execute | 4 | Subject: [PATCH 23/68] video:uvesafb: Fix oops that uvesafb try to execute |
5 | NX-protected page | 5 | NX-protected page |
6 | 6 | ||
7 | commit b78f29ca0516266431688c5eb42d39ce42ec039a upstream. | 7 | commit b78f29ca0516266431688c5eb42d39ce42ec039a upstream. |
@@ -114,5 +114,5 @@ index 7f8472c..8813588 100644 | |||
114 | /* The protected mode interface is not available on non-x86. */ | 114 | /* The protected mode interface is not available on non-x86. */ |
115 | par->pmi_setpal = par->ypan = 0; | 115 | par->pmi_setpal = par->ypan = 0; |
116 | -- | 116 | -- |
117 | 1.7.9.5 | 117 | 1.7.10 |
118 | 118 | ||
diff --git a/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0025-nohz-Fix-stale-jiffies-update-in-tick_nohz_restart.patch b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0024-nohz-Fix-stale-jiffies-update-in-tick_nohz_restart.patch index 1d5dcca6..a2cf91f6 100644 --- a/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0025-nohz-Fix-stale-jiffies-update-in-tick_nohz_restart.patch +++ b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0024-nohz-Fix-stale-jiffies-update-in-tick_nohz_restart.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From dd19a09c7530975d86328c8eaf082626dd1d4fe1 Mon Sep 17 00:00:00 2001 | 1 | From 5e1fb3da35cd1e7b3bf1aa1f3384b5d3735c8fa8 Mon Sep 17 00:00:00 2001 |
2 | From: Neal Cardwell <ncardwell@google.com> | 2 | From: Neal Cardwell <ncardwell@google.com> |
3 | Date: Tue, 27 Mar 2012 15:09:37 -0400 | 3 | Date: Tue, 27 Mar 2012 15:09:37 -0400 |
4 | Subject: [PATCH 25/69] nohz: Fix stale jiffies update in tick_nohz_restart() | 4 | Subject: [PATCH 24/68] nohz: Fix stale jiffies update in tick_nohz_restart() |
5 | 5 | ||
6 | commit 6f103929f8979d2638e58d7f7fda0beefcb8ee7e upstream. | 6 | commit 6f103929f8979d2638e58d7f7fda0beefcb8ee7e upstream. |
7 | 7 | ||
@@ -49,5 +49,5 @@ index 4042064..c923640 100644 | |||
49 | } | 49 | } |
50 | 50 | ||
51 | -- | 51 | -- |
52 | 1.7.9.5 | 52 | 1.7.10 |
53 | 53 | ||
diff --git a/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0026-pch_uart-Fix-MSI-setting-issue.patch b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0025-pch_uart-Fix-MSI-setting-issue.patch index 3792b6fd..b0f9df57 100644 --- a/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0026-pch_uart-Fix-MSI-setting-issue.patch +++ b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0025-pch_uart-Fix-MSI-setting-issue.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 701cb5c2dbbe57b09a0585ea3a983540a29106c6 Mon Sep 17 00:00:00 2001 | 1 | From 4390c4afeff1688398e91fa58626daa4c476426a Mon Sep 17 00:00:00 2001 |
2 | From: Tomoya MORINAGA <tomoya.rohm@gmail.com> | 2 | From: Tomoya MORINAGA <tomoya.rohm@gmail.com> |
3 | Date: Mon, 2 Apr 2012 14:36:22 +0900 | 3 | Date: Mon, 2 Apr 2012 14:36:22 +0900 |
4 | Subject: [PATCH 26/69] pch_uart: Fix MSI setting issue | 4 | Subject: [PATCH 25/68] pch_uart: Fix MSI setting issue |
5 | 5 | ||
6 | commit 867c902e07d5677e2a5b54c0435e589513abde48 upstream. | 6 | commit 867c902e07d5677e2a5b54c0435e589513abde48 upstream. |
7 | 7 | ||
@@ -39,5 +39,5 @@ index d6aba8c..da776a0 100644 | |||
39 | iobase = pci_resource_start(pdev, 0); | 39 | iobase = pci_resource_start(pdev, 0); |
40 | mapbase = pci_resource_start(pdev, 1); | 40 | mapbase = pci_resource_start(pdev, 1); |
41 | -- | 41 | -- |
42 | 1.7.9.5 | 42 | 1.7.10 |
43 | 43 | ||
diff --git a/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0027-USB-serial-fix-race-between-probe-and-open.patch b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0026-USB-serial-fix-race-between-probe-and-open.patch index 53ef3987..60b1ca18 100644 --- a/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0027-USB-serial-fix-race-between-probe-and-open.patch +++ b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0026-USB-serial-fix-race-between-probe-and-open.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From fe3ac85bc01bebcbfd24255f567c18d0d609661b Mon Sep 17 00:00:00 2001 | 1 | From 2c3a918f01cceefb6b25eda48f8703c0f07d316d Mon Sep 17 00:00:00 2001 |
2 | From: Johan Hovold <jhovold@gmail.com> | 2 | From: Johan Hovold <jhovold@gmail.com> |
3 | Date: Tue, 20 Mar 2012 16:59:33 +0100 | 3 | Date: Tue, 20 Mar 2012 16:59:33 +0100 |
4 | Subject: [PATCH 27/69] USB: serial: fix race between probe and open | 4 | Subject: [PATCH 26/68] USB: serial: fix race between probe and open |
5 | 5 | ||
6 | commit a65a6f14dc24a90bde3f5d0073ba2364476200bf upstream. | 6 | commit a65a6f14dc24a90bde3f5d0073ba2364476200bf upstream. |
7 | 7 | ||
@@ -93,5 +93,5 @@ index cc274fd..38d7ebd 100644 | |||
93 | 93 | ||
94 | exit: | 94 | exit: |
95 | -- | 95 | -- |
96 | 1.7.9.5 | 96 | 1.7.10 |
97 | 97 | ||
diff --git a/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0028-USB-pl2303-fix-DTR-RTS-being-raised-on-baud-rate-cha.patch b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0027-USB-pl2303-fix-DTR-RTS-being-raised-on-baud-rate-cha.patch index 48e31f13..139d5ebf 100644 --- a/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0028-USB-pl2303-fix-DTR-RTS-being-raised-on-baud-rate-cha.patch +++ b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0027-USB-pl2303-fix-DTR-RTS-being-raised-on-baud-rate-cha.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From fa3bc47f28470076336a7f3cfedcf67837224a71 Mon Sep 17 00:00:00 2001 | 1 | From 759454c93c1d1532f9a9c76e16741d8b09f3fefd Mon Sep 17 00:00:00 2001 |
2 | From: Johan Hovold <jhovold@gmail.com> | 2 | From: Johan Hovold <jhovold@gmail.com> |
3 | Date: Fri, 23 Mar 2012 15:23:18 +0100 | 3 | Date: Fri, 23 Mar 2012 15:23:18 +0100 |
4 | Subject: [PATCH 28/69] USB: pl2303: fix DTR/RTS being raised on baud rate | 4 | Subject: [PATCH 27/68] USB: pl2303: fix DTR/RTS being raised on baud rate |
5 | change | 5 | change |
6 | MIME-Version: 1.0 | 6 | MIME-Version: 1.0 |
7 | Content-Type: text/plain; charset=UTF-8 | 7 | Content-Type: text/plain; charset=UTF-8 |
@@ -33,5 +33,5 @@ index fc2d66f..5532ea5 100644 | |||
33 | if (control != priv->line_control) { | 33 | if (control != priv->line_control) { |
34 | control = priv->line_control; | 34 | control = priv->line_control; |
35 | -- | 35 | -- |
36 | 1.7.9.5 | 36 | 1.7.10 |
37 | 37 | ||
diff --git a/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0029-USB-option-re-add-NOVATELWIRELESS_PRODUCT_HSPA_HIGHS.patch b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0028-USB-option-re-add-NOVATELWIRELESS_PRODUCT_HSPA_HIGHS.patch index 17b3947a..c3736bb9 100644 --- a/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0029-USB-option-re-add-NOVATELWIRELESS_PRODUCT_HSPA_HIGHS.patch +++ b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0028-USB-option-re-add-NOVATELWIRELESS_PRODUCT_HSPA_HIGHS.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 1b71d0901a340fb7f1acfa39053b5baa7d22b8e5 Mon Sep 17 00:00:00 2001 | 1 | From 64b66ecdf795206abc8fe6ed8df7b34f581fb4cc Mon Sep 17 00:00:00 2001 |
2 | From: Santiago Garcia Mantinan <manty@debian.org> | 2 | From: Santiago Garcia Mantinan <manty@debian.org> |
3 | Date: Mon, 19 Mar 2012 18:17:00 +0100 | 3 | Date: Mon, 19 Mar 2012 18:17:00 +0100 |
4 | Subject: [PATCH 29/69] USB: option: re-add | 4 | Subject: [PATCH 28/68] USB: option: re-add |
5 | NOVATELWIRELESS_PRODUCT_HSPA_HIGHSPEED to option_id | 5 | NOVATELWIRELESS_PRODUCT_HSPA_HIGHSPEED to option_id |
6 | array | 6 | array |
7 | 7 | ||
@@ -28,5 +28,5 @@ index 54898c9..cbe3451 100644 | |||
28 | { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_HSPA_HIGHSPEED4) }, | 28 | { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_HSPA_HIGHSPEED4) }, |
29 | { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_HSPA_HIGHSPEED5) }, | 29 | { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_HSPA_HIGHSPEED5) }, |
30 | -- | 30 | -- |
31 | 1.7.9.5 | 31 | 1.7.10 |
32 | 32 | ||
diff --git a/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0030-USB-ftdi_sio-fix-status-line-change-handling-for-TIO.patch b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0029-USB-ftdi_sio-fix-status-line-change-handling-for-TIO.patch index 96810680..55a36f84 100644 --- a/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0030-USB-ftdi_sio-fix-status-line-change-handling-for-TIO.patch +++ b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0029-USB-ftdi_sio-fix-status-line-change-handling-for-TIO.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From f3a53ff9baee1e730f4332eccf3d5feb3245e7a9 Mon Sep 17 00:00:00 2001 | 1 | From 8c15eaa2462cd32b7e2aebf64e4692ed6f6bd775 Mon Sep 17 00:00:00 2001 |
2 | From: Simon Arlott <simon@fire.lp0.eu> | 2 | From: Simon Arlott <simon@fire.lp0.eu> |
3 | Date: Mon, 26 Mar 2012 21:19:40 +0100 | 3 | Date: Mon, 26 Mar 2012 21:19:40 +0100 |
4 | Subject: [PATCH 30/69] USB: ftdi_sio: fix status line change handling for | 4 | Subject: [PATCH 29/68] USB: ftdi_sio: fix status line change handling for |
5 | TIOCMIWAIT and TIOCGICOUNT | 5 | TIOCMIWAIT and TIOCGICOUNT |
6 | 6 | ||
7 | commit fca5430d48d53eaf103498c33fd0d1984b9f448b upstream. | 7 | commit fca5430d48d53eaf103498c33fd0d1984b9f448b upstream. |
@@ -75,5 +75,5 @@ index f2c9ef7..cfc8e59 100644 | |||
75 | } | 75 | } |
76 | 76 | ||
77 | -- | 77 | -- |
78 | 1.7.9.5 | 78 | 1.7.10 |
79 | 79 | ||
diff --git a/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0031-USB-ftdi_sio-fix-race-condition-in-TIOCMIWAIT-and-ab.patch b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0030-USB-ftdi_sio-fix-race-condition-in-TIOCMIWAIT-and-ab.patch index 189b5980..1f825a8e 100644 --- a/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0031-USB-ftdi_sio-fix-race-condition-in-TIOCMIWAIT-and-ab.patch +++ b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0030-USB-ftdi_sio-fix-race-condition-in-TIOCMIWAIT-and-ab.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 9290ee7d767163efb842c578e20c74164dddb350 Mon Sep 17 00:00:00 2001 | 1 | From 7a6e307dd338f12c1a9ece87fdd962f48b5a56a7 Mon Sep 17 00:00:00 2001 |
2 | From: Simon Arlott <simon@fire.lp0.eu> | 2 | From: Simon Arlott <simon@fire.lp0.eu> |
3 | Date: Mon, 26 Mar 2012 23:27:59 +0100 | 3 | Date: Mon, 26 Mar 2012 23:27:59 +0100 |
4 | Subject: [PATCH 31/69] USB: ftdi_sio: fix race condition in TIOCMIWAIT, and | 4 | Subject: [PATCH 30/68] USB: ftdi_sio: fix race condition in TIOCMIWAIT, and |
5 | abort of TIOCMIWAIT when the device is removed | 5 | abort of TIOCMIWAIT when the device is removed |
6 | MIME-Version: 1.0 | 6 | MIME-Version: 1.0 |
7 | Content-Type: text/plain; charset=UTF-8 | 7 | Content-Type: text/plain; charset=UTF-8 |
@@ -107,5 +107,5 @@ index cfc8e59..c4cf3f3 100644 | |||
107 | case TIOCSERGETLSR: | 107 | case TIOCSERGETLSR: |
108 | return get_lsr_info(port, (struct serial_struct __user *)arg); | 108 | return get_lsr_info(port, (struct serial_struct __user *)arg); |
109 | -- | 109 | -- |
110 | 1.7.9.5 | 110 | 1.7.10 |
111 | 111 | ||
diff --git a/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0032-USB-sierra-add-support-for-Sierra-Wireless-MC7710.patch b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0031-USB-sierra-add-support-for-Sierra-Wireless-MC7710.patch index b13cff3d..9de79309 100644 --- a/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0032-USB-sierra-add-support-for-Sierra-Wireless-MC7710.patch +++ b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0031-USB-sierra-add-support-for-Sierra-Wireless-MC7710.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From fa17e1b79bef42fa178918e05b7a38d69caa13d7 Mon Sep 17 00:00:00 2001 | 1 | From 6f304009cc2e6546ded2d677953ad5e43c8dce88 Mon Sep 17 00:00:00 2001 |
2 | From: Anton Samokhvalov <pg83@yandex.ru> | 2 | From: Anton Samokhvalov <pg83@yandex.ru> |
3 | Date: Wed, 4 Apr 2012 22:26:01 +0400 | 3 | Date: Wed, 4 Apr 2012 22:26:01 +0400 |
4 | Subject: [PATCH 32/69] USB: sierra: add support for Sierra Wireless MC7710 | 4 | Subject: [PATCH 31/68] USB: sierra: add support for Sierra Wireless MC7710 |
5 | 5 | ||
6 | commit c5d703dcc776cb542b41665f2b7e2ba054efb4a7 upstream. | 6 | commit c5d703dcc776cb542b41665f2b7e2ba054efb4a7 upstream. |
7 | 7 | ||
@@ -26,5 +26,5 @@ index b18179b..7c3ec9e 100644 | |||
26 | { USB_DEVICE_AND_INTERFACE_INFO(0x1199, 0x6880, 0xFF, 0xFF, 0xFF)}, | 26 | { USB_DEVICE_AND_INTERFACE_INFO(0x1199, 0x6880, 0xFF, 0xFF, 0xFF)}, |
27 | /* Sierra Wireless C888, Air Card 501, USB 303, USB 304 */ | 27 | /* Sierra Wireless C888, Air Card 501, USB 303, USB 304 */ |
28 | -- | 28 | -- |
29 | 1.7.9.5 | 29 | 1.7.10 |
30 | 30 | ||
diff --git a/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0033-USB-don-t-clear-urb-dev-in-scatter-gather-library.patch b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0032-USB-don-t-clear-urb-dev-in-scatter-gather-library.patch index 9ff10f9a..02e6915d 100644 --- a/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0033-USB-don-t-clear-urb-dev-in-scatter-gather-library.patch +++ b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0032-USB-don-t-clear-urb-dev-in-scatter-gather-library.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From cd107339d3370b39dcaafd354a0c658b207dcaf0 Mon Sep 17 00:00:00 2001 | 1 | From aa2fe95f433d360d0625752971b99e30ecde56bf Mon Sep 17 00:00:00 2001 |
2 | From: Alan Stern <stern@rowland.harvard.edu> | 2 | From: Alan Stern <stern@rowland.harvard.edu> |
3 | Date: Thu, 22 Mar 2012 11:00:21 -0400 | 3 | Date: Thu, 22 Mar 2012 11:00:21 -0400 |
4 | Subject: [PATCH 33/69] USB: don't clear urb->dev in scatter-gather library | 4 | Subject: [PATCH 32/68] USB: don't clear urb->dev in scatter-gather library |
5 | 5 | ||
6 | commit bcf398537630bf20b4dbe59ba855b69f404c93cf upstream. | 6 | commit bcf398537630bf20b4dbe59ba855b69f404c93cf upstream. |
7 | 7 | ||
@@ -81,5 +81,5 @@ index b3bdfed..aed3e07 100644 | |||
81 | __func__, retval); | 81 | __func__, retval); |
82 | } | 82 | } |
83 | -- | 83 | -- |
84 | 1.7.9.5 | 84 | 1.7.10 |
85 | 85 | ||
diff --git a/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0034-USB-don-t-ignore-suspend-errors-for-root-hubs.patch b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0033-USB-don-t-ignore-suspend-errors-for-root-hubs.patch index 019927df..0d9190f8 100644 --- a/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0034-USB-don-t-ignore-suspend-errors-for-root-hubs.patch +++ b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0033-USB-don-t-ignore-suspend-errors-for-root-hubs.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 2bfec5e16aa5c74b8c5934059f3e32595ef95214 Mon Sep 17 00:00:00 2001 | 1 | From 76cec389c13edcc348d13a0efc7351752c3f71e3 Mon Sep 17 00:00:00 2001 |
2 | From: Alan Stern <stern@rowland.harvard.edu> | 2 | From: Alan Stern <stern@rowland.harvard.edu> |
3 | Date: Wed, 28 Mar 2012 15:56:17 -0400 | 3 | Date: Wed, 28 Mar 2012 15:56:17 -0400 |
4 | Subject: [PATCH 34/69] USB: don't ignore suspend errors for root hubs | 4 | Subject: [PATCH 33/68] USB: don't ignore suspend errors for root hubs |
5 | 5 | ||
6 | commit cd4376e23a59a2adf3084cb5f4a523e6d5fd4e49 upstream. | 6 | commit cd4376e23a59a2adf3084cb5f4a523e6d5fd4e49 upstream. |
7 | 7 | ||
@@ -50,5 +50,5 @@ index 45887a0..c77f0d6 100644 | |||
50 | } | 50 | } |
51 | 51 | ||
52 | -- | 52 | -- |
53 | 1.7.9.5 | 53 | 1.7.10 |
54 | 54 | ||
diff --git a/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0035-xhci-don-t-re-enable-IE-constantly.patch b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0034-xhci-don-t-re-enable-IE-constantly.patch index 0643790a..590fa5ba 100644 --- a/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0035-xhci-don-t-re-enable-IE-constantly.patch +++ b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0034-xhci-don-t-re-enable-IE-constantly.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 36e9ddc88d64edf5a78006753b3ec306384008d7 Mon Sep 17 00:00:00 2001 | 1 | From 4baf16baa7693c3ef1083347dfc02d92050ee34b Mon Sep 17 00:00:00 2001 |
2 | From: Felipe Balbi <balbi@ti.com> | 2 | From: Felipe Balbi <balbi@ti.com> |
3 | Date: Thu, 15 Mar 2012 16:37:08 +0200 | 3 | Date: Thu, 15 Mar 2012 16:37:08 +0200 |
4 | Subject: [PATCH 35/69] xhci: don't re-enable IE constantly | 4 | Subject: [PATCH 34/68] xhci: don't re-enable IE constantly |
5 | 5 | ||
6 | commit 4e833c0b87a30798e67f06120cecebef6ee9644c upstream. | 6 | commit 4e833c0b87a30798e67f06120cecebef6ee9644c upstream. |
7 | 7 | ||
@@ -54,5 +54,5 @@ index 09eda3a..4850c4d 100644 | |||
54 | /* HC not running - set to 1 when run/stop bit is cleared. */ | 54 | /* HC not running - set to 1 when run/stop bit is cleared. */ |
55 | #define STS_HALT XHCI_STS_HALT | 55 | #define STS_HALT XHCI_STS_HALT |
56 | -- | 56 | -- |
57 | 1.7.9.5 | 57 | 1.7.10 |
58 | 58 | ||
diff --git a/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0036-xhci-Don-t-write-zeroed-pointers-to-xHC-registers.patch b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0035-xhci-Don-t-write-zeroed-pointers-to-xHC-registers.patch index 9eb5447c..47e7b055 100644 --- a/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0036-xhci-Don-t-write-zeroed-pointers-to-xHC-registers.patch +++ b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0035-xhci-Don-t-write-zeroed-pointers-to-xHC-registers.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From f8d0987af5d135d8eb54e7b525e985328f0e8bd5 Mon Sep 17 00:00:00 2001 | 1 | From eefbd6d2849f7b6a48865e9946d80f2d08fbda44 Mon Sep 17 00:00:00 2001 |
2 | From: Sarah Sharp <sarah.a.sharp@linux.intel.com> | 2 | From: Sarah Sharp <sarah.a.sharp@linux.intel.com> |
3 | Date: Fri, 16 Mar 2012 13:09:39 -0700 | 3 | Date: Fri, 16 Mar 2012 13:09:39 -0700 |
4 | Subject: [PATCH 36/69] xhci: Don't write zeroed pointers to xHC registers. | 4 | Subject: [PATCH 35/68] xhci: Don't write zeroed pointers to xHC registers. |
5 | 5 | ||
6 | commit 159e1fcc9a60fc7daba23ee8fcdb99799de3fe84 upstream. | 6 | commit 159e1fcc9a60fc7daba23ee8fcdb99799de3fe84 upstream. |
7 | 7 | ||
@@ -74,5 +74,5 @@ index c69cf54..01c3800 100644 | |||
74 | return -ENOMEM; | 74 | return -ENOMEM; |
75 | } | 75 | } |
76 | -- | 76 | -- |
77 | 1.7.9.5 | 77 | 1.7.10 |
78 | 78 | ||
diff --git a/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0037-xhci-Restore-event-ring-dequeue-pointer-on-resume.patch b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0036-xhci-Restore-event-ring-dequeue-pointer-on-resume.patch index cadc9293..3b16ebdd 100644 --- a/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0037-xhci-Restore-event-ring-dequeue-pointer-on-resume.patch +++ b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0036-xhci-Restore-event-ring-dequeue-pointer-on-resume.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 375a67105a521c7ae75a529509218c4bda02c612 Mon Sep 17 00:00:00 2001 | 1 | From f8f150a7dd5f865281c14bff1e2260ecc60e9f3f Mon Sep 17 00:00:00 2001 |
2 | From: Sarah Sharp <sarah.a.sharp@linux.intel.com> | 2 | From: Sarah Sharp <sarah.a.sharp@linux.intel.com> |
3 | Date: Fri, 16 Mar 2012 13:27:39 -0700 | 3 | Date: Fri, 16 Mar 2012 13:27:39 -0700 |
4 | Subject: [PATCH 37/69] xhci: Restore event ring dequeue pointer on resume. | 4 | Subject: [PATCH 36/68] xhci: Restore event ring dequeue pointer on resume. |
5 | 5 | ||
6 | commit fb3d85bc7193f23c9a564502df95564c49a32c91 upstream. | 6 | commit fb3d85bc7193f23c9a564502df95564c49a32c91 upstream. |
7 | 7 | ||
@@ -35,5 +35,5 @@ index 034f554..4d44713 100644 | |||
35 | 35 | ||
36 | static void xhci_set_cmd_ring_deq(struct xhci_hcd *xhci) | 36 | static void xhci_set_cmd_ring_deq(struct xhci_hcd *xhci) |
37 | -- | 37 | -- |
38 | 1.7.9.5 | 38 | 1.7.10 |
39 | 39 | ||
diff --git a/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0038-USB-fix-bug-of-device-descriptor-got-from-superspeed.patch b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0037-USB-fix-bug-of-device-descriptor-got-from-superspeed.patch index a48a25d5..6e94e7b6 100644 --- a/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0038-USB-fix-bug-of-device-descriptor-got-from-superspeed.patch +++ b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0037-USB-fix-bug-of-device-descriptor-got-from-superspeed.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 75b1fa981bf0fcddcc4a6c8916d6995a273dcfad Mon Sep 17 00:00:00 2001 | 1 | From 0060609ba317d6efd3584b4f0ad260944049dc69 Mon Sep 17 00:00:00 2001 |
2 | From: Elric Fu <elricfu1@gmail.com> | 2 | From: Elric Fu <elricfu1@gmail.com> |
3 | Date: Mon, 26 Mar 2012 21:16:02 +0800 | 3 | Date: Mon, 26 Mar 2012 21:16:02 +0800 |
4 | Subject: [PATCH 38/69] USB: fix bug of device descriptor got from superspeed | 4 | Subject: [PATCH 37/68] USB: fix bug of device descriptor got from superspeed |
5 | device | 5 | device |
6 | 6 | ||
7 | commit d8aec3dbdfd02627e198e7956ab4aaeba2a349fa upstream. | 7 | commit d8aec3dbdfd02627e198e7956ab4aaeba2a349fa upstream. |
@@ -69,5 +69,5 @@ index f982eeb..18373ec 100644 | |||
69 | udev->speed == USB_SPEED_SUPER) | 69 | udev->speed == USB_SPEED_SUPER) |
70 | i = 512; | 70 | i = 512; |
71 | -- | 71 | -- |
72 | 1.7.9.5 | 72 | 1.7.10 |
73 | 73 | ||
diff --git a/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0039-xHCI-add-XHCI_RESET_ON_RESUME-quirk-for-VIA-xHCI-hos.patch b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0038-xHCI-add-XHCI_RESET_ON_RESUME-quirk-for-VIA-xHCI-hos.patch index 9229f08a..0e548975 100644 --- a/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0039-xHCI-add-XHCI_RESET_ON_RESUME-quirk-for-VIA-xHCI-hos.patch +++ b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0038-xHCI-add-XHCI_RESET_ON_RESUME-quirk-for-VIA-xHCI-hos.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From f9cce3fb45a90fffc8d2bb59a65ebdbfc881d5a8 Mon Sep 17 00:00:00 2001 | 1 | From 8f4c9c4038bbc8e334790983712c1492e292d7f2 Mon Sep 17 00:00:00 2001 |
2 | From: Elric Fu <elricfu1@gmail.com> | 2 | From: Elric Fu <elricfu1@gmail.com> |
3 | Date: Thu, 29 Mar 2012 15:47:50 +0800 | 3 | Date: Thu, 29 Mar 2012 15:47:50 +0800 |
4 | Subject: [PATCH 39/69] xHCI: add XHCI_RESET_ON_RESUME quirk for VIA xHCI host | 4 | Subject: [PATCH 38/68] xHCI: add XHCI_RESET_ON_RESUME quirk for VIA xHCI host |
5 | 5 | ||
6 | commit 457a4f61f9bfc3ae76e5b49f30f25d86bb696f67 upstream. | 6 | commit 457a4f61f9bfc3ae76e5b49f30f25d86bb696f67 upstream. |
7 | 7 | ||
@@ -39,5 +39,5 @@ index ef98b38..211296a 100644 | |||
39 | 39 | ||
40 | /* called during probe() after chip reset completes */ | 40 | /* called during probe() after chip reset completes */ |
41 | -- | 41 | -- |
42 | 1.7.9.5 | 42 | 1.7.10 |
43 | 43 | ||
diff --git a/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0040-xHCI-Correct-the-define-XHCI_LEGACY_DISABLE_SMI.patch b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0039-xHCI-Correct-the-define-XHCI_LEGACY_DISABLE_SMI.patch index 5a3f5bc0..b1848949 100644 --- a/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0040-xHCI-Correct-the-define-XHCI_LEGACY_DISABLE_SMI.patch +++ b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0039-xHCI-Correct-the-define-XHCI_LEGACY_DISABLE_SMI.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 84ff902a342b34de5c637eccde339aa7bd644c2b Mon Sep 17 00:00:00 2001 | 1 | From f7dd4f23cd64f64dbed76c7cca31533f3ed11037 Mon Sep 17 00:00:00 2001 |
2 | From: Alex He <alex.he@amd.com> | 2 | From: Alex He <alex.he@amd.com> |
3 | Date: Fri, 30 Mar 2012 10:21:38 +0800 | 3 | Date: Fri, 30 Mar 2012 10:21:38 +0800 |
4 | Subject: [PATCH 40/69] xHCI: Correct the #define XHCI_LEGACY_DISABLE_SMI | 4 | Subject: [PATCH 39/68] xHCI: Correct the #define XHCI_LEGACY_DISABLE_SMI |
5 | 5 | ||
6 | commit 95018a53f7653e791bba1f54c8d75d9cb700d1bd upstream. | 6 | commit 95018a53f7653e791bba1f54c8d75d9cb700d1bd upstream. |
7 | 7 | ||
@@ -57,5 +57,5 @@ index c7f3312..377f424 100644 | |||
57 | /* USB 2.0 xHCI 0.96 L1C capability - section 7.2.2.1.3.2 */ | 57 | /* USB 2.0 xHCI 0.96 L1C capability - section 7.2.2.1.3.2 */ |
58 | #define XHCI_L1C (1 << 16) | 58 | #define XHCI_L1C (1 << 16) |
59 | -- | 59 | -- |
60 | 1.7.9.5 | 60 | 1.7.10 |
61 | 61 | ||
diff --git a/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0041-fix-tlb-flushing-for-page-table-pages.patch b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0040-fix-tlb-flushing-for-page-table-pages.patch index 350e9d76..1a6e44c8 100644 --- a/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0041-fix-tlb-flushing-for-page-table-pages.patch +++ b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0040-fix-tlb-flushing-for-page-table-pages.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 0110a55b4db1e1f84f4980aef2528e2cfe6875af Mon Sep 17 00:00:00 2001 | 1 | From d0cba3dd900c1420176693c3f10ec11ada4553af Mon Sep 17 00:00:00 2001 |
2 | From: Martin Schwidefsky <schwidefsky@de.ibm.com> | 2 | From: Martin Schwidefsky <schwidefsky@de.ibm.com> |
3 | Date: Wed, 11 Apr 2012 14:28:07 +0200 | 3 | Date: Wed, 11 Apr 2012 14:28:07 +0200 |
4 | Subject: [PATCH 41/69] fix tlb flushing for page table pages | 4 | Subject: [PATCH 40/68] fix tlb flushing for page table pages |
5 | 5 | ||
6 | commit cd94154cc6a28dd9dc271042c1a59c08d26da886 upstream. | 6 | commit cd94154cc6a28dd9dc271042c1a59c08d26da886 upstream. |
7 | 7 | ||
@@ -236,5 +236,5 @@ index 301c84d..f8ceac4 100644 | |||
236 | /* | 236 | /* |
237 | * switch on pgstes for its userspace process (for kvm) | 237 | * switch on pgstes for its userspace process (for kvm) |
238 | -- | 238 | -- |
239 | 1.7.9.5 | 239 | 1.7.10 |
240 | 240 | ||
diff --git a/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0042-serial-PL011-clear-pending-interrupts.patch b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0041-serial-PL011-clear-pending-interrupts.patch index ecece35d..3b17d2c7 100644 --- a/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0042-serial-PL011-clear-pending-interrupts.patch +++ b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0041-serial-PL011-clear-pending-interrupts.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 6408483ea69660e6ad8a2a8852edb9cd539cd51d Mon Sep 17 00:00:00 2001 | 1 | From 83b1f68d0e0fdc6993be1ebf4ef51a439b71180f Mon Sep 17 00:00:00 2001 |
2 | From: Linus Walleij <linus.walleij@linaro.org> | 2 | From: Linus Walleij <linus.walleij@linaro.org> |
3 | Date: Tue, 13 Mar 2012 13:27:23 +0100 | 3 | Date: Tue, 13 Mar 2012 13:27:23 +0100 |
4 | Subject: [PATCH 42/69] serial: PL011: clear pending interrupts | 4 | Subject: [PATCH 41/68] serial: PL011: clear pending interrupts |
5 | 5 | ||
6 | commit 9b96fbacda34079dea0638ee1e92c56286f6114a upstream. | 6 | commit 9b96fbacda34079dea0638ee1e92c56286f6114a upstream. |
7 | 7 | ||
@@ -78,5 +78,5 @@ index 8e00926..dddc3f2 100644 | |||
78 | uap->lcrh_rx = vendor->lcrh_rx; | 78 | uap->lcrh_rx = vendor->lcrh_rx; |
79 | uap->lcrh_tx = vendor->lcrh_tx; | 79 | uap->lcrh_tx = vendor->lcrh_tx; |
80 | -- | 80 | -- |
81 | 1.7.9.5 | 81 | 1.7.10 |
82 | 82 | ||
diff --git a/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0043-serial-PL011-move-interrupt-clearing.patch b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0042-serial-PL011-move-interrupt-clearing.patch index bc47af07..8ecc1bda 100644 --- a/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0043-serial-PL011-move-interrupt-clearing.patch +++ b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0042-serial-PL011-move-interrupt-clearing.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 02822f5ea52d9c9c4d197187b1a2553fe70f106c Mon Sep 17 00:00:00 2001 | 1 | From 39f2e7d1ec34222f7e7262c87425b18964d16b25 Mon Sep 17 00:00:00 2001 |
2 | From: Linus Walleij <linus.walleij@linaro.org> | 2 | From: Linus Walleij <linus.walleij@linaro.org> |
3 | Date: Wed, 21 Mar 2012 20:15:18 +0100 | 3 | Date: Wed, 21 Mar 2012 20:15:18 +0100 |
4 | Subject: [PATCH 43/69] serial: PL011: move interrupt clearing | 4 | Subject: [PATCH 42/68] serial: PL011: move interrupt clearing |
5 | 5 | ||
6 | commit c3d8b76f61586714cdc5f219ba45592a54caaa55 upstream. | 6 | commit c3d8b76f61586714cdc5f219ba45592a54caaa55 upstream. |
7 | 7 | ||
@@ -51,5 +51,5 @@ index dddc3f2..6da8cf8 100644 | |||
51 | 51 | ||
52 | amba_ports[i] = uap; | 52 | amba_ports[i] = uap; |
53 | -- | 53 | -- |
54 | 1.7.9.5 | 54 | 1.7.10 |
55 | 55 | ||
diff --git a/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0044-fcaps-clear-the-same-personality-flags-as-suid-when-.patch b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0043-fcaps-clear-the-same-personality-flags-as-suid-when-.patch index b2e4de61..39016829 100644 --- a/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0044-fcaps-clear-the-same-personality-flags-as-suid-when-.patch +++ b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0043-fcaps-clear-the-same-personality-flags-as-suid-when-.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 0acc120610478e7f4b80e0d1379bd927c90eaff4 Mon Sep 17 00:00:00 2001 | 1 | From 131deceebcd7239f193e6f9fef1fe30df267e1c4 Mon Sep 17 00:00:00 2001 |
2 | From: Eric Paris <eparis@redhat.com> | 2 | From: Eric Paris <eparis@redhat.com> |
3 | Date: Tue, 17 Apr 2012 16:26:54 -0400 | 3 | Date: Tue, 17 Apr 2012 16:26:54 -0400 |
4 | Subject: [PATCH 44/69] fcaps: clear the same personality flags as suid when | 4 | Subject: [PATCH 43/68] fcaps: clear the same personality flags as suid when |
5 | fcaps are used | 5 | fcaps are used |
6 | 6 | ||
7 | commit d52fc5dde171f030170a6cb78034d166b13c9445 upstream. | 7 | commit d52fc5dde171f030170a6cb78034d166b13c9445 upstream. |
@@ -37,5 +37,5 @@ index ee4f848..0aee106 100644 | |||
37 | * credentials unless they have the appropriate permit | 37 | * credentials unless they have the appropriate permit |
38 | */ | 38 | */ |
39 | -- | 39 | -- |
40 | 1.7.9.5 | 40 | 1.7.10 |
41 | 41 | ||
diff --git a/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0045-ath9k-fix-max-noise-floor-threshold.patch b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0044-ath9k-fix-max-noise-floor-threshold.patch index 618a68a1..2fde0474 100644 --- a/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0045-ath9k-fix-max-noise-floor-threshold.patch +++ b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0044-ath9k-fix-max-noise-floor-threshold.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From ffdc1eb0a3c60111912b7bfe80c3a9358edd6b42 Mon Sep 17 00:00:00 2001 | 1 | From dd47cb2da9c6045068d6677d27b4a8acffa9d1a6 Mon Sep 17 00:00:00 2001 |
2 | From: Rajkumar Manoharan <rmanohar@qca.qualcomm.com> | 2 | From: Rajkumar Manoharan <rmanohar@qca.qualcomm.com> |
3 | Date: Thu, 15 Mar 2012 06:08:04 +0530 | 3 | Date: Thu, 15 Mar 2012 06:08:04 +0530 |
4 | Subject: [PATCH 45/69] ath9k: fix max noise floor threshold | 4 | Subject: [PATCH 44/68] ath9k: fix max noise floor threshold |
5 | 5 | ||
6 | commit 2ee0a07028d2cde6e131b73f029dae2b93c50f3a upstream. | 6 | commit 2ee0a07028d2cde6e131b73f029dae2b93c50f3a upstream. |
7 | 7 | ||
@@ -52,5 +52,5 @@ index 8ddef3e..d771de5 100644 | |||
52 | } else if (nf[i] < limit->min) { | 52 | } else if (nf[i] < limit->min) { |
53 | ath_dbg(common, ATH_DBG_CALIBRATE, | 53 | ath_dbg(common, ATH_DBG_CALIBRATE, |
54 | -- | 54 | -- |
55 | 1.7.9.5 | 55 | 1.7.10 |
56 | 56 | ||
diff --git a/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0046-xhci-Fix-register-save-restore-order.patch b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0045-xhci-Fix-register-save-restore-order.patch index 2fe2c5e0..b7de663c 100644 --- a/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0046-xhci-Fix-register-save-restore-order.patch +++ b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0045-xhci-Fix-register-save-restore-order.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From d4e6ce02459552a127973c9c204509136b940671 Mon Sep 17 00:00:00 2001 | 1 | From 5d1eb145d8bd522d7e6fbbd0ee566417535f5291 Mon Sep 17 00:00:00 2001 |
2 | From: Sarah Sharp <sarah.a.sharp@linux.intel.com> | 2 | From: Sarah Sharp <sarah.a.sharp@linux.intel.com> |
3 | Date: Fri, 16 Mar 2012 13:19:35 -0700 | 3 | Date: Fri, 16 Mar 2012 13:19:35 -0700 |
4 | Subject: [PATCH 46/69] xhci: Fix register save/restore order. | 4 | Subject: [PATCH 45/68] xhci: Fix register save/restore order. |
5 | 5 | ||
6 | commit c7713e736526d8c9f6f87716fb90562a8ffaff2c upstream. | 6 | commit c7713e736526d8c9f6f87716fb90562a8ffaff2c upstream. |
7 | 7 | ||
@@ -58,5 +58,5 @@ index 4d44713..4c00606 100644 | |||
58 | 58 | ||
59 | static void xhci_set_cmd_ring_deq(struct xhci_hcd *xhci) | 59 | static void xhci_set_cmd_ring_deq(struct xhci_hcd *xhci) |
60 | -- | 60 | -- |
61 | 1.7.9.5 | 61 | 1.7.10 |
62 | 62 | ||
diff --git a/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0047-Bluetooth-hci_core-fix-NULL-pointer-dereference-at-u.patch b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0046-Bluetooth-hci_core-fix-NULL-pointer-dereference-at-u.patch index 4e3ff35d..5d271e95 100644 --- a/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0047-Bluetooth-hci_core-fix-NULL-pointer-dereference-at-u.patch +++ b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0046-Bluetooth-hci_core-fix-NULL-pointer-dereference-at-u.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 1eb32b0dc5c5286345e96240894af14de856e515 Mon Sep 17 00:00:00 2001 | 1 | From 5cfa510424e3901b81a0dd9579d078b56f5bca05 Mon Sep 17 00:00:00 2001 |
2 | From: Johan Hovold <jhovold@gmail.com> | 2 | From: Johan Hovold <jhovold@gmail.com> |
3 | Date: Thu, 15 Mar 2012 14:48:41 +0100 | 3 | Date: Thu, 15 Mar 2012 14:48:41 +0100 |
4 | Subject: [PATCH 47/69] Bluetooth: hci_core: fix NULL-pointer dereference at | 4 | Subject: [PATCH 46/68] Bluetooth: hci_core: fix NULL-pointer dereference at |
5 | unregister | 5 | unregister |
6 | 6 | ||
7 | commit 94324962066231a938564bebad0f941cd2d06bb2 upstream. | 7 | commit 94324962066231a938564bebad0f941cd2d06bb2 upstream. |
@@ -129,5 +129,5 @@ index b84458d..857dc88 100644 | |||
129 | list_del(&hdev->list); | 129 | list_del(&hdev->list); |
130 | write_unlock_bh(&hci_dev_list_lock); | 130 | write_unlock_bh(&hci_dev_list_lock); |
131 | -- | 131 | -- |
132 | 1.7.9.5 | 132 | 1.7.10 |
133 | 133 | ||
diff --git a/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0048-pch_gpio-Support-new-device-LAPIS-Semiconductor-ML78.patch b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0047-pch_gpio-Support-new-device-LAPIS-Semiconductor-ML78.patch index 1f78b921..68cfa641 100644 --- a/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0048-pch_gpio-Support-new-device-LAPIS-Semiconductor-ML78.patch +++ b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0047-pch_gpio-Support-new-device-LAPIS-Semiconductor-ML78.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 02f5e653d3083265e70a5cc00f050b6ec394fb83 Mon Sep 17 00:00:00 2001 | 1 | From d1d630c1d03f1b6c860fb0f7019aad8df08f4511 Mon Sep 17 00:00:00 2001 |
2 | From: Tomoya MORINAGA <tomoya-linux@dsn.lapis-semi.com> | 2 | From: Tomoya MORINAGA <tomoya-linux@dsn.lapis-semi.com> |
3 | Date: Fri, 28 Oct 2011 09:23:32 +0900 | 3 | Date: Fri, 28 Oct 2011 09:23:32 +0900 |
4 | Subject: [PATCH 48/69] pch_gpio: Support new device LAPIS Semiconductor | 4 | Subject: [PATCH 47/68] pch_gpio: Support new device LAPIS Semiconductor |
5 | ML7831 IOH | 5 | ML7831 IOH |
6 | 6 | ||
7 | commit 868fea0507308b6548bba7debe5f5c2d5ca47fca upstream. | 7 | commit 868fea0507308b6548bba7debe5f5c2d5ca47fca upstream. |
@@ -59,5 +59,5 @@ index a6008e1..eb574f2 100644 | |||
59 | }; | 59 | }; |
60 | MODULE_DEVICE_TABLE(pci, pch_gpio_pcidev_id); | 60 | MODULE_DEVICE_TABLE(pci, pch_gpio_pcidev_id); |
61 | -- | 61 | -- |
62 | 1.7.9.5 | 62 | 1.7.10 |
63 | 63 | ||
diff --git a/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0049-gpio-Add-missing-spin_lock_init-in-gpio-pch-driver.patch b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0048-gpio-Add-missing-spin_lock_init-in-gpio-pch-driver.patch index 23824a74..f3d980fe 100644 --- a/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0049-gpio-Add-missing-spin_lock_init-in-gpio-pch-driver.patch +++ b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0048-gpio-Add-missing-spin_lock_init-in-gpio-pch-driver.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 9fb55b40aa4e085f86bfce237a482b13847fdc01 Mon Sep 17 00:00:00 2001 | 1 | From d318ceeea315d2005b914345b86e62c43a6f37b8 Mon Sep 17 00:00:00 2001 |
2 | From: Axel Lin <axel.lin@gmail.com> | 2 | From: Axel Lin <axel.lin@gmail.com> |
3 | Date: Wed, 1 Feb 2012 10:51:53 +0800 | 3 | Date: Wed, 1 Feb 2012 10:51:53 +0800 |
4 | Subject: [PATCH 49/69] gpio: Add missing spin_lock_init in gpio-pch driver | 4 | Subject: [PATCH 48/68] gpio: Add missing spin_lock_init in gpio-pch driver |
5 | 5 | ||
6 | commit d166370ad86b33b1111af3a0cdd7de94e03789a6 upstream. | 6 | commit d166370ad86b33b1111af3a0cdd7de94e03789a6 upstream. |
7 | 7 | ||
@@ -31,5 +31,5 @@ index eb574f2..779ff70 100644 | |||
31 | ret = gpiochip_add(&chip->gpio); | 31 | ret = gpiochip_add(&chip->gpio); |
32 | if (ret) { | 32 | if (ret) { |
33 | -- | 33 | -- |
34 | 1.7.9.5 | 34 | 1.7.10 |
35 | 35 | ||
diff --git a/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0050-usb-gadget-pch_udc-Fix-disconnect-issue.patch b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0049-usb-gadget-pch_udc-Fix-disconnect-issue.patch index 6588e3c9..a5944193 100644 --- a/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0050-usb-gadget-pch_udc-Fix-disconnect-issue.patch +++ b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0049-usb-gadget-pch_udc-Fix-disconnect-issue.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 51d31aff64b1ebc13cab146aea7e34e0b9deec9a Mon Sep 17 00:00:00 2001 | 1 | From 71f57b2818d96219c94e582efd23fc0d16186424 Mon Sep 17 00:00:00 2001 |
2 | From: Tomoya MORINAGA <tomoya.rohm@gmail.com> | 2 | From: Tomoya MORINAGA <tomoya.rohm@gmail.com> |
3 | Date: Thu, 12 Jan 2012 11:27:05 +0900 | 3 | Date: Thu, 12 Jan 2012 11:27:05 +0900 |
4 | Subject: [PATCH 50/69] usb: gadget: pch_udc: Fix disconnect issue | 4 | Subject: [PATCH 49/68] usb: gadget: pch_udc: Fix disconnect issue |
5 | 5 | ||
6 | commit c50a3bff0edb0acd49d8033a12ea4668e09a31ad upstream. | 6 | commit c50a3bff0edb0acd49d8033a12ea4668e09a31ad upstream. |
7 | 7 | ||
@@ -38,5 +38,5 @@ index dd2313c..521e995 100644 | |||
38 | 38 | ||
39 | /** | 39 | /** |
40 | -- | 40 | -- |
41 | 1.7.9.5 | 41 | 1.7.10 |
42 | 42 | ||
diff --git a/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0051-usb-gadget-pch_udc-Fix-wrong-return-value.patch b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0050-usb-gadget-pch_udc-Fix-wrong-return-value.patch index decab7b0..7f865084 100644 --- a/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0051-usb-gadget-pch_udc-Fix-wrong-return-value.patch +++ b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0050-usb-gadget-pch_udc-Fix-wrong-return-value.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 8fd36443bed52de1ac27dade568e7a3d94158d13 Mon Sep 17 00:00:00 2001 | 1 | From f081bd91f871a44ac4bf6035aaacfd666024b30a Mon Sep 17 00:00:00 2001 |
2 | From: Tomoya MORINAGA <tomoya.rohm@gmail.com> | 2 | From: Tomoya MORINAGA <tomoya.rohm@gmail.com> |
3 | Date: Thu, 12 Jan 2012 11:27:06 +0900 | 3 | Date: Thu, 12 Jan 2012 11:27:06 +0900 |
4 | Subject: [PATCH 51/69] usb: gadget: pch_udc: Fix wrong return value | 4 | Subject: [PATCH 50/68] usb: gadget: pch_udc: Fix wrong return value |
5 | 5 | ||
6 | commit c802672cd36cd063bfd54d54c8c34825ab5b2357 upstream. | 6 | commit c802672cd36cd063bfd54d54c8c34825ab5b2357 upstream. |
7 | 7 | ||
@@ -38,5 +38,5 @@ index 521e995..a9a7d8a 100644 | |||
38 | dev)) { | 38 | dev)) { |
39 | dev_err(&pdev->dev, "%s: request_irq(%d) fail\n", __func__, | 39 | dev_err(&pdev->dev, "%s: request_irq(%d) fail\n", __func__, |
40 | -- | 40 | -- |
41 | 1.7.9.5 | 41 | 1.7.10 |
42 | 42 | ||
diff --git a/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0052-usb-gadget-pch_udc-Fix-USB-suspend-issue.patch b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0051-usb-gadget-pch_udc-Fix-USB-suspend-issue.patch index fda0ca92..52ae3251 100644 --- a/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0052-usb-gadget-pch_udc-Fix-USB-suspend-issue.patch +++ b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0051-usb-gadget-pch_udc-Fix-USB-suspend-issue.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From c0aaf320ddf17688ad75ab9f024f789b4cb89365 Mon Sep 17 00:00:00 2001 | 1 | From d99b719a9a857340a246bfd51b329ba5bc09a7ea Mon Sep 17 00:00:00 2001 |
2 | From: Tomoya MORINAGA <tomoya.rohm@gmail.com> | 2 | From: Tomoya MORINAGA <tomoya.rohm@gmail.com> |
3 | Date: Thu, 12 Jan 2012 11:27:07 +0900 | 3 | Date: Thu, 12 Jan 2012 11:27:07 +0900 |
4 | Subject: [PATCH 52/69] usb: gadget: pch_udc: Fix USB suspend issue | 4 | Subject: [PATCH 51/68] usb: gadget: pch_udc: Fix USB suspend issue |
5 | 5 | ||
6 | commit 84566abba058b2aae8d603dfa90b5a3778a6714f upstream. | 6 | commit 84566abba058b2aae8d603dfa90b5a3778a6714f upstream. |
7 | 7 | ||
@@ -41,5 +41,5 @@ index a9a7d8a..3ab799c 100644 | |||
41 | if (dev_intr & UDC_DEVINT_SOF) | 41 | if (dev_intr & UDC_DEVINT_SOF) |
42 | dev_dbg(&dev->pdev->dev, "SOF\n"); | 42 | dev_dbg(&dev->pdev->dev, "SOF\n"); |
43 | -- | 43 | -- |
44 | 1.7.9.5 | 44 | 1.7.10 |
45 | 45 | ||
diff --git a/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0053-usb-gadget-pch_udc-Fix-usb-gadget-pch_udc-Fix-ether-.patch b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0052-usb-gadget-pch_udc-Fix-usb-gadget-pch_udc-Fix-ether-.patch index 379b748e..061b3319 100644 --- a/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0053-usb-gadget-pch_udc-Fix-usb-gadget-pch_udc-Fix-ether-.patch +++ b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0052-usb-gadget-pch_udc-Fix-usb-gadget-pch_udc-Fix-ether-.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 9200ef1704e7415a883be5ff751f486da1df7212 Mon Sep 17 00:00:00 2001 | 1 | From f6fb5ed067a0dc147a7ffe713ad3cffbcf7733b9 Mon Sep 17 00:00:00 2001 |
2 | From: Tomoya MORINAGA <tomoya.rohm@gmail.com> | 2 | From: Tomoya MORINAGA <tomoya.rohm@gmail.com> |
3 | Date: Thu, 12 Jan 2012 11:27:08 +0900 | 3 | Date: Thu, 12 Jan 2012 11:27:08 +0900 |
4 | Subject: [PATCH 53/69] usb: gadget: pch_udc: Fix usb/gadget/pch_udc: Fix | 4 | Subject: [PATCH 52/68] usb: gadget: pch_udc: Fix usb/gadget/pch_udc: Fix |
5 | ether gadget connect/disconnect issue | 5 | ether gadget connect/disconnect issue |
6 | 6 | ||
7 | commit 1c575d2d2e3ff2a7cb3c2e2165064199cfd8ad32 upstream. | 7 | commit 1c575d2d2e3ff2a7cb3c2e2165064199cfd8ad32 upstream. |
@@ -149,5 +149,5 @@ index 3ab799c..f232e65 100644 | |||
149 | /* Clear device interrupts */ | 149 | /* Clear device interrupts */ |
150 | pch_udc_write_device_interrupts(dev, dev_intr); | 150 | pch_udc_write_device_interrupts(dev, dev_intr); |
151 | -- | 151 | -- |
152 | 1.7.9.5 | 152 | 1.7.10 |
153 | 153 | ||
diff --git a/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0054-usb-gadget-pch_udc-Reduce-redundant-interrupt.patch b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0053-usb-gadget-pch_udc-Reduce-redundant-interrupt.patch index 3322abf0..681f166d 100644 --- a/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0054-usb-gadget-pch_udc-Reduce-redundant-interrupt.patch +++ b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0053-usb-gadget-pch_udc-Reduce-redundant-interrupt.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 841c06ccc583055a42b0546efb5e6b448f26d5fd Mon Sep 17 00:00:00 2001 | 1 | From e7a01f05195272844be9a3e9abae0d18086cbc69 Mon Sep 17 00:00:00 2001 |
2 | From: Tomoya MORINAGA <tomoya.rohm@gmail.com> | 2 | From: Tomoya MORINAGA <tomoya.rohm@gmail.com> |
3 | Date: Thu, 12 Jan 2012 11:27:09 +0900 | 3 | Date: Thu, 12 Jan 2012 11:27:09 +0900 |
4 | Subject: [PATCH 54/69] usb: gadget: pch_udc: Reduce redundant interrupt | 4 | Subject: [PATCH 53/68] usb: gadget: pch_udc: Reduce redundant interrupt |
5 | 5 | ||
6 | commit 833310402c54ad9b676b465fc53ad276b13d36be upstream. | 6 | commit 833310402c54ad9b676b465fc53ad276b13d36be upstream. |
7 | 7 | ||
@@ -51,5 +51,5 @@ index f232e65..870897ac 100644 | |||
51 | 51 | ||
52 | /** | 52 | /** |
53 | -- | 53 | -- |
54 | 1.7.9.5 | 54 | 1.7.10 |
55 | 55 | ||
diff --git a/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0055-ACPICA-Fix-to-allow-region-arguments-to-reference-ot.patch b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0054-ACPICA-Fix-to-allow-region-arguments-to-reference-ot.patch index 996c5fd4..bcc8661a 100644 --- a/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0055-ACPICA-Fix-to-allow-region-arguments-to-reference-ot.patch +++ b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0054-ACPICA-Fix-to-allow-region-arguments-to-reference-ot.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 0584e8b8127ffeb0de3d56313113727fab87aff5 Mon Sep 17 00:00:00 2001 | 1 | From 5326c71bbfb0de3fef65c9f702ffdb8589e8e6df Mon Sep 17 00:00:00 2001 |
2 | From: Lin Ming <ming.m.lin@intel.com> | 2 | From: Lin Ming <ming.m.lin@intel.com> |
3 | Date: Mon, 28 Nov 2011 09:46:02 +0800 | 3 | Date: Mon, 28 Nov 2011 09:46:02 +0800 |
4 | Subject: [PATCH 55/69] ACPICA: Fix to allow region arguments to reference | 4 | Subject: [PATCH 54/68] ACPICA: Fix to allow region arguments to reference |
5 | other scopes | 5 | other scopes |
6 | 6 | ||
7 | commit 8931d9ea78848b073bf299594f148b83abde4a5e upstream. | 7 | commit 8931d9ea78848b073bf299594f148b83abde4a5e upstream. |
@@ -78,5 +78,5 @@ index 110711a..8a06dc5 100644 | |||
78 | /* Init the region from the operands */ | 78 | /* Init the region from the operands */ |
79 | 79 | ||
80 | -- | 80 | -- |
81 | 1.7.9.5 | 81 | 1.7.10 |
82 | 82 | ||
diff --git a/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0056-security-fix-compile-error-in-commoncap.c.patch b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0055-security-fix-compile-error-in-commoncap.c.patch index e40edbea..cc78b796 100644 --- a/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0056-security-fix-compile-error-in-commoncap.c.patch +++ b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0055-security-fix-compile-error-in-commoncap.c.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From c44baf116ced749a5017ab4f36a808c4aad7c39c Mon Sep 17 00:00:00 2001 | 1 | From 1a4f70eea080bfa569723eb1c16ca46956cebd25 Mon Sep 17 00:00:00 2001 |
2 | From: Jonghwan Choi <jhbird.choi@samsung.com> | 2 | From: Jonghwan Choi <jhbird.choi@samsung.com> |
3 | Date: Wed, 18 Apr 2012 17:23:04 -0400 | 3 | Date: Wed, 18 Apr 2012 17:23:04 -0400 |
4 | Subject: [PATCH 56/69] security: fix compile error in commoncap.c | 4 | Subject: [PATCH 55/68] security: fix compile error in commoncap.c |
5 | 5 | ||
6 | commit 51b79bee627d526199b2f6a6bef8ee0c0739b6d1 upstream. | 6 | commit 51b79bee627d526199b2f6a6bef8ee0c0739b6d1 upstream. |
7 | 7 | ||
@@ -33,5 +33,5 @@ index 0aee106..12440ee 100644 | |||
33 | /* | 33 | /* |
34 | * If a non-root user executes a setuid-root binary in | 34 | * If a non-root user executes a setuid-root binary in |
35 | -- | 35 | -- |
36 | 1.7.9.5 | 36 | 1.7.10 |
37 | 37 | ||
diff --git a/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0057-pch_gbe-Do-not-abort-probe-on-bad-MAC.patch b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0056-pch_gbe-Do-not-abort-probe-on-bad-MAC.patch index 0b69021b..2759af4c 100644 --- a/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0057-pch_gbe-Do-not-abort-probe-on-bad-MAC.patch +++ b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0056-pch_gbe-Do-not-abort-probe-on-bad-MAC.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 56bfb17ce9aba57b7bd205d7828d4f3d9935276e Mon Sep 17 00:00:00 2001 | 1 | From aebee39c4e129dbeccd9485f8375b7e59a4b7b26 Mon Sep 17 00:00:00 2001 |
2 | From: Darren Hart <dvhart@linux.intel.com> | 2 | From: Darren Hart <dvhart@linux.intel.com> |
3 | Date: Mon, 16 Jan 2012 09:50:19 +0000 | 3 | Date: Mon, 16 Jan 2012 09:50:19 +0000 |
4 | Subject: [PATCH 57/69] pch_gbe: Do not abort probe on bad MAC | 4 | Subject: [PATCH 56/68] pch_gbe: Do not abort probe on bad MAC |
5 | 5 | ||
6 | commit 2b53d07891630dead46d65c8f896955fd3ae0302 upstream. | 6 | commit 2b53d07891630dead46d65c8f896955fd3ae0302 upstream. |
7 | 7 | ||
@@ -38,7 +38,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> | |||
38 | Signed-off-by: Tomoya MORINAGA <tomoya.rohm@gmail.com> | 38 | Signed-off-by: Tomoya MORINAGA <tomoya.rohm@gmail.com> |
39 | Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 39 | Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
40 | --- | 40 | --- |
41 | .../net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c | 17 ++++++++++++++--- | 41 | drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c | 17 ++++++++++++++--- |
42 | 1 file changed, 14 insertions(+), 3 deletions(-) | 42 | 1 file changed, 14 insertions(+), 3 deletions(-) |
43 | 43 | ||
44 | diff --git a/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c b/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c | 44 | diff --git a/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c b/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c |
@@ -77,5 +77,5 @@ index 48406ca..43c7b25 100644 | |||
77 | setup_timer(&adapter->watchdog_timer, pch_gbe_watchdog, | 77 | setup_timer(&adapter->watchdog_timer, pch_gbe_watchdog, |
78 | (unsigned long)adapter); | 78 | (unsigned long)adapter); |
79 | -- | 79 | -- |
80 | 1.7.9.5 | 80 | 1.7.10 |
81 | 81 | ||
diff --git a/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0058-pch_gbe-memory-corruption-calling-pch_gbe_validate_o.patch b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0057-pch_gbe-memory-corruption-calling-pch_gbe_validate_o.patch index 1c4d0da3..07cc85b1 100644 --- a/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0058-pch_gbe-memory-corruption-calling-pch_gbe_validate_o.patch +++ b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0057-pch_gbe-memory-corruption-calling-pch_gbe_validate_o.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From aa636350865960bf05da0427e6129a09787b9a8e Mon Sep 17 00:00:00 2001 | 1 | From 39ac4e9f39a308616c42f055e6eb61883171826c Mon Sep 17 00:00:00 2001 |
2 | From: Dan Carpenter <dan.carpenter@oracle.com> | 2 | From: Dan Carpenter <dan.carpenter@oracle.com> |
3 | Date: Wed, 29 Feb 2012 21:17:08 +0000 | 3 | Date: Wed, 29 Feb 2012 21:17:08 +0000 |
4 | Subject: [PATCH 58/69] pch_gbe: memory corruption calling | 4 | Subject: [PATCH 57/68] pch_gbe: memory corruption calling |
5 | pch_gbe_validate_option() | 5 | pch_gbe_validate_option() |
6 | 6 | ||
7 | commit 73f98eab9b9e0bab492ca06add5657d9e702ddb1 upstream. | 7 | commit 73f98eab9b9e0bab492ca06add5657d9e702ddb1 upstream. |
@@ -15,7 +15,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> | |||
15 | Signed-off-by: Tomoya MORINAGA <tomoya.rohm@gmail.com> | 15 | Signed-off-by: Tomoya MORINAGA <tomoya.rohm@gmail.com> |
16 | Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 16 | Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
17 | --- | 17 | --- |
18 | .../net/ethernet/oki-semi/pch_gbe/pch_gbe_param.c | 15 ++++++++------- | 18 | drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_param.c | 15 ++++++++------- |
19 | 1 file changed, 8 insertions(+), 7 deletions(-) | 19 | 1 file changed, 8 insertions(+), 7 deletions(-) |
20 | 20 | ||
21 | diff --git a/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_param.c b/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_param.c | 21 | diff --git a/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_param.c b/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_param.c |
@@ -52,5 +52,5 @@ index 9cb5f91..29e23be 100644 | |||
52 | 52 | ||
53 | pch_gbe_check_copper_options(adapter); | 53 | pch_gbe_check_copper_options(adapter); |
54 | -- | 54 | -- |
55 | 1.7.9.5 | 55 | 1.7.10 |
56 | 56 | ||
diff --git a/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0059-pch_dma-Support-new-device-LAPIS-Semiconductor-ML783.patch b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0058-pch_dma-Support-new-device-LAPIS-Semiconductor-ML783.patch index dd77d52e..dbf592ca 100644 --- a/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0059-pch_dma-Support-new-device-LAPIS-Semiconductor-ML783.patch +++ b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0058-pch_dma-Support-new-device-LAPIS-Semiconductor-ML783.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From b9ec954fcea6867cd78e33f003ce6c11a8c1b217 Mon Sep 17 00:00:00 2001 | 1 | From 0e69eca9d7e396d17ee6350491cb53b68b11f18a Mon Sep 17 00:00:00 2001 |
2 | From: Tomoya MORINAGA <tomoya.rohm@gmail.com> | 2 | From: Tomoya MORINAGA <tomoya.rohm@gmail.com> |
3 | Date: Thu, 17 Nov 2011 16:14:23 +0900 | 3 | Date: Thu, 17 Nov 2011 16:14:23 +0900 |
4 | Subject: [PATCH 59/69] pch_dma: Support new device LAPIS Semiconductor ML7831 | 4 | Subject: [PATCH 58/68] pch_dma: Support new device LAPIS Semiconductor ML7831 |
5 | IOH | 5 | IOH |
6 | 6 | ||
7 | commit ca7fe2db892dcf91b2c72ee352eda4ff867903a7 upstream. | 7 | commit ca7fe2db892dcf91b2c72ee352eda4ff867903a7 upstream. |
@@ -78,5 +78,5 @@ index a6d0e3d..629c430 100644 | |||
78 | MODULE_AUTHOR("Yong Wang <yong.y.wang@intel.com>"); | 78 | MODULE_AUTHOR("Yong Wang <yong.y.wang@intel.com>"); |
79 | MODULE_LICENSE("GPL v2"); | 79 | MODULE_LICENSE("GPL v2"); |
80 | -- | 80 | -- |
81 | 1.7.9.5 | 81 | 1.7.10 |
82 | 82 | ||
diff --git a/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0060-spi-topcliff-pch-fix-Wuninitialized-warning.patch b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0059-spi-topcliff-pch-fix-Wuninitialized-warning.patch index 9b5bc86d..fe20c45e 100644 --- a/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0060-spi-topcliff-pch-fix-Wuninitialized-warning.patch +++ b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0059-spi-topcliff-pch-fix-Wuninitialized-warning.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 799b889232ef93a544b5b580bc8fb1178c27adbe Mon Sep 17 00:00:00 2001 | 1 | From 82a52f9ef76f612159cc947961ce36687ab1d58e Mon Sep 17 00:00:00 2001 |
2 | From: Danny Kukawka <danny.kukawka@bisect.de> | 2 | From: Danny Kukawka <danny.kukawka@bisect.de> |
3 | Date: Tue, 14 Feb 2012 15:35:03 +0100 | 3 | Date: Tue, 14 Feb 2012 15:35:03 +0100 |
4 | Subject: [PATCH 60/69] spi-topcliff-pch: fix -Wuninitialized warning | 4 | Subject: [PATCH 59/68] spi-topcliff-pch: fix -Wuninitialized warning |
5 | MIME-Version: 1.0 | 5 | MIME-Version: 1.0 |
6 | Content-Type: text/plain; charset=UTF-8 | 6 | Content-Type: text/plain; charset=UTF-8 |
7 | Content-Transfer-Encoding: 8bit | 7 | Content-Transfer-Encoding: 8bit |
@@ -78,5 +78,5 @@ index 027b6d0..ec50541 100644 | |||
78 | } | 78 | } |
79 | } | 79 | } |
80 | -- | 80 | -- |
81 | 1.7.9.5 | 81 | 1.7.10 |
82 | 82 | ||
diff --git a/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0061-spi-topcliff-pch-Support-new-device-LAPIS-Semiconduc.patch b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0060-spi-topcliff-pch-Support-new-device-LAPIS-Semiconduc.patch index 0bef575b..2014e745 100644 --- a/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0061-spi-topcliff-pch-Support-new-device-LAPIS-Semiconduc.patch +++ b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0060-spi-topcliff-pch-Support-new-device-LAPIS-Semiconduc.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 77fac631e9296a678208e031ca3b47a644a64bb8 Mon Sep 17 00:00:00 2001 | 1 | From 743c46c92827cc3cd7bd1fa7b0e9e7ca84e7463a Mon Sep 17 00:00:00 2001 |
2 | From: Tomoya MORINAGA <tomoya-linux@dsn.lapis-semi.com> | 2 | From: Tomoya MORINAGA <tomoya-linux@dsn.lapis-semi.com> |
3 | Date: Fri, 28 Oct 2011 09:35:21 +0900 | 3 | Date: Fri, 28 Oct 2011 09:35:21 +0900 |
4 | Subject: [PATCH 61/69] spi-topcliff-pch: Support new device LAPIS | 4 | Subject: [PATCH 60/68] spi-topcliff-pch: Support new device LAPIS |
5 | Semiconductor ML7831 IOH | 5 | Semiconductor ML7831 IOH |
6 | 6 | ||
7 | commit 92b3a5c1bc3c7da1ae4675d014124f4a97ddb632 upstream. | 7 | commit 92b3a5c1bc3c7da1ae4675d014124f4a97ddb632 upstream. |
@@ -72,5 +72,5 @@ index ec50541..54b9d2e 100644 | |||
72 | }; | 72 | }; |
73 | 73 | ||
74 | -- | 74 | -- |
75 | 1.7.9.5 | 75 | 1.7.10 |
76 | 76 | ||
diff --git a/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0062-Bluetooth-Adding-USB-device-13d3-3375-as-an-Atheros-.patch b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0061-Bluetooth-Adding-USB-device-13d3-3375-as-an-Atheros-.patch index 471914c1..53132fc8 100644 --- a/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0062-Bluetooth-Adding-USB-device-13d3-3375-as-an-Atheros-.patch +++ b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0061-Bluetooth-Adding-USB-device-13d3-3375-as-an-Atheros-.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From efa82e03e24743425f4cb3d3632f29756b70d5b5 Mon Sep 17 00:00:00 2001 | 1 | From 3100f55ea5eeb7e5c2c03ccf26fffdbcaa29dae7 Mon Sep 17 00:00:00 2001 |
2 | From: Eran <eran@over-here.org> | 2 | From: Eran <eran@over-here.org> |
3 | Date: Mon, 5 Dec 2011 22:15:29 +0000 | 3 | Date: Mon, 5 Dec 2011 22:15:29 +0000 |
4 | Subject: [PATCH 62/69] Bluetooth: Adding USB device 13d3:3375 as an Atheros | 4 | Subject: [PATCH 61/68] Bluetooth: Adding USB device 13d3:3375 as an Atheros |
5 | AR3012. | 5 | AR3012. |
6 | 6 | ||
7 | commit 9498ba7a1d38d42eef4ef6d906ab1743c9f0fd6f upstream. | 7 | commit 9498ba7a1d38d42eef4ef6d906ab1743c9f0fd6f upstream. |
@@ -63,5 +63,5 @@ index c16c750..df0331a 100644 | |||
63 | /* Atheros AR5BBU12 with sflash firmware */ | 63 | /* Atheros AR5BBU12 with sflash firmware */ |
64 | { USB_DEVICE(0x0489, 0xe02c), .driver_info = BTUSB_IGNORE }, | 64 | { USB_DEVICE(0x0489, 0xe02c), .driver_info = BTUSB_IGNORE }, |
65 | -- | 65 | -- |
66 | 1.7.9.5 | 66 | 1.7.10 |
67 | 67 | ||
diff --git a/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0063-Bluetooth-Add-Atheros-maryann-PIDVID-support.patch b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0062-Bluetooth-Add-Atheros-maryann-PIDVID-support.patch index 4ae57d9b..2fd57624 100644 --- a/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0063-Bluetooth-Add-Atheros-maryann-PIDVID-support.patch +++ b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0062-Bluetooth-Add-Atheros-maryann-PIDVID-support.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From cf0a0312929eb18f55e95db15f2129fd28a0adb3 Mon Sep 17 00:00:00 2001 | 1 | From 44d3b492e84ea02e1edd019490f1eeb39c9ab3e6 Mon Sep 17 00:00:00 2001 |
2 | From: "Cho, Yu-Chen" <acho@suse.com> | 2 | From: "Cho, Yu-Chen" <acho@suse.com> |
3 | Date: Wed, 14 Mar 2012 22:01:21 +0200 | 3 | Date: Wed, 14 Mar 2012 22:01:21 +0200 |
4 | Subject: [PATCH 63/69] Bluetooth: Add Atheros maryann PIDVID support | 4 | Subject: [PATCH 62/68] Bluetooth: Add Atheros maryann PIDVID support |
5 | 5 | ||
6 | commit 07c0ea874d43c299d185948452945a361052b6e3 upstream. | 6 | commit 07c0ea874d43c299d185948452945a361052b6e3 upstream. |
7 | 7 | ||
@@ -115,5 +115,5 @@ index df0331a..5a87b2e 100644 | |||
115 | 115 | ||
116 | /* Atheros AR5BBU12 with sflash firmware */ | 116 | /* Atheros AR5BBU12 with sflash firmware */ |
117 | -- | 117 | -- |
118 | 1.7.9.5 | 118 | 1.7.10 |
119 | 119 | ||
diff --git a/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0064-Bluetooth-Add-support-for-BCM20702A0-0a5c-21e3.patch b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0063-Bluetooth-Add-support-for-BCM20702A0-0a5c-21e3.patch index 85b6c137..cb6c36cd 100644 --- a/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0064-Bluetooth-Add-support-for-BCM20702A0-0a5c-21e3.patch +++ b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0063-Bluetooth-Add-support-for-BCM20702A0-0a5c-21e3.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 876f46c3f8fe8b612d1892941785c52c3f1d0012 Mon Sep 17 00:00:00 2001 | 1 | From 8931ca8a3317ab71c85168b05664efa171563f59 Mon Sep 17 00:00:00 2001 |
2 | From: Jesse Sung <jesse.sung@canonical.com> | 2 | From: Jesse Sung <jesse.sung@canonical.com> |
3 | Date: Thu, 22 Dec 2011 10:48:47 +0800 | 3 | Date: Thu, 22 Dec 2011 10:48:47 +0800 |
4 | Subject: [PATCH 64/69] Bluetooth: Add support for BCM20702A0 [0a5c:21e3] | 4 | Subject: [PATCH 63/68] Bluetooth: Add support for BCM20702A0 [0a5c:21e3] |
5 | 5 | ||
6 | commit c0190925dacd976a67044f4382d4effbed568dce upstream. | 6 | commit c0190925dacd976a67044f4382d4effbed568dce upstream. |
7 | 7 | ||
@@ -41,5 +41,5 @@ index 5a87b2e..db44ad5 100644 | |||
41 | 41 | ||
42 | { } /* Terminating entry */ | 42 | { } /* Terminating entry */ |
43 | -- | 43 | -- |
44 | 1.7.9.5 | 44 | 1.7.10 |
45 | 45 | ||
diff --git a/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0065-futex-Do-not-leak-robust-list-to-unprivileged-proces.patch b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0064-futex-Do-not-leak-robust-list-to-unprivileged-proces.patch index d39ffb48..0d9c4109 100644 --- a/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0065-futex-Do-not-leak-robust-list-to-unprivileged-proces.patch +++ b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0064-futex-Do-not-leak-robust-list-to-unprivileged-proces.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 39bc94c8c5909dc1047dad45c14ba96ff54e5654 Mon Sep 17 00:00:00 2001 | 1 | From 7480d9953ded1b970bb05c7585e2a08001ae8565 Mon Sep 17 00:00:00 2001 |
2 | From: Kees Cook <keescook@chromium.org> | 2 | From: Kees Cook <keescook@chromium.org> |
3 | Date: Mon, 19 Mar 2012 16:12:53 -0700 | 3 | Date: Mon, 19 Mar 2012 16:12:53 -0700 |
4 | Subject: [PATCH 65/69] futex: Do not leak robust list to unprivileged process | 4 | Subject: [PATCH 64/68] futex: Do not leak robust list to unprivileged process |
5 | 5 | ||
6 | commit bdbb776f882f5ad431aa1e694c69c1c3d6a4a5b8 upstream. | 6 | commit bdbb776f882f5ad431aa1e694c69c1c3d6a4a5b8 upstream. |
7 | 7 | ||
@@ -166,5 +166,5 @@ index 5f9e689..a9642d5 100644 | |||
166 | return -EFAULT; | 166 | return -EFAULT; |
167 | return put_user(ptr_to_compat(head), head_ptr); | 167 | return put_user(ptr_to_compat(head), head_ptr); |
168 | -- | 168 | -- |
169 | 1.7.9.5 | 169 | 1.7.10 |
170 | 170 | ||
diff --git a/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0066-drm-radeon-kms-fix-the-regression-of-DVI-connector-c.patch b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0065-drm-radeon-kms-fix-the-regression-of-DVI-connector-c.patch index 78e16f86..8bbc0926 100644 --- a/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0066-drm-radeon-kms-fix-the-regression-of-DVI-connector-c.patch +++ b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0065-drm-radeon-kms-fix-the-regression-of-DVI-connector-c.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 8bfeb0bfde94ba70986c03d0a8ca9ab876073e35 Mon Sep 17 00:00:00 2001 | 1 | From 53b833e3b2bc7382175c75d982087cf6b03a3753 Mon Sep 17 00:00:00 2001 |
2 | From: Takashi Iwai <tiwai@suse.de> | 2 | From: Takashi Iwai <tiwai@suse.de> |
3 | Date: Wed, 18 Apr 2012 15:21:07 +0200 | 3 | Date: Wed, 18 Apr 2012 15:21:07 +0200 |
4 | Subject: [PATCH 66/69] drm/radeon/kms: fix the regression of DVI connector | 4 | Subject: [PATCH 65/68] drm/radeon/kms: fix the regression of DVI connector |
5 | check | 5 | check |
6 | 6 | ||
7 | commit e36325071832f1ba96ac54fb8ba1459f08b05dd8 upstream. | 7 | commit e36325071832f1ba96ac54fb8ba1459f08b05dd8 upstream. |
@@ -35,5 +35,5 @@ index f7d39ac..f19ea2e 100644 | |||
35 | continue; | 35 | continue; |
36 | 36 | ||
37 | -- | 37 | -- |
38 | 1.7.9.5 | 38 | 1.7.10 |
39 | 39 | ||
diff --git a/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0067-drm-radeon-disable-MSI-on-RV515.patch b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0066-drm-radeon-disable-MSI-on-RV515.patch index 6bf86500..624a8ab8 100644 --- a/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0067-drm-radeon-disable-MSI-on-RV515.patch +++ b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0066-drm-radeon-disable-MSI-on-RV515.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 0532e1f8a710f011e839ad1ad0d83c6f3a1d2d74 Mon Sep 17 00:00:00 2001 | 1 | From 4c47e0570154691338fd2e670109120a8e99184c Mon Sep 17 00:00:00 2001 |
2 | From: Dave Airlie <airlied@redhat.com> | 2 | From: Dave Airlie <airlied@redhat.com> |
3 | Date: Fri, 13 Apr 2012 11:14:50 +0100 | 3 | Date: Fri, 13 Apr 2012 11:14:50 +0100 |
4 | Subject: [PATCH 67/69] drm/radeon: disable MSI on RV515 | 4 | Subject: [PATCH 66/68] drm/radeon: disable MSI on RV515 |
5 | 5 | ||
6 | commit 16a5e32b83fd946312b9b13590c75d20c95c5202 upstream. | 6 | commit 16a5e32b83fd946312b9b13590c75d20c95c5202 upstream. |
7 | 7 | ||
@@ -33,5 +33,5 @@ index e7ddb49..baa019e 100644 | |||
33 | /* APUs work fine with MSIs */ | 33 | /* APUs work fine with MSIs */ |
34 | if (rdev->family >= CHIP_PALM) | 34 | if (rdev->family >= CHIP_PALM) |
35 | -- | 35 | -- |
36 | 1.7.9.5 | 36 | 1.7.10 |
37 | 37 | ||
diff --git a/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0068-drm-radeon-fix-load-detect-on-rn50-with-hardcoded-ED.patch b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0067-drm-radeon-fix-load-detect-on-rn50-with-hardcoded-ED.patch index ee262ca9..d026278d 100644 --- a/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0068-drm-radeon-fix-load-detect-on-rn50-with-hardcoded-ED.patch +++ b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0067-drm-radeon-fix-load-detect-on-rn50-with-hardcoded-ED.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 29e2a67065f74d9a1f31a61d4466976551d9bed4 Mon Sep 17 00:00:00 2001 | 1 | From cfcbd4d6d2b7604aee1daa122663bbdfa5743fd1 Mon Sep 17 00:00:00 2001 |
2 | From: Dave Airlie <airlied@redhat.com> | 2 | From: Dave Airlie <airlied@redhat.com> |
3 | Date: Thu, 19 Apr 2012 15:42:58 +0100 | 3 | Date: Thu, 19 Apr 2012 15:42:58 +0100 |
4 | Subject: [PATCH 68/69] drm/radeon: fix load detect on rn50 with hardcoded | 4 | Subject: [PATCH 67/68] drm/radeon: fix load detect on rn50 with hardcoded |
5 | EDIDs. | 5 | EDIDs. |
6 | 6 | ||
7 | commit a09d431f344d854e4fe9cfac44f78cb8202f3eb7 upstream. | 7 | commit a09d431f344d854e4fe9cfac44f78cb8202f3eb7 upstream. |
@@ -42,5 +42,5 @@ index f19ea2e..4a4493f 100644 | |||
42 | radeon_connector_update_scratch_regs(connector, ret); | 42 | radeon_connector_update_scratch_regs(connector, ret); |
43 | return ret; | 43 | return ret; |
44 | -- | 44 | -- |
45 | 1.7.9.5 | 45 | 1.7.10 |
46 | 46 | ||
diff --git a/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0069-Linux-3.2.16.patch b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0068-Linux-3.2.16.patch index 261d3551..94f1f5f5 100644 --- a/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0069-Linux-3.2.16.patch +++ b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0068-Linux-3.2.16.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 206e830feaa561615d9ea721a7e4a0f8d3708e81 Mon Sep 17 00:00:00 2001 | 1 | From 45902e2bad446ada74fea7c6b467828211e49430 Mon Sep 17 00:00:00 2001 |
2 | From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2 | From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
3 | Date: Sun, 22 Apr 2012 15:31:32 -0700 | 3 | Date: Sun, 22 Apr 2012 15:31:32 -0700 |
4 | Subject: [PATCH 69/69] Linux 3.2.16 | 4 | Subject: [PATCH 68/68] Linux 3.2.16 |
5 | 5 | ||
6 | --- | 6 | --- |
7 | Makefile | 2 +- | 7 | Makefile | 2 +- |
@@ -20,5 +20,5 @@ index 6195122..3da29cb 100644 | |||
20 | NAME = Saber-toothed Squirrel | 20 | NAME = Saber-toothed Squirrel |
21 | 21 | ||
22 | -- | 22 | -- |
23 | 1.7.9.5 | 23 | 1.7.10 |
24 | 24 | ||
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 6676539f..9045bb6a 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 0a4a06fdba20b76d03dde619a4dec0e88cdad6c3 Mon Sep 17 00:00:00 2001 | 1 | From 4999df64c677cd0a32e87ccea5c1405331576d3d 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/26] f_rndis: HACK around undefined variables | 4 | Subject: [PATCH 01/33] 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.5 | 30 | 1.7.10 |
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 23b7aaf5..9414a32e 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 a89b2d3cdef2af0baa57f31da5e39537d22c247c Mon Sep 17 00:00:00 2001 | 1 | From 831a092f5cad298cb9d7d3f2d1a2d08cec82e733 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/26] da8xx-fb: add DVI support for beaglebone | 4 | Subject: [PATCH 02/33] 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 | --- |
@@ -34,5 +34,5 @@ index 2e69278..b01f15b 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.5 | 37 | 1.7.10 |
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 4b682c5c..c29cfa70 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,7 +1,7 @@ | |||
1 | From 5b5413023290ed7f79ef3018eeee046c7736d7d0 Mon Sep 17 00:00:00 2001 | 1 | From 83111bdeba0ddfd16b409e8c1cacd77a756507c9 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/26] beaglebone: rebase everything onto 3.2 - WARNING | 4 | Subject: [PATCH 03/33] beaglebone: rebase everything onto 3.2 - WARNING |
5 | MEGAPATCH | 5 | MEGAPATCH |
6 | 6 | ||
7 | Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> | 7 | Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> |
@@ -10,7 +10,7 @@ Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> | |||
10 | 1 file changed, 415 insertions(+), 11 deletions(-) | 10 | 1 file changed, 415 insertions(+), 11 deletions(-) |
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 70aa3a9..12a269f 100644 | 13 | index 563bdf1..2741431 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 | @@ -19,6 +19,7 @@ | 16 | @@ -19,6 +19,7 @@ |
@@ -28,8 +28,8 @@ index 70aa3a9..12a269f 100644 | |||
28 | -#include <linux/input/ti_tscadc.h> | 28 | -#include <linux/input/ti_tscadc.h> |
29 | #include <linux/reboot.h> | 29 | #include <linux/reboot.h> |
30 | #include <linux/pwm/pwm.h> | 30 | #include <linux/pwm/pwm.h> |
31 | 31 | #include <linux/opp.h> | |
32 | @@ -172,6 +172,68 @@ struct da8xx_lcdc_platform_data TFC_S9700RTWV35TR_01B_pdata = { | 32 | @@ -174,6 +174,68 @@ struct da8xx_lcdc_platform_data TFC_S9700RTWV35TR_01B_pdata = { |
33 | 33 | ||
34 | #include "common.h" | 34 | #include "common.h" |
35 | 35 | ||
@@ -98,7 +98,7 @@ index 70aa3a9..12a269f 100644 | |||
98 | #include <linux/lis3lv02d.h> | 98 | #include <linux/lis3lv02d.h> |
99 | 99 | ||
100 | /* TSc controller */ | 100 | /* TSc controller */ |
101 | @@ -340,9 +402,34 @@ static struct am335x_evm_eeprom_config config; | 101 | @@ -342,9 +404,34 @@ static struct am335x_evm_eeprom_config config; |
102 | static struct am335x_eeprom_config1 config1; | 102 | static struct am335x_eeprom_config1 config1; |
103 | static bool daughter_brd_detected; | 103 | static bool daughter_brd_detected; |
104 | 104 | ||
@@ -133,7 +133,7 @@ index 70aa3a9..12a269f 100644 | |||
133 | static unsigned int gp_evm_revision = GP_EVM_REV_IS_UNKNOWN; | 133 | static unsigned int gp_evm_revision = GP_EVM_REV_IS_UNKNOWN; |
134 | 134 | ||
135 | unsigned int gigabit_enable = 1; | 135 | unsigned int gigabit_enable = 1; |
136 | @@ -425,11 +512,102 @@ static struct pinmux_config lcdc_pin_mux[] = { | 136 | @@ -427,11 +514,102 @@ static struct pinmux_config lcdc_pin_mux[] = { |
137 | {NULL, 0}, | 137 | {NULL, 0}, |
138 | }; | 138 | }; |
139 | 139 | ||
@@ -236,7 +236,7 @@ index 70aa3a9..12a269f 100644 | |||
236 | {"vrefp.vrefp", OMAP_MUX_MODE0 | AM33XX_INPUT_EN}, | 236 | {"vrefp.vrefp", OMAP_MUX_MODE0 | AM33XX_INPUT_EN}, |
237 | {"vrefn.vrefn", OMAP_MUX_MODE0 | AM33XX_INPUT_EN}, | 237 | {"vrefn.vrefn", OMAP_MUX_MODE0 | AM33XX_INPUT_EN}, |
238 | {NULL, 0}, | 238 | {NULL, 0}, |
239 | @@ -564,9 +742,9 @@ static struct pinmux_config i2c1_pin_mux[] = { | 239 | @@ -566,9 +744,9 @@ static struct pinmux_config i2c1_pin_mux[] = { |
240 | 240 | ||
241 | static struct pinmux_config i2c2_pin_mux[] = { | 241 | static struct pinmux_config i2c2_pin_mux[] = { |
242 | {"uart1_ctsn.i2c2_sda", OMAP_MUX_MODE3 | AM33XX_SLEWCTRL_SLOW | | 242 | {"uart1_ctsn.i2c2_sda", OMAP_MUX_MODE3 | AM33XX_SLEWCTRL_SLOW | |
@@ -248,7 +248,7 @@ index 70aa3a9..12a269f 100644 | |||
248 | {NULL, 0}, | 248 | {NULL, 0}, |
249 | }; | 249 | }; |
250 | 250 | ||
251 | @@ -844,6 +1022,64 @@ static struct pinmux_config profibus_pin_mux[] = { | 251 | @@ -846,6 +1024,64 @@ static struct pinmux_config profibus_pin_mux[] = { |
252 | {NULL, 0}, | 252 | {NULL, 0}, |
253 | }; | 253 | }; |
254 | 254 | ||
@@ -313,7 +313,7 @@ index 70aa3a9..12a269f 100644 | |||
313 | /* Module pin mux for eCAP0 */ | 313 | /* Module pin mux for eCAP0 */ |
314 | static struct pinmux_config ecap0_pin_mux[] = { | 314 | static struct pinmux_config ecap0_pin_mux[] = { |
315 | {"ecap0_in_pwm0_out.ecap0_in_pwm0_out", | 315 | {"ecap0_in_pwm0_out.ecap0_in_pwm0_out", |
316 | @@ -966,6 +1202,51 @@ static void lcdc_init(int evm_id, int profile) | 316 | @@ -968,6 +1204,51 @@ static void lcdc_init(int evm_id, int profile) |
317 | return; | 317 | return; |
318 | } | 318 | } |
319 | 319 | ||
@@ -365,7 +365,7 @@ index 70aa3a9..12a269f 100644 | |||
365 | static void tsc_init(int evm_id, int profile) | 365 | static void tsc_init(int evm_id, int profile) |
366 | { | 366 | { |
367 | int err; | 367 | int err; |
368 | @@ -973,10 +1254,15 @@ static void tsc_init(int evm_id, int profile) | 368 | @@ -975,10 +1256,15 @@ static void tsc_init(int evm_id, int profile) |
369 | if (gp_evm_revision == GP_EVM_REV_IS_1_1A) { | 369 | if (gp_evm_revision == GP_EVM_REV_IS_1_1A) { |
370 | am335x_touchscreen_data.analog_input = 1; | 370 | am335x_touchscreen_data.analog_input = 1; |
371 | pr_info("TSC connected to beta GP EVM\n"); | 371 | pr_info("TSC connected to beta GP EVM\n"); |
@@ -382,7 +382,7 @@ index 70aa3a9..12a269f 100644 | |||
382 | setup_pin_mux(tsc_pin_mux); | 382 | setup_pin_mux(tsc_pin_mux); |
383 | 383 | ||
384 | err = am33xx_register_tsc(&am335x_touchscreen_data); | 384 | err = am33xx_register_tsc(&am335x_touchscreen_data); |
385 | @@ -984,6 +1270,33 @@ static void tsc_init(int evm_id, int profile) | 385 | @@ -986,6 +1272,33 @@ static void tsc_init(int evm_id, int profile) |
386 | pr_err("failed to register touchscreen device\n"); | 386 | pr_err("failed to register touchscreen device\n"); |
387 | } | 387 | } |
388 | 388 | ||
@@ -416,7 +416,7 @@ index 70aa3a9..12a269f 100644 | |||
416 | static void rgmii1_init(int evm_id, int profile) | 416 | static void rgmii1_init(int evm_id, int profile) |
417 | { | 417 | { |
418 | setup_pin_mux(rgmii1_pin_mux); | 418 | setup_pin_mux(rgmii1_pin_mux); |
419 | @@ -1429,18 +1742,106 @@ static void i2c1_init(int evm_id, int profile) | 419 | @@ -1431,18 +1744,106 @@ static void i2c1_init(int evm_id, int profile) |
420 | return; | 420 | return; |
421 | } | 421 | } |
422 | 422 | ||
@@ -528,7 +528,7 @@ index 70aa3a9..12a269f 100644 | |||
528 | /* Setup McASP 1 */ | 528 | /* Setup McASP 1 */ |
529 | static void mcasp1_init(int evm_id, int profile) | 529 | static void mcasp1_init(int evm_id, int profile) |
530 | { | 530 | { |
531 | @@ -1794,8 +2195,9 @@ static struct evm_dev_cfg beaglebone_old_dev_cfg[] = { | 531 | @@ -1826,8 +2227,9 @@ static struct evm_dev_cfg beaglebone_old_dev_cfg[] = { |
532 | {rmii1_init, DEV_ON_BASEBOARD, PROFILE_NONE}, | 532 | {rmii1_init, DEV_ON_BASEBOARD, PROFILE_NONE}, |
533 | {usb0_init, DEV_ON_BASEBOARD, PROFILE_NONE}, | 533 | {usb0_init, DEV_ON_BASEBOARD, PROFILE_NONE}, |
534 | {usb1_init, DEV_ON_BASEBOARD, PROFILE_NONE}, | 534 | {usb1_init, DEV_ON_BASEBOARD, PROFILE_NONE}, |
@@ -539,7 +539,7 @@ index 70aa3a9..12a269f 100644 | |||
539 | {NULL, 0, 0}, | 539 | {NULL, 0, 0}, |
540 | }; | 540 | }; |
541 | 541 | ||
542 | @@ -1805,8 +2207,9 @@ static struct evm_dev_cfg beaglebone_dev_cfg[] = { | 542 | @@ -1837,8 +2239,9 @@ static struct evm_dev_cfg beaglebone_dev_cfg[] = { |
543 | {mii1_init, DEV_ON_BASEBOARD, PROFILE_NONE}, | 543 | {mii1_init, DEV_ON_BASEBOARD, PROFILE_NONE}, |
544 | {usb0_init, DEV_ON_BASEBOARD, PROFILE_NONE}, | 544 | {usb0_init, DEV_ON_BASEBOARD, PROFILE_NONE}, |
545 | {usb1_init, DEV_ON_BASEBOARD, PROFILE_NONE}, | 545 | {usb1_init, DEV_ON_BASEBOARD, PROFILE_NONE}, |
@@ -550,7 +550,7 @@ index 70aa3a9..12a269f 100644 | |||
550 | {NULL, 0, 0}, | 550 | {NULL, 0, 0}, |
551 | }; | 551 | }; |
552 | 552 | ||
553 | @@ -1893,6 +2296,7 @@ static void setup_beaglebone_old(void) | 553 | @@ -1925,6 +2328,7 @@ static void setup_beaglebone_old(void) |
554 | static void setup_beaglebone(void) | 554 | static void setup_beaglebone(void) |
555 | { | 555 | { |
556 | pr_info("The board is a AM335x Beaglebone.\n"); | 556 | pr_info("The board is a AM335x Beaglebone.\n"); |
@@ -559,5 +559,5 @@ index 70aa3a9..12a269f 100644 | |||
559 | /* 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 */ |
560 | am335x_mmc[0].gpio_wp = -EINVAL; | 560 | am335x_mmc[0].gpio_wp = -EINVAL; |
561 | -- | 561 | -- |
562 | 1.7.9.5 | 562 | 1.7.10 |
563 | 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 e8ef8eeb..3b4b05cc 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,7 +1,7 @@ | |||
1 | From f5d99c334bedef5b0213118590ea2ad7dbc2e29a Mon Sep 17 00:00:00 2001 | 1 | From fda651d1a17eba23bae75e22a811a9f45c96da16 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/26] more beaglebone merges | 4 | Subject: [PATCH 04/33] 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 | --- |
@@ -9,10 +9,10 @@ Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> | |||
9 | 1 file changed, 50 insertions(+), 2 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 12a269f..3c67e94 100644 | 12 | index 2741431..ffbecae 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 | @@ -240,6 +240,11 @@ struct da8xx_lcdc_platform_data dvi_pdata = { | 15 | @@ -242,6 +242,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, |
@@ -24,7 +24,7 @@ index 12a269f..3c67e94 100644 | |||
24 | }; | 24 | }; |
25 | 25 | ||
26 | static u8 am335x_iis_serializer_direction1[] = { | 26 | static u8 am335x_iis_serializer_direction1[] = { |
27 | @@ -427,6 +432,7 @@ static bool beaglebone_tsadcpins_free = 1; | 27 | @@ -429,6 +434,7 @@ static bool beaglebone_tsadcpins_free = 1; |
28 | 28 | ||
29 | 29 | ||
30 | #define GP_EVM_REV_IS_1_0 0x1 | 30 | #define GP_EVM_REV_IS_1_0 0x1 |
@@ -32,7 +32,7 @@ index 12a269f..3c67e94 100644 | |||
32 | #define GP_EVM_REV_IS_1_1A 0x2 | 32 | #define GP_EVM_REV_IS_1_1A 0x2 |
33 | #define GP_EVM_REV_IS_UNKNOWN 0xFF | 33 | #define GP_EVM_REV_IS_UNKNOWN 0xFF |
34 | #define GP_EVM_ACTUALLY_BEAGLEBONE 0xBB | 34 | #define GP_EVM_ACTUALLY_BEAGLEBONE 0xBB |
35 | @@ -1022,6 +1028,47 @@ static struct pinmux_config profibus_pin_mux[] = { | 35 | @@ -1024,6 +1030,47 @@ static struct pinmux_config profibus_pin_mux[] = { |
36 | {NULL, 0}, | 36 | {NULL, 0}, |
37 | }; | 37 | }; |
38 | 38 | ||
@@ -80,7 +80,7 @@ index 12a269f..3c67e94 100644 | |||
80 | 80 | ||
81 | #define BEAGLEBONEDVI_USR0_LED GPIO_TO_PIN(1, 18) | 81 | #define BEAGLEBONEDVI_USR0_LED GPIO_TO_PIN(1, 18) |
82 | #define BEAGLEBONEDVI_USR1_LED GPIO_TO_PIN(1, 19) | 82 | #define BEAGLEBONEDVI_USR1_LED GPIO_TO_PIN(1, 19) |
83 | @@ -1775,11 +1822,11 @@ static void beaglebone_cape_setup(struct memory_accessor *mem_acc, void *context | 83 | @@ -1777,11 +1824,11 @@ static void beaglebone_cape_setup(struct memory_accessor *mem_acc, void *context |
84 | snprintf(tmp, sizeof(cape_config.partnumber) + 1, "%s", cape_config.partnumber); | 84 | snprintf(tmp, sizeof(cape_config.partnumber) + 1, "%s", cape_config.partnumber); |
85 | pr_info("BeagleBone cape partnumber: %s\n", tmp); | 85 | pr_info("BeagleBone cape partnumber: %s\n", tmp); |
86 | 86 | ||
@@ -94,7 +94,7 @@ index 12a269f..3c67e94 100644 | |||
94 | pr_info("BeagleBone cape: initializing LCD cape\n"); | 94 | pr_info("BeagleBone cape: initializing LCD cape\n"); |
95 | bbtoys7lcd_init(0,0); | 95 | bbtoys7lcd_init(0,0); |
96 | pr_info("BeagleBone cape: initializing LCD cape touchscreen\n"); | 96 | pr_info("BeagleBone cape: initializing LCD cape touchscreen\n"); |
97 | @@ -2226,6 +2273,7 @@ static void setup_general_purpose_evm(void) | 97 | @@ -2258,6 +2305,7 @@ static void setup_general_purpose_evm(void) |
98 | pr_info("The board is general purpose EVM in profile %d\n", prof_sel); | 98 | pr_info("The board is general purpose EVM in profile %d\n", prof_sel); |
99 | 99 | ||
100 | if (!strncmp("1.1A", config.version, 4)) { | 100 | if (!strncmp("1.1A", config.version, 4)) { |
@@ -103,5 +103,5 @@ index 12a269f..3c67e94 100644 | |||
103 | } else if (!strncmp("1.0", config.version, 3)) { | 103 | } else if (!strncmp("1.0", config.version, 3)) { |
104 | gp_evm_revision = GP_EVM_REV_IS_1_0; | 104 | gp_evm_revision = GP_EVM_REV_IS_1_0; |
105 | -- | 105 | -- |
106 | 1.7.9.5 | 106 | 1.7.10 |
107 | 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 a7f53852..dc8843fc 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 ca13fa5f840198db430a21a643f3df4788f21b85 Mon Sep 17 00:00:00 2001 | 1 | From 182bdf186f6dfde9d97faea406bc9d1925f18353 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/26] beaglebone: disable tsadc | 4 | Subject: [PATCH 05/33] 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 3c67e94..b0f5ce3 100644 | 12 | index ffbecae..ba611c0 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 | @@ -240,11 +240,11 @@ struct da8xx_lcdc_platform_data dvi_pdata = { | 15 | @@ -242,11 +242,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, |
@@ -27,5 +27,5 @@ index 3c67e94..b0f5ce3 100644 | |||
27 | 27 | ||
28 | static u8 am335x_iis_serializer_direction1[] = { | 28 | static u8 am335x_iis_serializer_direction1[] = { |
29 | -- | 29 | -- |
30 | 1.7.9.5 | 30 | 1.7.10 |
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 01c309d1..720dc180 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 529eb4be71f6387842a1823c7dcac803cc31d8f9 Mon Sep 17 00:00:00 2001 | 1 | From 9b99753d6e4324b98bedd6289993e57c93dbe59d 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/26] tscadc: Add general purpose mode, untested with | 4 | Subject: [PATCH 06/33] 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> |
@@ -19,10 +19,10 @@ Conflicts: | |||
19 | 5 files changed, 178 insertions(+), 49 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 b0f5ce3..5ab9c18 100644 | 22 | index ba611c0..8f7ee0b 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 | @@ -2245,6 +2245,7 @@ static struct evm_dev_cfg beaglebone_old_dev_cfg[] = { | 25 | @@ -2277,6 +2277,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 b0f5ce3..5ab9c18 100644 | |||
30 | {NULL, 0, 0}, | 30 | {NULL, 0, 0}, |
31 | }; | 31 | }; |
32 | 32 | ||
33 | @@ -2257,6 +2258,7 @@ static struct evm_dev_cfg beaglebone_dev_cfg[] = { | 33 | @@ -2289,6 +2290,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}, |
@@ -77,7 +77,7 @@ 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 950c07f..2f38c0c 100644 | 80 | index 835a0ba..c6dc6f0 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 | @@ -28,6 +28,8 @@ | 83 | @@ -28,6 +28,8 @@ |
@@ -109,7 +109,7 @@ index 950c07f..2f38c0c 100644 | |||
109 | #define TSCADC_STEPCONFIG_XPP BIT(5) | 109 | #define TSCADC_STEPCONFIG_XPP BIT(5) |
110 | #define TSCADC_STEPCONFIG_XNN BIT(6) | 110 | #define TSCADC_STEPCONFIG_XNN BIT(6) |
111 | #define TSCADC_STEPCONFIG_YPP BIT(7) | 111 | #define TSCADC_STEPCONFIG_YPP BIT(7) |
112 | @@ -108,6 +117,7 @@ struct tscadc { | 112 | @@ -109,6 +118,7 @@ struct tscadc { |
113 | int wires; | 113 | int wires; |
114 | int analog_input; | 114 | int analog_input; |
115 | int x_plate_resistance; | 115 | int x_plate_resistance; |
@@ -117,7 +117,7 @@ index 950c07f..2f38c0c 100644 | |||
117 | int irq; | 117 | int irq; |
118 | void __iomem *tsc_base; | 118 | void __iomem *tsc_base; |
119 | unsigned int ctrl; | 119 | unsigned int ctrl; |
120 | @@ -124,6 +134,86 @@ static void tscadc_writel(struct tscadc *tsc, unsigned int reg, | 120 | @@ -125,6 +135,86 @@ static void tscadc_writel(struct tscadc *tsc, unsigned int reg, |
121 | writel(val, tsc->tsc_base + reg); | 121 | writel(val, tsc->tsc_base + reg); |
122 | } | 122 | } |
123 | 123 | ||
@@ -204,7 +204,7 @@ index 950c07f..2f38c0c 100644 | |||
204 | static void tsc_step_config(struct tscadc *ts_dev) | 204 | static void tsc_step_config(struct tscadc *ts_dev) |
205 | { | 205 | { |
206 | unsigned int stepconfigx = 0, stepconfigy = 0; | 206 | unsigned int stepconfigx = 0, stepconfigy = 0; |
207 | @@ -228,7 +318,7 @@ static void tsc_step_config(struct tscadc *ts_dev) | 207 | @@ -229,7 +319,7 @@ static void tsc_step_config(struct tscadc *ts_dev) |
208 | tscadc_writel(ts_dev, TSCADC_REG_STEPCONFIG14, stepconfigz2); | 208 | tscadc_writel(ts_dev, TSCADC_REG_STEPCONFIG14, stepconfigz2); |
209 | tscadc_writel(ts_dev, TSCADC_REG_STEPDELAY14, delay); | 209 | tscadc_writel(ts_dev, TSCADC_REG_STEPDELAY14, delay); |
210 | 210 | ||
@@ -213,7 +213,7 @@ index 950c07f..2f38c0c 100644 | |||
213 | } | 213 | } |
214 | 214 | ||
215 | static void tsc_idle_config(struct tscadc *ts_config) | 215 | static void tsc_idle_config(struct tscadc *ts_config) |
216 | @@ -246,7 +336,7 @@ static void tsc_idle_config(struct tscadc *ts_config) | 216 | @@ -247,7 +337,7 @@ static void tsc_idle_config(struct tscadc *ts_config) |
217 | tscadc_writel(ts_config, TSCADC_REG_IDLECONFIG, idleconfig); | 217 | tscadc_writel(ts_config, TSCADC_REG_IDLECONFIG, idleconfig); |
218 | } | 218 | } |
219 | 219 | ||
@@ -222,7 +222,7 @@ index 950c07f..2f38c0c 100644 | |||
222 | { | 222 | { |
223 | struct tscadc *ts_dev = (struct tscadc *)dev; | 223 | struct tscadc *ts_dev = (struct tscadc *)dev; |
224 | struct input_dev *input_dev = ts_dev->input; | 224 | struct input_dev *input_dev = ts_dev->input; |
225 | @@ -367,7 +457,7 @@ static irqreturn_t tscadc_interrupt(int irq, void *dev) | 225 | @@ -368,7 +458,7 @@ static irqreturn_t tscadc_interrupt(int irq, void *dev) |
226 | /* check pending interrupts */ | 226 | /* check pending interrupts */ |
227 | tscadc_writel(ts_dev, TSCADC_REG_IRQEOI, 0x0); | 227 | tscadc_writel(ts_dev, TSCADC_REG_IRQEOI, 0x0); |
228 | 228 | ||
@@ -231,7 +231,7 @@ index 950c07f..2f38c0c 100644 | |||
231 | return IRQ_HANDLED; | 231 | return IRQ_HANDLED; |
232 | } | 232 | } |
233 | 233 | ||
234 | @@ -405,13 +495,15 @@ static int __devinit tscadc_probe(struct platform_device *pdev) | 234 | @@ -406,13 +496,15 @@ static int __devinit tscadc_probe(struct platform_device *pdev) |
235 | return -ENODEV; | 235 | return -ENODEV; |
236 | } | 236 | } |
237 | 237 | ||
@@ -253,7 +253,7 @@ index 950c07f..2f38c0c 100644 | |||
253 | 253 | ||
254 | res = request_mem_region(res->start, resource_size(res), pdev->name); | 254 | res = request_mem_region(res->start, resource_size(res), pdev->name); |
255 | if (!res) { | 255 | if (!res) { |
256 | @@ -427,8 +519,15 @@ static int __devinit tscadc_probe(struct platform_device *pdev) | 256 | @@ -428,8 +520,15 @@ static int __devinit tscadc_probe(struct platform_device *pdev) |
257 | goto err_release_mem; | 257 | goto err_release_mem; |
258 | } | 258 | } |
259 | 259 | ||
@@ -271,7 +271,7 @@ index 950c07f..2f38c0c 100644 | |||
271 | if (err) { | 271 | if (err) { |
272 | dev_err(&pdev->dev, "failed to allocate irq.\n"); | 272 | dev_err(&pdev->dev, "failed to allocate irq.\n"); |
273 | goto err_unmap_regs; | 273 | goto err_unmap_regs; |
274 | @@ -444,12 +543,18 @@ static int __devinit tscadc_probe(struct platform_device *pdev) | 274 | @@ -445,12 +544,18 @@ static int __devinit tscadc_probe(struct platform_device *pdev) |
275 | goto err_free_irq; | 275 | goto err_free_irq; |
276 | } | 276 | } |
277 | clock_rate = clk_get_rate(clk); | 277 | clock_rate = clk_get_rate(clk); |
@@ -290,7 +290,7 @@ index 950c07f..2f38c0c 100644 | |||
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 | @@ -457,53 +562,55 @@ static int __devinit tscadc_probe(struct platform_device *pdev) | 293 | @@ -458,53 +563,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; |
@@ -402,5 +402,5 @@ index 2c547bb..850cd4b 100644 | |||
402 | + int mode; | 402 | + int mode; |
403 | }; | 403 | }; |
404 | -- | 404 | -- |
405 | 1.7.9.5 | 405 | 1.7.10 |
406 | 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 81192703..3b747f80 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 3d2d69999a7de330c9c1e85fcedb094d4f160e16 Mon Sep 17 00:00:00 2001 | 1 | From 2c10000ff1538c2cfb91ebfb27054b262584ce1c 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/26] tscadc: Add board file mfd support, fix warning | 4 | Subject: [PATCH 07/33] 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 5ab9c18..2597650 100644 | 17 | index 8f7ee0b..64a0c0a 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 | @@ -2245,7 +2245,7 @@ static struct evm_dev_cfg beaglebone_old_dev_cfg[] = { | 20 | @@ -2277,7 +2277,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 5ab9c18..2597650 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 2f38c0c..5070450 100644 | 30 | index c6dc6f0..b50a08c 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 | @@ -468,7 +468,7 @@ static irqreturn_t tsc_interrupt(int irq, void *dev) | 33 | @@ -469,7 +469,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 2f38c0c..5070450 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.5 | 43 | 1.7.10 |
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 2cf1fec4..023b6ab7 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 165b0cfffef915ca0efc4f55bc7078c55893ef3e Mon Sep 17 00:00:00 2001 | 1 | From 8b4f4ecc8c831a5bfa87ee66faada2d9d28c5fb4 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/26] AM335X: init tsc bone style for new boards | 4 | Subject: [PATCH 08/33] 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 2597650..5bac604 100644 | 12 | index 64a0c0a..6b78ae6 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 | @@ -2258,7 +2258,7 @@ static struct evm_dev_cfg beaglebone_dev_cfg[] = { | 15 | @@ -2290,7 +2290,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 2597650..5bac604 100644 | |||
22 | }; | 22 | }; |
23 | 23 | ||
24 | -- | 24 | -- |
25 | 1.7.9.5 | 25 | 1.7.10 |
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 d1dadf20..f100a6dd 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 f7e890d43fd383c48e75bbdc363e5ce44bd5eb04 Mon Sep 17 00:00:00 2001 | 1 | From fb47de51034c21646d79aef0605a7a84b9fb6dcf 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/26] tscadc: make stepconfig channel-configurable | 4 | Subject: [PATCH 09/33] 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 5070450..3950696 100644 | 12 | index b50a08c..6083de7 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 | @@ -134,7 +134,9 @@ static void tscadc_writel(struct tscadc *tsc, unsigned int reg, | 15 | @@ -135,7 +135,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 5070450..3950696 100644 | |||
23 | { | 23 | { |
24 | unsigned int stepconfig = 0, delay = 0, chargeconfig = 0; | 24 | unsigned int stepconfig = 0, delay = 0, chargeconfig = 0; |
25 | 25 | ||
26 | @@ -146,7 +148,7 @@ static void tsc_adc_step_config(struct tscadc *ts_dev) | 26 | @@ -147,7 +149,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 5070450..3950696 100644 | |||
32 | 32 | ||
33 | delay = TSCADC_STEPCONFIG_SAMPLEDLY | TSCADC_STEPCONFIG_OPENDLY; | 33 | delay = TSCADC_STEPCONFIG_SAMPLEDLY | TSCADC_STEPCONFIG_OPENDLY; |
34 | 34 | ||
35 | @@ -603,7 +605,7 @@ static int __devinit tscadc_probe(struct platform_device *pdev) | 35 | @@ -604,7 +606,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 5070450..3950696 100644 | |||
42 | irqenable = TSCADC_IRQENB_FIFO0THRES; | 42 | irqenable = TSCADC_IRQENB_FIFO0THRES; |
43 | } | 43 | } |
44 | -- | 44 | -- |
45 | 1.7.9.5 | 45 | 1.7.10 |
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 a0765427..50407fae 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 50c698d37ac59a4ba4cec9d6b844444e312e1a26 Mon Sep 17 00:00:00 2001 | 1 | From a45b9634ecd2d8251c86ff2111e7202471f3f842 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/26] tscadc: Trigger through sysfs | 4 | Subject: [PATCH 10/33] 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,7 +14,7 @@ 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 3950696..8661b3a 100644 | 17 | index 6083de7..d6aec8c 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,8 +26,19 @@ | 20 | @@ -26,8 +26,19 @@ |
@@ -37,7 +37,7 @@ index 3950696..8661b3a 100644 | |||
37 | /* Memory mapped registers here have incorrect offsets! | 37 | /* Memory mapped registers here have incorrect offsets! |
38 | * Correct after referring TRM */ | 38 | * Correct after referring TRM */ |
39 | #define TSCADC_REG_IRQEOI 0x020 | 39 | #define TSCADC_REG_IRQEOI 0x020 |
40 | @@ -149,12 +160,12 @@ static void tsc_adc_step_config(struct tscadc *ts_dev, int channel) | 40 | @@ -150,12 +161,12 @@ static void tsc_adc_step_config(struct tscadc *ts_dev, int channel) |
41 | stepconfig = TSCADC_STEPCONFIG_MODE_SWONESHOT | | 41 | stepconfig = TSCADC_STEPCONFIG_MODE_SWONESHOT | |
42 | TSCADC_STEPCONFIG_2SAMPLES_AVG | | 42 | TSCADC_STEPCONFIG_2SAMPLES_AVG | |
43 | ((channel-1) << 19); | 43 | ((channel-1) << 19); |
@@ -52,7 +52,7 @@ index 3950696..8661b3a 100644 | |||
52 | /* 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 |
53 | * as soon as TSC_ADC_SS is turned on */ | 53 | * as soon as TSC_ADC_SS is turned on */ |
54 | tscadc_writel(ts_dev, TSCADC_REG_SE, TSCADC_STPENB_STEPENB_GENERAL); | 54 | tscadc_writel(ts_dev, TSCADC_REG_SE, TSCADC_STPENB_STEPENB_GENERAL); |
55 | @@ -204,7 +215,7 @@ static irqreturn_t tsc_adc_interrupt(int irq, void *dev) | 55 | @@ -205,7 +216,7 @@ static irqreturn_t tsc_adc_interrupt(int irq, void *dev) |
56 | irqclr |= TSCADC_IRQENB_FIFO1THRES; | 56 | irqclr |= TSCADC_IRQENB_FIFO1THRES; |
57 | } | 57 | } |
58 | 58 | ||
@@ -61,7 +61,7 @@ index 3950696..8661b3a 100644 | |||
61 | 61 | ||
62 | tscadc_writel(ts_dev, TSCADC_REG_IRQSTATUS, irqclr); | 62 | tscadc_writel(ts_dev, TSCADC_REG_IRQSTATUS, irqclr); |
63 | 63 | ||
64 | @@ -212,7 +223,7 @@ static irqreturn_t tsc_adc_interrupt(int irq, void *dev) | 64 | @@ -213,7 +224,7 @@ static irqreturn_t tsc_adc_interrupt(int irq, void *dev) |
65 | tscadc_writel(ts_dev, TSCADC_REG_IRQEOI, 0x0); | 65 | tscadc_writel(ts_dev, TSCADC_REG_IRQEOI, 0x0); |
66 | 66 | ||
67 | /* Turn on Step 1 again */ | 67 | /* Turn on Step 1 again */ |
@@ -70,7 +70,7 @@ index 3950696..8661b3a 100644 | |||
70 | return IRQ_HANDLED; | 70 | return IRQ_HANDLED; |
71 | } | 71 | } |
72 | 72 | ||
73 | @@ -467,6 +478,34 @@ static irqreturn_t tsc_interrupt(int irq, void *dev) | 73 | @@ -468,6 +479,34 @@ static irqreturn_t tsc_interrupt(int irq, void *dev) |
74 | * The functions for inserting/removing driver as a module. | 74 | * The functions for inserting/removing driver as a module. |
75 | */ | 75 | */ |
76 | 76 | ||
@@ -105,7 +105,7 @@ index 3950696..8661b3a 100644 | |||
105 | static int __devinit tscadc_probe(struct platform_device *pdev) | 105 | static int __devinit tscadc_probe(struct platform_device *pdev) |
106 | { | 106 | { |
107 | struct tscadc *ts_dev; | 107 | struct tscadc *ts_dev; |
108 | @@ -478,6 +517,18 @@ static int __devinit tscadc_probe(struct platform_device *pdev) | 108 | @@ -479,6 +518,18 @@ static int __devinit tscadc_probe(struct platform_device *pdev) |
109 | struct resource *res; | 109 | struct resource *res; |
110 | struct clk *clk; | 110 | struct clk *clk; |
111 | 111 | ||
@@ -124,7 +124,7 @@ index 3950696..8661b3a 100644 | |||
124 | res = platform_get_resource(pdev, IORESOURCE_MEM, 0); | 124 | res = platform_get_resource(pdev, IORESOURCE_MEM, 0); |
125 | if (!res) { | 125 | if (!res) { |
126 | dev_err(&pdev->dev, "no memory resource defined.\n"); | 126 | dev_err(&pdev->dev, "no memory resource defined.\n"); |
127 | @@ -605,7 +656,6 @@ static int __devinit tscadc_probe(struct platform_device *pdev) | 127 | @@ -606,7 +657,6 @@ static int __devinit tscadc_probe(struct platform_device *pdev) |
128 | goto err_fail; | 128 | goto err_fail; |
129 | } | 129 | } |
130 | else { | 130 | else { |
@@ -145,5 +145,5 @@ index 850cd4b..fc239c6 100644 | |||
145 | #define TI_TSCADC_TSCMODE 0 | 145 | #define TI_TSCADC_TSCMODE 0 |
146 | #define TI_TSCADC_GENMODE 1 | 146 | #define TI_TSCADC_GENMODE 1 |
147 | -- | 147 | -- |
148 | 1.7.9.5 | 148 | 1.7.10 |
149 | 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 c7c1c373..5ecb48c1 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 92c8dd2fe6e62db7bcb07a9010c5eb9b757f2446 Mon Sep 17 00:00:00 2001 | 1 | From a893b2486f36716a3196fa58fae5b7d973976b5a 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/26] meta-ti: Remove debug messages for meta-ti | 4 | Subject: [PATCH 11/33] 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 8661b3a..c82f9bf 100644 | 12 | index d6aec8c..da48bcd 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 | @@ -186,14 +186,14 @@ static irqreturn_t tsc_adc_interrupt(int irq, void *dev) | 15 | @@ -187,14 +187,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 8661b3a..c82f9bf 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.5 | 33 | 1.7.10 |
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 d08d8d5a..92375cc5 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 a1bedb47197c154069710b8f0f2258a7651cc05c Mon Sep 17 00:00:00 2001 | 1 | From f0963a18454ca4943c436432300d310b6f4ebd16 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/26] tscadc: switch to polling instead of interrupts | 4 | Subject: [PATCH 12/33] 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 c82f9bf..3082e5c 100644 | 12 | index da48bcd..4fd2e18 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 | @@ -483,6 +483,8 @@ size_t do_adc_sample(struct kobject *kobj, struct attribute *attr, char *buf) { | 15 | @@ -484,6 +484,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 c82f9bf..3082e5c 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 | @@ -502,7 +504,17 @@ size_t do_adc_sample(struct kobject *kobj, struct attribute *attr, char *buf) { | 24 | @@ -503,7 +505,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 c82f9bf..3082e5c 100644 | |||
40 | return strlen(attr->name); | 40 | return strlen(attr->name); |
41 | } | 41 | } |
42 | 42 | ||
43 | @@ -657,7 +669,7 @@ static int __devinit tscadc_probe(struct platform_device *pdev) | 43 | @@ -658,7 +670,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 c82f9bf..3082e5c 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.5 | 53 | 1.7.10 |
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 59318299..6e3a9ce9 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 1d54ffc655a7d22e1477e3bc0d72c0593049d83b Mon Sep 17 00:00:00 2001 | 1 | From a1dabedca0bb4b1e016036368fa1888e21514570 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/26] beaglebone: fix ADC init | 4 | Subject: [PATCH 13/33] 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 5bac604..3c67e94 100644 | 12 | index 6b78ae6..ffbecae 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 | @@ -240,11 +240,11 @@ struct da8xx_lcdc_platform_data dvi_pdata = { | 15 | @@ -242,11 +242,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, |
@@ -26,7 +26,7 @@ index 5bac604..3c67e94 100644 | |||
26 | }; | 26 | }; |
27 | 27 | ||
28 | static u8 am335x_iis_serializer_direction1[] = { | 28 | static u8 am335x_iis_serializer_direction1[] = { |
29 | @@ -2245,7 +2245,6 @@ static struct evm_dev_cfg beaglebone_old_dev_cfg[] = { | 29 | @@ -2277,7 +2277,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 5bac604..3c67e94 100644 | |||
34 | {NULL, 0, 0}, | 34 | {NULL, 0, 0}, |
35 | }; | 35 | }; |
36 | 36 | ||
37 | @@ -2258,7 +2257,6 @@ static struct evm_dev_cfg beaglebone_dev_cfg[] = { | 37 | @@ -2290,7 +2289,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 5bac604..3c67e94 100644 | |||
43 | }; | 43 | }; |
44 | 44 | ||
45 | -- | 45 | -- |
46 | 1.7.9.5 | 46 | 1.7.10 |
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 44c50520..d50acc22 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 c150d02db78ceb0ec05774b834bf2001c6427552 Mon Sep 17 00:00:00 2001 | 1 | From 32868ed9e44bf2cf9193e4bb8a903c20ca5a8d93 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/26] AM335x: MUX: add ehrpwm1A | 4 | Subject: [PATCH 14/33] 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 | --- |
@@ -22,5 +22,5 @@ index 572ed16..0f71646 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.5 | 25 | 1.7.10 |
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 ba2b3060..f70e8980 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,7 +1,7 @@ | |||
1 | From 46c7fc0ed1ad0e5da431d15a4333a4fb5bb0ff0e Mon Sep 17 00:00:00 2001 | 1 | From 28cbad5cd7338d27e6f440c26b508a171640df85 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/26] beaglebone: enable PWM for lcd backlight <- backlight | 4 | Subject: [PATCH 15/33] 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> |
@@ -10,10 +10,10 @@ Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> | |||
10 | 1 file changed, 42 insertions(+), 9 deletions(-) | 10 | 1 file changed, 42 insertions(+), 9 deletions(-) |
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 3c67e94..23b59c2 100644 | 13 | index ffbecae..43a83ca 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 | @@ -179,6 +179,16 @@ static const struct display_panel bbtoys7_panel = { | 16 | @@ -181,6 +181,16 @@ static const struct display_panel bbtoys7_panel = { |
17 | COLOR_ACTIVE, | 17 | COLOR_ACTIVE, |
18 | }; | 18 | }; |
19 | 19 | ||
@@ -30,7 +30,7 @@ index 3c67e94..23b59c2 100644 | |||
30 | static struct lcd_ctrl_config bbtoys7_cfg = { | 30 | static struct lcd_ctrl_config bbtoys7_cfg = { |
31 | &bbtoys7_panel, | 31 | &bbtoys7_panel, |
32 | .ac_bias = 255, | 32 | .ac_bias = 255, |
33 | @@ -599,9 +609,9 @@ static struct pinmux_config bbtoys7_pin_mux[] = { | 33 | @@ -601,9 +611,9 @@ static struct pinmux_config bbtoys7_pin_mux[] = { |
34 | {"lcd_vsync.lcd_vsync", OMAP_MUX_MODE0 | AM33XX_PIN_OUTPUT}, | 34 | {"lcd_vsync.lcd_vsync", OMAP_MUX_MODE0 | AM33XX_PIN_OUTPUT}, |
35 | {"lcd_hsync.lcd_hsync", OMAP_MUX_MODE0 | AM33XX_PIN_OUTPUT}, | 35 | {"lcd_hsync.lcd_hsync", OMAP_MUX_MODE0 | AM33XX_PIN_OUTPUT}, |
36 | {"lcd_pclk.lcd_pclk", OMAP_MUX_MODE0 | AM33XX_PIN_OUTPUT}, | 36 | {"lcd_pclk.lcd_pclk", OMAP_MUX_MODE0 | AM33XX_PIN_OUTPUT}, |
@@ -42,7 +42,7 @@ index 3c67e94..23b59c2 100644 | |||
42 | {NULL, 0}, | 42 | {NULL, 0}, |
43 | }; | 43 | }; |
44 | 44 | ||
45 | @@ -1134,6 +1144,7 @@ static struct pinmux_config ecap0_pin_mux[] = { | 45 | @@ -1136,6 +1146,7 @@ static struct pinmux_config ecap0_pin_mux[] = { |
46 | {NULL, 0}, | 46 | {NULL, 0}, |
47 | }; | 47 | }; |
48 | 48 | ||
@@ -50,7 +50,7 @@ index 3c67e94..23b59c2 100644 | |||
50 | static int backlight_enable; | 50 | static int backlight_enable; |
51 | 51 | ||
52 | #define AM335XEVM_WLAN_PMENA_GPIO GPIO_TO_PIN(1, 30) | 52 | #define AM335XEVM_WLAN_PMENA_GPIO GPIO_TO_PIN(1, 30) |
53 | @@ -1216,6 +1227,30 @@ static int __init ecap0_init(void) | 53 | @@ -1218,6 +1229,30 @@ static int __init ecap0_init(void) |
54 | } | 54 | } |
55 | late_initcall(ecap0_init); | 55 | late_initcall(ecap0_init); |
56 | 56 | ||
@@ -81,7 +81,7 @@ index 3c67e94..23b59c2 100644 | |||
81 | static int __init conf_disp_pll(int rate) | 81 | static int __init conf_disp_pll(int rate) |
82 | { | 82 | { |
83 | struct clk *disp_pll; | 83 | struct clk *disp_pll; |
84 | @@ -1250,11 +1285,12 @@ static void lcdc_init(int evm_id, int profile) | 84 | @@ -1252,11 +1287,12 @@ static void lcdc_init(int evm_id, int profile) |
85 | } | 85 | } |
86 | 86 | ||
87 | #define BEAGLEBONE_LCD_AVDD_EN GPIO_TO_PIN(0, 7) | 87 | #define BEAGLEBONE_LCD_AVDD_EN GPIO_TO_PIN(0, 7) |
@@ -95,7 +95,7 @@ index 3c67e94..23b59c2 100644 | |||
95 | 95 | ||
96 | // 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 |
97 | if (conf_disp_pll(300000000)) { | 97 | if (conf_disp_pll(300000000)) { |
98 | @@ -1265,12 +1301,7 @@ static void bbtoys7lcd_init(int evm_id, int profile) | 98 | @@ -1267,12 +1303,7 @@ static void bbtoys7lcd_init(int evm_id, int profile) |
99 | 99 | ||
100 | if (am33xx_register_lcdc(&bbtoys7_pdata)) | 100 | if (am33xx_register_lcdc(&bbtoys7_pdata)) |
101 | pr_info("Failed to register Beagleboardtoys 7\" LCD cape device\n"); | 101 | pr_info("Failed to register Beagleboardtoys 7\" LCD cape device\n"); |
@@ -109,7 +109,7 @@ index 3c67e94..23b59c2 100644 | |||
109 | return; | 109 | return; |
110 | } | 110 | } |
111 | 111 | ||
112 | @@ -1831,6 +1862,8 @@ static void beaglebone_cape_setup(struct memory_accessor *mem_acc, void *context | 112 | @@ -1833,6 +1864,8 @@ static void beaglebone_cape_setup(struct memory_accessor *mem_acc, void *context |
113 | bbtoys7lcd_init(0,0); | 113 | bbtoys7lcd_init(0,0); |
114 | pr_info("BeagleBone cape: initializing LCD cape touchscreen\n"); | 114 | pr_info("BeagleBone cape: initializing LCD cape touchscreen\n"); |
115 | tsc_init(0,0); | 115 | tsc_init(0,0); |
@@ -119,5 +119,5 @@ index 3c67e94..23b59c2 100644 | |||
119 | } | 119 | } |
120 | 120 | ||
121 | -- | 121 | -- |
122 | 1.7.9.5 | 122 | 1.7.10 |
123 | 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 42e342b8..d3e8e0ef 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 96debb4a5199afb9ad47e8c94292540e99d4050f Mon Sep 17 00:00:00 2001 | 1 | From ba233d60909b0b895c28f88c5714ebcb68b87617 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/26] omap_hsmmc: Set dto to max value of 14 to avoid SD | 4 | Subject: [PATCH 16/33] 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 |
@@ -30,5 +30,5 @@ index 1f938d9..ace26f7 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.5 | 33 | 1.7.10 |
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 a52ff8c7..2c2c4554 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 55315e3442ea08e4bd0d676921f968dc1fccf588 Mon Sep 17 00:00:00 2001 | 1 | From 2d746bba72e5334bbf6269e1063dea891ad58394 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/26] beaglebone: set default brightness to 50% for pwm | 4 | Subject: [PATCH 17/33] 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,10 +10,10 @@ 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 23b59c2..9294af5 100644 | 13 | index 43a83ca..97b069f 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 | @@ -133,7 +133,7 @@ static const struct display_panel disp_panel = { | 16 | @@ -135,7 +135,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 |
@@ -23,5 +23,5 @@ index 23b59c2..9294af5 100644 | |||
23 | 23 | ||
24 | #define PWM_DEVICE_ID "ecap.0" | 24 | #define PWM_DEVICE_ID "ecap.0" |
25 | -- | 25 | -- |
26 | 1.7.9.5 | 26 | 1.7.10 |
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 9f60391f..46fafa06 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 87a3d78cceff02796574ec9c0e5ee9c81372cd29 Mon Sep 17 00:00:00 2001 | 1 | From 5d3a23267ebf757159b1dce032505d0c15683909 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/26] st7735fb: WIP framebuffer driver supporting Adafruit | 4 | Subject: [PATCH 18/33] 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.5 | 667 | 1.7.10 |
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 c165721c..d5b6a276 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 4f40b3e2d3fa97add575cfd398fc76595d2c2141 Mon Sep 17 00:00:00 2001 | 1 | From f70a6f936227f65da0e5bff0e72ad59fe2c9b36f 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/26] beaglebone: use P8_6 (gpio1_3) as w1 bus | 4 | Subject: [PATCH 19/33] 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 9294af5..88f07e3 100644 | 12 | index 97b069f..3ba4bbc 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 | @@ -38,6 +38,7 @@ | 15 | @@ -39,6 +39,7 @@ |
16 | #include <linux/pwm_backlight.h> | ||
17 | #include <linux/reboot.h> | 16 | #include <linux/reboot.h> |
18 | #include <linux/pwm/pwm.h> | 17 | #include <linux/pwm/pwm.h> |
18 | #include <linux/opp.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 | @@ -615,6 +616,11 @@ static struct pinmux_config bbtoys7_pin_mux[] = { | 23 | @@ -617,6 +618,11 @@ static struct pinmux_config bbtoys7_pin_mux[] = { |
24 | {NULL, 0}, | 24 | {NULL, 0}, |
25 | }; | 25 | }; |
26 | 26 | ||
@@ -32,7 +32,7 @@ index 9294af5..88f07e3 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 | @@ -1038,6 +1044,19 @@ static struct pinmux_config profibus_pin_mux[] = { | 35 | @@ -1040,6 +1046,19 @@ static struct pinmux_config profibus_pin_mux[] = { |
36 | {NULL, 0}, | 36 | {NULL, 0}, |
37 | }; | 37 | }; |
38 | 38 | ||
@@ -52,7 +52,7 @@ index 9294af5..88f07e3 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 | @@ -1375,6 +1394,17 @@ static void dvileds_init(int evm_id, int profile ) | 55 | @@ -1377,6 +1396,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 9294af5..88f07e3 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 | @@ -2290,6 +2320,7 @@ static struct evm_dev_cfg beaglebone_dev_cfg[] = { | 73 | @@ -2322,6 +2352,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 9294af5..88f07e3 100644 | |||
79 | }; | 79 | }; |
80 | 80 | ||
81 | -- | 81 | -- |
82 | 1.7.9.5 | 82 | 1.7.10 |
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 59b86076..313d140e 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 89028c4350be00850cb58b9dcb82d93dcb6373c4 Mon Sep 17 00:00:00 2001 | 1 | From 3554b72659f168b6b699a02a57e9d91471ad7c32 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/26] beaglebone: add support for Towertech TT3201 CAN cape | 4 | Subject: [PATCH 20/33] 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 88f07e3..a30689f 100644 | 15 | index 3ba4bbc..a8dfcdf 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 | @@ -39,6 +39,7 @@ | 18 | @@ -40,6 +40,7 @@ |
19 | #include <linux/reboot.h> | ||
20 | #include <linux/pwm/pwm.h> | 19 | #include <linux/pwm/pwm.h> |
20 | #include <linux/opp.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 | @@ -841,6 +842,15 @@ static struct pinmux_config d_can_ia_pin_mux[] = { | 26 | @@ -843,6 +844,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 88f07e3..a30689f 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 | @@ -1850,6 +1860,44 @@ static void i2c1_init(int evm_id, int profile) | 42 | @@ -1852,6 +1862,44 @@ static void i2c1_init(int evm_id, int profile) |
43 | return; | 43 | return; |
44 | } | 44 | } |
45 | 45 | ||
@@ -84,7 +84,7 @@ index 88f07e3..a30689f 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 | @@ -1897,7 +1945,11 @@ static void beaglebone_cape_setup(struct memory_accessor *mem_acc, void *context | 87 | @@ -1899,7 +1947,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 | ||
@@ -316,5 +316,5 @@ index 330140e..b3e231c 100644 | |||
316 | } | 316 | } |
317 | error_probe: | 317 | error_probe: |
318 | -- | 318 | -- |
319 | 1.7.9.5 | 319 | 1.7.10 |
320 | 320 | ||
diff --git a/recipes-kernel/linux/linux-ti33x-psp-3.2/beaglebone/0021-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 0067a5ea..937c03ae 100644 --- a/recipes-kernel/linux/linux-ti33x-psp-3.2/beaglebone/0021-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,7 +1,7 @@ | |||
1 | From 6f8cb102c35b2770f11da5fc4ad9585b529c0bf2 Mon Sep 17 00:00:00 2001 | 1 | From 33f4b51e615b9550acdb99de61427e1aa46db4b3 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 21/26] beaglebone: add more beagleboardtoys cape partnumbers | 4 | Subject: [PATCH 21/33] 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 | --- |
@@ -9,10 +9,10 @@ Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> | |||
9 | 1 file changed, 24 insertions(+), 1 deletion(-) | 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 a30689f..73d9dd9 100644 | 12 | index a8dfcdf..f854329 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 | @@ -1945,11 +1945,34 @@ static void beaglebone_cape_setup(struct memory_accessor *mem_acc, void *context | 15 | @@ -1947,11 +1947,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 a30689f..73d9dd9 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.9.5 | 52 | 1.7.10 |
53 | 53 | ||
diff --git a/recipes-kernel/linux/linux-ti33x-psp-3.2/beaglebone/0022-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 7b8d2422..d219f97c 100644 --- a/recipes-kernel/linux/linux-ti33x-psp-3.2/beaglebone/0022-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,7 +1,7 @@ | |||
1 | From fd358035f83d5edab1130ea569be580960a0dce7 Mon Sep 17 00:00:00 2001 | 1 | From 73da74ec5becc06d598a1ddcc435ed9fb277d0ce 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 22/26] beaglebone: add gpio-keys for lcd7, add notes for | 4 | Subject: [PATCH 22/33] beaglebone: add gpio-keys for lcd7, add notes for |
5 | missing functionality for other capes | 5 | missing functionality for other capes |
6 | 6 | ||
7 | Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> | 7 | Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> |
@@ -10,10 +10,10 @@ Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> | |||
10 | 1 file changed, 79 insertions(+) | 10 | 1 file changed, 79 insertions(+) |
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 73d9dd9..a3d7846 100644 | 13 | index f854329..9e9cf5b 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 | @@ -992,6 +992,73 @@ static void volume_keys_init(int evm_id, int profile) | 16 | @@ -994,6 +994,73 @@ static void volume_keys_init(int evm_id, int profile) |
17 | pr_err("failed to register matrix keypad (2x3) device\n"); | 17 | pr_err("failed to register matrix keypad (2x3) device\n"); |
18 | } | 18 | } |
19 | 19 | ||
@@ -87,7 +87,7 @@ index 73d9dd9..a3d7846 100644 | |||
87 | /* | 87 | /* |
88 | * @evm_id - evm id which needs to be configured | 88 | * @evm_id - evm id which needs to be configured |
89 | * @dev_cfg - single evm structure which includes | 89 | * @dev_cfg - single evm structure which includes |
90 | @@ -1943,6 +2010,8 @@ static void beaglebone_cape_setup(struct memory_accessor *mem_acc, void *context | 90 | @@ -1945,6 +2012,8 @@ static void beaglebone_cape_setup(struct memory_accessor *mem_acc, void *context |
91 | pr_info("BeagleBone cape: Registering PWM backlight for LCD cape\n"); | 91 | pr_info("BeagleBone cape: Registering PWM backlight for LCD cape\n"); |
92 | enable_ehrpwm1(0,0); | 92 | enable_ehrpwm1(0,0); |
93 | beaglebone_tsadcpins_free = 0; | 93 | beaglebone_tsadcpins_free = 0; |
@@ -96,7 +96,7 @@ index 73d9dd9..a3d7846 100644 | |||
96 | } | 96 | } |
97 | 97 | ||
98 | if (!strncmp("BB-BONE-LCD3-01", cape_config.partnumber, 15)) { | 98 | if (!strncmp("BB-BONE-LCD3-01", cape_config.partnumber, 15)) { |
99 | @@ -1951,6 +2020,10 @@ static void beaglebone_cape_setup(struct memory_accessor *mem_acc, void *context | 99 | @@ -1953,6 +2022,10 @@ static void beaglebone_cape_setup(struct memory_accessor *mem_acc, void *context |
100 | pr_info("BeagleBone cape: initializing LCD cape touchscreen\n"); | 100 | pr_info("BeagleBone cape: initializing LCD cape touchscreen\n"); |
101 | tsc_init(0,0); | 101 | tsc_init(0,0); |
102 | beaglebone_tsadcpins_free = 0; | 102 | beaglebone_tsadcpins_free = 0; |
@@ -107,7 +107,7 @@ index 73d9dd9..a3d7846 100644 | |||
107 | } | 107 | } |
108 | 108 | ||
109 | if (!strncmp("BB-BONE-VGA-01", cape_config.partnumber, 15)) { | 109 | if (!strncmp("BB-BONE-VGA-01", cape_config.partnumber, 15)) { |
110 | @@ -1960,11 +2033,17 @@ static void beaglebone_cape_setup(struct memory_accessor *mem_acc, void *context | 110 | @@ -1962,11 +2035,17 @@ static void beaglebone_cape_setup(struct memory_accessor *mem_acc, void *context |
111 | 111 | ||
112 | if (!strncmp("BB-BONE-BATT-01", cape_config.partnumber, 15)) { | 112 | if (!strncmp("BB-BONE-BATT-01", cape_config.partnumber, 15)) { |
113 | pr_info("BeagleBone cape: initializing battery cape\n"); | 113 | pr_info("BeagleBone cape: initializing battery cape\n"); |
@@ -126,5 +126,5 @@ index 73d9dd9..a3d7846 100644 | |||
126 | } | 126 | } |
127 | 127 | ||
128 | -- | 128 | -- |
129 | 1.7.9.5 | 129 | 1.7.10 |
130 | 130 | ||
diff --git a/recipes-kernel/linux/linux-ti33x-psp-3.2/beaglebone/0023-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 332b8629..6d0d3d38 100644 --- a/recipes-kernel/linux/linux-ti33x-psp-3.2/beaglebone/0023-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,7 +1,7 @@ | |||
1 | From 2eb2e497cb55889497801ac263d7aa309656ff89 Mon Sep 17 00:00:00 2001 | 1 | From 47651bc2ba05d4d5f8a7d10a9c55ad915a4e3500 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 23/26] beaglebone: add enter key for lcd7 cape | 4 | Subject: [PATCH 23/33] 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 | --- |
@@ -9,10 +9,10 @@ Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> | |||
9 | 1 file changed, 9 insertions(+) | 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 a3d7846..e77bcd6 100644 | 12 | index 9e9cf5b..8c78eb5 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 | @@ -998,6 +998,7 @@ static struct pinmux_config lcd7_keys_pin_mux[] = { | 15 | @@ -1000,6 +1000,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 a3d7846..e77bcd6 100644 | |||
20 | {NULL, 0}, | 20 | {NULL, 0}, |
21 | }; | 21 | }; |
22 | 22 | ||
23 | @@ -1035,6 +1036,14 @@ static struct gpio_keys_button beaglebone_lcd7_gpio_keys[] = { | 23 | @@ -1037,6 +1038,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 a3d7846..e77bcd6 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.9.5 | 39 | 1.7.10 |
40 | 40 | ||
diff --git a/recipes-kernel/linux/linux-ti33x-psp-3.2/beaglebone/0024-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 44ebfda7..7de222e2 100644 --- a/recipes-kernel/linux/linux-ti33x-psp-3.2/beaglebone/0024-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,7 +1,7 @@ | |||
1 | From d76d09ea8918a1aa315b44d4e12b71a522545da8 Mon Sep 17 00:00:00 2001 | 1 | From 555493dc65a5f0ff80bfb8fc60a10bb8c0fef0de 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 24/26] beaglebone: add gpio-keys for lcd | 4 | Subject: [PATCH 24/33] 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 | --- |
@@ -9,10 +9,10 @@ Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> | |||
9 | 1 file 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 e77bcd6..ed2ea68 100644 | 12 | index 8c78eb5..5266f78 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 | @@ -1068,6 +1068,82 @@ static void beaglebone_lcd7_keys_init(int evm_id, int profile) | 15 | @@ -1070,6 +1070,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 e77bcd6..ed2ea68 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 | @@ -2029,10 +2105,8 @@ static void beaglebone_cape_setup(struct memory_accessor *mem_acc, void *context | 98 | @@ -2031,10 +2107,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 e77bcd6..ed2ea68 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.9.5 | 112 | 1.7.10 |
113 | 113 | ||
diff --git a/recipes-kernel/linux/linux-ti33x-psp-3.2/beaglebone/0025-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 8fa656a3..4edc4c87 100644 --- a/recipes-kernel/linux/linux-ti33x-psp-3.2/beaglebone/0025-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,7 +1,7 @@ | |||
1 | From e979180175348c0118f7e461fefa44dcc78e124a Mon Sep 17 00:00:00 2001 | 1 | From c33d25585e467ab54b3db2d3c5b403e071150751 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 25/26] beaglebone: fix direction of gpio-keys | 4 | Subject: [PATCH 25/33] 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 | --- |
@@ -9,10 +9,10 @@ Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> | |||
9 | 1 file 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 ed2ea68..ed03e14 100644 | 12 | index 5266f78..36b0c85 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 | @@ -1007,7 +1007,7 @@ static struct gpio_keys_button beaglebone_lcd7_gpio_keys[] = { | 15 | @@ -1009,7 +1009,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 ed2ea68..ed03e14 100644 | |||
21 | .desc = "left", | 21 | .desc = "left", |
22 | .type = EV_KEY, | 22 | .type = EV_KEY, |
23 | .wakeup = 1, | 23 | .wakeup = 1, |
24 | @@ -1015,7 +1015,7 @@ static struct gpio_keys_button beaglebone_lcd7_gpio_keys[] = { | 24 | @@ -1017,7 +1017,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 ed2ea68..ed03e14 100644 | |||
30 | .desc = "right", | 30 | .desc = "right", |
31 | .type = EV_KEY, | 31 | .type = EV_KEY, |
32 | .wakeup = 1, | 32 | .wakeup = 1, |
33 | @@ -1023,7 +1023,7 @@ static struct gpio_keys_button beaglebone_lcd7_gpio_keys[] = { | 33 | @@ -1025,7 +1025,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 ed2ea68..ed03e14 100644 | |||
39 | .desc = "up", | 39 | .desc = "up", |
40 | .type = EV_KEY, | 40 | .type = EV_KEY, |
41 | .wakeup = 1, | 41 | .wakeup = 1, |
42 | @@ -1031,7 +1031,7 @@ static struct gpio_keys_button beaglebone_lcd7_gpio_keys[] = { | 42 | @@ -1033,7 +1033,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 ed2ea68..ed03e14 100644 | |||
48 | .desc = "down", | 48 | .desc = "down", |
49 | .type = EV_KEY, | 49 | .type = EV_KEY, |
50 | .wakeup = 1, | 50 | .wakeup = 1, |
51 | @@ -1039,7 +1039,7 @@ static struct gpio_keys_button beaglebone_lcd7_gpio_keys[] = { | 51 | @@ -1041,7 +1041,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 ed2ea68..ed03e14 100644 | |||
57 | .desc = "enter", | 57 | .desc = "enter", |
58 | .type = EV_KEY, | 58 | .type = EV_KEY, |
59 | .wakeup = 1, | 59 | .wakeup = 1, |
60 | @@ -1083,7 +1083,7 @@ static struct gpio_keys_button beaglebone_lcd3_gpio_keys[] = { | 60 | @@ -1085,7 +1085,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 ed2ea68..ed03e14 100644 | |||
66 | .desc = "left", | 66 | .desc = "left", |
67 | .type = EV_KEY, | 67 | .type = EV_KEY, |
68 | .wakeup = 1, | 68 | .wakeup = 1, |
69 | @@ -1091,7 +1091,7 @@ static struct gpio_keys_button beaglebone_lcd3_gpio_keys[] = { | 69 | @@ -1093,7 +1093,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 ed2ea68..ed03e14 100644 | |||
75 | .desc = "right", | 75 | .desc = "right", |
76 | .type = EV_KEY, | 76 | .type = EV_KEY, |
77 | .wakeup = 1, | 77 | .wakeup = 1, |
78 | @@ -1099,7 +1099,7 @@ static struct gpio_keys_button beaglebone_lcd3_gpio_keys[] = { | 78 | @@ -1101,7 +1101,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 ed2ea68..ed03e14 100644 | |||
84 | .desc = "up", | 84 | .desc = "up", |
85 | .type = EV_KEY, | 85 | .type = EV_KEY, |
86 | .wakeup = 1, | 86 | .wakeup = 1, |
87 | @@ -1107,7 +1107,7 @@ static struct gpio_keys_button beaglebone_lcd3_gpio_keys[] = { | 87 | @@ -1109,7 +1109,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 ed2ea68..ed03e14 100644 | |||
93 | .desc = "down", | 93 | .desc = "down", |
94 | .type = EV_KEY, | 94 | .type = EV_KEY, |
95 | .wakeup = 1, | 95 | .wakeup = 1, |
96 | @@ -1115,7 +1115,7 @@ static struct gpio_keys_button beaglebone_lcd3_gpio_keys[] = { | 96 | @@ -1117,7 +1117,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 ed2ea68..ed03e14 100644 | |||
103 | .type = EV_KEY, | 103 | .type = EV_KEY, |
104 | .wakeup = 1, | 104 | .wakeup = 1, |
105 | -- | 105 | -- |
106 | 1.7.9.5 | 106 | 1.7.10 |
107 | 107 | ||
diff --git a/recipes-kernel/linux/linux-ti33x-psp-3.2/beaglebone/0026-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 ecae4d63..60ea0554 100644 --- a/recipes-kernel/linux/linux-ti33x-psp-3.2/beaglebone/0026-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 a40eb4d0e3ca83642a3035f7385de0ddf9421b08 Mon Sep 17 00:00:00 2001 | 1 | From 23c8aaf1d86378c6d4325b88ec85ac7d8130e86a 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 26/26] beaglebone: fix 3.5" lcd cape support | 4 | Subject: [PATCH 26/33] beaglebone: fix 3.5" lcd cape support |
5 | 5 | ||
6 | * proper timings | 6 | * proper timings |
7 | * fix gpio conflict | 7 | * fix gpio conflict |
@@ -13,10 +13,10 @@ Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> | |||
13 | 2 files changed, 55 insertions(+), 1 deletion(-) | 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 ed03e14..74a7e91 100644 | 16 | index 36b0c85..127516f 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 | @@ -214,6 +214,29 @@ struct da8xx_lcdc_platform_data bbtoys7_pdata = { | 19 | @@ -216,6 +216,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 ed03e14..74a7e91 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 | @@ -1486,6 +1509,23 @@ static void bbtoys7lcd_init(int evm_id, int profile) | 49 | @@ -1488,6 +1511,23 @@ static void bbtoys7lcd_init(int evm_id, int profile) |
50 | return; | 50 | return; |
51 | } | 51 | } |
52 | 52 | ||
@@ -70,7 +70,7 @@ index ed03e14..74a7e91 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 | @@ -2101,7 +2141,7 @@ static void beaglebone_cape_setup(struct memory_accessor *mem_acc, void *context | 73 | @@ -2103,7 +2143,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"); |
@@ -105,5 +105,5 @@ index b01f15b..86b19ac 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.9.5 | 108 | 1.7.10 |
109 | 109 | ||
diff --git a/recipes-kernel/linux/linux-ti33x-psp-3.2/beaglebone/0027-beaglebone-decrease-PWM-frequency-to-old-value-LCD7-.patch b/recipes-kernel/linux/linux-ti33x-psp-3.2/beaglebone/0027-beaglebone-decrease-PWM-frequency-to-old-value-LCD7-.patch index 59c13710..0b99d3bc 100644 --- a/recipes-kernel/linux/linux-ti33x-psp-3.2/beaglebone/0027-beaglebone-decrease-PWM-frequency-to-old-value-LCD7-.patch +++ b/recipes-kernel/linux/linux-ti33x-psp-3.2/beaglebone/0027-beaglebone-decrease-PWM-frequency-to-old-value-LCD7-.patch | |||
@@ -1,19 +1,19 @@ | |||
1 | From 22560ed5c9c2a4e693adf5981e47f3b5f363676d Mon Sep 17 00:00:00 2001 | 1 | From 91190bb0f7c8b075011701e44daffc0f1a8ca766 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, 17 Apr 2012 11:25:00 +0200 | 3 | Date: Tue, 17 Apr 2012 11:25:00 +0200 |
4 | Subject: [PATCH 27/29] beaglebone: decrease PWM frequency to old value, LCD7 | 4 | Subject: [PATCH 27/33] beaglebone: decrease PWM frequency to old value, LCD7 |
5 | doesn't like it | 5 | doesn't like it |
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 | 2 +- | 9 | arch/arm/mach-omap2/board-am335xevm.c | 2 +- |
10 | 1 files changed, 1 insertions(+), 1 deletions(-) | 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 74a7e91..b0ee67e 100644 | 13 | index 127516f..4d5238d 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 | @@ -136,7 +136,7 @@ static const struct display_panel disp_panel = { | 16 | @@ -138,7 +138,7 @@ static const struct display_panel disp_panel = { |
17 | /* LCD backlight platform Data */ | 17 | /* LCD backlight platform Data */ |
18 | #define AM335X_BACKLIGHT_MAX_BRIGHTNESS 100 | 18 | #define AM335X_BACKLIGHT_MAX_BRIGHTNESS 100 |
19 | #define AM335X_BACKLIGHT_DEFAULT_BRIGHTNESS 50 | 19 | #define AM335X_BACKLIGHT_DEFAULT_BRIGHTNESS 50 |
@@ -23,5 +23,5 @@ index 74a7e91..b0ee67e 100644 | |||
23 | #define PWM_DEVICE_ID "ecap.0" | 23 | #define PWM_DEVICE_ID "ecap.0" |
24 | 24 | ||
25 | -- | 25 | -- |
26 | 1.7.7.6 | 26 | 1.7.10 |
27 | 27 | ||
diff --git a/recipes-kernel/linux/linux-ti33x-psp-3.2/beaglebone/0028-beaglebone-fix-ehrpwm-backlight.patch b/recipes-kernel/linux/linux-ti33x-psp-3.2/beaglebone/0028-beaglebone-fix-ehrpwm-backlight.patch index 543c2746..3d725d04 100644 --- a/recipes-kernel/linux/linux-ti33x-psp-3.2/beaglebone/0028-beaglebone-fix-ehrpwm-backlight.patch +++ b/recipes-kernel/linux/linux-ti33x-psp-3.2/beaglebone/0028-beaglebone-fix-ehrpwm-backlight.patch | |||
@@ -1,18 +1,18 @@ | |||
1 | From 2ade67b1a3c53567ea131902c3631f7d57b4332f Mon Sep 17 00:00:00 2001 | 1 | From 61314ea39f2f7cbf5e72efa93350820b83b95fd9 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, 17 Apr 2012 12:35:01 +0200 | 3 | Date: Tue, 17 Apr 2012 12:35:01 +0200 |
4 | Subject: [PATCH 28/29] beaglebone: fix ehrpwm backlight | 4 | Subject: [PATCH 28/33] beaglebone: fix ehrpwm backlight |
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 | 1 + | 8 | arch/arm/mach-omap2/board-am335xevm.c | 1 + |
9 | 1 files changed, 1 insertions(+), 0 deletions(-) | 9 | 1 file changed, 1 insertion(+) |
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 b0ee67e..0d20bb1 100644 | 12 | index 4d5238d..24ed0b6 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 | @@ -1434,6 +1434,7 @@ late_initcall(ecap0_init); | 15 | @@ -1436,6 +1436,7 @@ late_initcall(ecap0_init); |
16 | static void enable_ehrpwm1(int evm_id, int profile) | 16 | static void enable_ehrpwm1(int evm_id, int profile) |
17 | { | 17 | { |
18 | ehrpwm_backlight_enable = true; | 18 | ehrpwm_backlight_enable = true; |
@@ -21,5 +21,5 @@ index b0ee67e..0d20bb1 100644 | |||
21 | 21 | ||
22 | /* Setup pwm-backlight for bbtoys7lcd */ | 22 | /* Setup pwm-backlight for bbtoys7lcd */ |
23 | -- | 23 | -- |
24 | 1.7.7.6 | 24 | 1.7.10 |
25 | 25 | ||
diff --git a/recipes-kernel/linux/linux-ti33x-psp-3.2/beaglebone/0029-beaglebone-also-report-cape-revision.patch b/recipes-kernel/linux/linux-ti33x-psp-3.2/beaglebone/0029-beaglebone-also-report-cape-revision.patch index de75a579..86db3fce 100644 --- a/recipes-kernel/linux/linux-ti33x-psp-3.2/beaglebone/0029-beaglebone-also-report-cape-revision.patch +++ b/recipes-kernel/linux/linux-ti33x-psp-3.2/beaglebone/0029-beaglebone-also-report-cape-revision.patch | |||
@@ -1,18 +1,18 @@ | |||
1 | From e6865fbe71c47846a528986effd6b21e4fe3f84b Mon Sep 17 00:00:00 2001 | 1 | From dc1f8ab451ceb72da5d6d2bf8418dc0b0043723c 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, 17 Apr 2012 12:57:38 +0200 | 3 | Date: Tue, 17 Apr 2012 12:57:38 +0200 |
4 | Subject: [PATCH 29/29] beaglebone: also report cape revision | 4 | Subject: [PATCH 29/33] beaglebone: also report cape revision |
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 | 4 +++- | 8 | arch/arm/mach-omap2/board-am335xevm.c | 4 +++- |
9 | 1 files changed, 3 insertions(+), 1 deletions(-) | 9 | 1 file changed, 3 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 0d20bb1..bfcccd9 100644 | 12 | index 24ed0b6..a4e113c 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 | @@ -2097,6 +2097,7 @@ static void beaglebone_cape_setup(struct memory_accessor *mem_acc, void *context | 15 | @@ -2099,6 +2099,7 @@ static void beaglebone_cape_setup(struct memory_accessor *mem_acc, void *context |
16 | int ret; | 16 | int ret; |
17 | char tmp[32]; | 17 | char tmp[32]; |
18 | char name[32]; | 18 | char name[32]; |
@@ -20,7 +20,7 @@ index 0d20bb1..bfcccd9 100644 | |||
20 | char manufacturer[32]; | 20 | char manufacturer[32]; |
21 | 21 | ||
22 | /* get cape specific data */ | 22 | /* get cape specific data */ |
23 | @@ -2119,8 +2120,9 @@ static void beaglebone_cape_setup(struct memory_accessor *mem_acc, void *context | 23 | @@ -2121,8 +2122,9 @@ static void beaglebone_cape_setup(struct memory_accessor *mem_acc, void *context |
24 | 24 | ||
25 | pr_info("BeagleBone cape EEPROM: found eeprom at address 0x%x\n", capecount + 0x53); | 25 | pr_info("BeagleBone cape EEPROM: found eeprom at address 0x%x\n", capecount + 0x53); |
26 | snprintf(name, sizeof(cape_config.name) + 1, "%s", cape_config.name); | 26 | snprintf(name, sizeof(cape_config.name) + 1, "%s", cape_config.name); |
@@ -32,5 +32,5 @@ index 0d20bb1..bfcccd9 100644 | |||
32 | pr_info("BeagleBone cape partnumber: %s\n", tmp); | 32 | pr_info("BeagleBone cape partnumber: %s\n", tmp); |
33 | 33 | ||
34 | -- | 34 | -- |
35 | 1.7.7.6 | 35 | 1.7.10 |
36 | 36 | ||
diff --git a/recipes-kernel/linux/linux-ti33x-psp-3.2/beaglebone/0030-beaglebone-don-t-compare-undefined-characters-it-mak.patch b/recipes-kernel/linux/linux-ti33x-psp-3.2/beaglebone/0030-beaglebone-don-t-compare-undefined-characters-it-mak.patch index 48e8c53b..7e4168fb 100644 --- a/recipes-kernel/linux/linux-ti33x-psp-3.2/beaglebone/0030-beaglebone-don-t-compare-undefined-characters-it-mak.patch +++ b/recipes-kernel/linux/linux-ti33x-psp-3.2/beaglebone/0030-beaglebone-don-t-compare-undefined-characters-it-mak.patch | |||
@@ -1,18 +1,19 @@ | |||
1 | From 6e14ab85bd71ec3831169d665c4e79f646a60df8 Mon Sep 17 00:00:00 2001 | 1 | From 7757a6ad6989fc4baeb7fcd8a1784531cdfc76c8 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, 19 Apr 2012 07:55:55 +0200 | 3 | Date: Thu, 19 Apr 2012 07:55:55 +0200 |
4 | Subject: [PATCH 30/30] beaglebone: don't compare undefined characters, it makes strncomp fail | 4 | Subject: [PATCH 30/33] beaglebone: don't compare undefined characters, it |
5 | makes strncomp fail | ||
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 | 2 +- | 9 | arch/arm/mach-omap2/board-am335xevm.c | 2 +- |
9 | 1 files changed, 1 insertions(+), 1 deletions(-) | 10 | 1 file changed, 1 insertion(+), 1 deletion(-) |
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 bfcccd9..08a0425 100644 | 13 | index a4e113c..f2f03b6 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 | @@ -2152,7 +2152,7 @@ static void beaglebone_cape_setup(struct memory_accessor *mem_acc, void *context | 16 | @@ -2154,7 +2154,7 @@ static void beaglebone_cape_setup(struct memory_accessor *mem_acc, void *context |
16 | beaglebone_lcd3_keys_init(0,0); | 17 | beaglebone_lcd3_keys_init(0,0); |
17 | } | 18 | } |
18 | 19 | ||
@@ -22,5 +23,5 @@ index bfcccd9..08a0425 100644 | |||
22 | dvi_init(0,0); | 23 | dvi_init(0,0); |
23 | } | 24 | } |
24 | -- | 25 | -- |
25 | 1.7.2.5 | 26 | 1.7.10 |
26 | 27 | ||
diff --git a/recipes-kernel/linux/linux-ti33x-psp-3.2/beaglebone/0033-beaglebone-fix-3.5-cape-support.patch b/recipes-kernel/linux/linux-ti33x-psp-3.2/beaglebone/0031-beaglebone-fix-3.5-cape-support.patch index caee6fcf..72df38cf 100644 --- a/recipes-kernel/linux/linux-ti33x-psp-3.2/beaglebone/0033-beaglebone-fix-3.5-cape-support.patch +++ b/recipes-kernel/linux/linux-ti33x-psp-3.2/beaglebone/0031-beaglebone-fix-3.5-cape-support.patch | |||
@@ -1,18 +1,18 @@ | |||
1 | From d698dff8ded6583a447d81362534bacf77b8cbe5 Mon Sep 17 00:00:00 2001 | 1 | From 6114856631437ebac4469713e5b7ec2b1094f536 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, 19 Apr 2012 14:33:53 +0200 | 3 | Date: Thu, 19 Apr 2012 14:33:53 +0200 |
4 | Subject: [PATCH 33/35] beaglebone: fix 3.5" cape support | 4 | Subject: [PATCH 31/33] beaglebone: fix 3.5" cape support |
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 | 42 ++++++++++++++++++++++++++++++++- | 8 | arch/arm/mach-omap2/board-am335xevm.c | 42 ++++++++++++++++++++++++++++++++- |
9 | 1 files changed, 41 insertions(+), 1 deletions(-) | 9 | 1 file changed, 41 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 08a0425..7a4b766 100644 | 12 | index f2f03b6..3adc4ac 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 | @@ -597,6 +597,46 @@ static struct pinmux_config dvi_pin_mux[] = { | 15 | @@ -599,6 +599,46 @@ static struct pinmux_config dvi_pin_mux[] = { |
16 | {NULL, 0}, | 16 | {NULL, 0}, |
17 | }; | 17 | }; |
18 | 18 | ||
@@ -59,7 +59,7 @@ index 08a0425..7a4b766 100644 | |||
59 | /* Module pin mux for Beagleboardtoys 7" LCD cape */ | 59 | /* Module pin mux for Beagleboardtoys 7" LCD cape */ |
60 | static struct pinmux_config bbtoys7_pin_mux[] = { | 60 | static struct pinmux_config bbtoys7_pin_mux[] = { |
61 | {"lcd_data0.lcd_data0", OMAP_MUX_MODE0 | AM33XX_PIN_OUTPUT | 61 | {"lcd_data0.lcd_data0", OMAP_MUX_MODE0 | AM33XX_PIN_OUTPUT |
62 | @@ -1512,7 +1552,7 @@ static void bbtoys7lcd_init(int evm_id, int profile) | 62 | @@ -1514,7 +1554,7 @@ static void bbtoys7lcd_init(int evm_id, int profile) |
63 | 63 | ||
64 | static void bbtoys35lcd_init(int evm_id, int profile) | 64 | static void bbtoys35lcd_init(int evm_id, int profile) |
65 | { | 65 | { |
@@ -69,5 +69,5 @@ index 08a0425..7a4b766 100644 | |||
69 | // we are being stupid and setting pixclock from here instead of da8xx-fb.c | 69 | // we are being stupid and setting pixclock from here instead of da8xx-fb.c |
70 | if (conf_disp_pll(16000000)) { | 70 | if (conf_disp_pll(16000000)) { |
71 | -- | 71 | -- |
72 | 1.7.7.6 | 72 | 1.7.10 |
73 | 73 | ||
diff --git a/recipes-kernel/linux/linux-ti33x-psp-3.2/beaglebone/0034-beaglebone-connect-batterycape-GPIO-to-gpio-charger.patch b/recipes-kernel/linux/linux-ti33x-psp-3.2/beaglebone/0032-beaglebone-connect-batterycape-GPIO-to-gpio-charger.patch index 0a3c70ab..8eb42339 100644 --- a/recipes-kernel/linux/linux-ti33x-psp-3.2/beaglebone/0034-beaglebone-connect-batterycape-GPIO-to-gpio-charger.patch +++ b/recipes-kernel/linux/linux-ti33x-psp-3.2/beaglebone/0032-beaglebone-connect-batterycape-GPIO-to-gpio-charger.patch | |||
@@ -1,18 +1,18 @@ | |||
1 | From 759b49957081a1ccecf7302efc85c5141d00fe69 Mon Sep 17 00:00:00 2001 | 1 | From b81fd612ad4d08415df513e2627b35439cd921e5 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, 25 Apr 2012 12:35:07 +0200 | 3 | Date: Wed, 25 Apr 2012 12:35:07 +0200 |
4 | Subject: [PATCH 34/35] beaglebone: connect batterycape GPIO to gpio-charger | 4 | Subject: [PATCH 32/33] beaglebone: connect batterycape GPIO to gpio-charger |
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 | 46 ++++++++++++++++++++++++++++++++- | 8 | arch/arm/mach-omap2/board-am335xevm.c | 46 ++++++++++++++++++++++++++++++++- |
9 | 1 files changed, 45 insertions(+), 1 deletions(-) | 9 | 1 file changed, 45 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 7a4b766..2bc9b14 100644 | 12 | index 3adc4ac..717bb8c 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 | @@ -133,6 +133,36 @@ static const struct display_panel disp_panel = { | 15 | @@ -135,6 +135,36 @@ static const struct display_panel disp_panel = { |
16 | COLOR_ACTIVE, | 16 | COLOR_ACTIVE, |
17 | }; | 17 | }; |
18 | 18 | ||
@@ -49,7 +49,7 @@ index 7a4b766..2bc9b14 100644 | |||
49 | /* LCD backlight platform Data */ | 49 | /* LCD backlight platform Data */ |
50 | #define AM335X_BACKLIGHT_MAX_BRIGHTNESS 100 | 50 | #define AM335X_BACKLIGHT_MAX_BRIGHTNESS 100 |
51 | #define AM335X_BACKLIGHT_DEFAULT_BRIGHTNESS 50 | 51 | #define AM335X_BACKLIGHT_DEFAULT_BRIGHTNESS 50 |
52 | @@ -504,6 +534,13 @@ static struct pinmux_config haptics_pin_mux[] = { | 52 | @@ -506,6 +536,13 @@ static struct pinmux_config haptics_pin_mux[] = { |
53 | {NULL, 0}, | 53 | {NULL, 0}, |
54 | }; | 54 | }; |
55 | 55 | ||
@@ -63,7 +63,7 @@ index 7a4b766..2bc9b14 100644 | |||
63 | /* Module pin mux for LCDC */ | 63 | /* Module pin mux for LCDC */ |
64 | static struct pinmux_config lcdc_pin_mux[] = { | 64 | static struct pinmux_config lcdc_pin_mux[] = { |
65 | {"lcd_data0.lcd_data0", OMAP_MUX_MODE0 | AM33XX_PIN_OUTPUT | 65 | {"lcd_data0.lcd_data0", OMAP_MUX_MODE0 | AM33XX_PIN_OUTPUT |
66 | @@ -2201,7 +2238,14 @@ static void beaglebone_cape_setup(struct memory_accessor *mem_acc, void *context | 66 | @@ -2203,7 +2240,14 @@ static void beaglebone_cape_setup(struct memory_accessor *mem_acc, void *context |
67 | pr_info("BeagleBone cape: initializing battery cape\n"); | 67 | pr_info("BeagleBone cape: initializing battery cape\n"); |
68 | // gpio1_6, P9_15 lowbat output | 68 | // gpio1_6, P9_15 lowbat output |
69 | // AIN4, P9_33 vbat | 69 | // AIN4, P9_33 vbat |
@@ -80,5 +80,5 @@ index 7a4b766..2bc9b14 100644 | |||
80 | 80 | ||
81 | if (!strncmp("BB-BONE-SERL", cape_config.partnumber, 12)) { | 81 | if (!strncmp("BB-BONE-SERL", cape_config.partnumber, 12)) { |
82 | -- | 82 | -- |
83 | 1.7.7.6 | 83 | 1.7.10 |
84 | 84 | ||
diff --git a/recipes-kernel/linux/linux-ti33x-psp-3.2/beaglebone/0035-beaglebone-add-support-for-CAN-and-RS232-cape.patch b/recipes-kernel/linux/linux-ti33x-psp-3.2/beaglebone/0033-beaglebone-add-support-for-CAN-and-RS232-cape.patch index caf5ad37..e70ebd4a 100644 --- a/recipes-kernel/linux/linux-ti33x-psp-3.2/beaglebone/0035-beaglebone-add-support-for-CAN-and-RS232-cape.patch +++ b/recipes-kernel/linux/linux-ti33x-psp-3.2/beaglebone/0033-beaglebone-add-support-for-CAN-and-RS232-cape.patch | |||
@@ -1,18 +1,18 @@ | |||
1 | From caa3254ea2054e6b5cf6a5c52002dfeba6aa3f4c Mon Sep 17 00:00:00 2001 | 1 | From 0bed6db60e5a5bf78931b7da0376676a14bfce6f 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, 4 May 2012 13:19:45 +0200 | 3 | Date: Fri, 4 May 2012 13:19:45 +0200 |
4 | Subject: [PATCH 35/35] beaglebone: add support for CAN and RS232 cape | 4 | Subject: [PATCH 33/33] beaglebone: add support for CAN and RS232 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 | 36 +++++++++++++++++++++++++++----- | 8 | arch/arm/mach-omap2/board-am335xevm.c | 36 +++++++++++++++++++++++++++------ |
9 | 1 files changed, 30 insertions(+), 6 deletions(-) | 9 | 1 file changed, 30 insertions(+), 6 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 2bc9b14..66d7613 100644 | 12 | index 717bb8c..6e7b203 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 | @@ -951,6 +951,18 @@ static struct pinmux_config tt3201_pin_mux[] = { | 15 | @@ -953,6 +953,18 @@ static struct pinmux_config tt3201_pin_mux[] = { |
16 | {NULL, 0}, | 16 | {NULL, 0}, |
17 | }; | 17 | }; |
18 | 18 | ||
@@ -31,7 +31,7 @@ index 2bc9b14..66d7613 100644 | |||
31 | /* Module pin mux for uart2 */ | 31 | /* Module pin mux for uart2 */ |
32 | static struct pinmux_config uart2_pin_mux[] = { | 32 | static struct pinmux_config uart2_pin_mux[] = { |
33 | {"spi0_sclk.uart2_rxd", OMAP_MUX_MODE1 | AM33XX_SLEWCTRL_SLOW | | 33 | {"spi0_sclk.uart2_rxd", OMAP_MUX_MODE1 | AM33XX_SLEWCTRL_SLOW | |
34 | @@ -2248,12 +2260,24 @@ static void beaglebone_cape_setup(struct memory_accessor *mem_acc, void *context | 34 | @@ -2250,12 +2262,24 @@ static void beaglebone_cape_setup(struct memory_accessor *mem_acc, void *context |
35 | #endif | 35 | #endif |
36 | } | 36 | } |
37 | 37 | ||
@@ -63,5 +63,5 @@ index 2bc9b14..66d7613 100644 | |||
63 | } | 63 | } |
64 | 64 | ||
65 | -- | 65 | -- |
66 | 1.7.7.6 | 66 | 1.7.10 |
67 | 67 | ||
diff --git a/recipes-kernel/linux/linux-ti33x-psp-3.2/led/0001-leds-heartbeat-stop-on-shutdown-reboot-or-panic.patch b/recipes-kernel/linux/linux-ti33x-psp-3.2/led/0001-leds-heartbeat-stop-on-shutdown-reboot-or-panic.patch index 009f8fa6..87b7741b 100644 --- a/recipes-kernel/linux/linux-ti33x-psp-3.2/led/0001-leds-heartbeat-stop-on-shutdown-reboot-or-panic.patch +++ b/recipes-kernel/linux/linux-ti33x-psp-3.2/led/0001-leds-heartbeat-stop-on-shutdown-reboot-or-panic.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From fa1fff60e0f18032378fa97a6951c6f79e24507d Mon Sep 17 00:00:00 2001 | 1 | From 59d23a375a752abc6a6a8ddd935d1b367f69ed3d Mon Sep 17 00:00:00 2001 |
2 | From: Alexander Holler <hol...@ahsoftware.de> | 2 | From: Alexander Holler <hol...@ahsoftware.de> |
3 | Date: Wed, 25 Apr 2012 00:50:03 +0200 | 3 | Date: Wed, 25 Apr 2012 00:50:03 +0200 |
4 | Subject: [PATCH] leds: heartbeat: stop on shutdown, reboot or panic | 4 | Subject: [PATCH] leds: heartbeat: stop on shutdown, reboot or panic |
@@ -63,5 +63,5 @@ index 759c0bb..31c234c 100644 | |||
63 | } | 63 | } |
64 | 64 | ||
65 | -- | 65 | -- |
66 | 1.7.9.5 | 66 | 1.7.10 |
67 | 67 | ||
diff --git a/recipes-kernel/linux/linux-ti33x-psp_3.2.bb b/recipes-kernel/linux/linux-ti33x-psp_3.2.bb index 593d6e7b..63c0532d 100644 --- a/recipes-kernel/linux/linux-ti33x-psp_3.2.bb +++ b/recipes-kernel/linux/linux-ti33x-psp_3.2.bb | |||
@@ -11,8 +11,8 @@ 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 = "baaa0c0425528486efcc70b7696dd6359f10b5bd" | 14 | SRCREV = "720e07b4c1f687b61b147b31c698cb6816d72f01" |
15 | MACHINE_KERNEL_PR_append = "g+gitr${SRCREV}" | 15 | MACHINE_KERNEL_PR_append = "h+gitr${SRCREV}" |
16 | 16 | ||
17 | COMPATIBLE_MACHINE = "(ti33x)" | 17 | COMPATIBLE_MACHINE = "(ti33x)" |
18 | 18 | ||
@@ -878,52 +878,52 @@ PATCHES_OVER_PSP = " \ | |||
878 | file://3.2.16/0020-sparc64-Fix-bootup-crash-on-sun4v.patch \ | 878 | file://3.2.16/0020-sparc64-Fix-bootup-crash-on-sun4v.patch \ |
879 | file://3.2.16/0021-cciss-Initialize-scsi-host-max_sectors-for-tape-driv.patch \ | 879 | file://3.2.16/0021-cciss-Initialize-scsi-host-max_sectors-for-tape-driv.patch \ |
880 | file://3.2.16/0022-cciss-Fix-scsi-tape-io-with-more-than-255-scatter-ga.patch \ | 880 | file://3.2.16/0022-cciss-Fix-scsi-tape-io-with-more-than-255-scatter-ga.patch \ |
881 | file://3.2.16/0024-video-uvesafb-Fix-oops-that-uvesafb-try-to-execute-N.patch \ | 881 | file://3.2.16/0023-video-uvesafb-Fix-oops-that-uvesafb-try-to-execute-N.patch \ |
882 | file://3.2.16/0025-nohz-Fix-stale-jiffies-update-in-tick_nohz_restart.patch \ | 882 | file://3.2.16/0024-nohz-Fix-stale-jiffies-update-in-tick_nohz_restart.patch \ |
883 | file://3.2.16/0026-pch_uart-Fix-MSI-setting-issue.patch \ | 883 | file://3.2.16/0025-pch_uart-Fix-MSI-setting-issue.patch \ |
884 | file://3.2.16/0027-USB-serial-fix-race-between-probe-and-open.patch \ | 884 | file://3.2.16/0026-USB-serial-fix-race-between-probe-and-open.patch \ |
885 | file://3.2.16/0028-USB-pl2303-fix-DTR-RTS-being-raised-on-baud-rate-cha.patch \ | 885 | file://3.2.16/0027-USB-pl2303-fix-DTR-RTS-being-raised-on-baud-rate-cha.patch \ |
886 | file://3.2.16/0029-USB-option-re-add-NOVATELWIRELESS_PRODUCT_HSPA_HIGHS.patch \ | 886 | file://3.2.16/0028-USB-option-re-add-NOVATELWIRELESS_PRODUCT_HSPA_HIGHS.patch \ |
887 | file://3.2.16/0030-USB-ftdi_sio-fix-status-line-change-handling-for-TIO.patch \ | 887 | file://3.2.16/0029-USB-ftdi_sio-fix-status-line-change-handling-for-TIO.patch \ |
888 | file://3.2.16/0031-USB-ftdi_sio-fix-race-condition-in-TIOCMIWAIT-and-ab.patch \ | 888 | file://3.2.16/0030-USB-ftdi_sio-fix-race-condition-in-TIOCMIWAIT-and-ab.patch \ |
889 | file://3.2.16/0032-USB-sierra-add-support-for-Sierra-Wireless-MC7710.patch \ | 889 | file://3.2.16/0031-USB-sierra-add-support-for-Sierra-Wireless-MC7710.patch \ |
890 | file://3.2.16/0033-USB-don-t-clear-urb-dev-in-scatter-gather-library.patch \ | 890 | file://3.2.16/0032-USB-don-t-clear-urb-dev-in-scatter-gather-library.patch \ |
891 | file://3.2.16/0034-USB-don-t-ignore-suspend-errors-for-root-hubs.patch \ | 891 | file://3.2.16/0033-USB-don-t-ignore-suspend-errors-for-root-hubs.patch \ |
892 | file://3.2.16/0035-xhci-don-t-re-enable-IE-constantly.patch \ | 892 | file://3.2.16/0034-xhci-don-t-re-enable-IE-constantly.patch \ |
893 | file://3.2.16/0036-xhci-Don-t-write-zeroed-pointers-to-xHC-registers.patch \ | 893 | file://3.2.16/0035-xhci-Don-t-write-zeroed-pointers-to-xHC-registers.patch \ |
894 | file://3.2.16/0037-xhci-Restore-event-ring-dequeue-pointer-on-resume.patch \ | 894 | file://3.2.16/0036-xhci-Restore-event-ring-dequeue-pointer-on-resume.patch \ |
895 | file://3.2.16/0038-USB-fix-bug-of-device-descriptor-got-from-superspeed.patch \ | 895 | file://3.2.16/0037-USB-fix-bug-of-device-descriptor-got-from-superspeed.patch \ |
896 | file://3.2.16/0039-xHCI-add-XHCI_RESET_ON_RESUME-quirk-for-VIA-xHCI-hos.patch \ | 896 | file://3.2.16/0038-xHCI-add-XHCI_RESET_ON_RESUME-quirk-for-VIA-xHCI-hos.patch \ |
897 | file://3.2.16/0040-xHCI-Correct-the-define-XHCI_LEGACY_DISABLE_SMI.patch \ | 897 | file://3.2.16/0039-xHCI-Correct-the-define-XHCI_LEGACY_DISABLE_SMI.patch \ |
898 | file://3.2.16/0041-fix-tlb-flushing-for-page-table-pages.patch \ | 898 | file://3.2.16/0040-fix-tlb-flushing-for-page-table-pages.patch \ |
899 | file://3.2.16/0042-serial-PL011-clear-pending-interrupts.patch \ | 899 | file://3.2.16/0041-serial-PL011-clear-pending-interrupts.patch \ |
900 | file://3.2.16/0043-serial-PL011-move-interrupt-clearing.patch \ | 900 | file://3.2.16/0042-serial-PL011-move-interrupt-clearing.patch \ |
901 | file://3.2.16/0044-fcaps-clear-the-same-personality-flags-as-suid-when-.patch \ | 901 | file://3.2.16/0043-fcaps-clear-the-same-personality-flags-as-suid-when-.patch \ |
902 | file://3.2.16/0045-ath9k-fix-max-noise-floor-threshold.patch \ | 902 | file://3.2.16/0044-ath9k-fix-max-noise-floor-threshold.patch \ |
903 | file://3.2.16/0046-xhci-Fix-register-save-restore-order.patch \ | 903 | file://3.2.16/0045-xhci-Fix-register-save-restore-order.patch \ |
904 | file://3.2.16/0047-Bluetooth-hci_core-fix-NULL-pointer-dereference-at-u.patch \ | 904 | file://3.2.16/0046-Bluetooth-hci_core-fix-NULL-pointer-dereference-at-u.patch \ |
905 | file://3.2.16/0048-pch_gpio-Support-new-device-LAPIS-Semiconductor-ML78.patch \ | 905 | file://3.2.16/0047-pch_gpio-Support-new-device-LAPIS-Semiconductor-ML78.patch \ |
906 | file://3.2.16/0049-gpio-Add-missing-spin_lock_init-in-gpio-pch-driver.patch \ | 906 | file://3.2.16/0048-gpio-Add-missing-spin_lock_init-in-gpio-pch-driver.patch \ |
907 | file://3.2.16/0050-usb-gadget-pch_udc-Fix-disconnect-issue.patch \ | 907 | file://3.2.16/0049-usb-gadget-pch_udc-Fix-disconnect-issue.patch \ |
908 | file://3.2.16/0051-usb-gadget-pch_udc-Fix-wrong-return-value.patch \ | 908 | file://3.2.16/0050-usb-gadget-pch_udc-Fix-wrong-return-value.patch \ |
909 | file://3.2.16/0052-usb-gadget-pch_udc-Fix-USB-suspend-issue.patch \ | 909 | file://3.2.16/0051-usb-gadget-pch_udc-Fix-USB-suspend-issue.patch \ |
910 | file://3.2.16/0053-usb-gadget-pch_udc-Fix-usb-gadget-pch_udc-Fix-ether-.patch \ | 910 | file://3.2.16/0052-usb-gadget-pch_udc-Fix-usb-gadget-pch_udc-Fix-ether-.patch \ |
911 | file://3.2.16/0054-usb-gadget-pch_udc-Reduce-redundant-interrupt.patch \ | 911 | file://3.2.16/0053-usb-gadget-pch_udc-Reduce-redundant-interrupt.patch \ |
912 | file://3.2.16/0055-ACPICA-Fix-to-allow-region-arguments-to-reference-ot.patch \ | 912 | file://3.2.16/0054-ACPICA-Fix-to-allow-region-arguments-to-reference-ot.patch \ |
913 | file://3.2.16/0056-security-fix-compile-error-in-commoncap.c.patch \ | 913 | file://3.2.16/0055-security-fix-compile-error-in-commoncap.c.patch \ |
914 | file://3.2.16/0057-pch_gbe-Do-not-abort-probe-on-bad-MAC.patch \ | 914 | file://3.2.16/0056-pch_gbe-Do-not-abort-probe-on-bad-MAC.patch \ |
915 | file://3.2.16/0058-pch_gbe-memory-corruption-calling-pch_gbe_validate_o.patch \ | 915 | file://3.2.16/0057-pch_gbe-memory-corruption-calling-pch_gbe_validate_o.patch \ |
916 | file://3.2.16/0059-pch_dma-Support-new-device-LAPIS-Semiconductor-ML783.patch \ | 916 | file://3.2.16/0058-pch_dma-Support-new-device-LAPIS-Semiconductor-ML783.patch \ |
917 | file://3.2.16/0060-spi-topcliff-pch-fix-Wuninitialized-warning.patch \ | 917 | file://3.2.16/0059-spi-topcliff-pch-fix-Wuninitialized-warning.patch \ |
918 | file://3.2.16/0061-spi-topcliff-pch-Support-new-device-LAPIS-Semiconduc.patch \ | 918 | file://3.2.16/0060-spi-topcliff-pch-Support-new-device-LAPIS-Semiconduc.patch \ |
919 | file://3.2.16/0062-Bluetooth-Adding-USB-device-13d3-3375-as-an-Atheros-.patch \ | 919 | file://3.2.16/0061-Bluetooth-Adding-USB-device-13d3-3375-as-an-Atheros-.patch \ |
920 | file://3.2.16/0063-Bluetooth-Add-Atheros-maryann-PIDVID-support.patch \ | 920 | file://3.2.16/0062-Bluetooth-Add-Atheros-maryann-PIDVID-support.patch \ |
921 | file://3.2.16/0064-Bluetooth-Add-support-for-BCM20702A0-0a5c-21e3.patch \ | 921 | file://3.2.16/0063-Bluetooth-Add-support-for-BCM20702A0-0a5c-21e3.patch \ |
922 | file://3.2.16/0065-futex-Do-not-leak-robust-list-to-unprivileged-proces.patch \ | 922 | file://3.2.16/0064-futex-Do-not-leak-robust-list-to-unprivileged-proces.patch \ |
923 | file://3.2.16/0066-drm-radeon-kms-fix-the-regression-of-DVI-connector-c.patch \ | 923 | file://3.2.16/0065-drm-radeon-kms-fix-the-regression-of-DVI-connector-c.patch \ |
924 | file://3.2.16/0067-drm-radeon-disable-MSI-on-RV515.patch \ | 924 | file://3.2.16/0066-drm-radeon-disable-MSI-on-RV515.patch \ |
925 | file://3.2.16/0068-drm-radeon-fix-load-detect-on-rn50-with-hardcoded-ED.patch \ | 925 | file://3.2.16/0067-drm-radeon-fix-load-detect-on-rn50-with-hardcoded-ED.patch \ |
926 | file://3.2.16/0069-Linux-3.2.16.patch \ | 926 | file://3.2.16/0068-Linux-3.2.16.patch \ |
927 | file://led/0001-leds-heartbeat-stop-on-shutdown-reboot-or-panic.patch \ | 927 | file://led/0001-leds-heartbeat-stop-on-shutdown-reboot-or-panic.patch \ |
928 | file://beaglebone/0001-f_rndis-HACK-around-undefined-variables.patch \ | 928 | file://beaglebone/0001-f_rndis-HACK-around-undefined-variables.patch \ |
929 | file://beaglebone/0002-da8xx-fb-add-DVI-support-for-beaglebone.patch \ | 929 | file://beaglebone/0002-da8xx-fb-add-DVI-support-for-beaglebone.patch \ |
@@ -955,7 +955,7 @@ PATCHES_OVER_PSP = " \ | |||
955 | file://beaglebone/0028-beaglebone-fix-ehrpwm-backlight.patch \ | 955 | file://beaglebone/0028-beaglebone-fix-ehrpwm-backlight.patch \ |
956 | file://beaglebone/0029-beaglebone-also-report-cape-revision.patch \ | 956 | file://beaglebone/0029-beaglebone-also-report-cape-revision.patch \ |
957 | file://beaglebone/0030-beaglebone-don-t-compare-undefined-characters-it-mak.patch \ | 957 | file://beaglebone/0030-beaglebone-don-t-compare-undefined-characters-it-mak.patch \ |
958 | file://beaglebone/0033-beaglebone-fix-3.5-cape-support.patch \ | 958 | file://beaglebone/0031-beaglebone-fix-3.5-cape-support.patch \ |
959 | file://beaglebone/0034-beaglebone-connect-batterycape-GPIO-to-gpio-charger.patch \ | 959 | file://beaglebone/0032-beaglebone-connect-batterycape-GPIO-to-gpio-charger.patch \ |
960 | file://beaglebone/0035-beaglebone-add-support-for-CAN-and-RS232-cape.patch \ | 960 | file://beaglebone/0033-beaglebone-add-support-for-CAN-and-RS232-cape.patch \ |
961 | " | 961 | " |