summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilippe Langlais <philippe.langlais@linaro.org>2012-02-08 16:32:12 -0800
committerPhilippe Langlais <philippe.langlais@linaro.org>2012-02-08 16:32:12 -0800
commit4d298a7c16c95577f0df9f4de645eeab8bbfaccb (patch)
tree5e11df1a254d5f320f5e0fdaa8da323f5e772718
parent22cd8335937ac27a9657da4daa67a0a265bd2ce8 (diff)
ux500: Remove keyboard pin definition for snowball
Interfered with CG2900 Signed-off-by: Benn Pörscke <benn.porscke@stericsson.com>
-rw-r--r--arch/arm/mach-ux500/board-mop500-pins.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/arch/arm/mach-ux500/board-mop500-pins.c b/arch/arm/mach-ux500/board-mop500-pins.c
index f8e7cd74e3c..da171115533 100644
--- a/arch/arm/mach-ux500/board-mop500-pins.c
+++ b/arch/arm/mach-ux500/board-mop500-pins.c
@@ -419,7 +419,6 @@ static struct ux500_pin_lookup mop500_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),
@@ -428,6 +427,10 @@ static struct ux500_pin_lookup mop500_pins[] = {
PIN_LOOKUP("spi2", &mop500_pins_spi2),
};
+static struct ux500_pin_lookup mop500_ske_pins[] = {
+ PIN_LOOKUP("ske", &mop500_pins_ske),
+};
+
/*
* Sleep pin configuration for u8500 platform.
* If another HW is used the GPIO's must be configured
@@ -930,6 +933,7 @@ void __init mop500_pins_init(void)
ARRAY_SIZE(mop500_pins_common));
ux500_pins_add(mop500_pins, ARRAY_SIZE(mop500_pins));
+ ux500_pins_add(mop500_ske_pins, ARRAY_SIZE(mop500_ske_pins));
switch (pinsfor) {
case PINS_FOR_U9500:
@@ -971,6 +975,7 @@ void __init hrefv60_pins_init(void)
ARRAY_SIZE(mop500_pins_common));
ux500_pins_add(mop500_pins, ARRAY_SIZE(mop500_pins));
+ ux500_pins_add(mop500_ske_pins, ARRAY_SIZE(mop500_ske_pins));
nmk_config_pins(hrefv60_pins,
ARRAY_SIZE(hrefv60_pins));