summaryrefslogtreecommitdiff
path: root/arch/arm/mach-ux500/board-mop500-pins.c
diff options
context:
space:
mode:
authorPhilippe Langlais <philippe.langlais@linaro.org>2011-08-09 17:22:24 +0200
committerUlf Hansson <ulf.hansson@stericsson.com>2011-09-19 15:15:52 +0200
commit63e1ddaea9b07a9805cdf5787cef008710b80c66 (patch)
tree92524a93e1689758f6344eb950a7de6ae1ff14f1 /arch/arm/mach-ux500/board-mop500-pins.c
parent6c8cf065b0d679b353e40be5391ef25d3562507c (diff)
board: snowball: set right GPIOs for Accelerometer/Magnetometer LSM303DLH driver
Signed-off-by: Philippe Langlais <philippe.langlais@linaro.org>
Diffstat (limited to 'arch/arm/mach-ux500/board-mop500-pins.c')
-rw-r--r--arch/arm/mach-ux500/board-mop500-pins.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/arch/arm/mach-ux500/board-mop500-pins.c b/arch/arm/mach-ux500/board-mop500-pins.c
index 52da47b6331..3b1122c1a6c 100644
--- a/arch/arm/mach-ux500/board-mop500-pins.c
+++ b/arch/arm/mach-ux500/board-mop500-pins.c
@@ -232,6 +232,11 @@ static pin_cfg_t snowball_pins[] = {
/* RSTn_LAN */
GPIO141_GPIO | PIN_OUTPUT_HIGH,
+ /* Accelerometer/Magnetometer */
+ GPIO163_GPIO | PIN_INPUT_PULLUP, /* ACCEL_IRQ1 */
+ GPIO164_GPIO | PIN_INPUT_PULLUP, /* ACCEL_IRQ2 */
+ GPIO165_GPIO | PIN_INPUT_PULLUP, /* MAG_DRDY */
+
/* WLAN/GBF */
GPIO171_GPIO | PIN_OUTPUT_HIGH,/* GBF_ENA */
GPIO215_GPIO | PIN_OUTPUT_LOW,/* WLAN_ENA */
@@ -899,6 +904,9 @@ void __init mop500_pins_init(void)
{
nmk_config_pins(mop500_pins_common,
ARRAY_SIZE(mop500_pins_common));
+
+ ux500_pins_add(mop500_pins, ARRAY_SIZE(mop500_pins));
+
if (machine_is_hrefv60())
nmk_config_pins(mop500_pins_hrefv60,
ARRAY_SIZE(mop500_pins_hrefv60));
@@ -909,8 +917,6 @@ void __init mop500_pins_init(void)
nmk_config_pins(mop500_pins_default,
ARRAY_SIZE(mop500_pins_default));
- ux500_pins_add(mop500_pins, ARRAY_SIZE(mop500_pins));
-
switch (pinsfor) {
case PINS_FOR_U9500_21:
nmk_config_pins(u9500_21_pins, ARRAY_SIZE(u9500_21_pins));