summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--recipes/linux/linux-2.6.32/mtcdp/linux-2.6.32.3-at91_mci.patch49
-rw-r--r--recipes/linux/linux_2.6.32.bb2
2 files changed, 39 insertions, 12 deletions
diff --git a/recipes/linux/linux-2.6.32/mtcdp/linux-2.6.32.3-at91_mci.patch b/recipes/linux/linux-2.6.32/mtcdp/linux-2.6.32.3-at91_mci.patch
index 3d4296aebd..8ef607f8ff 100644
--- a/recipes/linux/linux-2.6.32/mtcdp/linux-2.6.32.3-at91_mci.patch
+++ b/recipes/linux/linux-2.6.32/mtcdp/linux-2.6.32.3-at91_mci.patch
@@ -1,12 +1,39 @@
-diff -uprN -X linux-2.6.32.3/Documentation/dontdiff linux-2.6.32.3-vanilla/drivers/mmc/host/at91_mci.c linux-2.6.32.3/drivers/mmc/host/at91_mci.c
---- linux-2.6.32.3-vanilla/drivers/mmc/host/at91_mci.c 2010-01-06 17:07:45.000000000 -0600
-+++ linux-2.6.32.3/drivers/mmc/host/at91_mci.c 2010-09-17 10:42:23.000000000 -0500
-@@ -1017,7 +1017,7 @@ static int __init at91_mci_probe(struct
- host->bus_mode = 0;
- host->board = pdev->dev.platform_data;
- if (host->board->wire4) {
+diff -urN -x CVS linux-2.6.32/drivers/mmc/host/at91_mci.c linux-2.6/drivers/mmc/host/at91_mci.c
+--- linux-2.6.32/drivers/mmc/host/at91_mci.c 2010-01-28 20:30:25.000000000 +0200
++++ linux-2.6/drivers/mmc/host/at91_mci.c 2009-12-14 21:55:58.000000000 +0200
+@@ -201,7 +201,7 @@
+ len = data->sg_len;
+
+ /* AT91SAM926[0/3] Data Write Operation and number of bytes erratum */
+- if (cpu_is_at91sam9260() || cpu_is_at91sam9263())
++ if (cpu_is_at91sam9260() || cpu_is_at91sam9263() || cpu_is_at91sam9g20())
+ if (host->total_length == 12)
+ memset(dmabuf, 0, 12);
+
+@@ -461,7 +461,7 @@
+ at91_mci_write(host, AT91_MCI_DTOR, AT91_MCI_DTOMUL_1M | AT91_MCI_DTOCYC);
+ mr = AT91_MCI_PDCMODE | 0x34a;
+
+- if (cpu_is_at91sam9260() || cpu_is_at91sam9263())
++ if (cpu_is_at91sam9260() || cpu_is_at91sam9263() || cpu_is_at91sam9g20())
+ mr |= AT91_MCI_RDPROOF | AT91_MCI_WRPROOF;
+
+ at91_mci_write(host, AT91_MCI_MR, mr);
+@@ -617,7 +617,7 @@
+ * AT91SAM926[0/3] Data Write Operation and
+ * number of bytes erratum
+ */
+- if (cpu_is_at91sam9260 () || cpu_is_at91sam9263())
++ if (cpu_is_at91sam9260 () || cpu_is_at91sam9263() || cpu_is_at91sam9g20())
+ if (host->total_length < 12)
+ host->total_length = 12;
+
+@@ -1017,7 +1017,7 @@
+ host->bus_mode = 0;
+ host->board = pdev->dev.platform_data;
+ if (host->board->wire4) {
- if (cpu_is_at91sam9260() || cpu_is_at91sam9263())
-+ if (cpu_is_at91sam9260() || cpu_is_at91sam9g20() || cpu_is_at91sam9263())
- mmc->caps |= MMC_CAP_4_BIT_DATA;
- else
- dev_warn(&pdev->dev, "4 wire bus mode not supported"
++ if (cpu_is_at91sam9260() || cpu_is_at91sam9263() || cpu_is_at91sam9g20())
+ mmc->caps |= MMC_CAP_4_BIT_DATA;
+ else
+ dev_warn(&pdev->dev, "4 wire bus mode not supported"
diff --git a/recipes/linux/linux_2.6.32.bb b/recipes/linux/linux_2.6.32.bb
index 32fabdb4b8..f337561500 100644
--- a/recipes/linux/linux_2.6.32.bb
+++ b/recipes/linux/linux_2.6.32.bb
@@ -1,6 +1,6 @@
require linux.inc
-PR = "r4"
+PR = "r5"
S = "${WORKDIR}/linux-${PV}"