diff options
| -rw-r--r-- | multitech/recipes/linux/linux-2.6.39-at91/mtocgd3/linux-2.6.39.4-mach-at91-mtocgd3.patch | 23 | ||||
| -rw-r--r-- | multitech/recipes/linux/linux_2.6.39-at91.bb | 1 |
2 files changed, 10 insertions, 14 deletions
diff --git a/multitech/recipes/linux/linux-2.6.39-at91/mtocgd3/linux-2.6.39.4-mach-at91-mtocgd3.patch b/multitech/recipes/linux/linux-2.6.39-at91/mtocgd3/linux-2.6.39.4-mach-at91-mtocgd3.patch index 6fd737b..5c1ae8f 100644 --- a/multitech/recipes/linux/linux-2.6.39-at91/mtocgd3/linux-2.6.39.4-mach-at91-mtocgd3.patch +++ b/multitech/recipes/linux/linux-2.6.39-at91/mtocgd3/linux-2.6.39.4-mach-at91-mtocgd3.patch @@ -1,7 +1,7 @@ Index: linux-2.6.39.4/arch/arm/mach-at91/board-sam9x5cm.c =================================================================== ---- linux-2.6.39.4.orig/arch/arm/mach-at91/board-sam9x5cm.c 2013-03-07 17:07:04.793136604 -0600 -+++ linux-2.6.39.4/arch/arm/mach-at91/board-sam9x5cm.c 2013-03-07 17:07:04.793136604 -0600 +--- linux-2.6.39.4.orig/arch/arm/mach-at91/board-sam9x5cm.c 2013-02-19 09:38:45.180035681 -0600 ++++ linux-2.6.39.4/arch/arm/mach-at91/board-sam9x5cm.c 2013-02-27 16:36:25.684073131 -0600 @@ -18,6 +18,9 @@ #include <linux/platform_device.h> #include <linux/spi/flash.h> @@ -205,8 +205,8 @@ Index: linux-2.6.39.4/arch/arm/mach-at91/board-sam9x5cm.c } Index: linux-2.6.39.4/arch/arm/mach-at91/board-sam9x5ek.c =================================================================== ---- linux-2.6.39.4.orig/arch/arm/mach-at91/board-sam9x5ek.c 2013-03-07 17:07:03.293174822 -0600 -+++ linux-2.6.39.4/arch/arm/mach-at91/board-sam9x5ek.c 2013-03-08 10:11:42.653155621 -0600 +--- linux-2.6.39.4.orig/arch/arm/mach-at91/board-sam9x5ek.c 2013-02-19 09:38:43.680033046 -0600 ++++ linux-2.6.39.4/arch/arm/mach-at91/board-sam9x5ek.c 2013-02-19 09:38:45.180035681 -0600 @@ -23,6 +23,7 @@ #include <linux/leds.h> #include <linux/clk.h> @@ -340,7 +340,7 @@ Index: linux-2.6.39.4/arch/arm/mach-at91/board-sam9x5ek.c at91_add_device_mci(0, &mci0_data); /* I2C */ if (cm_config & CM_CONFIG_I2C0_ENABLE) -@@ -405,6 +443,18 @@ +@@ -405,6 +443,15 @@ at91_add_device_i2c(0, ek_i2c_devices, ARRAY_SIZE(ek_i2c_devices)); @@ -351,15 +351,12 @@ Index: linux-2.6.39.4/arch/arm/mach-at91/board-sam9x5ek.c + if (wl12xx_set_platform_data(&mtr_wlan_data)) + pr_err("error setting wl12xx data\n"); + -+ // MTOCGD3: enable wl1271 chip so it is detected by SDIO scan on start up -+ wl12xx_enable(1); -+ +/* MTOCGD3: no LCD */ +#if 0 if (cpu_is_at91sam9g25()) { /* ISI */ /* NOTE: PCK0 provides ISI_MCK to the ISI module. -@@ -430,13 +480,10 @@ +@@ -430,13 +477,10 @@ /* Touch Screen */ at91_add_device_tsadcc(&ek_tsadcc_data); } @@ -376,7 +373,7 @@ Index: linux-2.6.39.4/arch/arm/mach-at91/board-sam9x5ek.c #if 0 if (cpu_is_at91sam9x25() || cpu_is_at91sam9x35()) -@@ -448,6 +495,8 @@ +@@ -448,6 +492,8 @@ at91_add_device_can(0, NULL); #endif @@ -385,7 +382,7 @@ Index: linux-2.6.39.4/arch/arm/mach-at91/board-sam9x5ek.c if (cpu_is_at91sam9x25() || cpu_is_at91sam9x35()) /* this conflicts with usart.1 */ at91_add_device_can(1, NULL); -@@ -474,6 +523,9 @@ +@@ -474,6 +520,9 @@ else if (config_isi_enabled) printk(KERN_CRIT "AT91: ISI conficts with MCI1, disable MCI1\n"); @@ -397,8 +394,8 @@ Index: linux-2.6.39.4/arch/arm/mach-at91/board-sam9x5ek.c MACHINE_START(AT91SAM9X5EK, "Atmel AT91SAM9X5-EK") Index: linux-2.6.39.4/arch/arm/mach-at91/at91sam9x5_devices.c =================================================================== ---- linux-2.6.39.4.orig/arch/arm/mach-at91/at91sam9x5_devices.c 2013-03-07 17:07:03.793204785 -0600 -+++ linux-2.6.39.4/arch/arm/mach-at91/at91sam9x5_devices.c 2013-03-07 17:07:04.793136604 -0600 +--- linux-2.6.39.4.orig/arch/arm/mach-at91/at91sam9x5_devices.c 2013-02-19 09:38:44.680033189 -0600 ++++ linux-2.6.39.4/arch/arm/mach-at91/at91sam9x5_devices.c 2013-02-19 15:28:04.792006181 -0600 @@ -543,11 +543,11 @@ #endif diff --git a/multitech/recipes/linux/linux_2.6.39-at91.bb b/multitech/recipes/linux/linux_2.6.39-at91.bb index dc1e89f..a309023 100644 --- a/multitech/recipes/linux/linux_2.6.39-at91.bb +++ b/multitech/recipes/linux/linux_2.6.39-at91.bb @@ -19,7 +19,6 @@ SRC_URI_append_mtocgd3 = " \ file://linux-2.6.39.4-ledtrig-netdev.patch \ file://linux-2.6.39.4-at91sam9x5-extreset.patch \ file://linux-2.6.39.4-atmel-mci-force-detect.patch \ - file://linux-2.6.39.4-atmel-mci-module-alias.patch \ file://linux-2.6.39.4-wl12xx-sdio-irq.patch \ file://linux-2.6.35.14-at91-gpio-pullup.patch \ file://linux-2.6.32.3-atmel_spi.patch \ |