diff options
| author | Mike Fiore <mfiore@multitech.com> | 2013-05-01 15:07:16 -0500 |
|---|---|---|
| committer | Mike Fiore <mfiore@multitech.com> | 2013-05-01 15:07:16 -0500 |
| commit | ab454c6117ff3692c380a2da737d179e461d2e49 (patch) | |
| tree | d258fa4b8e3088d4da1196511bd62e4dc9f9e1d7 | |
| parent | c93dc7fcad90d55f1a1592ca0635d9cec3927e15 (diff) | |
linux-2.6.39-at91: add heartbeat attribute to led-a in leds-gpio
| -rw-r--r-- | multitech/conf/machine/mtocgd.conf | 2 | ||||
| -rw-r--r-- | multitech/recipes/linux/linux-2.6.39-at91/mtocgd/linux-2.6.39.4-mach-at91-mtocgd.patch | 25 |
2 files changed, 13 insertions, 14 deletions
diff --git a/multitech/conf/machine/mtocgd.conf b/multitech/conf/machine/mtocgd.conf index 94a3cb9..d0aa696 100644 --- a/multitech/conf/machine/mtocgd.conf +++ b/multitech/conf/machine/mtocgd.conf @@ -7,7 +7,7 @@ TARGET_ARCH = "arm" PREFERRED_PROVIDER_virtual/kernel = "linux" PREFERRED_VERSION_linux = "2.6.39-at91" -MACHINE_KERNEL_PR = "r2" +MACHINE_KERNEL_PR = "r3" PREFERRED_VERSION_mts-io ?= "0.6.2" KERNEL_IMAGETYPE = "uImage" diff --git a/multitech/recipes/linux/linux-2.6.39-at91/mtocgd/linux-2.6.39.4-mach-at91-mtocgd.patch b/multitech/recipes/linux/linux-2.6.39-at91/mtocgd/linux-2.6.39.4-mach-at91-mtocgd.patch index f109e96..9832c23 100644 --- a/multitech/recipes/linux/linux-2.6.39-at91/mtocgd/linux-2.6.39.4-mach-at91-mtocgd.patch +++ b/multitech/recipes/linux/linux-2.6.39-at91/mtocgd/linux-2.6.39.4-mach-at91-mtocgd.patch @@ -1,7 +1,7 @@ Index: git/arch/arm/mach-at91/board-sam9x5cm.c =================================================================== --- git.orig/arch/arm/mach-at91/board-sam9x5cm.c 2013-04-17 17:15:13.000000000 -0500 -+++ git/arch/arm/mach-at91/board-sam9x5cm.c 2013-05-01 14:38:42.704435634 -0500 ++++ git/arch/arm/mach-at91/board-sam9x5cm.c 2013-05-01 15:02:23.164462880 -0500 @@ -18,6 +18,9 @@ #include <linux/platform_device.h> #include <linux/spi/flash.h> @@ -97,23 +97,17 @@ Index: git/arch/arm/mach-at91/board-sam9x5cm.c /* configure chip-select 3 (NAND) */ sam9_smc_configure(3, &cm_nand_smc_config); -@@ -189,25 +235,70 @@ +@@ -189,25 +235,71 @@ * LEDs */ static struct gpio_led cm_leds[] = { - { /* "left" led, blue, userled1 */ - .name = "d1", - .gpio = AT91_PIN_PB18, -- .default_trigger = "heartbeat", -- }, -- { /* "right" led, red, userled2 */ -- .name = "d2", -- .gpio = AT91_PIN_PD21, -- .active_low = 1, -- .default_trigger = "mmc0", + { /* default status LED */ + .name = "led-a", + .gpio = AT91_PIN_PC21, + .default_trigger = "heartbeat", + .active_low = 1 + }, + { @@ -135,7 +129,12 @@ Index: git/arch/arm/mach-at91/board-sam9x5cm.c + .name = "led-e", + .gpio = AT91_PIN_PC18, + .active_low = 1 -+ }, + }, +- { /* "right" led, red, userled2 */ +- .name = "d2", +- .gpio = AT91_PIN_PD21, +- .active_low = 1, +- .default_trigger = "mmc0", + { + .name = "led-f", + .gpio = AT91_PIN_PC17, @@ -179,7 +178,7 @@ Index: git/arch/arm/mach-at91/board-sam9x5cm.c }, }; -@@ -234,8 +325,12 @@ +@@ -234,8 +326,12 @@ /* LEDs */ at91_gpio_leds(cm_leds, ARRAY_SIZE(cm_leds)); @@ -195,7 +194,7 @@ Index: git/arch/arm/mach-at91/board-sam9x5cm.c Index: git/arch/arm/mach-at91/board-sam9x5ek.c =================================================================== --- git.orig/arch/arm/mach-at91/board-sam9x5ek.c 2013-04-17 17:15:13.000000000 -0500 -+++ git/arch/arm/mach-at91/board-sam9x5ek.c 2013-04-30 15:50:57.823175776 -0500 ++++ git/arch/arm/mach-at91/board-sam9x5ek.c 2013-05-01 14:52:00.492450935 -0500 @@ -23,6 +23,7 @@ #include <linux/leds.h> #include <linux/clk.h> @@ -380,7 +379,7 @@ Index: git/arch/arm/mach-at91/board-sam9x5ek.c Index: git/arch/arm/mach-at91/at91sam9x5_devices.c =================================================================== --- git.orig/arch/arm/mach-at91/at91sam9x5_devices.c 2013-04-17 17:15:13.000000000 -0500 -+++ git/arch/arm/mach-at91/at91sam9x5_devices.c 2013-04-30 15:50:57.823175776 -0500 ++++ git/arch/arm/mach-at91/at91sam9x5_devices.c 2013-05-01 14:52:00.492450935 -0500 @@ -543,11 +543,11 @@ #endif |