diff options
author | Arnd Bergmann <arnd@arndb.de> | 2016-05-10 08:03:53 -0400 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2016-05-10 08:03:53 -0400 |
commit | cbf3bbeb2e0a5a996207d48c0546c7ae5fc5e8f4 (patch) | |
tree | f1d5e2fe13bf725e309ed4e7f20b5ce8b09222e2 | |
parent | a651b61b8721b517044bb62de88de35924e7ffa1 (diff) | |
parent | 8b182f395aa6e41973eff14619f3cdd36a6c67de (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_defconfig | 7 |
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 |
3 | CONFIG_SYSVIPC=y | 3 | CONFIG_SYSVIPC=y |
4 | CONFIG_POSIX_MQUEUE=y | 4 | CONFIG_POSIX_MQUEUE=y |
5 | CONFIG_FHANDLE=y | ||
5 | CONFIG_IKCONFIG=y | 6 | CONFIG_IKCONFIG=y |
6 | CONFIG_IKCONFIG_PROC=y | 7 | CONFIG_IKCONFIG_PROC=y |
7 | CONFIG_LOG_BUF_SHIFT=14 | 8 | CONFIG_LOG_BUF_SHIFT=14 |
@@ -70,8 +71,10 @@ CONFIG_MTD_CFI=m | |||
70 | CONFIG_MTD_CFI_INTELEXT=m | 71 | CONFIG_MTD_CFI_INTELEXT=m |
71 | CONFIG_MTD_CFI_AMDSTD=m | 72 | CONFIG_MTD_CFI_AMDSTD=m |
72 | CONFIG_MTD_PHYSMAP=m | 73 | CONFIG_MTD_PHYSMAP=m |
74 | CONFIG_MTD_M25P80=m | ||
73 | CONFIG_MTD_NAND=m | 75 | CONFIG_MTD_NAND=m |
74 | CONFIG_MTD_NAND_DAVINCI=m | 76 | CONFIG_MTD_NAND_DAVINCI=m |
77 | CONFIG_MTD_SPI_NOR=m | ||
75 | CONFIG_PROC_DEVICETREE=y | 78 | CONFIG_PROC_DEVICETREE=y |
76 | CONFIG_BLK_DEV_LOOP=m | 79 | CONFIG_BLK_DEV_LOOP=m |
77 | CONFIG_BLK_DEV_RAM=y | 80 | CONFIG_BLK_DEV_RAM=y |
@@ -117,7 +120,10 @@ CONFIG_SERIAL_OF_PLATFORM=y | |||
117 | CONFIG_I2C=y | 120 | CONFIG_I2C=y |
118 | CONFIG_I2C_CHARDEV=y | 121 | CONFIG_I2C_CHARDEV=y |
119 | CONFIG_I2C_DAVINCI=y | 122 | CONFIG_I2C_DAVINCI=y |
123 | CONFIG_SPI=y | ||
124 | CONFIG_SPI_DAVINCI=m | ||
120 | CONFIG_PINCTRL_SINGLE=y | 125 | CONFIG_PINCTRL_SINGLE=y |
126 | CONFIG_GPIO_SYSFS=y | ||
121 | CONFIG_GPIO_PCF857X=y | 127 | CONFIG_GPIO_PCF857X=y |
122 | CONFIG_WATCHDOG=y | 128 | CONFIG_WATCHDOG=y |
123 | CONFIG_DAVINCI_WATCHDOG=m | 129 | CONFIG_DAVINCI_WATCHDOG=m |
@@ -187,7 +193,6 @@ CONFIG_TI_EDMA=y | |||
187 | CONFIG_EXT2_FS=y | 193 | CONFIG_EXT2_FS=y |
188 | CONFIG_EXT3_FS=y | 194 | CONFIG_EXT3_FS=y |
189 | CONFIG_XFS_FS=m | 195 | CONFIG_XFS_FS=m |
190 | CONFIG_INOTIFY=y | ||
191 | CONFIG_AUTOFS4_FS=m | 196 | CONFIG_AUTOFS4_FS=m |
192 | CONFIG_MSDOS_FS=y | 197 | CONFIG_MSDOS_FS=y |
193 | CONFIG_VFAT_FS=y | 198 | CONFIG_VFAT_FS=y |