Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f1d28f0b authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'omap-for-v4.3/defconfig-signed' of... 

Merge tag 'omap-for-v4.3/defconfig-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/defconfig

Merge "defconfig changes for v4.3" from Tony Lindgren:

Few defconfig changes for omap2plus_defconfig to enable
SPI NOR, CPTS, touchscreen and ADC used on am335x, am437x
and ra7 devices.

* tag 'omap-for-v4.3/defconfig-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap

:
  ARM: omap2plus_defconfig: enable support for M25P80 SPI NOR
  ARM: omap2plus_defconfig: enable support for TI CPTS
  ARM: omap2plus_defconfig: enable support for TI touchscreen
  ARM: omap2plus_defconfig: enable support for TI ADC

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents ea7b44b6 da104dc8

arch/arm/configs/omap2plus_defconfig

+7 −0
Original line number Diff line number Diff line
@@ -136,6 +136,8 @@ CONFIG_MTD_ONENAND=y 
CONFIG_MTD_ONENAND_VERIFY_WRITE=y

CONFIG_MTD_ONENAND_OMAP2=y

CONFIG_MTD_UBI=y

CONFIG_MTD_SPI_NOR=m

CONFIG_MTD_M25P80=m

CONFIG_BLK_DEV_LOOP=y

CONFIG_BLK_DEV_RAM=y

CONFIG_BLK_DEV_RAM_SIZE=16384
@@ -169,6 +171,7 @@ CONFIG_SMSC911X=y 
# CONFIG_NET_VENDOR_STMICRO is not set

CONFIG_TI_DAVINCI_EMAC=y

CONFIG_TI_CPSW=y

CONFIG_TI_CPTS=y

# CONFIG_NET_VENDOR_VIA is not set

# CONFIG_NET_VENDOR_WIZNET is not set

CONFIG_AT803X_PHY=y
@@ -208,6 +211,7 @@ CONFIG_TOUCHSCREEN_EDT_FT5X06=m 
CONFIG_TOUCHSCREEN_PIXCIR=m

CONFIG_TOUCHSCREEN_TSC2005=m

CONFIG_TOUCHSCREEN_TSC2007=m

CONFIG_TOUCHSCREEN_TI_AM335X_TSC=m

CONFIG_INPUT_MISC=y

CONFIG_INPUT_TPS65218_PWRBUTTON=m

CONFIG_INPUT_TWL4030_PWRBUTTON=m
@@ -269,6 +273,7 @@ CONFIG_MFD_PALMAS=y 
CONFIG_MFD_TPS65217=y

CONFIG_MFD_TPS65218=y

CONFIG_MFD_TPS65910=y

CONFIG_MFD_TI_AM335X_TSCADC=m

CONFIG_TWL6040_CORE=y

CONFIG_REGULATOR_PALMAS=y

CONFIG_REGULATOR_PBIAS=y
@@ -398,6 +403,8 @@ CONFIG_EXTCON=m 
CONFIG_EXTCON_USB_GPIO=m

CONFIG_EXTCON_PALMAS=m

CONFIG_TI_EMIF=m

CONFIG_IIO=m

CONFIG_TI_AM335X_ADC=m

CONFIG_PWM=y

CONFIG_PWM_TIECAP=m

CONFIG_PWM_TIEHRPWM=m