summaryrefslogtreecommitdiff
path: root/arch/arm/mach-ux500/board-mop500-wlan.c
diff options
context:
space:
mode:
authorPhilippe Langlais <philippe.langlais@stericsson.com>2012-04-25 16:36:08 +0200
committerPhilippe Langlais <philippe.langlais@stericsson.com>2012-05-22 11:06:52 +0200
commit5c5f4d2df9e9c8eacfdab76ac8060d80c802616c (patch)
tree133004c704f80c3e1db9f859d4b6cf1a63f94e16 /arch/arm/mach-ux500/board-mop500-wlan.c
parentaca1adce326e06dcdb18e8201719ad7eaab274f5 (diff)
cw1200: Manage parent device during initializationwlan
Signed-off-by: Philippe Langlais <philippe.langlais@linaro.org>
Diffstat (limited to 'arch/arm/mach-ux500/board-mop500-wlan.c')
-rw-r--r--arch/arm/mach-ux500/board-mop500-wlan.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-ux500/board-mop500-wlan.c b/arch/arm/mach-ux500/board-mop500-wlan.c
index 86cce36c9a9..821baae5273 100644
--- a/arch/arm/mach-ux500/board-mop500-wlan.c
+++ b/arch/arm/mach-ux500/board-mop500-wlan.c
@@ -178,7 +178,7 @@ static int cw1200_clk_ctrl(const struct cw1200_platform_data *pdata,
return ret;
}
-int __init mop500_wlan_init(void)
+int __init mop500_wlan_init(struct device *parent)
{
int ret;
@@ -218,6 +218,7 @@ int __init mop500_wlan_init(void)
if (WARN_ON(ret))
return ret;
+ cw1200_device.dev.parent = parent;
ret = platform_device_register(&cw1200_device);
if (ret)
cw1200_pins_enable(false);