linux-omap 2.6.39: initial add with beagleboard support
[openembedded.git] / recipes / linux / linux-omap-2.6.39 / sakoman / 0022-ARM-OMAP-automatically-set-musb-mode-in-platform-dat.patch
blob6d2a38a78572b65062562d9aa458f27924c5eac8
1 From df17c7eeca25cd9923828a4732a995e2c37d070b Mon Sep 17 00:00:00 2001
2 From: Steve Sakoman <steve@sakoman.com>
3 Date: Wed, 24 Feb 2010 10:37:22 -0800
4 Subject: [PATCH 22/28] ARM: OMAP: automatically set musb mode in platform data based on CONFIG options
6 ---
7 arch/arm/mach-omap2/board-omap3beagle.c | 6 ++++++
8 arch/arm/mach-omap2/board-overo.c | 6 ++++++
9 2 files changed, 12 insertions(+), 0 deletions(-)
11 diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c
12 index 33007fd..2de4b02 100644
13 --- a/arch/arm/mach-omap2/board-omap3beagle.c
14 +++ b/arch/arm/mach-omap2/board-omap3beagle.c
15 @@ -604,7 +604,13 @@ static struct omap_board_mux board_mux[] __initdata = {
17 static struct omap_musb_board_data musb_board_data = {
18 .interface_type = MUSB_INTERFACE_ULPI,
19 +#if defined(CONFIG_USB_MUSB_OTG)
20 .mode = MUSB_OTG,
21 +#elif defined(CONFIG_USB_GADGET_MUSB_HDRC)
22 + .mode = MUSB_PERIPHERAL,
23 +#else
24 + .mode = MUSB_HOST,
25 +#endif
26 .power = 100,
29 diff --git a/arch/arm/mach-omap2/board-overo.c b/arch/arm/mach-omap2/board-overo.c
30 index 86f76e9..61c59fc 100644
31 --- a/arch/arm/mach-omap2/board-overo.c
32 +++ b/arch/arm/mach-omap2/board-overo.c
33 @@ -729,7 +729,13 @@ static struct omap_board_mux board_mux[] __initdata = {
35 static struct omap_musb_board_data musb_board_data = {
36 .interface_type = MUSB_INTERFACE_ULPI,
37 +#if defined(CONFIG_USB_MUSB_OTG)
38 .mode = MUSB_OTG,
39 +#elif defined(CONFIG_USB_GADGET_MUSB_HDRC)
40 + .mode = MUSB_PERIPHERAL,
41 +#else
42 + .mode = MUSB_HOST,
43 +#endif
44 .power = 100,
47 --
48 1.6.6.1