summaryrefslogtreecommitdiff
path: root/arch/arm/mach-ux500/board-mop500.c
diff options
context:
space:
mode:
authorPhilippe Langlais <philippe.langlais@linaro.org>2011-07-05 14:40:21 +0200
committerUlf Hansson <ulf.hansson@stericsson.com>2011-09-19 15:15:43 +0200
commit2e4fbd86739c42bec905896d5358849de48452c1 (patch)
treede3fab64545f7d0ee4038a6d083d4feb45a371cd /arch/arm/mach-ux500/board-mop500.c
parentca36d68fd19bc9d5a30923b05e68aadb5fef3c62 (diff)
ux500: fix PRCMU boot problem, use new MFD driver & code cleanup
Signed-off-by: Philippe Langlais <philippe.langlais@linaro.org>
Diffstat (limited to 'arch/arm/mach-ux500/board-mop500.c')
-rw-r--r--arch/arm/mach-ux500/board-mop500.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-ux500/board-mop500.c b/arch/arm/mach-ux500/board-mop500.c
index b360330c9e0..2e7a2a4639b 100644
--- a/arch/arm/mach-ux500/board-mop500.c
+++ b/arch/arm/mach-ux500/board-mop500.c
@@ -101,7 +101,7 @@ static struct ab8500_gpio_platform_data ab8500_gpio_pdata = {
* on value present in GpioSel1 to GpioSel6 and AlternatFunction
* register. This is the array of 7 configuration settings.
* One has to compile time decide these settings. Below is the
- * explaination of these setting
+ * explanation of these setting
* GpioSel1 = 0x0F => Pin GPIO1 (SysClkReq2)
* Pin GPIO2 (SysClkReq3)
* Pin GPIO3 (SysClkReq4)
@@ -659,7 +659,6 @@ static struct platform_device *mop500_platform_devs[] __initdata = {
#endif
&ux500_cryp1_device,
&mop500_gpio_keys_device,
- &ab8500_device,
#ifdef CONFIG_LEDS_PWM
&ux500_leds_device,
#endif
@@ -878,7 +877,6 @@ static struct platform_device *snowball_platform_devs[] __initdata = {
&snowball_led_dev,
&snowball_key_dev,
&snowball_sbnet_dev,
- &ab8500_device,
&snowball_gpio_wlan_vbat_regulator_device,
&u8500_mcde_device,
&u8500_b2r2_device,
@@ -942,6 +940,8 @@ static void __init mop500_init_machine(void)
mop500_uart_init();
mop500_wlan_init();
+ platform_device_register(&ab8500_device);
+
i2c0_devs = ARRAY_SIZE(mop500_i2c0_devices);
if (machine_is_hrefv60())
i2c0_devs -= NUM_PRE_V60_I2C0_DEVICES;