diff options
| author | Philippe Langlais <philippe.langlais@stericsson.com> | 2011-10-14 15:37:24 +0200 |
|---|---|---|
| committer | Mathieu J. Poirier <mathieu.poirier@linaro.org> | 2011-11-10 11:01:08 -0700 |
| commit | 7853138d04d288c2b39cce3ef4b921132f20a0e9 (patch) | |
| tree | b153f2c7528868fca32f9a1a618bbb4b0b173341 | |
| parent | b0c5cff7681c114205650a53963bde6b8a662b6e (diff) | |
ux500: fix PRCMU boot problem, use new MFD driver & code cleanup
Signed-off-by: Philippe Langlais <philippe.langlais@linaro.org>
| -rw-r--r-- | arch/arm/mach-ux500/board-mop500.c | 6 | ||||
| -rw-r--r-- | arch/arm/mach-ux500/cpu.c | 2 |
2 files changed, 3 insertions, 5 deletions
diff --git a/arch/arm/mach-ux500/board-mop500.c b/arch/arm/mach-ux500/board-mop500.c index 6db061b04bc..25cecbff9e7 100644 --- a/arch/arm/mach-ux500/board-mop500.c +++ b/arch/arm/mach-ux500/board-mop500.c @@ -98,7 +98,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) @@ -583,7 +583,6 @@ static struct platform_device *mop500_platform_devs[] __initdata = { &u8500_trace_modem, #endif &mop500_gpio_keys_device, - &ab8500_device, #ifdef CONFIG_LEDS_PWM &ux500_leds_device, #endif @@ -799,7 +798,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, @@ -858,6 +856,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; diff --git a/arch/arm/mach-ux500/cpu.c b/arch/arm/mach-ux500/cpu.c index 40e816d3fc3..7b7a9f2d02f 100644 --- a/arch/arm/mach-ux500/cpu.c +++ b/arch/arm/mach-ux500/cpu.c @@ -8,8 +8,6 @@ #include <linux/platform_device.h> #include <linux/io.h> #include <linux/clk.h> -#include <linux/mfd/db8500-prcmu.h> -#include <linux/mfd/db5500-prcmu.h> #include <linux/delay.h> #include <asm/cacheflush.h> |