aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2016-05-10 08:03:53 -0400
committerArnd Bergmann <arnd@arndb.de>2016-05-10 08:03:53 -0400
commitcbf3bbeb2e0a5a996207d48c0546c7ae5fc5e8f4 (patch)
treef1d5e2fe13bf725e309ed4e7f20b5ce8b09222e2
parenta651b61b8721b517044bb62de88de35924e7ffa1 (diff)
parent8b182f395aa6e41973eff14619f3cdd36a6c67de (diff)
Merge tag 'davinci-for-v4.7/defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci into next/defconfig
Merge "DaVinci defconfig updates for v4.7" from Sekhar Nori: Some defconfig updates to support systemd based filesystems, SPI NOR and GPIO sysfs entries. * tag 'davinci-for-v4.7/defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci: ARM: davinci_all_defconfig: enable SPI and NOR as modules ARM: davinci_all_defconfig: support systemd ARM: davinci_all_defconfig: enable GPIO_SYSFS
-rw-r--r--arch/arm/configs/davinci_all_defconfig7
1 files changed, 6 insertions, 1 deletions
diff --git a/arch/arm/configs/davinci_all_defconfig b/arch/arm/configs/davinci_all_defconfig
index 235842c9ba96..f33d042b1273 100644
--- a/arch/arm/configs/davinci_all_defconfig
+++ b/arch/arm/configs/davinci_all_defconfig
@@ -2,6 +2,7 @@ CONFIG_EXPERIMENTAL=y
2# CONFIG_SWAP is not set 2# CONFIG_SWAP is not set
3CONFIG_SYSVIPC=y 3CONFIG_SYSVIPC=y
4CONFIG_POSIX_MQUEUE=y 4CONFIG_POSIX_MQUEUE=y
5CONFIG_FHANDLE=y
5CONFIG_IKCONFIG=y 6CONFIG_IKCONFIG=y
6CONFIG_IKCONFIG_PROC=y 7CONFIG_IKCONFIG_PROC=y
7CONFIG_LOG_BUF_SHIFT=14 8CONFIG_LOG_BUF_SHIFT=14
@@ -70,8 +71,10 @@ CONFIG_MTD_CFI=m
70CONFIG_MTD_CFI_INTELEXT=m 71CONFIG_MTD_CFI_INTELEXT=m
71CONFIG_MTD_CFI_AMDSTD=m 72CONFIG_MTD_CFI_AMDSTD=m
72CONFIG_MTD_PHYSMAP=m 73CONFIG_MTD_PHYSMAP=m
74CONFIG_MTD_M25P80=m
73CONFIG_MTD_NAND=m 75CONFIG_MTD_NAND=m
74CONFIG_MTD_NAND_DAVINCI=m 76CONFIG_MTD_NAND_DAVINCI=m
77CONFIG_MTD_SPI_NOR=m
75CONFIG_PROC_DEVICETREE=y 78CONFIG_PROC_DEVICETREE=y
76CONFIG_BLK_DEV_LOOP=m 79CONFIG_BLK_DEV_LOOP=m
77CONFIG_BLK_DEV_RAM=y 80CONFIG_BLK_DEV_RAM=y
@@ -117,7 +120,10 @@ CONFIG_SERIAL_OF_PLATFORM=y
117CONFIG_I2C=y 120CONFIG_I2C=y
118CONFIG_I2C_CHARDEV=y 121CONFIG_I2C_CHARDEV=y
119CONFIG_I2C_DAVINCI=y 122CONFIG_I2C_DAVINCI=y
123CONFIG_SPI=y
124CONFIG_SPI_DAVINCI=m
120CONFIG_PINCTRL_SINGLE=y 125CONFIG_PINCTRL_SINGLE=y
126CONFIG_GPIO_SYSFS=y
121CONFIG_GPIO_PCF857X=y 127CONFIG_GPIO_PCF857X=y
122CONFIG_WATCHDOG=y 128CONFIG_WATCHDOG=y
123CONFIG_DAVINCI_WATCHDOG=m 129CONFIG_DAVINCI_WATCHDOG=m
@@ -187,7 +193,6 @@ CONFIG_TI_EDMA=y
187CONFIG_EXT2_FS=y 193CONFIG_EXT2_FS=y
188CONFIG_EXT3_FS=y 194CONFIG_EXT3_FS=y
189CONFIG_XFS_FS=m 195CONFIG_XFS_FS=m
190CONFIG_INOTIFY=y
191CONFIG_AUTOFS4_FS=m 196CONFIG_AUTOFS4_FS=m
192CONFIG_MSDOS_FS=y 197CONFIG_MSDOS_FS=y
193CONFIG_VFAT_FS=y 198CONFIG_VFAT_FS=y