diff options
author | Fabio Baltieri <fabio.baltieri@linaro.org> | 2013-03-21 08:31:53 -0400 |
---|---|---|
committer | Linus Walleij <linus.walleij@linaro.org> | 2013-05-27 08:06:59 -0400 |
commit | 94204cd4e1452e13ecf5fc6fcec9485e93e8a8f4 (patch) | |
tree | f59e111b460dbdd8d13c2806dde5f428e6c59819 /arch/arm | |
parent | e4aa937ec75df0eea0bee03bffa3303ad36c986b (diff) |
ARM: ux500: select WATCHDOG and MUSB for ux500
Enable ux500 specific USB and watchdog drivers by default on
u8500_defconfig.
Signed-off-by: Fabio Baltieri <fabio.baltieri@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'arch/arm')
-rw-r--r-- | arch/arm/configs/u8500_defconfig | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/arm/configs/u8500_defconfig b/arch/arm/configs/u8500_defconfig index c037aa1065b7..acb62cf36c70 100644 --- a/arch/arm/configs/u8500_defconfig +++ b/arch/arm/configs/u8500_defconfig | |||
@@ -70,6 +70,7 @@ CONFIG_GPIO_TC3589X=y | |||
70 | # CONFIG_AB8500_BATTERY_THERM_ON_BATCTRL is not set | 70 | # CONFIG_AB8500_BATTERY_THERM_ON_BATCTRL is not set |
71 | CONFIG_THERMAL=y | 71 | CONFIG_THERMAL=y |
72 | CONFIG_CPU_THERMAL=y | 72 | CONFIG_CPU_THERMAL=y |
73 | CONFIG_WATCHDOG=y | ||
73 | CONFIG_MFD_STMPE=y | 74 | CONFIG_MFD_STMPE=y |
74 | CONFIG_MFD_TC3589X=y | 75 | CONFIG_MFD_TC3589X=y |
75 | CONFIG_AB5500_CORE=y | 76 | CONFIG_AB5500_CORE=y |
@@ -79,7 +80,13 @@ CONFIG_REGULATOR_AB8500=y | |||
79 | CONFIG_REGULATOR_FIXED_VOLTAGE=y | 80 | CONFIG_REGULATOR_FIXED_VOLTAGE=y |
80 | CONFIG_REGULATOR_GPIO=y | 81 | CONFIG_REGULATOR_GPIO=y |
81 | # CONFIG_HID_SUPPORT is not set | 82 | # CONFIG_HID_SUPPORT is not set |
83 | CONFIG_USB=y | ||
84 | CONFIG_USB_MUSB_HDRC=y | ||
85 | CONFIG_USB_MUSB_UX500=y | ||
86 | CONFIG_USB_PHY=y | ||
82 | CONFIG_USB_GADGET=y | 87 | CONFIG_USB_GADGET=y |
88 | CONFIG_USB_GADGET_MUSB_HDRC=y | ||
89 | CONFIG_USB_ETH=m | ||
83 | CONFIG_AB8500_USB=y | 90 | CONFIG_AB8500_USB=y |
84 | CONFIG_MMC=y | 91 | CONFIG_MMC=y |
85 | CONFIG_MMC_CLKGATE=y | 92 | CONFIG_MMC_CLKGATE=y |