diff options
author | Sebastien Jan <s-jan@ti.com> | 2011-09-23 13:31:21 -0400 |
---|---|---|
committer | Paolo Pisati <paolo.pisati@canonical.com> | 2012-08-17 04:19:22 -0400 |
commit | 5605a0a25b20990060f303858ad419d89277cc5f (patch) | |
tree | 6cccaeade87c6d5921926f61c6ab6083f43e8757 /arch/arm | |
parent | 0445c4a12f7bb34eea340033a0a60d7e7001b533 (diff) |
Config: enable musb in OTG mode
Signed-off-by: Sebastien Jan <s-jan@ti.com>
Diffstat (limited to 'arch/arm')
-rw-r--r-- | arch/arm/configs/omap4_defconfig | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/arch/arm/configs/omap4_defconfig b/arch/arm/configs/omap4_defconfig index 5aeb247e66f..480c36b7172 100644 --- a/arch/arm/configs/omap4_defconfig +++ b/arch/arm/configs/omap4_defconfig | |||
@@ -1981,7 +1981,6 @@ CONFIG_USB_DEVICEFS=y | |||
1981 | CONFIG_USB_DEVICE_CLASS=y | 1981 | CONFIG_USB_DEVICE_CLASS=y |
1982 | # CONFIG_USB_DYNAMIC_MINORS is not set | 1982 | # CONFIG_USB_DYNAMIC_MINORS is not set |
1983 | CONFIG_USB_SUSPEND=y | 1983 | CONFIG_USB_SUSPEND=y |
1984 | CONFIG_USB_OTG=y | ||
1985 | # CONFIG_USB_OTG_WHITELIST is not set | 1984 | # CONFIG_USB_OTG_WHITELIST is not set |
1986 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | 1985 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set |
1987 | CONFIG_USB_MON=y | 1986 | CONFIG_USB_MON=y |
@@ -2015,6 +2014,10 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y | |||
2015 | # | 2014 | # |
2016 | # CONFIG_USB_ACM is not set | 2015 | # CONFIG_USB_ACM is not set |
2017 | # CONFIG_USB_PRINTER is not set | 2016 | # CONFIG_USB_PRINTER is not set |
2017 | CONFIG_USB_MUSB_HDRC=y | ||
2018 | CONFIG_USB_MUSB_OMAP2PLUS=y | ||
2019 | CONFIG_USB_MUSB_OTG=y | ||
2020 | CONFIG_USB_GADGET_MUSB_HDRC=y | ||
2018 | CONFIG_USB_WDM=y | 2021 | CONFIG_USB_WDM=y |
2019 | # CONFIG_USB_TMC is not set | 2022 | # CONFIG_USB_TMC is not set |
2020 | 2023 | ||
@@ -2099,6 +2102,7 @@ CONFIG_USB_ZERO=m | |||
2099 | # CONFIG_USB_GADGETFS is not set | 2102 | # CONFIG_USB_GADGETFS is not set |
2100 | # CONFIG_USB_FUNCTIONFS is not set | 2103 | # CONFIG_USB_FUNCTIONFS is not set |
2101 | # CONFIG_USB_FILE_STORAGE is not set | 2104 | # CONFIG_USB_FILE_STORAGE is not set |
2105 | CONFIG_USB_FILE_STORAGE=m | ||
2102 | CONFIG_USB_MASS_STORAGE=m | 2106 | CONFIG_USB_MASS_STORAGE=m |
2103 | # CONFIG_USB_G_SERIAL is not set | 2107 | # CONFIG_USB_G_SERIAL is not set |
2104 | # CONFIG_USB_MIDI_GADGET is not set | 2108 | # CONFIG_USB_MIDI_GADGET is not set |
@@ -2119,6 +2123,7 @@ CONFIG_USB_OTG_UTILS=y | |||
2119 | CONFIG_TWL4030_USB=y | 2123 | CONFIG_TWL4030_USB=y |
2120 | CONFIG_TWL6030_USB=y | 2124 | CONFIG_TWL6030_USB=y |
2121 | CONFIG_NOP_USB_XCEIV=y | 2125 | CONFIG_NOP_USB_XCEIV=y |
2126 | CONFIG_USB_G_MULTI=m | ||
2122 | CONFIG_MMC=y | 2127 | CONFIG_MMC=y |
2123 | # CONFIG_MMC_DEBUG is not set | 2128 | # CONFIG_MMC_DEBUG is not set |
2124 | CONFIG_MMC_UNSAFE_RESUME=y | 2129 | CONFIG_MMC_UNSAFE_RESUME=y |