diff options
author | Stefan Agner <stefan@agner.ch> | 2014-05-14 23:31:50 +0200 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2014-05-24 00:16:26 +0200 |
commit | 11fd0a41cdb7e113919076c029cafe674c6d8eb3 (patch) | |
tree | ea59393d8db5542c2cca9071baabdc5bab2667c6 /arch/arm | |
parent | c4d1c506e073f190c8964b5a35ef79272f947843 (diff) | |
download | talos-obmc-linux-11fd0a41cdb7e113919076c029cafe674c6d8eb3.tar.gz talos-obmc-linux-11fd0a41cdb7e113919076c029cafe674c6d8eb3.zip |
ARM: add drivers for Colibri T30 to multi_v7_defconfig
Toradex Colibri Evaluation Board uses the DS1307 RTC and the
MCP251x CAN controller. The NVIDIA Tegra 3 based Colibri T30
module can be used on this carrier board, hence enable those
drivers in tegra_defonfig and multi_v7_defconfig.
Furthermore the NVIDIA Tegra 3 based Apalis T30 module too
contains two MCP251x CAN controller.
Signed-off-by: Stefan Agner <stefan@agner.ch>
Acked-by: Stephen Warren <swarren@nvidia.com>
Signed-off-by: Olof Johansson <olof@lixom.net>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm')
-rw-r--r-- | arch/arm/configs/multi_v7_defconfig | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig index 0c94665f8927..5b9a320c79e4 100644 --- a/arch/arm/configs/multi_v7_defconfig +++ b/arch/arm/configs/multi_v7_defconfig @@ -97,6 +97,11 @@ CONFIG_INET6_IPCOMP=m CONFIG_IPV6_MIP6=m CONFIG_IPV6_TUNNEL=m CONFIG_IPV6_MULTIPLE_TABLES=y +CONFIG_CAN=y +CONFIG_CAN_RAW=y +CONFIG_CAN_BCM=y +CONFIG_CAN_DEV=y +CONFIG_CAN_MCP251X=y CONFIG_CFG80211=m CONFIG_MAC80211=m CONFIG_RFKILL=y @@ -293,6 +298,7 @@ CONFIG_EDAC_HIGHBANK_MC=y CONFIG_EDAC_HIGHBANK_L2=y CONFIG_RTC_CLASS=y CONFIG_RTC_DRV_AS3722=y +CONFIG_RTC_DRV_DS1307=y CONFIG_RTC_DRV_MAX8907=y CONFIG_RTC_DRV_PALMAS=y CONFIG_RTC_DRV_TWL4030=y |