summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenn Pörscke <benn.porscke@stericsson.com>2012-01-16 14:22:07 +0100
committerKalle Vahlman <kalle.vahlman@movial.com>2012-01-26 14:28:28 +0200
commitc9e919465008e36dbfd50b817fd94062cf4f735f (patch)
treec81b9c1bbdf11eca9e89c745665654e5131a2a9f
parent20b7fe0f932bb6e9a72d846dfd9e24eb823100b6 (diff)
Remove keyboard pin definition for snowballHEADigloo-devandroid-20120201
Interfered with CG2900 Change-Id: I4475fd73be0d58856dd6f424e6d47b34f8ff9404
-rw-r--r--arch/arm/mach-ux500/board-mop500-pins.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/arch/arm/mach-ux500/board-mop500-pins.c b/arch/arm/mach-ux500/board-mop500-pins.c
index 9788e45ec59..7eb1517f57e 100644
--- a/arch/arm/mach-ux500/board-mop500-pins.c
+++ b/arch/arm/mach-ux500/board-mop500-pins.c
@@ -411,7 +411,6 @@ static struct ux500_pin_lookup mop500_runtime_pins[] = {
PIN_LOOKUP("nmk-i2c.1", &mop500_pins_i2c1),
PIN_LOOKUP("nmk-i2c.2", &mop500_pins_i2c2),
PIN_LOOKUP("nmk-i2c.3", &mop500_pins_i2c3),
- PIN_LOOKUP("ske", &mop500_pins_ske),
PIN_LOOKUP("sdi0", &mop500_pins_sdi0),
PIN_LOOKUP("sdi1", &mop500_pins_sdi1),
PIN_LOOKUP("sdi2", &mop500_pins_sdi2),
@@ -420,6 +419,10 @@ static struct ux500_pin_lookup mop500_runtime_pins[] = {
PIN_LOOKUP("spi2", &mop500_pins_spi2),
};
+static struct ux500_pin_lookup mop500_runtime_pins_ske[] = {
+ PIN_LOOKUP("ske", &mop500_pins_ske),
+};
+
static struct ux500_pin_lookup mop500_runtime_pins_v60[] = {
PIN_LOOKUP("gpio-keys.0", &mop500_pins_sensors1p),
};
@@ -1012,6 +1015,9 @@ void __init mop500_pins_init(void)
ux500_pins_add(mop500_runtime_pins, ARRAY_SIZE(mop500_runtime_pins));
+ if (!machine_is_snowball())
+ ux500_pins_add(mop500_runtime_pins_ske, ARRAY_SIZE(mop500_runtime_pins_ske));
+
if (machine_is_hrefv60())
ux500_pins_add(mop500_runtime_pins_v60,
ARRAY_SIZE(mop500_runtime_pins_v60));