summaryrefslogtreecommitdiffstats
path: root/config-armv7
diff options
context:
space:
mode:
authorPeter Robinson <pbrobinson@gmail.com>2014-01-12 14:20:41 +0000
committerPeter Robinson <pbrobinson@gmail.com>2014-01-12 14:20:41 +0000
commit39549c0eb37a4c221592b6359d2a5663b13978b7 (patch)
treefc49c1aa0df7732e0226cc6b55733c6c617bb373 /config-armv7
parent97eebfc4785e598f3540d748b33b38676e4afd71 (diff)
downloadkernel-39549c0eb37a4c221592b6359d2a5663b13978b7.tar.gz
kernel-39549c0eb37a4c221592b6359d2a5663b13978b7.tar.xz
kernel-39549c0eb37a4c221592b6359d2a5663b13978b7.zip
Minor ARM config updates and cleanups
Diffstat (limited to 'config-armv7')
-rw-r--r--config-armv714
1 files changed, 7 insertions, 7 deletions
diff --git a/config-armv7 b/config-armv7
index 22eab1120..c57957c9a 100644
--- a/config-armv7
+++ b/config-armv7
@@ -143,7 +143,6 @@ CONFIG_RTC_DRV_TWL4030=y
CONFIG_RTC_DRV_OMAP=y
CONFIG_SENSORS_TWL4030_MADC=m
CONFIG_TWL6030_GPADC=m
-CONFIG_HW_RANDOM_OMAP3_ROM=m
# OMAP5 (possibly other devices too)
CONFIG_MFD_PALMAS=y
@@ -176,7 +175,7 @@ CONFIG_TOUCHSCREEN_TI_TSCADC=m
# OMAP thermal temp. Can likely be built as module but doesn't autoload so build in to ensure performance on PandaES
CONFIG_OMAP_BANDGAP=y
-CONFIG_TI_SOC_THERMAL=m
+CONFIG_TI_SOC_THERMAL=y
CONFIG_TI_THERMAL=y
CONFIG_OMAP4_THERMAL=y
CONFIG_OMAP5_THERMAL=y
@@ -196,6 +195,7 @@ CONFIG_PWM_TWL_LED=m
CONFIG_CRYPTO_DEV_OMAP_SHAM=m
CONFIG_CRYPTO_DEV_OMAP_AES=m
CONFIG_HW_RANDOM_OMAP=m
+CONFIG_HW_RANDOM_OMAP3_ROM=m
CONFIG_DRM_OMAP=m
CONFIG_DRM_OMAP_NUM_CRTCS=2
@@ -296,23 +296,23 @@ 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_MUSB_AM335X_CHILD=m
+CONFIG_TI_CPPI41=m
CONFIG_USB_TI_CPPI41_DMA=y
CONFIG_MFD_TI_AM335X_TSCADC=m
CONFIG_TI_ST=m
CONFIG_TI_DAC7512=m
+CONFIG_TI_DAVINCI_CPDMA=m
CONFIG_TI_DAVINCI_EMAC=m
CONFIG_TI_DAVINCI_MDIO=m
-CONFIG_TI_DAVINCI_CPDMA=m
CONFIG_TI_CPSW=m
-CONFIG_TI_CPTS=y
+CONFIG_TI_CPSW_PHY_SEL=y
+# CONFIG_TI_CPTS is not set
CONFIG_TI_EMIF=m
CONFIG_DRM_TILCDC=m
CONFIG_SPI_DAVINCI=m
CONFIG_SND_DAVINCI_SOC=m
CONFIG_REGULATOR_TI_ABB=m
-CONFIG_TI_CPPI41=m
-CONFIG_MFD_TI_AM335X_TSCADC=m
CONFIG_TI_ADC081C=m
CONFIG_TI_AM335X_ADC=m
CONFIG_PWM_TIPWMSS=y