diff options
| author | Bartosz Markowski <bartosz.markowski@tieto.com> | 2011-09-14 12:24:31 +0200 |
|---|---|---|
| committer | Ulf Hansson <ulf.hansson@stericsson.com> | 2011-09-19 16:12:39 +0200 |
| commit | 8a6824d29fa6861f27f79cf5d96fc83c1263869a (patch) | |
| tree | 4e499846a48514e4b3943886ffc4026c2a201999 | |
| parent | c0f00a50eaa67d7c0ed5e5b06a05f5e5f2934822 (diff) | |
WLAN: u5500: Add wlan init to u5500 board file
Adds WLAN init to board-u5500 to have platform
configuration in one place.
ST-Ericsson ID: 352334
ST-Ericsson FOSS-OUT ID: Trivial
Signed-off-by: Bartosz Markowski <bartosz.markowski@tieto.com>
Change-Id: Ica7a1f1e588c7beaf489bafda16a763cfb4dc929
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/30924
Reviewed-by: Stefan NILSSON9 <stefan.xk.nilsson@stericsson.com>
Reviewed-by: Srinidhi KASAGAR <srinidhi.kasagar@stericsson.com>
| -rw-r--r-- | arch/arm/mach-ux500/Makefile | 6 | ||||
| -rw-r--r-- | arch/arm/mach-ux500/board-mop500-wlan.c | 3 | ||||
| -rw-r--r-- | arch/arm/mach-ux500/board-u5500.c | 3 |
3 files changed, 9 insertions, 3 deletions
diff --git a/arch/arm/mach-ux500/Makefile b/arch/arm/mach-ux500/Makefile index e48b2d74649..4a1ed39f4f3 100644 --- a/arch/arm/mach-ux500/Makefile +++ b/arch/arm/mach-ux500/Makefile @@ -34,8 +34,10 @@ obj-$(CONFIG_MACH_U8500) += board-mop500.o board-mop500-sdi.o \ obj-$(CONFIG_ANDROID_STE_TIMED_VIBRA) += board-mop500-vibra.o obj-$(CONFIG_SENSORS1P_MOP) += sensors1p.o obj-$(CONFIG_MACH_U5500) += board-u5500.o board-u5500-sdi.o \ - board-u5500-mcde.o board-u5500-regulators.o \ - board-u5500-pins.o + board-u5500-mcde.o \ + board-u5500-regulators.o \ + board-u5500-pins.o \ + board-mop500-wlan.o obj-$(CONFIG_U5500_MMIO) += board-u5500-mmio.o obj-$(CONFIG_U8500_MMIO) += board-mop500-mmio.o obj-$(CONFIG_SMP) += platsmp.o headsmp.o diff --git a/arch/arm/mach-ux500/board-mop500-wlan.c b/arch/arm/mach-ux500/board-mop500-wlan.c index d17c2748386..16169d1cfcb 100644 --- a/arch/arm/mach-ux500/board-mop500-wlan.c +++ b/arch/arm/mach-ux500/board-mop500-wlan.c @@ -145,7 +145,8 @@ int __init mop500_wlan_init(void) return -ENOTSUPP; } - if (machine_is_snowball()) + if (machine_is_snowball() || + machine_is_u5500()) cw1200_platform_data.mmc_id = "mmc2"; else cw1200_platform_data.mmc_id = "mmc3"; diff --git a/arch/arm/mach-ux500/board-u5500.c b/arch/arm/mach-ux500/board-u5500.c index af551a870e9..db77123b604 100644 --- a/arch/arm/mach-ux500/board-u5500.c +++ b/arch/arm/mach-ux500/board-u5500.c @@ -42,6 +42,7 @@ #include "devices-db5500.h" #include "board-u5500.h" #include "board-u5500-bm.h" +#include "board-mop500-wlan.h" /* * LSM303DLH @@ -580,6 +581,8 @@ static void __init u5500_init_machine(void) u5500_sdi_init(); u5500_uart_init(); + mop500_wlan_init(); + db5500_add_keypad(&u5500_keypad_board); u5500_cryp1_hash1_init(); |