Skip to content

Commit af4cf6a

Browse files
committed
Merge tag 'arm-defconfig-5.14' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
Pull ARM defconfig updates from "Olof Johansson "A set of defconfig changes, we keep them in a separate branch to avoid conflicts between topics by separating them out. These changes are almost exclusively turning on new drivers for various platforms, or turning on modules for new drivers for the shared generic configs" * tag 'arm-defconfig-5.14' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (22 commits) arm64: defconfig: Enable renesas usb xhci pci host controller arm64: defconfig: Visconti: Enable GPIO arm64: defconfig: Visconti: Enable PWM arm64: defconfig: add drivers needed for DragonBoard410c ARM: config: aspeed: Add DEBUG_FS and EXT4 ARM: ixp4xx_defconfig: add MTD_PHYSMAP ARM: ixp4xx_defconfig: add CONFIG_SERIAL_OF_PLATFORM ARM: imx_v6_v7_defconfig: Select the Wifi ath10k sdio driver ARM: exynos_defconfig: restore framebuffer support arm64: defconfig: Enable ARCH_R9A07G044 ARM: configs: at91_dt_defconfig: configs for sam9x60 arm64: defconfig: Enable Exynos UFS driver arm64: defconfig: qcom: enable interconnect for SM8350 ARM: tegra_defconfig: Enable CONFIG_DEVFREQ_THERMAL arm64: defconfig: Enable usb2_clksel for R-Car Gen3 and RZ/G2 arm64: defconfig: enable Layerscape EDAC driver ARM: omap2plus_defconfig: Add LP5523 LED driver ARM: omap2plus_defconfig: Add WL1251 and WEXT modules ARM: shmobile: defconfig: Refresh for v5.13-rc1 arm64: defconfig: Allow Mediatek boards to boot from the mmc ...
2 parents 071e5ac + e6adbcb commit af4cf6a

10 files changed

Lines changed: 33 additions & 2 deletions

arch/arm/configs/aspeed_g4_defconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -254,6 +254,7 @@ CONFIG_DEBUG_INFO_REDUCED=y
254254
CONFIG_DEBUG_INFO_DWARF4=y
255255
CONFIG_GDB_SCRIPTS=y
256256
CONFIG_STRIP_ASM_SYMS=y
257+
CONFIG_DEBUG_FS=y
257258
CONFIG_SCHED_STACK_END_CHECK=y
258259
CONFIG_PANIC_ON_OOPS=y
259260
CONFIG_PANIC_TIMEOUT=-1

arch/arm/configs/aspeed_g5_defconfig

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -247,6 +247,7 @@ CONFIG_FSI_MASTER_ASPEED=y
247247
CONFIG_FSI_SCOM=y
248248
CONFIG_FSI_SBEFIFO=y
249249
CONFIG_FSI_OCC=y
250+
CONFIG_EXT4_FS=y
250251
CONFIG_FANOTIFY=y
251252
CONFIG_OVERLAY_FS=y
252253
CONFIG_TMPFS=y
@@ -276,6 +277,7 @@ CONFIG_DEBUG_INFO_REDUCED=y
276277
CONFIG_DEBUG_INFO_DWARF4=y
277278
CONFIG_GDB_SCRIPTS=y
278279
CONFIG_STRIP_ASM_SYMS=y
280+
CONFIG_DEBUG_FS=y
279281
CONFIG_SOFTLOCKUP_DETECTOR=y
280282
# CONFIG_DETECT_HUNG_TASK is not set
281283
CONFIG_WQ_WATCHDOG=y

arch/arm/configs/at91_dt_defconfig

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
# CONFIG_LOCALVERSION_AUTO is not set
22
# CONFIG_SWAP is not set
33
CONFIG_SYSVIPC=y
4+
CONFIG_NO_HZ_IDLE=y
5+
CONFIG_HIGH_RES_TIMERS=y
46
CONFIG_LOG_BUF_SHIFT=14
57
CONFIG_BLK_DEV_INITRD=y
68
CONFIG_CC_OPTIMIZE_FOR_SIZE=y

arch/arm/configs/exynos_defconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -236,6 +236,7 @@ CONFIG_DRM_SII9234=y
236236
CONFIG_DRM_TOSHIBA_TC358764=y
237237
CONFIG_DRM_LIMA=y
238238
CONFIG_DRM_PANFROST=y
239+
CONFIG_FB=y
239240
CONFIG_LCD_CLASS_DEVICE=y
240241
CONFIG_LCD_PLATFORM=y
241242
CONFIG_BACKLIGHT_PWM=y

arch/arm/configs/imx_v6_v7_defconfig

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,8 @@ CONFIG_USB_USBNET=y
150150
CONFIG_USB_NET_CDC_EEM=m
151151
CONFIG_USB_NET_SMSC95XX=y
152152
CONFIG_USB_NET_MCS7830=y
153+
CONFIG_ATH10K=m
154+
CONFIG_ATH10K_SDIO=m
153155
CONFIG_BRCMFMAC=m
154156
CONFIG_MWIFIEX=m
155157
CONFIG_MWIFIEX_SDIO=m

arch/arm/configs/ixp4xx_defconfig

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,8 @@ CONFIG_MTD_REDBOOT_PARTS=y
109109
CONFIG_MTD_BLOCK=y
110110
CONFIG_MTD_CFI=y
111111
CONFIG_MTD_CFI_INTELEXT=y
112+
CONFIG_MTD_PHYSMAP=y
113+
CONFIG_MTD_PHYSMAP_OF=y
112114
CONFIG_MTD_COMPLEX_MAPPINGS=y
113115
CONFIG_MTD_IXP4XX=y
114116
CONFIG_MTD_RAW_NAND=m
@@ -152,6 +154,7 @@ CONFIG_INPUT_IXP4XX_BEEPER=y
152154
CONFIG_SERIAL_8250=y
153155
CONFIG_SERIAL_8250_CONSOLE=y
154156
CONFIG_SERIAL_8250_NR_UARTS=2
157+
CONFIG_SERIAL_OF_PLATFORM=y
155158
CONFIG_I2C=y
156159
CONFIG_I2C_CHARDEV=y
157160
CONFIG_SENSORS_W83781D=y

arch/arm/configs/omap2plus_defconfig

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -276,6 +276,7 @@ CONFIG_BT_MRVL_SDIO=m
276276
CONFIG_AF_RXRPC=m
277277
CONFIG_RXKAD=y
278278
CONFIG_CFG80211=m
279+
CONFIG_CFG80211_WEXT=y
279280
CONFIG_MAC80211=m
280281
CONFIG_PCI=y
281282
CONFIG_PCI_MSI=y
@@ -374,6 +375,8 @@ CONFIG_LIBERTAS_DEBUG=y
374375
CONFIG_MWIFIEX=m
375376
CONFIG_MWIFIEX_SDIO=m
376377
CONFIG_MWIFIEX_USB=m
378+
CONFIG_WL1251=m
379+
CONFIG_WL1251_SPI=m
377380
CONFIG_WL12XX=m
378381
CONFIG_WL18XX=m
379382
CONFIG_WLCORE_SPI=m
@@ -617,6 +620,8 @@ CONFIG_LEDS_CLASS=m
617620
CONFIG_LEDS_CPCAP=m
618621
CONFIG_LEDS_LM3532=m
619622
CONFIG_LEDS_GPIO=m
623+
CONFIG_LEDS_LP55XX_COMMON=m
624+
CONFIG_LEDS_LP5523=m
620625
CONFIG_LEDS_PCA963X=m
621626
CONFIG_LEDS_PWM=m
622627
CONFIG_LEDS_TRIGGERS=y

arch/arm/configs/shmobile_defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,6 @@ CONFIG_AK8975=y
202202
CONFIG_PWM=y
203203
CONFIG_PWM_RCAR=y
204204
CONFIG_PWM_RENESAS_TPU=y
205-
CONFIG_RESET_CONTROLLER=y
206205
CONFIG_PHY_RCAR_GEN2=y
207206
CONFIG_PHY_RCAR_GEN3_USB2=y
208207
# CONFIG_DNOTIFY is not set

arch/arm/configs/tegra_defconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -167,6 +167,7 @@ CONFIG_SENSORS_LM95245=y
167167
CONFIG_THERMAL=y
168168
CONFIG_THERMAL_STATISTICS=y
169169
CONFIG_CPU_THERMAL=y
170+
CONFIG_DEVFREQ_THERMAL=y
170171
CONFIG_TEGRA_SOCTHERM=m
171172
CONFIG_WATCHDOG=y
172173
CONFIG_MAX77620_WATCHDOG=y

arch/arm64/configs/defconfig

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -289,6 +289,7 @@ CONFIG_SCSI_UFSHCD=y
289289
CONFIG_SCSI_UFSHCD_PLATFORM=y
290290
CONFIG_SCSI_UFS_QCOM=m
291291
CONFIG_SCSI_UFS_HISI=y
292+
CONFIG_SCSI_UFS_EXYNOS=y
292293
CONFIG_ATA=y
293294
CONFIG_SATA_AHCI=y
294295
CONFIG_SATA_AHCI_PLATFORM=y
@@ -491,7 +492,6 @@ CONFIG_SPI_S3C64XX=y
491492
CONFIG_SPI_SH_MSIOF=m
492493
CONFIG_SPI_SUN6I=y
493494
CONFIG_SPI_SPIDEV=m
494-
CONFIG_MTK_PMIC_WRAP=m
495495
CONFIG_SPMI=y
496496
CONFIG_PINCTRL_SINGLE=y
497497
CONFIG_PINCTRL_MAX77620=y
@@ -530,6 +530,7 @@ CONFIG_GPIO_MXC=y
530530
CONFIG_GPIO_PL061=y
531531
CONFIG_GPIO_RCAR=y
532532
CONFIG_GPIO_UNIPHIER=y
533+
CONFIG_GPIO_VISCONTI=y
533534
CONFIG_GPIO_WCD934X=m
534535
CONFIG_GPIO_XGENE=y
535536
CONFIG_GPIO_XGENE_SB=y
@@ -662,6 +663,7 @@ CONFIG_VIDEO_SAMSUNG_EXYNOS_GSC=m
662663
CONFIG_VIDEO_RENESAS_FDP1=m
663664
CONFIG_VIDEO_RENESAS_FCP=m
664665
CONFIG_VIDEO_RENESAS_VSP1=m
666+
CONFIG_VIDEO_QCOM_VENUS=m
665667
CONFIG_SDR_PLATFORM_DRIVERS=y
666668
CONFIG_VIDEO_RCAR_DRIF=m
667669
CONFIG_VIDEO_IMX219=m
@@ -701,6 +703,7 @@ CONFIG_DRM_PANEL_RAYDIUM_RM67191=m
701703
CONFIG_DRM_PANEL_SITRONIX_ST7703=m
702704
CONFIG_DRM_PANEL_TRULY_NT35597_WQXGA=m
703705
CONFIG_DRM_DISPLAY_CONNECTOR=m
706+
CONFIG_DRM_LONTIUM_LT8912B=m
704707
CONFIG_DRM_NWL_MIPI_DSI=m
705708
CONFIG_DRM_LONTIUM_LT9611=m
706709
CONFIG_DRM_PARADE_PS8640=m
@@ -774,6 +777,8 @@ CONFIG_SND_SOC_AK4613=m
774777
CONFIG_SND_SOC_ES7134=m
775778
CONFIG_SND_SOC_ES7241=m
776779
CONFIG_SND_SOC_GTM601=m
780+
CONFIG_SND_SOC_MSM8916_WCD_ANALOG=m
781+
CONFIG_SND_SOC_MSM8916_WCD_DIGITAL=m
777782
CONFIG_SND_SOC_PCM3168A_I2C=m
778783
CONFIG_SND_SOC_RT5659=m
779784
CONFIG_SND_SOC_SIMPLE_AMPLIFIER=m
@@ -795,6 +800,8 @@ CONFIG_USB_CONN_GPIO=m
795800
CONFIG_USB=y
796801
CONFIG_USB_OTG=y
797802
CONFIG_USB_XHCI_HCD=y
803+
CONFIG_USB_XHCI_PCI=m
804+
CONFIG_USB_XHCI_PCI_RENESAS=m
798805
CONFIG_USB_XHCI_TEGRA=y
799806
CONFIG_USB_EHCI_HCD=y
800807
CONFIG_USB_EHCI_EXYNOS=y
@@ -866,6 +873,7 @@ CONFIG_MMC_DW_K3=y
866873
CONFIG_MMC_DW_ROCKCHIP=y
867874
CONFIG_MMC_SUNXI=y
868875
CONFIG_MMC_BCM2835=y
876+
CONFIG_MMC_MTK=y
869877
CONFIG_MMC_SDHCI_XENON=y
870878
CONFIG_MMC_SDHCI_AM654=y
871879
CONFIG_MMC_OWL=y
@@ -884,6 +892,7 @@ CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
884892
CONFIG_LEDS_TRIGGER_PANIC=y
885893
CONFIG_EDAC=y
886894
CONFIG_EDAC_GHES=y
895+
CONFIG_EDAC_LAYERSCAPE=m
887896
CONFIG_RTC_CLASS=y
888897
CONFIG_RTC_DRV_DS1307=m
889898
CONFIG_RTC_DRV_HYM8563=m
@@ -987,6 +996,7 @@ CONFIG_SM_GPUCC_8250=y
987996
CONFIG_SM_DISPCC_8250=y
988997
CONFIG_QCOM_HFPLL=y
989998
CONFIG_CLK_GFM_LPASS_SM8250=m
999+
CONFIG_CLK_RCAR_USB2_CLOCK_SEL=y
9901000
CONFIG_HWSPINLOCK=y
9911001
CONFIG_HWSPINLOCK_QCOM=y
9921002
CONFIG_ARM_MHU=y
@@ -1043,6 +1053,7 @@ CONFIG_ARCH_R8A77980=y
10431053
CONFIG_ARCH_R8A77990=y
10441054
CONFIG_ARCH_R8A77995=y
10451055
CONFIG_ARCH_R8A779A0=y
1056+
CONFIG_ARCH_R9A07G044=y
10461057
CONFIG_ROCKCHIP_PM_DOMAINS=y
10471058
CONFIG_ARCH_TEGRA_132_SOC=y
10481059
CONFIG_ARCH_TEGRA_210_SOC=y
@@ -1059,6 +1070,7 @@ CONFIG_RENESAS_RPCIF=m
10591070
CONFIG_IIO=y
10601071
CONFIG_EXYNOS_ADC=y
10611072
CONFIG_MAX9611=m
1073+
CONFIG_QCOM_SPMI_VADC=m
10621074
CONFIG_QCOM_SPMI_ADC5=m
10631075
CONFIG_ROCKCHIP_SARADC=m
10641076
CONFIG_IIO_CROS_EC_SENSORS_CORE=m
@@ -1083,6 +1095,7 @@ CONFIG_PWM_SAMSUNG=y
10831095
CONFIG_PWM_SL28CPLD=m
10841096
CONFIG_PWM_SUN4I=m
10851097
CONFIG_PWM_TEGRA=m
1098+
CONFIG_PWM_VISCONTI=m
10861099
CONFIG_SL28CPLD_INTC=y
10871100
CONFIG_QCOM_PDC=y
10881101
CONFIG_RESET_IMX7=y
@@ -1110,6 +1123,7 @@ CONFIG_PHY_ROCKCHIP_INNO_USB2=y
11101123
CONFIG_PHY_ROCKCHIP_INNO_DSIDPHY=m
11111124
CONFIG_PHY_ROCKCHIP_PCIE=m
11121125
CONFIG_PHY_ROCKCHIP_TYPEC=y
1126+
CONFIG_PHY_SAMSUNG_UFS=y
11131127
CONFIG_PHY_UNIPHIER_USB2=y
11141128
CONFIG_PHY_UNIPHIER_USB3=y
11151129
CONFIG_PHY_TEGRA_XUSB=y
@@ -1148,6 +1162,7 @@ CONFIG_INTERCONNECT_QCOM_OSM_L3=m
11481162
CONFIG_INTERCONNECT_QCOM_SDM845=y
11491163
CONFIG_INTERCONNECT_QCOM_SM8150=m
11501164
CONFIG_INTERCONNECT_QCOM_SM8250=m
1165+
CONFIG_INTERCONNECT_QCOM_SM8350=m
11511166
CONFIG_EXT2_FS=y
11521167
CONFIG_EXT3_FS=y
11531168
CONFIG_EXT4_FS_POSIX_ACL=y

0 commit comments

Comments
 (0)