diff options
| -rw-r--r-- | multitech/recipes/linux/linux-2.6.39.4/mtocgd3/linux-2.6.39.4-mach-at91-mtocgd3.patch | 85 |
1 files changed, 52 insertions, 33 deletions
diff --git a/multitech/recipes/linux/linux-2.6.39.4/mtocgd3/linux-2.6.39.4-mach-at91-mtocgd3.patch b/multitech/recipes/linux/linux-2.6.39.4/mtocgd3/linux-2.6.39.4-mach-at91-mtocgd3.patch index e8c5add..5c1ae8f 100644 --- a/multitech/recipes/linux/linux-2.6.39.4/mtocgd3/linux-2.6.39.4-mach-at91-mtocgd3.patch +++ b/multitech/recipes/linux/linux-2.6.39.4/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-02-06 09:03:14.041869154 -0600 -+++ linux-2.6.39.4/arch/arm/mach-at91/board-sam9x5cm.c 2013-02-06 09:19:50.359999320 -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> @@ -53,8 +53,10 @@ Index: linux-2.6.39.4/arch/arm/mach-at91/board-sam9x5cm.c + .name = "UBoot Redundant Config", + .offset = 1408*1024, + .size = 640*1024, -+ }, -+ { + }, + { +- .name = "Partition 2", +- .offset = MTDPART_OFS_NXTBLK, + .name = "uImage", + .offset = 2*1024*1024, + .size = 6*1024*1024, @@ -68,10 +70,8 @@ Index: linux-2.6.39.4/arch/arm/mach-at91/board-sam9x5cm.c + .name = "Oem Config", + .offset = 16*1024*1024, + .size = 8*1024*1024, - }, - { -- .name = "Partition 2", -- .offset = MTDPART_OFS_NXTBLK, ++ }, ++ { + .name = "Rootfs", + .offset = 24*1024*1024, .size = MTDPART_SIZ_FULL, @@ -109,32 +109,51 @@ Index: linux-2.6.39.4/arch/arm/mach-at91/board-sam9x5cm.c /* configure chip-select 3 (NAND) */ sam9_smc_configure(3, &cm_nand_smc_config); -@@ -189,9 +240,16 @@ +@@ -189,25 +240,71 @@ * LEDs */ static struct gpio_led cm_leds[] = { -+ { /* Network Interface LED */ -+ .name = "network:green:activity", -+ .gpio = AT91_PIN_PA29, -+ .active_low = 1 -+ }, -+// MTOCGD3: disable kernel driven LEDs, driven by mts-io instead -+#if 0 - { /* "left" led, blue, userled1 */ +- { /* "left" led, blue, userled1 */ - .name = "d1", - .gpio = AT91_PIN_PB18, -+ .name = "status", ++ { /* default status LED */ ++ .name = "led-a", + .gpio = AT91_PIN_PA24, ++ .active_low = 1, .default_trigger = "heartbeat", }, - { /* "right" led, red, userled2 */ -@@ -200,6 +258,32 @@ - .active_low = 1, - .default_trigger = "mmc0", +- { /* "right" led, red, userled2 */ +- .name = "d2", +- .gpio = AT91_PIN_PD21, +- .active_low = 1, +- .default_trigger = "mmc0", ++ { ++ .name = "led-b", ++ .gpio = AT91_PIN_PA29, ++ .active_low = 1 ++ }, ++ { ++ .name = "led-c", ++ .gpio = AT91_PIN_PA25, ++ .active_low = 1 ++ }, ++ { ++ .name = "led-d", ++ .gpio = AT91_PIN_PA26, ++ .active_low = 1 ++ }, ++ { ++ .name = "led-e", ++ .gpio = AT91_PIN_PA27, ++ .active_low = 1 ++ }, ++ { ++ .name = "led-f", ++ .gpio = AT91_PIN_PA28, ++ .active_low = 1 }, -+#endif -+}; -+ + }; + + +uint8_t mts_id_eeprom[512]; + @@ -158,10 +177,10 @@ Index: linux-2.6.39.4/arch/arm/mach-at91/board-sam9x5cm.c + .byte_len = SZ_4K / 8, + .page_size = 16, + .setup = mts_id_eeprom_load, - }; - ++}; ++ /* -@@ -207,7 +291,8 @@ + * I2C Devices */ static struct i2c_board_info __initdata cm_i2c_devices[] = { { @@ -171,7 +190,7 @@ Index: linux-2.6.39.4/arch/arm/mach-at91/board-sam9x5cm.c }, }; -@@ -234,8 +319,12 @@ +@@ -234,8 +331,12 @@ /* LEDs */ at91_gpio_leds(cm_leds, ARRAY_SIZE(cm_leds)); @@ -186,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-02-06 09:03:12.541870178 -0600 -+++ linux-2.6.39.4/arch/arm/mach-at91/board-sam9x5ek.c 2013-02-06 09:03:14.541952299 -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> @@ -375,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-02-06 09:03:13.541883138 -0600 -+++ linux-2.6.39.4/arch/arm/mach-at91/at91sam9x5_devices.c 2013-02-06 09:03:14.541952299 -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 |