aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/configs/at91sam9g20_defconfig
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2012-03-16 13:05:30 +0000
committerArnd Bergmann <arnd@arndb.de>2012-03-16 13:05:46 +0000
commit2a9f23d82a79d2785429aba43b02683abf103c0b (patch)
tree16fc44dc26a0af5b08ac668ee02f4022737c33ae /arch/arm/configs/at91sam9g20_defconfig
parentcdc3df6f44f72c5924a16a47e1663c3fb0e57820 (diff)
parent62c5553ab7ecf23e7b5464a59d728ab94479adbb (diff)
downloadkernel_replicant_linux-2a9f23d82a79d2785429aba43b02683abf103c0b.tar.gz
kernel_replicant_linux-2a9f23d82a79d2785429aba43b02683abf103c0b.tar.bz2
kernel_replicant_linux-2a9f23d82a79d2785429aba43b02683abf103c0b.zip
Merge branch 'at91-3.4-cleanup2-DT2' of git://github.com/at91linux/linux-at91 into next/dt
* 'at91-3.4-cleanup2-DT2' of git://github.com/at91linux/linux-at91: (23 commits) ARM: at91: dt: enable usb ehci for sam9g45 and sam9x5 ARM: at91: usb ehci add dt support ARM: at91: dt: enable usb ohci for sam9g20, sam9g45 amd sam9x5 ARM: at91: usb ohci add dt support ARM: at91: add Shutdown Controller (SHDWC) DT support ARM: at91: add ram controller DT support ARM: at91: add RSTC (Reset Controller) dt support ARM: at91: always enable sam9 restart ARM: at91: add pmc DT support ARM: at91/dt: add specific DT soc init ARM: at91/dt: add Calao DAB-MMX daugther board support for USB-A9G20 ARM: at91: sam9x5 add i2c DT support ARM: at91: sam9g45 add i2c DT support ARM: at91: usb_a9g20 add DT i2c support ARM: at91: sam9g20 add i2c DT support i2c/gpio: add DT support ARM: at91: sam9x5 add nand support atmel/nand: add DT support of/mtd/nand: add generic bindings and helpers of: introduce helper to manage boolean ...
Diffstat (limited to 'arch/arm/configs/at91sam9g20_defconfig')
-rw-r--r--arch/arm/configs/at91sam9g20_defconfig3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/configs/at91sam9g20_defconfig b/arch/arm/configs/at91sam9g20_defconfig
index 9123568d9a8d..994d331b2319 100644
--- a/arch/arm/configs/at91sam9g20_defconfig
+++ b/arch/arm/configs/at91sam9g20_defconfig
@@ -74,6 +74,8 @@ CONFIG_LEGACY_PTY_COUNT=16
CONFIG_SERIAL_ATMEL=y
CONFIG_SERIAL_ATMEL_CONSOLE=y
CONFIG_HW_RANDOM=y
+CONFIG_I2C=y
+CONFIG_I2C_GPIO=y
CONFIG_SPI=y
CONFIG_SPI_ATMEL=y
CONFIG_SPI_SPIDEV=y
@@ -105,6 +107,7 @@ CONFIG_LEDS_TRIGGERS=y
CONFIG_LEDS_TRIGGER_TIMER=y
CONFIG_LEDS_TRIGGER_HEARTBEAT=y
CONFIG_RTC_CLASS=y
+CONFIG_RTC_DRV_RV3029C2=y
CONFIG_RTC_DRV_AT91SAM9=y
CONFIG_EXT2_FS=y
CONFIG_MSDOS_FS=y