mirror of
https://git.yoctoproject.org/meta-ti
synced 2026-07-16 22:38:04 +00:00
Koen Kooi
9bc77dff5f
Regenerate all beaglebone patches and add one vfs tracer patch for powertop Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> Signed-off-by: Denys Dmytriyenko <denys@ti.com>
53 lines
2.1 KiB
Diff
53 lines
2.1 KiB
Diff
From dbe62e3346ee4423a2d3c83e6390ef39c2a0a0bf Mon Sep 17 00:00:00 2001
|
|
From: Koen Kooi <koen@dominion.thruhere.net>
|
|
Date: Wed, 6 Jun 2012 11:20:21 +0200
|
|
Subject: [PATCH 69/79] beaglebone: fix buttons/spidev clash when using
|
|
mcasp0_axr0.gpio3_16
|
|
|
|
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
|
|
---
|
|
arch/arm/mach-omap2/board-am335xevm.c | 13 +++++++------
|
|
1 file changed, 7 insertions(+), 6 deletions(-)
|
|
|
|
diff --git a/arch/arm/mach-omap2/board-am335xevm.c b/arch/arm/mach-omap2/board-am335xevm.c
|
|
index d83431a..15ee8af 100644
|
|
--- a/arch/arm/mach-omap2/board-am335xevm.c
|
|
+++ b/arch/arm/mach-omap2/board-am335xevm.c
|
|
@@ -1051,12 +1051,11 @@ static void volume_keys_init(int evm_id, int profile)
|
|
|
|
/* pinmux for lcd7 keys */
|
|
static struct pinmux_config lcd7_keys_pin_mux[] = {
|
|
- {"gpmc_a0.gpio1_16", OMAP_MUX_MODE7 | AM33XX_PIN_INPUT},
|
|
- {"gpmc_a1.gpio1_17", OMAP_MUX_MODE7 | AM33XX_PIN_INPUT},
|
|
- {"gpmc_a3.gpio1_19", OMAP_MUX_MODE7 | AM33XX_PIN_INPUT},
|
|
- {"mcasp0_axr0.gpio3_16", OMAP_MUX_MODE7 | AM33XX_PIN_INPUT},
|
|
- {"mcasp0_fsr.gpio3_19", OMAP_MUX_MODE7 | AM33XX_PIN_INPUT},
|
|
- {"gpmc_ben1.gpio1_28", OMAP_MUX_MODE7 | AM33XX_PIN_OUTPUT},
|
|
+ {"gpmc_a0.gpio1_16", OMAP_MUX_MODE7 | AM33XX_PIN_INPUT}, //left
|
|
+ {"gpmc_a1.gpio1_17", OMAP_MUX_MODE7 | AM33XX_PIN_INPUT}, //right
|
|
+ {"gpmc_a3.gpio1_19", OMAP_MUX_MODE7 | AM33XX_PIN_INPUT}, //up
|
|
+ {"mcasp0_axr0.gpio3_16", OMAP_MUX_MODE7 | AM33XX_PIN_INPUT}, //down
|
|
+ {"mcasp0_fsr.gpio3_19", OMAP_MUX_MODE7 | AM33XX_PIN_INPUT}, //enter
|
|
{NULL, 0},
|
|
};
|
|
|
|
@@ -2738,6 +2737,7 @@ static void beaglebone_cape_setup(struct memory_accessor *mem_acc, void *context
|
|
pr_info("BeagleBone cape: Registering gpio-keys for LCD cape\n");
|
|
beaglebone_lcd7_keys_init(0,0);
|
|
|
|
+ beaglebone_spi1_free = 0;
|
|
// A1 or newer
|
|
beaglebone_leds_free = 0;
|
|
lcd7leds_init(0,0);
|
|
@@ -2765,6 +2765,7 @@ static void beaglebone_cape_setup(struct memory_accessor *mem_acc, void *context
|
|
if (err)
|
|
pr_err("failed to register gpio keys for LCD3 rev A1 or later cape\n");
|
|
}
|
|
+ beaglebone_spi1_free = 0;
|
|
beaglebone_leds_free = 0;
|
|
lcd3leds_init(0,0);
|
|
}
|
|
--
|
|
1.7.10
|
|
|