diff options
| author | James Maki <jmaki@multitech.com> | 2010-09-17 11:28:44 -0500 |
|---|---|---|
| committer | Jesse Gilles <jgilles@multitech.com> | 2010-09-17 12:43:48 -0500 |
| commit | 04b7f6c327cbf5d900883c1e614aecfa77bb40c1 (patch) | |
| tree | 30bc494271878bd2df8c524840896d715c553c2c | |
| parent | 0ad3155b997b79703f95a357fc5490cba141be99 (diff) | |
update linux-2.6.32.3 kernel patches
- patch at91_mci to use 4 wire mode for sam9g20
| -rw-r--r-- | recipes/linux/linux-2.6.32/mtcdp/linux-2.6.32.3-at91_mci.patch | 12 | ||||
| -rw-r--r-- | recipes/linux/linux-2.6.32/mtcdp/linux-2.6.32.3-mach-at91.patch | 8 | ||||
| -rw-r--r-- | recipes/linux/linux_2.6.32.bb | 1 |
3 files changed, 17 insertions, 4 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 new file mode 100644 index 0000000000..3d4296aebd --- /dev/null +++ b/recipes/linux/linux-2.6.32/mtcdp/linux-2.6.32.3-at91_mci.patch @@ -0,0 +1,12 @@ +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) { +- 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" diff --git a/recipes/linux/linux-2.6.32/mtcdp/linux-2.6.32.3-mach-at91.patch b/recipes/linux/linux-2.6.32/mtcdp/linux-2.6.32.3-mach-at91.patch index 0a6d8077d8..03389ce29b 100644 --- a/recipes/linux/linux-2.6.32/mtcdp/linux-2.6.32.3-mach-at91.patch +++ b/recipes/linux/linux-2.6.32/mtcdp/linux-2.6.32.3-mach-at91.patch @@ -1,6 +1,6 @@ diff -uprN -X linux-2.6.32.3/Documentation/dontdiff linux-2.6.32.3-vanilla/arch/arm/mach-at91/at91sam9260_devices.c linux-2.6.32.3/arch/arm/mach-at91/at91sam9260_devices.c --- linux-2.6.32.3-vanilla/arch/arm/mach-at91/at91sam9260_devices.c 2010-01-06 17:07:45.000000000 -0600 -+++ linux-2.6.32.3/arch/arm/mach-at91/at91sam9260_devices.c 2010-09-09 10:24:26.000000000 -0500 ++++ linux-2.6.32.3/arch/arm/mach-at91/at91sam9260_devices.c 2010-09-17 10:36:01.000000000 -0500 @@ -183,9 +183,9 @@ void __init at91_add_device_eth(struct a at91_set_B_periph(AT91_PIN_PA25, 0); /* ERX2 */ at91_set_B_periph(AT91_PIN_PA26, 0); /* ERX3 */ @@ -33,7 +33,7 @@ diff -uprN -X linux-2.6.32.3/Documentation/dontdiff linux-2.6.32.3-vanilla/arch/ { diff -uprN -X linux-2.6.32.3/Documentation/dontdiff linux-2.6.32.3-vanilla/arch/arm/mach-at91/board-sam9g20ek.c linux-2.6.32.3/arch/arm/mach-at91/board-sam9g20ek.c --- linux-2.6.32.3-vanilla/arch/arm/mach-at91/board-sam9g20ek.c 2010-01-06 17:07:45.000000000 -0600 -+++ linux-2.6.32.3/arch/arm/mach-at91/board-sam9g20ek.c 2010-09-09 10:24:26.000000000 -0500 ++++ linux-2.6.32.3/arch/arm/mach-at91/board-sam9g20ek.c 2010-09-17 10:45:36.000000000 -0500 @@ -27,6 +27,8 @@ #include <linux/gpio_keys.h> #include <linux/input.h> @@ -71,7 +71,7 @@ diff -uprN -X linux-2.6.32.3/Documentation/dontdiff linux-2.6.32.3-vanilla/arch/ + at91_set_gpio_input(AT91_PIN_PA24, 0); + + /* -+ * PA24 and PA23 are used as ID pins on MTCBA and I2C pins on MTCDP. ++ * PA24 and PA23 are used as ID pins on MTCBA/MTCDP-0.0 and I2C pins on MTCDP-1.0. + * + * MTCBA Rev. B: 0x01, C: 0x02, D: 0x03 + * MTCDP Rev. A reads as 0x00 with TWCK and TWD pulled high @@ -82,7 +82,7 @@ diff -uprN -X linux-2.6.32.3/Documentation/dontdiff linux-2.6.32.3-vanilla/arch/ + i2c_present = !tmp; + + /* -+ * The GPS receiver is either at US2 on MTCBA and US3 on MTCDP. ++ * The GPS receiver is either at US2 on MTCBA/MTCDP-0.0 and US3 on MTCDP-1.0. + */ + if (i2c_present) { + at91_register_uart(AT91SAM9260_ID_US3, 3, ATMEL_UART_CTS | ATMEL_UART_RTS); diff --git a/recipes/linux/linux_2.6.32.bb b/recipes/linux/linux_2.6.32.bb index 23025cdce3..32fabdb4b8 100644 --- a/recipes/linux/linux_2.6.32.bb +++ b/recipes/linux/linux_2.6.32.bb @@ -34,6 +34,7 @@ SRC_URI_mtcdp = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2;n file://linux-2.6.32.3-option.patch;patch=1 \ file://linux-2.6.32.3-sierra.patch;patch=1 \ file://linux-2.6.32.3-atmel_spi.patch;patch=1 \ + file://linux-2.6.32.3-at91_mci.patch;patch=1 \ " SRC_URI[build.md5sum] = "6bd3c5fea1e88bb4d0948ec3688bd8f6" SRC_URI[build.sha256sum] = "e7526a7ae7210bc7c4f4837e9d8a666f9b126d59bee16015c41c5850d29c841f" |