Skip to content

Commit 0dca3c5

Browse files
committed
Merge tag 'defconfig-5.17' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
Pull ARM defconfig updates from Arnd Bergmann: "These are the usual changes to enable newly added driver by default, and to do some housekeeping around changing Kconfig symbols" * tag 'defconfig-5.17' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: arm64: defconfig: Enable Samsung I2C driver ARM: configs: at91: Enable crypto software implementations ARM: configs: at91: sama7: Enable SPI NOR and QSPI controller ARM: config: multi v7: Enable NVIDIA Tegra20 APB DMA driver ARM: config: multi v7: Enable NVIDIA Tegra20 S/PDIF driver ARM: tegra_defconfig: Enable S/PDIF driver ARM: imx_v6_v7_defconfig: Enable for DHCOM devices required RTC_DRV_RV3029C2 ARM: config: multi v7: Enable display drivers used by Tegra devices ARM: tegra_defconfig: Enable drivers wanted by Acer Chromebooks and ASUS tablets ARM: configs: gemini: Activate crypto driver arm64: defconfig: enable drivers for booting i.MX8ULP arm64: defconfig: Enable R-Car S4-8 arm64: defconfig: enable drivers for TQ TQMa8MxML-MBa8Mx arm64: defconfig: Enable OV5640 arm64: defconfig: Enable VIDEO_IMX_MEDIA
2 parents 1135ec0 + 0d2589a commit 0dca3c5

8 files changed

Lines changed: 54 additions & 5 deletions

File tree

arch/arm/configs/at91_dt_defconfig

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,14 @@ CONFIG_NLS_CODEPAGE_437=y
216216
CONFIG_NLS_CODEPAGE_850=y
217217
CONFIG_NLS_ISO8859_1=y
218218
CONFIG_NLS_UTF8=y
219-
CONFIG_CRYPTO_ECB=y
219+
CONFIG_CRYPTO_CBC=y
220+
CONFIG_CRYPTO_CFB=y
221+
CONFIG_CRYPTO_OFB=y
222+
CONFIG_CRYPTO_XTS=y
223+
CONFIG_CRYPTO_HMAC=y
224+
CONFIG_CRYPTO_SHA1=y
225+
CONFIG_CRYPTO_SHA512=y
226+
CONFIG_CRYPTO_DES=y
220227
CONFIG_CRYPTO_USER_API_HASH=m
221228
CONFIG_CRYPTO_USER_API_SKCIPHER=m
222229
CONFIG_CRYPTO_DEV_ATMEL_AES=y

arch/arm/configs/gemini_defconfig

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,6 @@ CONFIG_SERIAL_8250_CONSOLE=y
6363
CONFIG_SERIAL_8250_NR_UARTS=1
6464
CONFIG_SERIAL_8250_RUNTIME_UARTS=1
6565
CONFIG_SERIAL_OF_PLATFORM=y
66-
# CONFIG_HW_RANDOM is not set
6766
CONFIG_I2C_GPIO=y
6867
CONFIG_SPI=y
6968
CONFIG_SPI_GPIO=y
@@ -99,5 +98,5 @@ CONFIG_TMPFS_POSIX_ACL=y
9998
CONFIG_ROMFS_FS=y
10099
CONFIG_NLS_CODEPAGE_437=y
101100
CONFIG_NLS_ISO8859_1=y
102-
# CONFIG_ENABLE_MUST_CHECK is not set
101+
CONFIG_CRYPTO_DEV_SL3516=y
103102
CONFIG_DEBUG_FS=y

arch/arm/configs/imx_v6_v7_defconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -378,6 +378,7 @@ CONFIG_RTC_DRV_PCF8523=y
378378
CONFIG_RTC_DRV_PCF8563=y
379379
CONFIG_RTC_DRV_M41T80=y
380380
CONFIG_RTC_DRV_RC5T619=y
381+
CONFIG_RTC_DRV_RV3029C2=y
381382
CONFIG_RTC_DRV_DA9063=y
382383
CONFIG_RTC_DRV_MC13XXX=y
383384
CONFIG_RTC_DRV_MXC=y

arch/arm/configs/multi_v7_defconfig

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -382,6 +382,7 @@ CONFIG_TCG_TPM=m
382382
CONFIG_TCG_TIS_I2C_INFINEON=m
383383
CONFIG_I2C_CHARDEV=y
384384
CONFIG_I2C_ARB_GPIO_CHALLENGE=m
385+
CONFIG_I2C_MUX_GPIO=y
385386
CONFIG_I2C_MUX_PCA954x=y
386387
CONFIG_I2C_MUX_PINCTRL=y
387388
CONFIG_I2C_DEMUX_PINCTRL=y
@@ -680,19 +681,23 @@ CONFIG_DRM_FSL_DCU=m
680681
CONFIG_DRM_TEGRA=y
681682
CONFIG_DRM_STM=m
682683
CONFIG_DRM_STM_DSI=m
684+
CONFIG_DRM_PANEL_LVDS=m
683685
CONFIG_DRM_PANEL_SIMPLE=y
684686
CONFIG_DRM_PANEL_EDP=y
685687
CONFIG_DRM_PANEL_SAMSUNG_LD9040=m
688+
CONFIG_DRM_PANEL_SHARP_LQ101R1SX01=m
686689
CONFIG_DRM_PANEL_ORISETECH_OTM8009A=m
687690
CONFIG_DRM_PANEL_RAYDIUM_RM68200=m
688691
CONFIG_DRM_PANEL_SAMSUNG_S6E63J0X03=m
689692
CONFIG_DRM_PANEL_SAMSUNG_S6E8AA0=m
693+
CONFIG_DRM_LVDS_CODEC=m
690694
CONFIG_DRM_NXP_PTN3460=m
691695
CONFIG_DRM_PARADE_PS8622=m
692696
CONFIG_DRM_SII902X=m
693697
CONFIG_DRM_SII9234=m
694698
CONFIG_DRM_SIMPLE_BRIDGE=m
695699
CONFIG_DRM_TOSHIBA_TC358764=m
700+
CONFIG_DRM_TOSHIBA_TC358768=m
696701
CONFIG_DRM_I2C_ADV7511=m
697702
CONFIG_DRM_I2C_ADV7511_AUDIO=y
698703
CONFIG_DRM_STI=m
@@ -757,6 +762,7 @@ CONFIG_SND_SOC_STM32_DFSDM=m
757762
CONFIG_SND_SUN4I_CODEC=m
758763
CONFIG_SND_SOC_TEGRA=m
759764
CONFIG_SND_SOC_TEGRA20_I2S=m
765+
CONFIG_SND_SOC_TEGRA20_SPDIF=m
760766
CONFIG_SND_SOC_TEGRA30_I2S=m
761767
CONFIG_SND_SOC_TEGRA_RT5640=m
762768
CONFIG_SND_SOC_TEGRA_WM8753=m
@@ -952,6 +958,7 @@ CONFIG_ST_FDMA=m
952958
CONFIG_STM32_DMA=y
953959
CONFIG_STM32_DMAMUX=y
954960
CONFIG_STM32_MDMA=y
961+
CONFIG_TEGRA20_APB_DMA=y
955962
CONFIG_UNIPHIER_MDMAC=y
956963
CONFIG_XILINX_DMA=y
957964
CONFIG_QCOM_BAM_DMA=y

arch/arm/configs/sama5_defconfig

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -232,6 +232,14 @@ CONFIG_NLS_CODEPAGE_437=y
232232
CONFIG_NLS_CODEPAGE_850=y
233233
CONFIG_NLS_ISO8859_1=y
234234
CONFIG_NLS_UTF8=y
235+
CONFIG_CRYPTO_CBC=y
236+
CONFIG_CRYPTO_CFB=y
237+
CONFIG_CRYPTO_OFB=y
238+
CONFIG_CRYPTO_XTS=y
239+
CONFIG_CRYPTO_HMAC=y
240+
CONFIG_CRYPTO_SHA1=y
241+
CONFIG_CRYPTO_SHA512=y
242+
CONFIG_CRYPTO_DES=y
235243
CONFIG_CRYPTO_USER_API_HASH=m
236244
CONFIG_CRYPTO_USER_API_SKCIPHER=m
237245
CONFIG_CRYPTO_DEV_ATMEL_AES=y

arch/arm/configs/sama7_defconfig

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ CONFIG_MODULES=y
3333
CONFIG_MODULE_FORCE_LOAD=y
3434
CONFIG_MODULE_UNLOAD=y
3535
CONFIG_MODULE_FORCE_UNLOAD=y
36-
# CONFIG_BLK_DEV_BSG is not set
3736
CONFIG_PARTITION_ADVANCED=y
3837
# CONFIG_EFI_PARTITION is not set
3938
# CONFIG_COREDUMP is not set
@@ -83,13 +82,15 @@ CONFIG_DEVTMPFS_MOUNT=y
8382
CONFIG_MTD=y
8483
CONFIG_MTD_TESTS=m
8584
CONFIG_MTD_CMDLINE_PARTS=y
85+
CONFIG_MTD_SPI_NOR=y
8686
CONFIG_BLK_DEV_LOOP=y
8787
CONFIG_BLK_DEV_RAM=y
8888
CONFIG_BLK_DEV_RAM_COUNT=1
8989
CONFIG_BLK_DEV_RAM_SIZE=8192
9090
CONFIG_EEPROM_AT24=y
9191
CONFIG_SCSI=y
9292
CONFIG_BLK_DEV_SD=y
93+
# CONFIG_BLK_DEV_BSG is not set
9394
CONFIG_NETDEVICES=y
9495
CONFIG_MACB=y
9596
CONFIG_MICREL_PHY=y
@@ -104,8 +105,8 @@ CONFIG_I2C=y
104105
CONFIG_I2C_CHARDEV=y
105106
CONFIG_I2C_AT91=y
106107
CONFIG_SPI=y
107-
CONFIG_SPI_MEM=y
108108
CONFIG_SPI_ATMEL=y
109+
CONFIG_SPI_ATMEL_QUADSPI=y
109110
CONFIG_SPI_GPIO=y
110111
CONFIG_PINCTRL_AT91=y
111112
CONFIG_PINCTRL_AT91PIO4=y

arch/arm/configs/tegra_defconfig

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,8 @@ CONFIG_USB_USBNET=y
104104
CONFIG_USB_NET_SMSC75XX=y
105105
CONFIG_USB_NET_SMSC95XX=y
106106
CONFIG_BRCMFMAC=m
107+
CONFIG_MWIFIEX=m
108+
CONFIG_MWIFIEX_SDIO=m
107109
CONFIG_RT2X00=y
108110
CONFIG_RT2800USB=m
109111
CONFIG_INPUT_JOYDEV=y
@@ -112,6 +114,8 @@ CONFIG_KEYBOARD_GPIO=y
112114
CONFIG_KEYBOARD_TEGRA=y
113115
CONFIG_KEYBOARD_CROS_EC=y
114116
CONFIG_KEYBOARD_CAP11XX=y
117+
CONFIG_MOUSE_ELAN_I2C=m
118+
CONFIG_MOUSE_ELAN_I2C_SMBUS=y
115119
CONFIG_MOUSE_PS2_ELANTECH=y
116120
CONFIG_INPUT_TOUCHSCREEN=y
117121
CONFIG_TOUCHSCREEN_ATMEL_MXT=y
@@ -131,6 +135,7 @@ CONFIG_SERIAL_DEV_BUS=y
131135
# CONFIG_HW_RANDOM is not set
132136
# CONFIG_I2C_COMPAT is not set
133137
CONFIG_I2C_CHARDEV=y
138+
CONFIG_I2C_MUX_GPIO=y
134139
CONFIG_I2C_MUX_PCA954x=y
135140
CONFIG_I2C_MUX_PINCTRL=y
136141
CONFIG_I2C_TEGRA=y
@@ -151,7 +156,9 @@ CONFIG_GPIO_TPS65910=y
151156
CONFIG_POWER_RESET=y
152157
CONFIG_POWER_RESET_AS3722=y
153158
CONFIG_POWER_RESET_GPIO=y
159+
CONFIG_POWER_RESET_GPIO_RESTART=y
154160
CONFIG_BATTERY_SBS=y
161+
CONFIG_CHARGER_BQ24735=y
155162
CONFIG_BATTERY_BQ27XXX=y
156163
CONFIG_CHARGER_GPIO=y
157164
CONFIG_CHARGER_SMB347=y
@@ -200,7 +207,9 @@ CONFIG_DRM_TEGRA_STAGING=y
200207
CONFIG_DRM_PANEL_LVDS=y
201208
CONFIG_DRM_PANEL_SIMPLE=y
202209
CONFIG_DRM_PANEL_EDP=y
210+
CONFIG_DRM_PANEL_SHARP_LQ101R1SX01=y
203211
CONFIG_DRM_LVDS_CODEC=y
212+
CONFIG_DRM_TOSHIBA_TC358768=y
204213
CONFIG_FB=y
205214
CONFIG_BACKLIGHT_CLASS_DEVICE=y
206215
CONFIG_BACKLIGHT_PWM=y
@@ -222,6 +231,7 @@ CONFIG_SND_HDA_CODEC_HDMI=y
222231
CONFIG_SND_SOC=y
223232
CONFIG_SND_SOC_TEGRA=y
224233
CONFIG_SND_SOC_TEGRA20_I2S=y
234+
CONFIG_SND_SOC_TEGRA20_SPDIF=y
225235
CONFIG_SND_SOC_TEGRA30_I2S=y
226236
CONFIG_SND_SOC_TEGRA_RT5640=y
227237
CONFIG_SND_SOC_TEGRA_WM8753=y
@@ -279,6 +289,9 @@ CONFIG_STAGING_MEDIA=y
279289
CONFIG_TEGRA_VDE=y
280290
CONFIG_CHROME_PLATFORMS=y
281291
CONFIG_CROS_EC=y
292+
CONFIG_CROS_EC_I2C=m
293+
CONFIG_CROS_EC_SPI=m
294+
CONFIG_I2C_CROS_EC_TUNNEL=m
282295
CONFIG_TEGRA_IOMMU_GART=y
283296
CONFIG_TEGRA_IOMMU_SMMU=y
284297
CONFIG_ARCH_TEGRA_2x_SOC=y

arch/arm64/configs/defconfig

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -363,6 +363,7 @@ CONFIG_MICROSEMI_PHY=y
363363
CONFIG_AT803X_PHY=y
364364
CONFIG_REALTEK_PHY=y
365365
CONFIG_ROCKCHIP_PHY=y
366+
CONFIG_DP83867_PHY=y
366367
CONFIG_VITESSE_PHY=y
367368
CONFIG_USB_PEGASUS=m
368369
CONFIG_USB_RTL8150=m
@@ -397,6 +398,7 @@ CONFIG_TOUCHSCREEN_EDT_FT5X06=m
397398
CONFIG_INPUT_MISC=y
398399
CONFIG_INPUT_PM8941_PWRKEY=y
399400
CONFIG_INPUT_PM8XXX_VIBRATOR=m
401+
CONFIG_INPUT_PWM_BEEPER=m
400402
CONFIG_INPUT_PWM_VIBRA=m
401403
CONFIG_INPUT_HISI_POWERKEY=y
402404
# CONFIG_SERIO_SERPORT is not set
@@ -461,6 +463,7 @@ CONFIG_I2C_QCOM_GENI=m
461463
CONFIG_I2C_QUP=y
462464
CONFIG_I2C_RIIC=y
463465
CONFIG_I2C_RK3X=y
466+
CONFIG_I2C_S3C2410=y
464467
CONFIG_I2C_SH_MOBILE=y
465468
CONFIG_I2C_TEGRA=y
466469
CONFIG_I2C_UNIPHIER_F=y
@@ -504,6 +507,7 @@ CONFIG_PINCTRL_IMX8MQ=y
504507
CONFIG_PINCTRL_IMX8QM=y
505508
CONFIG_PINCTRL_IMX8QXP=y
506509
CONFIG_PINCTRL_IMX8DXL=y
510+
CONFIG_PINCTRL_IMX8ULP=y
507511
CONFIG_PINCTRL_MSM=y
508512
CONFIG_PINCTRL_IPQ8074=y
509513
CONFIG_PINCTRL_IPQ6018=y
@@ -555,6 +559,7 @@ CONFIG_BATTERY_MAX17042=m
555559
CONFIG_CHARGER_BQ25890=m
556560
CONFIG_CHARGER_BQ25980=m
557561
CONFIG_SENSORS_ARM_SCPI=y
562+
CONFIG_SENSORS_JC42=m
558563
CONFIG_SENSORS_LM90=m
559564
CONFIG_SENSORS_PWM_FAN=m
560565
CONFIG_SENSORS_RASPBERRYPI_HWMON=m
@@ -668,6 +673,7 @@ CONFIG_VIDEO_QCOM_VENUS=m
668673
CONFIG_SDR_PLATFORM_DRIVERS=y
669674
CONFIG_VIDEO_RCAR_DRIF=m
670675
CONFIG_VIDEO_IMX219=m
676+
CONFIG_VIDEO_OV5640=m
671677
CONFIG_VIDEO_OV5645=m
672678
CONFIG_VIDEO_QCOM_CAMSS=m
673679
CONFIG_DRM=m
@@ -792,6 +798,7 @@ CONFIG_SND_SOC_RT5659=m
792798
CONFIG_SND_SOC_SIMPLE_AMPLIFIER=m
793799
CONFIG_SND_SOC_SIMPLE_MUX=m
794800
CONFIG_SND_SOC_TAS571X=m
801+
CONFIG_SND_SOC_TLV320AIC32X4_I2C=m
795802
CONFIG_SND_SOC_WCD934X=m
796803
CONFIG_SND_SOC_WM8904=m
797804
CONFIG_SND_SOC_WM8960=m
@@ -907,6 +914,7 @@ CONFIG_RTC_DRV_DS1307=m
907914
CONFIG_RTC_DRV_HYM8563=m
908915
CONFIG_RTC_DRV_MAX77686=y
909916
CONFIG_RTC_DRV_RK808=m
917+
CONFIG_RTC_DRV_PCF85063=m
910918
CONFIG_RTC_DRV_PCF85363=m
911919
CONFIG_RTC_DRV_M41T80=m
912920
CONFIG_RTC_DRV_RX8581=m
@@ -958,6 +966,7 @@ CONFIG_MFD_CROS_EC_DEV=y
958966
CONFIG_STAGING=y
959967
CONFIG_STAGING_MEDIA=y
960968
CONFIG_VIDEO_HANTRO=m
969+
CONFIG_VIDEO_IMX_MEDIA=m
961970
CONFIG_CHROME_PLATFORMS=y
962971
CONFIG_CROS_EC=y
963972
CONFIG_CROS_EC_I2C=y
@@ -979,6 +988,7 @@ CONFIG_CLK_IMX8MN=y
979988
CONFIG_CLK_IMX8MP=y
980989
CONFIG_CLK_IMX8MQ=y
981990
CONFIG_CLK_IMX8QXP=y
991+
CONFIG_CLK_IMX8ULP=y
982992
CONFIG_TI_SCI_CLK=y
983993
CONFIG_COMMON_CLK_QCOM=y
984994
CONFIG_QCOM_A53PLL=y
@@ -1069,6 +1079,7 @@ CONFIG_ARCH_R8A77980=y
10691079
CONFIG_ARCH_R8A77990=y
10701080
CONFIG_ARCH_R8A77995=y
10711081
CONFIG_ARCH_R8A779A0=y
1082+
CONFIG_ARCH_R8A779F0=y
10721083
CONFIG_ARCH_R9A07G044=y
10731084
CONFIG_ROCKCHIP_PM_DOMAINS=y
10741085
CONFIG_ARCH_TEGRA_132_SOC=y
@@ -1174,6 +1185,8 @@ CONFIG_SLIM_QCOM_NGD_CTRL=m
11741185
CONFIG_MUX_MMIO=y
11751186
CONFIG_INTERCONNECT=y
11761187
CONFIG_INTERCONNECT_IMX=m
1188+
CONFIG_INTERCONNECT_IMX8MM=m
1189+
CONFIG_INTERCONNECT_IMX8MN=m
11771190
CONFIG_INTERCONNECT_IMX8MQ=m
11781191
CONFIG_INTERCONNECT_QCOM=y
11791192
CONFIG_INTERCONNECT_QCOM_MSM8916=m

0 commit comments

Comments
 (0)