Pandora Sourcecodes - openembedded.git/blob

   1 From 684902cfd776bdaf46d302d63be1d52edeb11428 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 24/48] ARM: OMAP: automatically set musb mode in platform data based on CONFIG options
   5
   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(-)
  10
  11 diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c
  12 index 781844c..006dc26 100644
  13 --- a/arch/arm/mach-omap2/board-omap3beagle.c
  14 +++ b/arch/arm/mach-omap2/board-omap3beagle.c
  15 @@ -759,7 +759,13 @@ static struct omap_board_mux board_mux[] __initdata = {
  16
  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,
  27  };
  28
  29 diff --git a/arch/arm/mach-omap2/board-overo.c b/arch/arm/mach-omap2/board-overo.c
  30 index 17f066a..b28a9d5 100644
  31 --- a/arch/arm/mach-omap2/board-overo.c
  32 +++ b/arch/arm/mach-omap2/board-overo.c
  33 @@ -447,7 +447,13 @@ static struct omap_board_mux board_mux[] __initdata = {
  34
  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,
  45  };
  46
  47 --
  48 1.6.6.1
  49