summaryrefslogtreecommitdiffstats
path: root/config-armv7
diff options
context:
space:
mode:
authorPeter Robinson <pbrobinson@gmail.com>2013-03-06 19:45:15 +0000
committerPeter Robinson <pbrobinson@gmail.com>2013-03-06 19:45:15 +0000
commitd77d603f14fac20b0821a042a81d62a175af2a27 (patch)
tree82cc3fb98740564afb7d9e0e6f88650ca50569bd /config-armv7
parent674fbccd241415e9f0f62e4295d0bdb0c1340eeb (diff)
downloadkernel-d77d603f14fac20b0821a042a81d62a175af2a27.tar.gz
kernel-d77d603f14fac20b0821a042a81d62a175af2a27.tar.xz
kernel-d77d603f14fac20b0821a042a81d62a175af2a27.zip
Update ARM mvebu config
Diffstat (limited to 'config-armv7')
-rw-r--r--config-armv710
1 files changed, 7 insertions, 3 deletions
diff --git a/config-armv7 b/config-armv7
index cc3ff539e..bfc2d13c0 100644
--- a/config-armv7
+++ b/config-armv7
@@ -188,7 +188,6 @@ CONFIG_ARM_AMBA=y
# mvebu
CONFIG_MV_XOR=y
-CONFIG_RTC_DRV_88PM80X=m
CONFIG_CRYPTO_DEV_MV_CESA=m
CONFIG_MV643XX_ETH=m
CONFIG_I2C_MV64XXX=m
@@ -197,10 +196,16 @@ CONFIG_PINCTRL_ARMADA_370=y
CONFIG_PINCTRL_ARMADA_XP=y
CONFIG_PINCTRL_DOVE=y
CONFIG_EDAC_MV64X60=m
-CONFIG_MVNETA=m
CONFIG_SATA_MV=m
CONFIG_MARVELL_PHY=m
CONFIG_RTC_DRV_S35390A=y
+CONFIG_RTC_DRV_88PM80X=m
+CONFIG_RTC_DRV_MV=m
+CONFIG_MVMDIO=m
+CONFIG_MVNETA=m
+CONFIG_GPIO_MVEBU=y
+CONFIG_MVEBU_CLK_CORE=y
+CONFIG_MVEBU_CLK_GATING=y
# Allwinner a1x
# CONFIG_SUNXI_RFKILL=y
@@ -351,7 +356,6 @@ CONFIG_MFD_MAX8907=m
# RTC
CONFIG_RTC_DRV_SNVS=m
-# CONFIG_RTC_DRV_MV is not set
# Pin stuff
CONFIG_PINMUX=y