From 764d14ba5b6920acd08c43af8d1160494cde6617 Mon Sep 17 00:00:00 2001 From: Philippe Langlais Date: Wed, 12 Oct 2011 16:22:25 +0200 Subject: cw1200: Integration with mach-ux500 CW1200 platform data is defined and set in arch/arm/mach-ux500. TODO: WLAN regulators are defined but not handled. Waiting for support in mach-ux500. Signed-off-by: Dmitry Tarnyagin Change-Id: If368398af1ca22366bb44c3bb8c7e3b1484cab1b Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/23353 Reviewed-by: Janusz DZIEDZIC Reviewed-by: Bartosz MARKOWSKI Reviewed-by: Philippe LANGLAIS --- arch/arm/mach-ux500/board-mop500-wlan.h | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 arch/arm/mach-ux500/board-mop500-wlan.h (limited to 'arch/arm/mach-ux500/board-mop500-wlan.h') diff --git a/arch/arm/mach-ux500/board-mop500-wlan.h b/arch/arm/mach-ux500/board-mop500-wlan.h new file mode 100644 index 00000000000..c6788adc46f --- /dev/null +++ b/arch/arm/mach-ux500/board-mop500-wlan.h @@ -0,0 +1,17 @@ +/* + * Copyright (C) ST-Ericsson SA 2011 + * + * License terms: GNU General Public License (GPL), version 2 + * + * U8500 board specific cw1200 (WLAN device) initialization. + * + * Author: Dmitry Tarnyagin + * + */ + +#ifndef __BOARD_MOP500_WLAN_H +#define __BOARD_MOP500_WLAN_H + +int mop500_wlan_init(void); + +#endif -- cgit v1.2.3 From 5c5f4d2df9e9c8eacfdab76ac8060d80c802616c Mon Sep 17 00:00:00 2001 From: Philippe Langlais Date: Wed, 25 Apr 2012 16:36:08 +0200 Subject: cw1200: Manage parent device during initialization Signed-off-by: Philippe Langlais --- arch/arm/mach-ux500/board-mop500-wlan.c | 3 ++- arch/arm/mach-ux500/board-mop500-wlan.h | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'arch/arm/mach-ux500/board-mop500-wlan.h') 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); diff --git a/arch/arm/mach-ux500/board-mop500-wlan.h b/arch/arm/mach-ux500/board-mop500-wlan.h index c6788adc46f..19a12d57ded 100644 --- a/arch/arm/mach-ux500/board-mop500-wlan.h +++ b/arch/arm/mach-ux500/board-mop500-wlan.h @@ -12,6 +12,6 @@ #ifndef __BOARD_MOP500_WLAN_H #define __BOARD_MOP500_WLAN_H -int mop500_wlan_init(void); +int mop500_wlan_init(struct device *parent); #endif -- cgit v1.2.3