From d42f3a9f565bf591f6c604be15432ed8d0c3bc95 Mon Sep 17 00:00:00 2001 From: Denis 'GNUtoo' Carikli Date: Fri, 24 May 2013 18:41:01 +0200 Subject: gta04 defconfig: Improve USB config and sync config. With that fix it seem to really suspend. The config was also syncronized with the generated config. Signed-off-by: Denis 'GNUtoo' Carikli --- arch/arm/configs/gta04_defconfig | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/arch/arm/configs/gta04_defconfig b/arch/arm/configs/gta04_defconfig index 563c76a..49779c3 100644 --- a/arch/arm/configs/gta04_defconfig +++ b/arch/arm/configs/gta04_defconfig @@ -299,8 +299,7 @@ CONFIG_OMAP_32K_TIMER=y CONFIG_OMAP_32K_TIMER_HZ=128 CONFIG_OMAP_DM_TIMER=y # CONFIG_OMAP_PM_NONE is not set -# CONFIG_OMAP_PM_NOOP is not set -CONFIG_OMAP_PM=y +CONFIG_OMAP_PM_NOOP=y # # TI OMAP2/3/4 Specific Features @@ -525,7 +524,6 @@ CONFIG_CAN_PM_TRACE=y CONFIG_ARCH_HAS_OPP=y CONFIG_PM_OPP=y CONFIG_PM_RUNTIME_CLK=y -CONFIG_CPU_PM=y # CONFIG_SUSPEND_TIME is not set CONFIG_ARCH_SUSPEND_POSSIBLE=y CONFIG_NET=y @@ -2046,15 +2044,16 @@ CONFIG_SND_USB=y # CONFIG_SND_USB_CAIAQ is not set # CONFIG_SND_USB_6FIRE is not set CONFIG_SND_SOC=y -CONFIG_SND_SOC_TWL4030=y -CONFIG_SND_SOC_GTM601=y -CONFIG_SND_SOC_SI47XX=y -CONFIG_SND_SOC_W2CBW003=y # CONFIG_SND_SOC_CACHE_LZO is not set CONFIG_SND_OMAP_SOC=y +CONFIG_SND_OMAP_SOC_MCBSP=y CONFIG_SND_OMAP_SOC_GTA04=y CONFIG_SND_SOC_I2C_AND_SPI=y # CONFIG_SND_SOC_ALL_CODECS is not set +CONFIG_SND_SOC_TWL4030=y +CONFIG_SND_SOC_GTM601=y +CONFIG_SND_SOC_SI47XX=y +CONFIG_SND_SOC_W2CBW003=y # CONFIG_SOUND_PRIME is not set CONFIG_HID_SUPPORT=y CONFIG_HID=y @@ -2145,7 +2144,7 @@ CONFIG_USB_MON=y # # CONFIG_USB_C67X00_HCD is not set CONFIG_USB_EHCI_HCD=y -# CONFIG_USB_EHCI_ROOT_HUB_TT is not set +CONFIG_USB_EHCI_ROOT_HUB_TT=y CONFIG_USB_EHCI_TT_NEWSCHED=y CONFIG_USB_EHCI_HCD_OMAP=y # CONFIG_USB_OXU210HP_HCD is not set @@ -2233,14 +2232,14 @@ CONFIG_USB_STORAGE_DEBUG=y # CONFIG_USB_LD is not set # CONFIG_USB_TRANCEVIBRATOR is not set # CONFIG_USB_IOWARRIOR is not set -CONFIG_USB_TEST=m +# CONFIG_USB_TEST is not set # CONFIG_USB_ISIGHTFW is not set # CONFIG_USB_YUREX is not set CONFIG_USB_GADGET=y # CONFIG_USB_GADGET_DEBUG is not set # CONFIG_USB_GADGET_DEBUG_FILES is not set # CONFIG_USB_GADGET_DEBUG_FS is not set -CONFIG_USB_GADGET_VBUS_DRAW=2 +CONFIG_USB_GADGET_VBUS_DRAW=100 CONFIG_USB_GADGET_SELECTED=y # CONFIG_USB_GADGET_FUSB300 is not set # CONFIG_USB_GADGET_OMAP is not set -- cgit v1.1