summaryrefslogtreecommitdiffstats
path: root/config-armv7-generic
diff options
context:
space:
mode:
authorPeter Robinson <pbrobinson@gmail.com>2013-10-07 17:34:36 +0100
committerPeter Robinson <pbrobinson@gmail.com>2013-10-07 17:34:36 +0100
commit82bda6aab09da5aab6a34d0cbfe4c4c003c85005 (patch)
treeb0cff17937d877a36827d5b87002e745e70c8d56 /config-armv7-generic
parent511955b506df909f91573ba7a7d788b837e98421 (diff)
downloadkernel-82bda6aab09da5aab6a34d0cbfe4c4c003c85005.tar.gz
kernel-82bda6aab09da5aab6a34d0cbfe4c4c003c85005.tar.xz
kernel-82bda6aab09da5aab6a34d0cbfe4c4c003c85005.zip
* General ARM config cleanups
- Remove old/dupe ARM config options - Enable external connectors on ARM - Enable i.MX and TI thermal controllers - Enable i.MX RNG driver - ARM MFD and REGULATOR changes and cleanups - AM33xx (BeagleBone) config improvements - Rebase OMAP DVI patch - Enable console for Zynq-7xxx SoCs
Diffstat (limited to 'config-armv7-generic')
-rw-r--r--config-armv7-generic50
1 files changed, 34 insertions, 16 deletions
diff --git a/config-armv7-generic b/config-armv7-generic
index b3d16473..0b0a3a76 100644
--- a/config-armv7-generic
+++ b/config-armv7-generic
@@ -157,7 +157,6 @@ CONFIG_PL330_DMA=m
CONFIG_AMBA_PL08X=y
CONFIG_ARM_SP805_WATCHDOG=m
CONFIG_GPIO_PL061=y
-CONFIG_FB_ARMCLCD=m
# usb
CONFIG_USB_OTG=y
@@ -170,7 +169,11 @@ CONFIG_USB_ISP1760_HCD=m
# CONFIG_USB_EHCI_HCD_ORION is not set
# Multifunction Devices
-CONFIG_MFD_SYSCON=y
+CONFIG_MFD_TPS65090=y
+CONFIG_MFD_TPS65217=y
+CONFIG_MFD_TPS65910=y
+CONFIG_MFD_TPS65912=y
+CONFIG_MFD_TPS65912_I2C=y
CONFIG_MFD_TPS65912_SPI=y
# CONFIG_MFD_DA9052_SPI is not set
# CONFIG_MFD_ARIZONA_SPI is not set
@@ -187,7 +190,6 @@ CONFIG_PINCTRL_SINGLE=y
# GPIO
CONFIG_GPIO_GENERIC_PLATFORM=m
-CONFIG_EXTCON_GPIO=m
# CONFIG_GPIO_EM is not set
CONFIG_GPIO_ADNP=m
CONFIG_GPIO_MCP23S08=m
@@ -200,11 +202,13 @@ CONFIG_LEDS_GPIO=m
CONFIG_GPIO_MAX7301=m
CONFIG_GPIO_MC33880=m
CONFIG_GPIO_74X164=m
+CONFIG_GPIO_TPS65910=y
CONFIG_GPIO_TPS65912=m
# CONFIG_GPIO_RCAR is not set
CONFIG_W1_MASTER_GPIO=m
CONFIG_CHARGER_GPIO=m
+# SPI
CONFIG_SPI=y
CONFIG_SPI_MASTER=y
CONFIG_SPI_GPIO=m
@@ -225,6 +229,10 @@ CONFIG_SPI_TLE62X0=m
CONFIG_NFC_NCI_SPI=y
+# i2c
+CONFIG_I2C_DESIGNWARE_CORE=m
+CONFIG_I2C_DESIGNWARE_PLATFORM=m
+
# HW crypto and rng
CONFIG_CRYPTO_SHA1_ARM=m
CONFIG_CRYPTO_AES_ARM=m
@@ -283,23 +291,26 @@ CONFIG_SND_DESIGNWARE_I2S=m
CONFIG_SND_SIMPLE_CARD=m
CONFIG_SND_SOC_CACHE_LZO=y
CONFIG_SND_SOC_ALL_CODECS=m
-CONFIG_SND_SOC_DMAENGINE_PCM=y
+CONFIG_SND_DMAENGINE_PCM=m
CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y
# CONFIG_SND_ATMEL_SOC is not set
# Displays
+CONFIG_BACKLIGHT_TPS65217=m
# RTC
-CONFIG_RTC_DRV_M41T93=m
-CONFIG_RTC_DRV_M41T94=m
CONFIG_RTC_DRV_DS1305=m
CONFIG_RTC_DRV_DS1390=m
+CONFIG_RTC_DRV_DS3234=m
+CONFIG_RTC_DRV_M41T93=m
+CONFIG_RTC_DRV_M41T94=m
CONFIG_RTC_DRV_MAX6902=m
+CONFIG_RTC_DRV_PCF2123=m
CONFIG_RTC_DRV_R9701=m
CONFIG_RTC_DRV_RS5C348=m
-CONFIG_RTC_DRV_DS3234=m
-CONFIG_RTC_DRV_PCF2123=m
CONFIG_RTC_DRV_RX4581=m
+CONFIG_RTC_DRV_TPS65910=m
+CONFIG_RTC_DRV_TPS80031=m
# Regulators
CONFIG_REGULATOR=y
@@ -311,27 +322,31 @@ CONFIG_REGULATOR_VIRTUAL_CONSUMER=m
CONFIG_REGULATOR_USERSPACE_CONSUMER=m
CONFIG_REGULATOR_GPIO=m
CONFIG_REGULATOR_AD5398=m
+CONFIG_REGULATOR_DA9210=m
CONFIG_REGULATOR_FAN53555=m
-CONFIG_REGULATOR_ANATOP=m
CONFIG_REGULATOR_ISL6271A=m
+CONFIG_REGULATOR_LP3971=m
+CONFIG_REGULATOR_LP3972=m
+CONFIG_REGULATOR_LP872X=m
+CONFIG_REGULATOR_LP8755=m
CONFIG_REGULATOR_MAX1586=m
CONFIG_REGULATOR_MAX8649=m
CONFIG_REGULATOR_MAX8660=m
CONFIG_REGULATOR_MAX8952=m
CONFIG_REGULATOR_MAX8973=m
-CONFIG_REGULATOR_LP3971=m
-CONFIG_REGULATOR_LP3972=m
-CONFIG_REGULATOR_LP8755=m
+CONFIG_REGULATOR_PFUZE100=m
CONFIG_REGULATOR_TPS51632=m
CONFIG_REGULATOR_TPS62360=m
CONFIG_REGULATOR_TPS65023=m
CONFIG_REGULATOR_TPS6507X=m
+CONFIG_REGULATOR_TPS65090=m
+CONFIG_REGULATOR_TPS65217=m
CONFIG_REGULATOR_TPS6524X=m
+CONFIG_REGULATOR_TPS6586X=m
+CONFIG_REGULATOR_TPS65910=m
CONFIG_REGULATOR_TPS65912=m
-CONFIG_REGULATOR_DA9210=m
-CONFIG_REGULATOR_LP872X=m
-CONFIG_REGULATOR_PFUZE100=m
-
+CONFIG_REGULATOR_TPS80031=m
+CONFIG_CHARGER_TPS65090=m
CONFIG_SENSORS_AD7314=m
CONFIG_SENSORS_ADCXX=m
@@ -414,6 +429,9 @@ CONFIG_UBIFS_FS_LZO=y
CONFIG_UBIFS_FS_ZLIB=y
# CONFIG_UBIFS_FS_DEBUG is not set
+# Sensors
+CONFIG_SENSORS_HTU21=m
+
# Should be in generic
CONFIG_BPF_JIT=y
# CONFIG_NET_VENDOR_CIRRUS is not set