Unverified Commit feb46c1b authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'omap-for-v7.1/defconfig-signed' of... 

Merge tag 'omap-for-v7.1/defconfig-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap into soc/defconfig

arm: OMAP defconfig updates for v7.1

* tag 'omap-for-v7.1/defconfig-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap

:
  arm: multi_v7_defconfig: Enable more OMAP 3/4 related configs
  ARM: multi_v7_defconfig: omap2plus_defconfig: Enable ITE IT66121 driver

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 1c4c5c50 adcf290f

arch/arm/configs/multi_v7_defconfig

+28 −0
Original line number Diff line number Diff line
@@ -155,6 +155,7 @@ CONFIG_QRTR_SMD=m 
CONFIG_CAN=y

CONFIG_BT=m

CONFIG_BT_HCIUART=m

CONFIG_BT_HCIUART_LL=y

CONFIG_BT_HCIUART_BCM=y

CONFIG_BT_MRVL=m

CONFIG_BT_MRVL_SDIO=m
@@ -310,6 +311,11 @@ CONFIG_MWIFIEX=m 
CONFIG_MWIFIEX_SDIO=m

CONFIG_RT2X00=m

CONFIG_RT2800USB=m

CONFIG_WL1251=m

CONFIG_WL1251_SDIO=m

CONFIG_WL12XX=m

CONFIG_WL18XX=m

CONFIG_WLCORE_SDIO=m

CONFIG_INPUT_JOYDEV=y

CONFIG_INPUT_EVDEV=y

CONFIG_KEYBOARD_QT1070=m
@@ -318,8 +324,10 @@ CONFIG_KEYBOARD_TEGRA=y 
CONFIG_KEYBOARD_PXA27x=m

CONFIG_KEYBOARD_SAMSUNG=m

CONFIG_KEYBOARD_ST_KEYSCAN=y

CONFIG_KEYBOARD_OMAP4=m

CONFIG_KEYBOARD_SPEAR=y

CONFIG_KEYBOARD_TM2_TOUCHKEY=m

CONFIG_KEYBOARD_TWL4030=m

CONFIG_KEYBOARD_CROS_EC=m

CONFIG_MOUSE_PS2_ELANTECH=y

CONFIG_MOUSE_CYAPA=m
@@ -342,6 +350,8 @@ CONFIG_INPUT_GPIO_DECODER=m 
CONFIG_INPUT_CPCAP_PWRBUTTON=m

CONFIG_INPUT_TPS65219_PWRBUTTON=m

CONFIG_INPUT_AXP20X_PEK=m

CONFIG_INPUT_TWL4030_PWRBUTTON=m

CONFIG_INPUT_TWL4030_VIBRA=m

CONFIG_INPUT_DA9063_ONKEY=m

CONFIG_INPUT_ADXL34X=m

CONFIG_INPUT_STPMIC1_ONKEY=y
@@ -521,6 +531,8 @@ CONFIG_AXP20X_POWER=m 
CONFIG_BATTERY_MAX17040=m

CONFIG_BATTERY_MAX17042=m

CONFIG_CHARGER_CPCAP=m

CONFIG_CHARGER_TWL4030=m

CONFIG_CHARGER_TWL6030=m

CONFIG_CHARGER_GPIO=m

CONFIG_CHARGER_MAX14577=m

CONFIG_CHARGER_MAX77693=m
@@ -549,6 +561,8 @@ CONFIG_ARMADA_THERMAL=y 
CONFIG_BCM2711_THERMAL=m

CONFIG_BCM2835_THERMAL=m

CONFIG_BRCMSTB_THERMAL=m

CONFIG_OMAP4_THERMAL=y

CONFIG_OMAP5_THERMAL=y

CONFIG_ST_THERMAL_MEMMAP=y

CONFIG_RCAR_THERMAL=y

CONFIG_TEGRA_SOCTHERM=m
@@ -563,10 +577,12 @@ CONFIG_AT91SAM9X_WATCHDOG=y 
CONFIG_SAMA5D4_WATCHDOG=y

CONFIG_S3C2410_WATCHDOG=m

CONFIG_DW_WATCHDOG=y

CONFIG_OMAP_WATCHDOG=y

CONFIG_DAVINCI_WATCHDOG=m

CONFIG_ORION_WATCHDOG=y

CONFIG_RN5T618_WATCHDOG=y

CONFIG_SUNXI_WATCHDOG=y

CONFIG_TWL4030_WATCHDOG=m

CONFIG_IMX2_WDT=y

CONFIG_ST_LPC_WATCHDOG=y

CONFIG_TEGRA_WATCHDOG=m
@@ -735,6 +751,7 @@ CONFIG_DRM_RCAR_DU=m 
CONFIG_DRM_SUN4I=m

CONFIG_DRM_OMAP=m

CONFIG_OMAP5_DSS_HDMI=y

CONFIG_DRM_TILCDC=m

CONFIG_DRM_MSM=m

CONFIG_DRM_FSL_DCU=m

CONFIG_DRM_TEGRA=y
@@ -751,6 +768,7 @@ CONFIG_DRM_PANEL_EDP=y 
CONFIG_DRM_PANEL_SIMPLE=y

CONFIG_DRM_DISPLAY_CONNECTOR=m

CONFIG_DRM_I2C_NXP_TDA998X=m

CONFIG_DRM_ITE_IT66121=m

CONFIG_DRM_LVDS_CODEC=m

CONFIG_DRM_NXP_PTN3460=m

CONFIG_DRM_PARADE_PS8622=m
@@ -845,6 +863,9 @@ CONFIG_SND_SOC_TEGRA_TRIMSLICE=m 
CONFIG_SND_SOC_TEGRA_ALC5632=m

CONFIG_SND_SOC_TEGRA_MAX98090=m

CONFIG_SND_SOC_DAVINCI_MCASP=m

CONFIG_SND_SOC_OMAP_DMIC=m

CONFIG_SND_SOC_OMAP_MCPDM=m

CONFIG_SND_SOC_OMAP3_TWL4030=m

CONFIG_SND_SOC_AC97_CODEC=m

CONFIG_SND_SOC_AK4642=m

CONFIG_SND_SOC_CPCAP=m
@@ -987,6 +1008,7 @@ CONFIG_LEDS_PCA9532=m 
CONFIG_LEDS_PCA9532_GPIO=y

CONFIG_LEDS_GPIO=y

CONFIG_LEDS_PWM=y

CONFIG_LEDS_TCA6507=m

CONFIG_LEDS_MAX8997=m

CONFIG_LEDS_ACER_A500=m

CONFIG_LEDS_TRIGGERS=y
@@ -1088,6 +1110,7 @@ CONFIG_COMMON_CLK_RK808=m 
CONFIG_COMMON_CLK_SCMI=y

CONFIG_COMMON_CLK_LAN966X=y

CONFIG_COMMON_CLK_S2MPS11=m

CONFIG_CLK_TWL=m

CONFIG_CLK_RASPBERRYPI=y

CONFIG_COMMON_CLK_QCOM=y

CONFIG_QCOM_A53PLL=y
@@ -1183,6 +1206,8 @@ CONFIG_STM32_ADC_CORE=m 
CONFIG_STM32_ADC=m

CONFIG_STM32_DFSDM_ADC=m

CONFIG_STMPE_ADC=m

CONFIG_TWL4030_MADC=m

CONFIG_TWL6030_GPADC=m

CONFIG_VF610_ADC=m

CONFIG_XILINX_XADC=y

CONFIG_IIO_CROS_EC_SENSORS_CORE=m
@@ -1205,6 +1230,7 @@ CONFIG_PWM_BCM2835=y 
CONFIG_PWM_BRCMSTB=m

CONFIG_PWM_FSL_FTM=m

CONFIG_PWM_MESON=m

CONFIG_PWM_OMAP_DMTIMER=m

CONFIG_PWM_RENESAS_RCAR=m

CONFIG_PWM_RENESAS_TPU=y

CONFIG_PWM_ROCKCHIP=m
@@ -1215,6 +1241,8 @@ CONFIG_PWM_STM32_LP=m 
CONFIG_PWM_SUN4I=y

CONFIG_PWM_TEGRA=y

CONFIG_PWM_TIECAP=m

CONFIG_PWM_TWL=m

CONFIG_PWM_TWL_LED=m

CONFIG_PWM_VT8500=y

CONFIG_KEYSTONE_IRQ=y

CONFIG_RESET_MCHP_SPARX5=y

arch/arm/configs/omap2plus_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -486,6 +486,7 @@ CONFIG_VIDEO_OMAP3=m 
CONFIG_VIDEO_MT9P031=m

CONFIG_VIDEO_TVP5150=m

CONFIG_DRM=m

CONFIG_DRM_ITE_IT66121=m

CONFIG_DRM_OMAP=m

CONFIG_OMAP5_DSS_HDMI=y

CONFIG_OMAP2_DSS_SDI=y