summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilippe Langlais <philippe.langlais@linaro.org>2012-04-18 11:37:21 +0200
committerPhilippe Langlais <philippe.langlais@stericsson.com>2012-05-22 11:02:47 +0200
commite5a842bd30c82876d7cd07d4499aa58b507b97c1 (patch)
tree559633f064dc86135c23f166eff24288d238e2a9
parent59b8c91dcbdf1607a074219c98a90ebc7a4b7c31 (diff)
mach-ux500: dt: workaround for 3.4 porting, the mop500 gpios keys management moved into board-mop500-uib.c
Signed-off-by: Philippe Langlais <philippe.langlais@linaro.org>
-rw-r--r--arch/arm/mach-ux500/board-mop500.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/mach-ux500/board-mop500.c b/arch/arm/mach-ux500/board-mop500.c
index c93de612f48..3299c0f73f9 100644
--- a/arch/arm/mach-ux500/board-mop500.c
+++ b/arch/arm/mach-ux500/board-mop500.c
@@ -1494,7 +1494,6 @@ static void __init u8500_init_machine(void)
of_platform_populate(NULL, u8500_soc_node, u8500_auxdata_lookup, parent);
if (of_machine_is_compatible("st-ericsson,mop500")) {
- mop500_gpio_keys[0].gpio = GPIO_PROX_SENSOR;
mop500_pins_init();
platform_add_devices(mop500_platform_devs,
@@ -1513,7 +1512,6 @@ static void __init u8500_init_machine(void)
* all these GPIO pins to the internal GPIO controller
* instead.
*/
- mop500_gpio_keys[0].gpio = HREFV60_PROX_SENSE_GPIO;
i2c0_devs -= NUM_PRE_V60_I2C0_DEVICES;
hrefv60_pins_init();
platform_add_devices(mop500_platform_devs,