Skip to content

Commit feb46c1

Browse files
committed
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: Arnd Bergmann <[email protected]>
2 parents 1c4c5c5 + adcf290 commit feb46c1

2 files changed

Lines changed: 29 additions & 0 deletions

File tree

arch/arm/configs/multi_v7_defconfig

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -155,6 +155,7 @@ CONFIG_QRTR_SMD=m
155155
CONFIG_CAN=y
156156
CONFIG_BT=m
157157
CONFIG_BT_HCIUART=m
158+
CONFIG_BT_HCIUART_LL=y
158159
CONFIG_BT_HCIUART_BCM=y
159160
CONFIG_BT_MRVL=m
160161
CONFIG_BT_MRVL_SDIO=m
@@ -310,6 +311,11 @@ CONFIG_MWIFIEX=m
310311
CONFIG_MWIFIEX_SDIO=m
311312
CONFIG_RT2X00=m
312313
CONFIG_RT2800USB=m
314+
CONFIG_WL1251=m
315+
CONFIG_WL1251_SDIO=m
316+
CONFIG_WL12XX=m
317+
CONFIG_WL18XX=m
318+
CONFIG_WLCORE_SDIO=m
313319
CONFIG_INPUT_JOYDEV=y
314320
CONFIG_INPUT_EVDEV=y
315321
CONFIG_KEYBOARD_QT1070=m
@@ -318,8 +324,10 @@ CONFIG_KEYBOARD_TEGRA=y
318324
CONFIG_KEYBOARD_PXA27x=m
319325
CONFIG_KEYBOARD_SAMSUNG=m
320326
CONFIG_KEYBOARD_ST_KEYSCAN=y
327+
CONFIG_KEYBOARD_OMAP4=m
321328
CONFIG_KEYBOARD_SPEAR=y
322329
CONFIG_KEYBOARD_TM2_TOUCHKEY=m
330+
CONFIG_KEYBOARD_TWL4030=m
323331
CONFIG_KEYBOARD_CROS_EC=m
324332
CONFIG_MOUSE_PS2_ELANTECH=y
325333
CONFIG_MOUSE_CYAPA=m
@@ -342,6 +350,8 @@ CONFIG_INPUT_GPIO_DECODER=m
342350
CONFIG_INPUT_CPCAP_PWRBUTTON=m
343351
CONFIG_INPUT_TPS65219_PWRBUTTON=m
344352
CONFIG_INPUT_AXP20X_PEK=m
353+
CONFIG_INPUT_TWL4030_PWRBUTTON=m
354+
CONFIG_INPUT_TWL4030_VIBRA=m
345355
CONFIG_INPUT_DA9063_ONKEY=m
346356
CONFIG_INPUT_ADXL34X=m
347357
CONFIG_INPUT_STPMIC1_ONKEY=y
@@ -521,6 +531,8 @@ CONFIG_AXP20X_POWER=m
521531
CONFIG_BATTERY_MAX17040=m
522532
CONFIG_BATTERY_MAX17042=m
523533
CONFIG_CHARGER_CPCAP=m
534+
CONFIG_CHARGER_TWL4030=m
535+
CONFIG_CHARGER_TWL6030=m
524536
CONFIG_CHARGER_GPIO=m
525537
CONFIG_CHARGER_MAX14577=m
526538
CONFIG_CHARGER_MAX77693=m
@@ -549,6 +561,8 @@ CONFIG_ARMADA_THERMAL=y
549561
CONFIG_BCM2711_THERMAL=m
550562
CONFIG_BCM2835_THERMAL=m
551563
CONFIG_BRCMSTB_THERMAL=m
564+
CONFIG_OMAP4_THERMAL=y
565+
CONFIG_OMAP5_THERMAL=y
552566
CONFIG_ST_THERMAL_MEMMAP=y
553567
CONFIG_RCAR_THERMAL=y
554568
CONFIG_TEGRA_SOCTHERM=m
@@ -563,10 +577,12 @@ CONFIG_AT91SAM9X_WATCHDOG=y
563577
CONFIG_SAMA5D4_WATCHDOG=y
564578
CONFIG_S3C2410_WATCHDOG=m
565579
CONFIG_DW_WATCHDOG=y
580+
CONFIG_OMAP_WATCHDOG=y
566581
CONFIG_DAVINCI_WATCHDOG=m
567582
CONFIG_ORION_WATCHDOG=y
568583
CONFIG_RN5T618_WATCHDOG=y
569584
CONFIG_SUNXI_WATCHDOG=y
585+
CONFIG_TWL4030_WATCHDOG=m
570586
CONFIG_IMX2_WDT=y
571587
CONFIG_ST_LPC_WATCHDOG=y
572588
CONFIG_TEGRA_WATCHDOG=m
@@ -735,6 +751,7 @@ CONFIG_DRM_RCAR_DU=m
735751
CONFIG_DRM_SUN4I=m
736752
CONFIG_DRM_OMAP=m
737753
CONFIG_OMAP5_DSS_HDMI=y
754+
CONFIG_DRM_TILCDC=m
738755
CONFIG_DRM_MSM=m
739756
CONFIG_DRM_FSL_DCU=m
740757
CONFIG_DRM_TEGRA=y
@@ -751,6 +768,7 @@ CONFIG_DRM_PANEL_EDP=y
751768
CONFIG_DRM_PANEL_SIMPLE=y
752769
CONFIG_DRM_DISPLAY_CONNECTOR=m
753770
CONFIG_DRM_I2C_NXP_TDA998X=m
771+
CONFIG_DRM_ITE_IT66121=m
754772
CONFIG_DRM_LVDS_CODEC=m
755773
CONFIG_DRM_NXP_PTN3460=m
756774
CONFIG_DRM_PARADE_PS8622=m
@@ -845,6 +863,9 @@ CONFIG_SND_SOC_TEGRA_TRIMSLICE=m
845863
CONFIG_SND_SOC_TEGRA_ALC5632=m
846864
CONFIG_SND_SOC_TEGRA_MAX98090=m
847865
CONFIG_SND_SOC_DAVINCI_MCASP=m
866+
CONFIG_SND_SOC_OMAP_DMIC=m
867+
CONFIG_SND_SOC_OMAP_MCPDM=m
868+
CONFIG_SND_SOC_OMAP3_TWL4030=m
848869
CONFIG_SND_SOC_AC97_CODEC=m
849870
CONFIG_SND_SOC_AK4642=m
850871
CONFIG_SND_SOC_CPCAP=m
@@ -987,6 +1008,7 @@ CONFIG_LEDS_PCA9532=m
9871008
CONFIG_LEDS_PCA9532_GPIO=y
9881009
CONFIG_LEDS_GPIO=y
9891010
CONFIG_LEDS_PWM=y
1011+
CONFIG_LEDS_TCA6507=m
9901012
CONFIG_LEDS_MAX8997=m
9911013
CONFIG_LEDS_ACER_A500=m
9921014
CONFIG_LEDS_TRIGGERS=y
@@ -1088,6 +1110,7 @@ CONFIG_COMMON_CLK_RK808=m
10881110
CONFIG_COMMON_CLK_SCMI=y
10891111
CONFIG_COMMON_CLK_LAN966X=y
10901112
CONFIG_COMMON_CLK_S2MPS11=m
1113+
CONFIG_CLK_TWL=m
10911114
CONFIG_CLK_RASPBERRYPI=y
10921115
CONFIG_COMMON_CLK_QCOM=y
10931116
CONFIG_QCOM_A53PLL=y
@@ -1183,6 +1206,8 @@ CONFIG_STM32_ADC_CORE=m
11831206
CONFIG_STM32_ADC=m
11841207
CONFIG_STM32_DFSDM_ADC=m
11851208
CONFIG_STMPE_ADC=m
1209+
CONFIG_TWL4030_MADC=m
1210+
CONFIG_TWL6030_GPADC=m
11861211
CONFIG_VF610_ADC=m
11871212
CONFIG_XILINX_XADC=y
11881213
CONFIG_IIO_CROS_EC_SENSORS_CORE=m
@@ -1205,6 +1230,7 @@ CONFIG_PWM_BCM2835=y
12051230
CONFIG_PWM_BRCMSTB=m
12061231
CONFIG_PWM_FSL_FTM=m
12071232
CONFIG_PWM_MESON=m
1233+
CONFIG_PWM_OMAP_DMTIMER=m
12081234
CONFIG_PWM_RENESAS_RCAR=m
12091235
CONFIG_PWM_RENESAS_TPU=y
12101236
CONFIG_PWM_ROCKCHIP=m
@@ -1215,6 +1241,8 @@ CONFIG_PWM_STM32_LP=m
12151241
CONFIG_PWM_SUN4I=y
12161242
CONFIG_PWM_TEGRA=y
12171243
CONFIG_PWM_TIECAP=m
1244+
CONFIG_PWM_TWL=m
1245+
CONFIG_PWM_TWL_LED=m
12181246
CONFIG_PWM_VT8500=y
12191247
CONFIG_KEYSTONE_IRQ=y
12201248
CONFIG_RESET_MCHP_SPARX5=y

arch/arm/configs/omap2plus_defconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -486,6 +486,7 @@ CONFIG_VIDEO_OMAP3=m
486486
CONFIG_VIDEO_MT9P031=m
487487
CONFIG_VIDEO_TVP5150=m
488488
CONFIG_DRM=m
489+
CONFIG_DRM_ITE_IT66121=m
489490
CONFIG_DRM_OMAP=m
490491
CONFIG_OMAP5_DSS_HDMI=y
491492
CONFIG_OMAP2_DSS_SDI=y

0 commit comments

Comments
 (0)