summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcin Juszkiewicz <hrw@openedhand.com>2007-10-17 09:03:49 +0000
committerMarcin Juszkiewicz <hrw@openedhand.com>2007-10-17 09:03:49 +0000
commit26ace33323aff802f7a11d91fe789eda80580131 (patch)
treea591f1dd7f3e2a095017a39982b6cf729acc09b7
parent81d6b0622b8316fd0949df9065dcad8460eb5786 (diff)
downloadpoky-26ace33323aff802f7a11d91fe789eda80580131.tar.gz
linux-rp: add no-SCR-check patch to 2.6.23
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2895 311d38ba-8fff-0310-9ca6-ca027cbcb966
-rw-r--r--meta/packages/linux/linux-rp-2.6.23/mmcsd_no_scr_check-r2.patch29
-rw-r--r--meta/packages/linux/linux-rp_2.6.23.bb3
2 files changed, 31 insertions, 1 deletions
diff --git a/meta/packages/linux/linux-rp-2.6.23/mmcsd_no_scr_check-r2.patch b/meta/packages/linux/linux-rp-2.6.23/mmcsd_no_scr_check-r2.patch
new file mode 100644
index 0000000000..ac2245f088
--- /dev/null
+++ b/meta/packages/linux/linux-rp-2.6.23/mmcsd_no_scr_check-r2.patch
@@ -0,0 +1,29 @@
1---
2 drivers/mmc/core/sd.c | 11 ++++++-----
3 1 file changed, 6 insertions(+), 5 deletions(-)
4
5Index: linux-2.6.23/drivers/mmc/core/sd.c
6===================================================================
7--- linux-2.6.23.orig/drivers/mmc/core/sd.c 2007-10-17 11:33:26.000000000 +0200
8+++ linux-2.6.23/drivers/mmc/core/sd.c 2007-10-17 11:33:49.000000000 +0200
9@@ -173,14 +173,15 @@
10
11 scr_struct = UNSTUFF_BITS(resp, 60, 4);
12 if (scr_struct != 0) {
13- printk(KERN_ERR "%s: unrecognised SCR structure version %d\n",
14+ printk(KERN_WARNING "%s: unrecognised SCR structure version %d\n",
15 mmc_hostname(card->host), scr_struct);
16- return -EINVAL;
17+ scr->sda_vsn = 0;
18+ scr->bus_widths = 0;
19+ } else {
20+ scr->sda_vsn = UNSTUFF_BITS(resp, 56, 4);
21+ scr->bus_widths = UNSTUFF_BITS(resp, 48, 4);
22 }
23
24- scr->sda_vsn = UNSTUFF_BITS(resp, 56, 4);
25- scr->bus_widths = UNSTUFF_BITS(resp, 48, 4);
26-
27 return 0;
28 }
29
diff --git a/meta/packages/linux/linux-rp_2.6.23.bb b/meta/packages/linux/linux-rp_2.6.23.bb
index e55bc63d65..6dd46e16cb 100644
--- a/meta/packages/linux/linux-rp_2.6.23.bb
+++ b/meta/packages/linux/linux-rp_2.6.23.bb
@@ -1,6 +1,6 @@
1require linux-rp.inc 1require linux-rp.inc
2 2
3PR = "r2" 3PR = "r3"
4 4
5DEFAULT_PREFERENCE_qemuarm = "-1" 5DEFAULT_PREFERENCE_qemuarm = "-1"
6DEFAULT_PREFERENCE_qemux86 = "-1" 6DEFAULT_PREFERENCE_qemux86 = "-1"
@@ -45,6 +45,7 @@ SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.23.tar.bz2 \
45 ${RPSRC}/logo_oz-r2.patch.bz2;patch=1;status=unmergable \ 45 ${RPSRC}/logo_oz-r2.patch.bz2;patch=1;status=unmergable \
46 ${RPSRC}/pxa-linking-bug.patch;patch=1;status=unmergable \ 46 ${RPSRC}/pxa-linking-bug.patch;patch=1;status=unmergable \
47 ${RPSRC}/mmcsd_large_cards-r1.patch;patch=1;status=hack \ 47 ${RPSRC}/mmcsd_large_cards-r1.patch;patch=1;status=hack \
48 file://mmcsd_no_scr_check-r2.patch;patch=1 \
48 ${RPSRC}/integrator_rgb-r1.patch;patch=1;status=hack \ 49 ${RPSRC}/integrator_rgb-r1.patch;patch=1;status=hack \
49 ${RPSRC}/pxa_cf_initorder_hack-r1.patch;patch=1;status=hack \ 50 ${RPSRC}/pxa_cf_initorder_hack-r1.patch;patch=1;status=hack \
50 file://pxa-serial-hack.patch;patch=1;status=hack \ 51 file://pxa-serial-hack.patch;patch=1;status=hack \