summaryrefslogtreecommitdiffstats
path: root/arch/arm/configs/mvebu_defconfig
diff options
context:
space:
mode:
authorJason Cooper <jason@lakedaemon.net>2012-11-22 03:28:05 +0000
committerJason Cooper <jason@lakedaemon.net>2012-11-22 03:28:05 +0000
commit4e76b1b2329b4a19adfacd187bc2920f68126a95 (patch)
treed0a75205304402d2724d1f290b9ee876af1b79ce /arch/arm/configs/mvebu_defconfig
parent32d6448a08bdbe6d22fcff1dfffb8399003282df (diff)
parent9bfd143ed247fc7a9e0573dc1fbaf6d124b5cac9 (diff)
downloadblackbird-op-linux-4e76b1b2329b4a19adfacd187bc2920f68126a95.tar.gz
blackbird-op-linux-4e76b1b2329b4a19adfacd187bc2920f68126a95.zip
Merge tag 'marvell-openblocks-i2c-sata-for-3.8' of git://github.com/MISL-EBU-System-SW/mainline-public into mvebu/everything
Marvell SATA and I2C enabling for OpenBlocks AX3-4
Diffstat (limited to 'arch/arm/configs/mvebu_defconfig')
-rw-r--r--arch/arm/configs/mvebu_defconfig4
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/configs/mvebu_defconfig b/arch/arm/configs/mvebu_defconfig
index 6008f12c1990..a702fb345c01 100644
--- a/arch/arm/configs/mvebu_defconfig
+++ b/arch/arm/configs/mvebu_defconfig
@@ -34,9 +34,13 @@ CONFIG_MARVELL_PHY=y
CONFIG_SERIAL_8250=y
CONFIG_SERIAL_8250_CONSOLE=y
CONFIG_SERIAL_OF_PLATFORM=y
+CONFIG_I2C=y
+CONFIG_I2C_MV64XXX=y
CONFIG_GPIOLIB=y
CONFIG_GPIO_SYSFS=y
# CONFIG_USB_SUPPORT is not set
+CONFIG_RTC_CLASS=y
+CONFIG_RTC_DRV_S35390A=y
CONFIG_DMADEVICES=y
CONFIG_MV_XOR=y
# CONFIG_IOMMU_SUPPORT is not set
OpenPOWER on IntegriCloud