diff options
author | Andy Green <andy.green@linaro.org> | 2011-07-24 15:59:10 -0400 |
---|---|---|
committer | Paolo Pisati <paolo.pisati@canonical.com> | 2012-08-17 04:18:12 -0400 |
commit | 71c75c90fdf67462a76919a46c2a059f41f1591b (patch) | |
tree | 0c0506c14a4b03f3327589b07c89874282afd113 /arch/arm | |
parent | 3e920e2c64addf566cf40a59876c3a2e9bd01591 (diff) |
omap2 panda upgrade bluetooth support
Bluetooth driver for wl12xx BT module now assumes there are more
members defined in platform_data, blows up if they aren't there.
This patch adds them.
Signed-off-by: Andy Green <andy.green@linaro.org>
Diffstat (limited to 'arch/arm')
-rw-r--r-- | arch/arm/mach-omap2/board-omap4panda.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/arch/arm/mach-omap2/board-omap4panda.c b/arch/arm/mach-omap2/board-omap4panda.c index 4932df75729..27906fe8a7c 100644 --- a/arch/arm/mach-omap2/board-omap4panda.c +++ b/arch/arm/mach-omap2/board-omap4panda.c | |||
@@ -30,6 +30,7 @@ | |||
30 | #include <linux/wl12xx.h> | 30 | #include <linux/wl12xx.h> |
31 | #include <linux/netdevice.h> | 31 | #include <linux/netdevice.h> |
32 | #include <linux/if_ether.h> | 32 | #include <linux/if_ether.h> |
33 | #include <linux/ti_wilink_st.h> | ||
33 | 34 | ||
34 | #include <mach/hardware.h> | 35 | #include <mach/hardware.h> |
35 | #include <mach/omap4-common.h> | 36 | #include <mach/omap4-common.h> |
@@ -59,13 +60,19 @@ | |||
59 | #define HDMI_GPIO_LS_OE 41 /* Level shifter for HDMI */ | 60 | #define HDMI_GPIO_LS_OE 41 /* Level shifter for HDMI */ |
60 | #define HDMI_GPIO_HPD 63 /* Hotplug detect */ | 61 | #define HDMI_GPIO_HPD 63 /* Hotplug detect */ |
61 | 62 | ||
62 | /* wl127x BT, FM, GPS connectivity chip */ | 63 | |
63 | static int wl1271_gpios[] = {46, -1, -1}; | 64 | struct ti_st_plat_data panda_bt_platform_data = { |
65 | .nshutdown_gpio = 46, | ||
66 | .dev_name = "/dev/ttyO1", | ||
67 | .flow_cntrl = 1, | ||
68 | .baud_rate = 3000000, | ||
69 | }; | ||
70 | |||
64 | static struct platform_device wl1271_device = { | 71 | static struct platform_device wl1271_device = { |
65 | .name = "kim", | 72 | .name = "kim", |
66 | .id = -1, | 73 | .id = -1, |
67 | .dev = { | 74 | .dev = { |
68 | .platform_data = &wl1271_gpios, | 75 | .platform_data = &panda_bt_platform_data, |
69 | }, | 76 | }, |
70 | }; | 77 | }; |
71 | 78 | ||