diff options
| author | Peter Robinson <pbrobinson@gmail.com> | 2013-10-13 11:33:25 +0100 |
|---|---|---|
| committer | Peter Robinson <pbrobinson@gmail.com> | 2013-10-13 11:33:25 +0100 |
| commit | 2fba3e3c2d7c356b4df3227bcee673fae9af956b (patch) | |
| tree | 808bc8a95ca6910c7a72ab4a2e6d96c566f28eb7 /config-armv7 | |
| parent | 694dc9b61006384cf2cb8240dbb6488d6d3a0a86 (diff) | |
| download | kernel-2fba3e3c2d7c356b4df3227bcee673fae9af956b.tar.gz kernel-2fba3e3c2d7c356b4df3227bcee673fae9af956b.tar.xz kernel-2fba3e3c2d7c356b4df3227bcee673fae9af956b.zip | |
Minor ARM config updates/cleanups, ARM GPIO/I2C updates, ARM usb gadget updates
Diffstat (limited to 'config-armv7')
| -rw-r--r-- | config-armv7 | 33 |
1 files changed, 18 insertions, 15 deletions
diff --git a/config-armv7 b/config-armv7 index 0ad00f2b7..09ee753af 100644 --- a/config-armv7 +++ b/config-armv7 @@ -20,11 +20,6 @@ CONFIG_ARCH_ZYNQ=y # CONFIG_VIRTIO_CONSOLE is not set # CONFIG_ARM_VIRT_EXT is not set -# Generic -CONFIG_REMOTEPROC=m -# Need at some point for am33xx and others -# CONFIG_IIO is not set - # mvebu CONFIG_MACH_ARMADA_370_XP=y CONFIG_MACH_ARMADA_370=y @@ -147,10 +142,6 @@ CONFIG_USB_OHCI_HCD_PLATFORM=m CONFIG_USB_OHCI_HCD_OMAP3=y CONFIG_USB_MUSB_AM35X=m CONFIG_USB_MUSB_OMAP2PLUS=m -CONFIG_USB_MUSB_HDRC=m -CONFIG_USB_GADGET_MUSB_HDRC=m -# CONFIG_MUSB_PIO_ONLY is not set -# CONFIG_USB_MUSB_DEBUG is not set CONFIG_OMAP_CONTROL_USB=m CONFIG_MMC_OMAP=y CONFIG_MMC_OMAP_HS=y @@ -312,6 +303,8 @@ CONFIG_SOC_AM33XX=y CONFIG_SOC_AM43XX=y CONFIG_AM335X_CONTROL_USB=m CONFIG_AM335X_PHY_USB=m +CONFIG_USB_MUSB_AM335X_CHILD=y +CONFIG_USB_TI_CPPI41_DMA=y CONFIG_MFD_TI_AM335X_TSCADC=m CONFIG_TI_ST=m CONFIG_TI_DAC7512=m @@ -440,11 +433,6 @@ CONFIG_RTC_DRV_DA9055=m CONFIG_REGULATOR_DA9052=m CONFIG_REGULATOR_DA9055=m -# exynos -# CONFIG_DRM_EXYNOS is not set -# CONFIG_PINCTRL_EXYNOS5440 is not set -# CONFIG_PINCTRL_EXYNOS is not set - # picoxcell CONFIG_CRYPTO_DEV_PICOXCELL=m CONFIG_HW_RANDOM_PICOXCELL=m @@ -586,6 +574,11 @@ CONFIG_MFD_TC6387XB=y # Generic drivers +CONFIG_REMOTEPROC=m + +# Need at some point for am33xx and others +# CONFIG_IIO is not set + # Regulator drivers CONFIG_REGULATOR_FAN53555=m # CONFIG_REGULATOR_88PM800 is not set @@ -602,8 +595,19 @@ CONFIG_REGULATOR_MAX8907=m CONFIG_REGULATOR_MAX8952=m CONFIG_REGULATOR_MAX8973=m +CONFIG_CHARGER_MANAGER=y +CONFIG_CHARGER_GPIO=m +CONFIG_PDA_POWER=m + # usb gadget CONFIG_USB_GADGET=m +CONFIG_USB_GADGET_MUSB_HDRC=m +CONFIG_USB_MUSB_HDRC=m +CONFIG_USB_MUSB_DUAL_ROLE=y +CONFIG_USB_MUSB_DSPS=m +CONFIG_USB_GPIO_VBUS=m +# CONFIG_MUSB_PIO_ONLY is not set +# CONFIG_USB_MUSB_DEBUG is not set CONFIG_USB_GADGET_VBUS_DRAW=100 CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2 # CONFIG_USB_FSL_USB2 is not set @@ -665,7 +669,6 @@ CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2 # CONFIG_TOUCHSCREEN_AUO_PIXCIR is not set # CONFIG_VIRTUALIZATION is not set -# CONFIG_CHARGER_MANAGER is not set # CONFIG_POWER_RESET_QNAP is not set # CONFIG_OMAP2_DSS_DEBUG is not set # CONFIG_DRM_TEGRA_DEBUG is not set |