diff options
| author | Olof Johansson <olof@lixom.net> | 2013-08-16 06:38:27 (GMT) |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-08-16 06:38:27 (GMT) |
| commit | 88ab316f34b55acaeed5c96fcbe7758ea8dc5d67 (patch) | |
| tree | e427c0e17c99d94c107257f643c91a31b88b259d /arch/arm/configs/kirkwood_defconfig | |
| parent | 5ddc9d6023c9b60f7e5b6c1658c3316cf915c3d1 (diff) | |
| parent | 697004aebfd847374f401dc852d2f2e107aa3096 (diff) | |
| download | linux-fsl-qoriq-88ab316f34b55acaeed5c96fcbe7758ea8dc5d67.tar.xz | |
Merge tag 'defconfig-3.12' of git://git.infradead.org/linux-mvebu into next/boards
From Jason Cooper, mvebu defconfig changes for v3.12:
- kirkwood: add i2c devices, ext4, r8169
- mvebu: gpio-keys, input event
- dove: SI5351, PCI, xHCI
* tag 'defconfig-3.12' of git://git.infradead.org/linux-mvebu:
ARM: dove: update dove_defconfig with SI5351, PCI, and xHCI
ARM: mvebu: add gpio-keys and input event support in defconfig
ARM: Kirkwood: update defconfig for used i2c devices, EXT4 FS, r8169
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/configs/kirkwood_defconfig')
| -rw-r--r-- | arch/arm/configs/kirkwood_defconfig | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/arch/arm/configs/kirkwood_defconfig b/arch/arm/configs/kirkwood_defconfig index e3f667a..0ae0eaeb 100644 --- a/arch/arm/configs/kirkwood_defconfig +++ b/arch/arm/configs/kirkwood_defconfig @@ -61,6 +61,7 @@ CONFIG_MTD_M25P80=y CONFIG_MTD_NAND=y CONFIG_MTD_NAND_ORION=y CONFIG_BLK_DEV_LOOP=y +CONFIG_EEPROM_AT24=y # CONFIG_SCSI_PROC_FS is not set CONFIG_BLK_DEV_SD=y CONFIG_BLK_DEV_SR=m @@ -71,6 +72,7 @@ CONFIG_SATA_MV=y CONFIG_NETDEVICES=y CONFIG_NET_DSA_MV88E6123_61_65=y CONFIG_MV643XX_ETH=y +CONFIG_R8169=y CONFIG_MARVELL_PHY=y CONFIG_LIBERTAS=y CONFIG_LIBERTAS_SDIO=y @@ -91,7 +93,10 @@ CONFIG_I2C_MV64XXX=y CONFIG_SPI=y CONFIG_SPI_ORION=y CONFIG_GPIO_SYSFS=y -# CONFIG_HWMON is not set +CONFIG_SENSORS_ADT7475=y +CONFIG_SENSORS_LM63=y +CONFIG_SENSORS_LM75=y +CONFIG_SENSORS_LM85=y CONFIG_THERMAL=y CONFIG_WATCHDOG=y CONFIG_ORION_WATCHDOG=y @@ -131,6 +136,8 @@ CONFIG_LEDS_TRIGGER_TIMER=y CONFIG_LEDS_TRIGGER_HEARTBEAT=y CONFIG_LEDS_TRIGGER_DEFAULT_ON=y CONFIG_RTC_CLASS=y +CONFIG_RTC_DRV_RS5C372=y +CONFIG_RTC_DRV_PCF8563=y CONFIG_RTC_DRV_S35390A=y CONFIG_RTC_DRV_MV=y CONFIG_DMADEVICES=y @@ -138,6 +145,7 @@ CONFIG_MV_XOR=y CONFIG_EXT2_FS=y CONFIG_EXT3_FS=y # CONFIG_EXT3_FS_XATTR is not set +CONFIG_EXT4_FS=y CONFIG_ISO9660_FS=m CONFIG_JOLIET=y CONFIG_UDF_FS=m |