Skip to content

Commit 298743c

Browse files
committed
Merge tag 'arm-defconfig-5.8' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
Pull ARM defconfig updates from Arnd Bergmann: "These are the usual updates to arm/arm64 defconfig files, enabling newly added drivers and addressing changes to Kconfig files" * tag 'arm-defconfig-5.8' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (22 commits) ARM: imx_v6_v7_defconfig: extend RN5T618 PMIC family support arm64: defconfig: enable Qualcomm IPA and RMNet modules arm64: defconfig: Add LEDS_TRIGGER_TIMER arm64: defconfig: Enable UACCE/PCI PASID/SEC2/HPRE configs arm64: defconfig: Enable Qualcomm SC7180 pinctrl and gcc arm64: defconfig: Remove QCOM_GLINK_SSR ARM: multi_v7_defconfig: Enable r8a7742 SoC ARM: shmobile: defconfig: Enable r8a7742 SoC arm64: defconfig: enable meson gx audio as module arm64: defconfig: Enable SM8250 GCC driver ARM: defconfig: u8500: Enable new drivers for ux500 arm64: defconfig: Enable CONFIG_PINCTRL_IMX8DXL by default arm64: configs: Enable sun50i cpufreq nvmem ARM: shmobile: defconfig: Refresh for v5.7-rc1 ARM: defconfig: u8500: Enable new drivers for samsung-golden ARM: configs: sunxi: Add sun8i analog codec arm64: defconfig: Enable Qualcomm CAMCC, CAMSS and CCI drivers ARM: configs: at91: sama5: enable MCP16502 regulator ARM: configs: at91: sama5: enable SAMA5D2_PIOBU ARM: exynos_defconfig: Compile MAC80211/CFG80211 as modules ...
2 parents 694b5a5 + f11d7cb commit 298743c

File tree

9 files changed

+45
-4
lines changed

9 files changed

+45
-4
lines changed

arch/arm/configs/bcm2835_defconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,7 @@ CONFIG_WATCHDOG=y
103103
CONFIG_BCM2835_WDT=y
104104
CONFIG_MFD_SYSCON=y
105105
CONFIG_REGULATOR=y
106+
CONFIG_REGULATOR_FIXED_VOLTAGE=y
106107
CONFIG_REGULATOR_GPIO=y
107108
CONFIG_MEDIA_SUPPORT=y
108109
CONFIG_MEDIA_CAMERA_SUPPORT=y

arch/arm/configs/exynos_defconfig

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@ CONFIG_BT_HCIUART=m
6969
CONFIG_BT_HCIUART_BCSP=y
7070
CONFIG_BT_HCIUART_ATH3K=y
7171
CONFIG_BT_HCIUART_INTEL=y
72+
CONFIG_BT_HCIUART_BCM=y
7273
CONFIG_BT_HCIUART_AG6XX=y
7374
CONFIG_BT_HCIUART_MRVL=y
7475
CONFIG_BT_HCIBCM203X=m
@@ -78,8 +79,8 @@ CONFIG_BT_HCIVHCI=m
7879
CONFIG_BT_MRVL=m
7980
CONFIG_BT_MRVL_SDIO=m
8081
CONFIG_BT_ATH3K=m
81-
CONFIG_CFG80211=y
82-
CONFIG_MAC80211=y
82+
CONFIG_CFG80211=m
83+
CONFIG_MAC80211=m
8384
CONFIG_MAC80211_LEDS=y
8485
CONFIG_NFC=y
8586
CONFIG_NFC_DIGITAL=m
@@ -94,7 +95,7 @@ CONFIG_DEVTMPFS_MOUNT=y
9495
CONFIG_BLK_DEV_LOOP=y
9596
CONFIG_BLK_DEV_CRYPTOLOOP=y
9697
CONFIG_BLK_DEV_RAM=y
97-
CONFIG_BLK_DEV_RAM_SIZE=32768
98+
CONFIG_BLK_DEV_RAM_SIZE=65536
9899
CONFIG_SCSI=y
99100
CONFIG_BLK_DEV_SD=y
100101
CONFIG_CHR_DEV_SG=y
@@ -133,6 +134,7 @@ CONFIG_SERIAL_8250=y
133134
CONFIG_SERIAL_OF_PLATFORM=y
134135
CONFIG_SERIAL_SAMSUNG=y
135136
CONFIG_SERIAL_SAMSUNG_CONSOLE=y
137+
CONFIG_SERIAL_DEV_BUS=y
136138
CONFIG_HW_RANDOM=y
137139
CONFIG_TCG_TPM=y
138140
CONFIG_TCG_TIS_I2C_INFINEON=y

arch/arm/configs/imx_v6_v7_defconfig

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -395,6 +395,7 @@ CONFIG_RTC_DRV_DA9063=y
395395
CONFIG_RTC_DRV_MC13XXX=y
396396
CONFIG_RTC_DRV_MXC=y
397397
CONFIG_RTC_DRV_MXC_V2=y
398+
CONFIG_RTC_DRV_RC5T619=y
398399
CONFIG_RTC_DRV_SNVS=y
399400
CONFIG_DMADEVICES=y
400401
CONFIG_FSL_EDMA=y
@@ -408,6 +409,7 @@ CONFIG_COMMON_CLK_PWM=y
408409
CONFIG_IIO=y
409410
CONFIG_MMA8452=y
410411
CONFIG_IMX7D_ADC=y
412+
CONFIG_RN5T618_ADC=y
411413
CONFIG_VF610_ADC=y
412414
CONFIG_SENSORS_ISL29018=y
413415
CONFIG_MAG3110=y

arch/arm/configs/multi_v7_defconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -979,6 +979,7 @@ CONFIG_ARCH_R7S72100=y
979979
CONFIG_ARCH_R7S9210=y
980980
CONFIG_ARCH_R8A73A4=y
981981
CONFIG_ARCH_R8A7740=y
982+
CONFIG_ARCH_R8A7742=y
982983
CONFIG_ARCH_R8A7743=y
983984
CONFIG_ARCH_R8A7744=y
984985
CONFIG_ARCH_R8A7745=y

arch/arm/configs/sama5_defconfig

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,7 @@ CONFIG_SPI=y
128128
CONFIG_SPI_ATMEL=y
129129
CONFIG_SPI_GPIO=y
130130
CONFIG_GPIO_SYSFS=y
131+
CONFIG_GPIO_SAMA5D2_PIOBU=m
131132
CONFIG_POWER_SUPPLY=y
132133
CONFIG_BATTERY_ACT8945A=y
133134
CONFIG_POWER_RESET=y
@@ -142,6 +143,7 @@ CONFIG_REGULATOR=y
142143
CONFIG_REGULATOR_FIXED_VOLTAGE=y
143144
CONFIG_REGULATOR_ACT8865=y
144145
CONFIG_REGULATOR_ACT8945A=y
146+
CONFIG_REGULATOR_MCP16502=m
145147
CONFIG_REGULATOR_PWM=m
146148
CONFIG_MEDIA_SUPPORT=y
147149
CONFIG_MEDIA_CAMERA_SUPPORT=y

arch/arm/configs/shmobile_defconfig

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,7 @@ CONFIG_VIDEO_ML86V7667=y
125125
CONFIG_DRM=y
126126
CONFIG_DRM_RCAR_DU=y
127127
CONFIG_DRM_PANEL_SIMPLE=y
128+
CONFIG_DRM_DISPLAY_CONNECTOR=y
128129
CONFIG_DRM_LVDS_CODEC=y
129130
CONFIG_DRM_SII902X=y
130131
CONFIG_DRM_SIMPLE_BRIDGE=y
@@ -178,6 +179,7 @@ CONFIG_ARCH_R7S72100=y
178179
CONFIG_ARCH_R7S9210=y
179180
CONFIG_ARCH_R8A73A4=y
180181
CONFIG_ARCH_R8A7740=y
182+
CONFIG_ARCH_R8A7742=y
181183
CONFIG_ARCH_R8A7743=y
182184
CONFIG_ARCH_R8A7744=y
183185
CONFIG_ARCH_R8A7745=y

arch/arm/configs/sunxi_defconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,7 @@ CONFIG_SOUND=y
107107
CONFIG_SND=y
108108
CONFIG_SND_SOC=y
109109
CONFIG_SND_SUN4I_CODEC=y
110+
CONFIG_SND_SUN8I_CODEC_ANALOG=y
110111
CONFIG_USB=y
111112
CONFIG_USB_EHCI_HCD=y
112113
CONFIG_USB_EHCI_HCD_PLATFORM=y

arch/arm/configs/u8500_defconfig

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,9 @@ CONFIG_IP_PNP=y
3232
CONFIG_IP_PNP_DHCP=y
3333
CONFIG_NETFILTER=y
3434
CONFIG_PHONET=y
35+
CONFIG_BT=y
36+
CONFIG_BT_HCIUART=m
37+
CONFIG_BT_HCIUART_BCM=y
3538
CONFIG_CFG80211=y
3639
CONFIG_CFG80211_DEBUGFS=y
3740
CONFIG_MAC80211=y
@@ -44,6 +47,7 @@ CONFIG_BLK_DEV_RAM_SIZE=65536
4447
CONFIG_NETDEVICES=y
4548
CONFIG_SMSC911X=y
4649
CONFIG_SMSC_PHY=y
50+
CONFIG_BRCMFMAC=m
4751
CONFIG_CW1200=y
4852
CONFIG_CW1200_WLAN_SDIO=y
4953
CONFIG_INPUT_EVDEV=y
@@ -54,17 +58,21 @@ CONFIG_KEYBOARD_STMPE=y
5458
CONFIG_KEYBOARD_TC3589X=y
5559
# CONFIG_INPUT_MOUSE is not set
5660
CONFIG_INPUT_TOUCHSCREEN=y
61+
CONFIG_TOUCHSCREEN_ATMEL_MXT=y
5762
CONFIG_TOUCHSCREEN_BU21013=y
5863
CONFIG_INPUT_MISC=y
5964
CONFIG_INPUT_AB8500_PONKEY=y
65+
CONFIG_INPUT_GPIO_VIBRA=y
6066
CONFIG_RMI4_CORE=y
6167
CONFIG_RMI4_I2C=y
6268
CONFIG_RMI4_F11=y
6369
# CONFIG_SERIO is not set
6470
# CONFIG_LEGACY_PTYS is not set
6571
CONFIG_SERIAL_AMBA_PL011=y
6672
CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
73+
CONFIG_SERIAL_DEV_BUS=y
6774
CONFIG_HW_RANDOM=y
75+
CONFIG_I2C_GPIO=y
6876
CONFIG_SPI=y
6977
CONFIG_SPI_PL022=y
7078
CONFIG_GPIO_STMPE=y
@@ -78,11 +86,14 @@ CONFIG_MFD_TC3589X=y
7886
CONFIG_REGULATOR_AB8500=y
7987
CONFIG_REGULATOR_GPIO=y
8088
CONFIG_DRM=y
89+
CONFIG_DRM_PANEL_NOVATEK_NT35510=y
8190
CONFIG_DRM_PANEL_SAMSUNG_S6D16D0=y
91+
CONFIG_DRM_PANEL_SONY_ACX424AKP=y
8292
CONFIG_DRM_LIMA=y
8393
CONFIG_DRM_MCDE=y
8494
CONFIG_BACKLIGHT_CLASS_DEVICE=y
8595
CONFIG_BACKLIGHT_GENERIC=m
96+
CONFIG_BACKLIGHT_GPIO=y
8697
CONFIG_LOGO=y
8798
CONFIG_SOUND=y
8899
CONFIG_SND=y
@@ -113,9 +124,12 @@ CONFIG_HWSPINLOCK=y
113124
CONFIG_HSEM_U8500=y
114125
CONFIG_IIO=y
115126
CONFIG_IIO_SW_TRIGGER=y
127+
CONFIG_BMA180=y
116128
CONFIG_IIO_ST_ACCEL_3AXIS=y
117129
CONFIG_IIO_ST_GYRO_3AXIS=y
130+
CONFIG_INV_MPU6050_I2C=y
118131
CONFIG_BH1780=y
132+
CONFIG_GP2AP002=y
119133
CONFIG_AK8974=y
120134
CONFIG_IIO_ST_MAGN_3AXIS=y
121135
CONFIG_IIO_HRTIMER_TRIGGER=y

arch/arm64/configs/defconfig

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,7 @@ CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m
8484
CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y
8585
CONFIG_CPUFREQ_DT=y
8686
CONFIG_ACPI_CPPC_CPUFREQ=m
87+
CONFIG_ARM_ALLWINNER_SUN50I_CPUFREQ_NVMEM=m
8788
CONFIG_ARM_ARMADA_37XX_CPUFREQ=y
8889
CONFIG_ARM_SCPI_CPUFREQ=y
8990
CONFIG_ARM_IMX_CPUFREQ_DT=m
@@ -188,6 +189,7 @@ CONFIG_NET_9P_VIRTIO=y
188189
CONFIG_PCI=y
189190
CONFIG_PCIEPORTBUS=y
190191
CONFIG_PCI_IOV=y
192+
CONFIG_PCI_PASID=y
191193
CONFIG_HOTPLUG_PCI=y
192194
CONFIG_HOTPLUG_PCI_ACPI=y
193195
CONFIG_PCI_AARDVARK=y
@@ -241,6 +243,7 @@ CONFIG_BLK_DEV_NVME=m
241243
CONFIG_SRAM=y
242244
CONFIG_EEPROM_AT24=m
243245
CONFIG_EEPROM_AT25=m
246+
CONFIG_UACCE=m
244247
# CONFIG_SCSI_PROC_FS is not set
245248
CONFIG_BLK_DEV_SD=y
246249
CONFIG_SCSI_SAS_ATA=y
@@ -305,13 +308,15 @@ CONFIG_MLX4_EN=m
305308
CONFIG_MLX5_CORE=m
306309
CONFIG_MLX5_CORE_EN=y
307310
CONFIG_QCOM_EMAC=m
311+
CONFIG_RMNET=m
308312
CONFIG_RAVB=y
309313
CONFIG_SMC91X=y
310314
CONFIG_SMSC911X=y
311315
CONFIG_SNI_AVE=y
312316
CONFIG_SNI_NETSEC=y
313317
CONFIG_STMMAC_ETH=m
314318
CONFIG_TI_K3_AM65_CPSW_NUSS=y
319+
CONFIG_QCOM_IPA=m
315320
CONFIG_MDIO_BUS_MUX_MMIOREG=y
316321
CONFIG_MDIO_BUS_MUX_MULTIPLEXER=y
317322
CONFIG_AQUANTIA_PHY=y
@@ -410,6 +415,7 @@ CONFIG_I2C_MESON=y
410415
CONFIG_I2C_MV64XXX=y
411416
CONFIG_I2C_OWL=y
412417
CONFIG_I2C_PXA=y
418+
CONFIG_I2C_QCOM_CCI=m
413419
CONFIG_I2C_QCOM_GENI=m
414420
CONFIG_I2C_QUP=y
415421
CONFIG_I2C_RK3X=y
@@ -450,6 +456,7 @@ CONFIG_PINCTRL_IMX8MN=y
450456
CONFIG_PINCTRL_IMX8MP=y
451457
CONFIG_PINCTRL_IMX8MQ=y
452458
CONFIG_PINCTRL_IMX8QXP=y
459+
CONFIG_PINCTRL_IMX8DXL=y
453460
CONFIG_PINCTRL_IPQ8074=y
454461
CONFIG_PINCTRL_IPQ6018=y
455462
CONFIG_PINCTRL_MSM8916=y
@@ -459,6 +466,7 @@ CONFIG_PINCTRL_MSM8998=y
459466
CONFIG_PINCTRL_QCS404=y
460467
CONFIG_PINCTRL_QDF2XXX=y
461468
CONFIG_PINCTRL_QCOM_SPMI_PMIC=y
469+
CONFIG_PINCTRL_SC7180=y
462470
CONFIG_PINCTRL_SDM845=y
463471
CONFIG_PINCTRL_SM8150=y
464472
CONFIG_GPIO_ALTERA=m
@@ -585,6 +593,7 @@ CONFIG_VIDEO_RENESAS_FCP=m
585593
CONFIG_VIDEO_RENESAS_VSP1=m
586594
CONFIG_SDR_PLATFORM_DRIVERS=y
587595
CONFIG_VIDEO_RCAR_DRIF=m
596+
CONFIG_VIDEO_QCOM_CAMSS=m
588597
CONFIG_DRM=m
589598
CONFIG_DRM_I2C_NXP_TDA998X=m
590599
CONFIG_DRM_MALI_DISPLAY=m
@@ -645,6 +654,7 @@ CONFIG_SND_HDA_CODEC_HDMI=m
645654
CONFIG_SND_SOC=y
646655
CONFIG_SND_BCM2835_SOC_I2S=m
647656
CONFIG_SND_MESON_AXG_SOUND_CARD=m
657+
CONFIG_SND_MESON_GX_SOUND_CARD=m
648658
CONFIG_SND_SOC_SDM845=m
649659
CONFIG_SND_SOC_ROCKCHIP=m
650660
CONFIG_SND_SOC_ROCKCHIP_SPDIF=m
@@ -657,6 +667,7 @@ CONFIG_SND_SOC_AK4613=m
657667
CONFIG_SND_SOC_ES7134=m
658668
CONFIG_SND_SOC_ES7241=m
659669
CONFIG_SND_SOC_PCM3168A_I2C=m
670+
CONFIG_SND_SOC_SIMPLE_AMPLIFIER=m
660671
CONFIG_SND_SOC_TAS571X=m
661672
CONFIG_SND_SOC_WCD934X=m
662673
CONFIG_SND_SOC_WSA881X=m
@@ -726,6 +737,7 @@ CONFIG_LEDS_CLASS=y
726737
CONFIG_LEDS_GPIO=y
727738
CONFIG_LEDS_PWM=y
728739
CONFIG_LEDS_SYSCON=y
740+
CONFIG_LEDS_TRIGGER_TIMER=y
729741
CONFIG_LEDS_TRIGGER_DISK=y
730742
CONFIG_LEDS_TRIGGER_HEARTBEAT=y
731743
CONFIG_LEDS_TRIGGER_CPU=y
@@ -805,10 +817,13 @@ CONFIG_MSM_GCC_8994=y
805817
CONFIG_MSM_MMCC_8996=y
806818
CONFIG_MSM_GCC_8998=y
807819
CONFIG_QCS_GCC_404=y
820+
CONFIG_SC_GCC_7180=y
821+
CONFIG_SDM_CAMCC_845=m
808822
CONFIG_SDM_GCC_845=y
809823
CONFIG_SDM_GPUCC_845=y
810824
CONFIG_SDM_DISPCC_845=y
811825
CONFIG_SM_GCC_8150=y
826+
CONFIG_SM_GCC_8250=y
812827
CONFIG_QCOM_HFPLL=y
813828
CONFIG_HWSPINLOCK=y
814829
CONFIG_HWSPINLOCK_QCOM=y
@@ -838,7 +853,6 @@ CONFIG_FSL_MC_DPIO=y
838853
CONFIG_IMX_SCU_SOC=y
839854
CONFIG_QCOM_AOSS_QMP=y
840855
CONFIG_QCOM_GENI_SE=y
841-
CONFIG_QCOM_GLINK_SSR=m
842856
CONFIG_QCOM_RMTFS_MEM=m
843857
CONFIG_QCOM_RPMH=y
844858
CONFIG_QCOM_RPMHPD=y
@@ -972,7 +986,9 @@ CONFIG_CRYPTO_DEV_FSL_CAAM=m
972986
CONFIG_CRYPTO_DEV_FSL_DPAA2_CAAM=m
973987
CONFIG_CRYPTO_DEV_QCOM_RNG=m
974988
CONFIG_CRYPTO_DEV_CCREE=m
989+
CONFIG_CRYPTO_DEV_HISI_SEC2=m
975990
CONFIG_CRYPTO_DEV_HISI_ZIP=m
991+
CONFIG_CRYPTO_DEV_HISI_HPRE=m
976992
CONFIG_CMA_SIZE_MBYTES=32
977993
CONFIG_PRINTK_TIME=y
978994
CONFIG_DEBUG_INFO=y

0 commit comments

Comments
 (0)