Commit 231d7030 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'soc-defconfig-7.1' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc 

Pull SoC defconfig updates from Arnd Bergmann:
 "As usual, we enable a number of additional device drivers as loadable
  modules, to support the added platforms. The largest change this time
  is for OMAP2/3, which were not that well supported in the generic
  arm32 defconfig.

  The Tegra SoC platforms are now enabled by default in Kconfig when
  ARCH_TEGRA is enabled, which means the defconfig change is done at the
  same time as the Kconfig change here"

* tag 'soc-defconfig-7.1' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (25 commits)
  arch/arm: Drop CONFIG_FIRMWARE_EDID from defconfig files
  arm64: defconfig: Enable DP83TG720 PHY driver
  arm64: tegra: defconfig: Drop redundant ARCH_TEGRA_foo_SOC
  ARM: tegra: defconfig: Drop redundant ARCH_TEGRA_foo_SOC
  arm64: defconfig: enable pci-pwrctrl-generic as module
  arm64: defconfig: Enable Lontium LT8713sx driver
  arm64: defconfig: Enable Qualcomm Eliza SoC display clock controller
  arm64: defconfig: enable IPQ5210 RDP504 base configs
  arm64: defconfig: Enable Milos LPASS LPI pinctrl driver
  arm64: defconfig: Enable Kaanapali clock controllers
  arm64: defconfig: Enable configs for Arduino VENTUNO Q
  arm64: defconfig: Enable Qualcomm Eliza basic resource providers
  arm64: defconfig: Enable S5KJN1 camera sensor
  arm64: defconfig: Enable configurations for Toradex Aquila AM69
  arm64: defconfig: remove SENSORS_SA67MCU
  arm64: defconfig: Enable Qualcomm WCD937x headphone codec as module
  arm64: defconfig: Enable QCOMTEE module for QTEE-enabled Qualcomm SoCs
  ARM: shmobile: defconfig: Refresh for v7.0-rc1
  arm: multi_v7_defconfig: Enable more OMAP 3/4 related configs
  ARM: multi_v7_defconfig: omap2plus_defconfig: Enable ITE IT66121 driver
  ...
parents 31b43c07 07e1a498

arch/arm/configs/davinci_all_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -148,7 +148,6 @@ CONFIG_DRM_TINYDRM=m 
CONFIG_TINYDRM_ST7586=m

CONFIG_FB=y

CONFIG_FB_DA8XX=y

CONFIG_FIRMWARE_EDID=y

CONFIG_BACKLIGHT_PWM=m

CONFIG_BACKLIGHT_GPIO=m

CONFIG_FRAMEBUFFER_CONSOLE=y

arch/arm/configs/multi_v7_defconfig

+28 −4
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
@@ -309,6 +310,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
@@ -317,8 +323,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
@@ -341,6 +349,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
@@ -520,6 +530,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
@@ -548,6 +560,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
@@ -562,10 +576,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
@@ -734,6 +750,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
@@ -750,6 +767,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
@@ -844,6 +862,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
@@ -986,6 +1007,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
@@ -1087,6 +1109,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
@@ -1141,10 +1164,6 @@ CONFIG_QCOM_SOCINFO=m 
CONFIG_QCOM_STATS=m

CONFIG_QCOM_WCNSS_CTRL=m

CONFIG_ROCKCHIP_IODOMAIN=y

CONFIG_ARCH_TEGRA_2x_SOC=y

CONFIG_ARCH_TEGRA_3x_SOC=y

CONFIG_ARCH_TEGRA_114_SOC=y

CONFIG_ARCH_TEGRA_124_SOC=y

CONFIG_SOC_TI=y

CONFIG_KEYSTONE_NAVIGATOR_QMSS=y

CONFIG_KEYSTONE_NAVIGATOR_DMA=y
@@ -1182,6 +1201,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
@@ -1204,6 +1225,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
@@ -1214,6 +1236,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/omap1_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -136,7 +136,6 @@ CONFIG_FB_OMAP_LCDC_EXTERNAL=y 
CONFIG_FB_OMAP_LCDC_HWA742=y

CONFIG_FB_OMAP_MANUAL_UPDATE=y

CONFIG_FB_OMAP_LCD_MIPID=y

CONFIG_FIRMWARE_EDID=y

CONFIG_FB_MODE_HELPERS=y

CONFIG_LCD_CLASS_DEVICE=y

CONFIG_FRAMEBUFFER_CONSOLE=y

arch/arm/configs/omap2plus_defconfig

+1 −1
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
@@ -505,7 +506,6 @@ CONFIG_DRM_SIMPLE_BRIDGE=m 
CONFIG_DRM_TI_TFP410=m

CONFIG_DRM_TI_TPD12S015=m

CONFIG_FB=y

CONFIG_FIRMWARE_EDID=y

CONFIG_FB_MODE_HELPERS=y

CONFIG_FB_TILEBLITTING=y

CONFIG_LCD_CLASS_DEVICE=y

arch/arm/configs/pxa_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -391,7 +391,6 @@ CONFIG_LCD_CORGI=m 
CONFIG_LCD_PLATFORM=m

CONFIG_BACKLIGHT_PWM=m

CONFIG_FRAMEBUFFER_CONSOLE=y

CONFIG_FIRMWARE_EDID=y

CONFIG_FB_TILEBLITTING=y

CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y

CONFIG_LOGO=y