summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Marklund <robert.marklund@stericsson.com>2011-11-21 15:13:19 +0100
committerPhilippe Langlais <philippe.langlais@stericsson.com>2011-12-06 10:54:40 +0100
commit7f680dd82f7619c42f8d41333e778483ca222831 (patch)
tree3f3f046a9588fc4a75ad9787753ae7e83fb581ab
parent0c1e75e5126c143888d639459da40f91faa0f0f1 (diff)
ux500: Detect accelerometer i2c address on snowball
Snowball V7 and above the accelerometer changed i2c address and there is now way to detect that in runtime. So between V7 and V10 we need to probe for the right address. Change-Id: I39528ca40952a8a868b7aff6c3abd7668420850d Signed-off-by: Robert Marklund <robert.marklund@stericsson.com>
-rw-r--r--arch/arm/mach-ux500/board-mop500-stuib.c4
-rw-r--r--arch/arm/mach-ux500/board-mop500.c6
-rw-r--r--arch/arm/mach-ux500/board-mop500.h1
3 files changed, 0 insertions, 11 deletions
diff --git a/arch/arm/mach-ux500/board-mop500-stuib.c b/arch/arm/mach-ux500/board-mop500-stuib.c
index f7b294d9b97..273869bf3ca 100644
--- a/arch/arm/mach-ux500/board-mop500-stuib.c
+++ b/arch/arm/mach-ux500/board-mop500-stuib.c
@@ -269,8 +269,4 @@ void __init mop500_stuib_init(void)
mop500_uib_i2c_add(3, u8500_i2c3_devices_stuib,
ARRAY_SIZE(u8500_i2c3_devices_stuib));
-
-#ifdef CONFIG_SENSORS_LSM303DLH
- mop500_sensors_init();
-#endif
}
diff --git a/arch/arm/mach-ux500/board-mop500.c b/arch/arm/mach-ux500/board-mop500.c
index 7706e2258e8..7d2eea57d9e 100644
--- a/arch/arm/mach-ux500/board-mop500.c
+++ b/arch/arm/mach-ux500/board-mop500.c
@@ -1295,12 +1295,6 @@ static void __init mop500_init_machine(void)
i2c_register_board_info(2, mop500_i2c2_devices,
ARRAY_SIZE(mop500_i2c2_devices));
-#ifdef CONFIG_SENSORS_LSM303DLH
- /* Snowball want sensors, u8500 get them from stuib */
- if (machine_is_snowball())
- mop500_sensors_init();
-#endif
-
/* This board has full regulator constraints */
regulator_has_full_constraints();
}
diff --git a/arch/arm/mach-ux500/board-mop500.h b/arch/arm/mach-ux500/board-mop500.h
index fb15b8dbff6..829a7bece6e 100644
--- a/arch/arm/mach-ux500/board-mop500.h
+++ b/arch/arm/mach-ux500/board-mop500.h
@@ -77,7 +77,6 @@ extern void mop500_sdi_init(void);
extern void mop500_sdi_tc35892_init(void);
void __init mop500_u8500uib_init(void);
void __init mop500_stuib_init(void);
-void __init mop500_sensors_init(void);
void __init mop500_msp_init(void);
void __init mop500_pins_init(void);
void mop500_cyttsp_init(void);