Skip to content

Commit 92c59e1

Browse files
committed
Merge tag 'arm-defconfig-5.9' 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.9' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (38 commits) ARM: configs: at91: sama5: enable CAN PLATFORM driver ARM: configs: at91: sama5: enable bridge and VLAN filtering ARM: configs: at91: sama5: add support for KSZ ethernet switches arm64: defconfig: Enable AM654x SDHCI controller arm64: arch_k3: enable chipid driver arm/arm64: defconfig: Update configs to use the new CROS_EC options ARM: tegra_defconfig: Enable options useful for Nexus 7 and Acer A500 ARM: tegra: Enable CPUFREQ userspace governor arm64: defconfig: enable CONFIG_FSL_ENETC_QOS arm64: defconfig: enable TSN features for ENETC and similiar hardware ARM: imx_v6_v7_defconfig: Support i.MX8MM arm64: defconfig: enable RTC and audio support on Kontron sl28 boards arm64: defconfig: add pca9450 pmic driver ARM: configs: sunxi: Enable crypto related options ARM: sunxi: configs: Enable the Mailbox driver ARM: configs: sunxi: Enable the PS/2 controller ARM: configs: sunxi: Enable Lima ARM: configs: sunxi: Add DRM output-related options ARM: configs: sunxi: Enable ASoC options ARM: configs: sunxi: Enable Cedrus ...
2 parents 09a0bd0 + 66d3037 commit 92c59e1

File tree

10 files changed

+145
-25
lines changed

10 files changed

+145
-25
lines changed

arch/arm/configs/exynos_defconfig

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,9 @@ CONFIG_DEVFREQ_THERMAL=y
166166
CONFIG_THERMAL_EMULATION=y
167167
CONFIG_WATCHDOG=y
168168
CONFIG_S3C2410_WATCHDOG=y
169-
CONFIG_MFD_CROS_EC=y
169+
CONFIG_MFD_CROS_EC_DEV=y
170+
CONFIG_CHROME_PLATFORMS=y
171+
CONFIG_CROS_EC=y
170172
CONFIG_MFD_MAX14577=y
171173
CONFIG_MFD_MAX77686=y
172174
CONFIG_MFD_MAX77693=y

arch/arm/configs/imx_v6_v7_defconfig

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -217,6 +217,7 @@ CONFIG_SPI=y
217217
CONFIG_SPI_GPIO=y
218218
CONFIG_SPI_IMX=y
219219
CONFIG_SPI_FSL_DSPI=y
220+
CONFIG_PINCTRL_IMX8MM=y
220221
CONFIG_GPIO_SYSFS=y
221222
CONFIG_GPIO_SIOX=m
222223
CONFIG_GPIO_MAX732X=y
@@ -406,6 +407,8 @@ CONFIG_STAGING=y
406407
CONFIG_STAGING_MEDIA=y
407408
CONFIG_VIDEO_IMX_MEDIA=y
408409
CONFIG_COMMON_CLK_PWM=y
410+
CONFIG_CLK_IMX8MM=y
411+
CONFIG_SOC_IMX8M=y
409412
CONFIG_IIO=y
410413
CONFIG_MMA8452=y
411414
CONFIG_IMX7D_ADC=y

arch/arm/configs/multi_v7_defconfig

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -314,6 +314,7 @@ CONFIG_INPUT_MAX77693_HAPTIC=m
314314
CONFIG_INPUT_MAX8997_HAPTIC=m
315315
CONFIG_INPUT_CPCAP_PWRBUTTON=m
316316
CONFIG_INPUT_AXP20X_PEK=m
317+
CONFIG_INPUT_DA9063_ONKEY=m
317318
CONFIG_INPUT_ADXL34X=m
318319
CONFIG_INPUT_STPMIC1_ONKEY=y
319320
CONFIG_SERIO_AMBAKMI=y
@@ -520,6 +521,7 @@ CONFIG_TEGRA_WATCHDOG=m
520521
CONFIG_MESON_WATCHDOG=y
521522
CONFIG_DIGICOLOR_WATCHDOG=y
522523
CONFIG_RENESAS_WDT=m
524+
CONFIG_RENESAS_RZAWDT=m
523525
CONFIG_STPMIC1_WATCHDOG=y
524526
CONFIG_BCM47XX_WDT=y
525527
CONFIG_BCM2835_WDT=y
@@ -618,6 +620,7 @@ CONFIG_V4L_PLATFORM_DRIVERS=y
618620
CONFIG_VIDEO_MMP_CAMERA=m
619621
CONFIG_VIDEO_ASPEED=m
620622
CONFIG_VIDEO_STM32_DCMI=m
623+
CONFIG_VIDEO_RENESAS_CEU=m
621624
CONFIG_VIDEO_SAMSUNG_EXYNOS4_IS=m
622625
CONFIG_VIDEO_S5P_FIMC=m
623626
CONFIG_VIDEO_S5P_MIPI_CSIS=m
@@ -640,6 +643,8 @@ CONFIG_VIDEO_VIVID=m
640643
CONFIG_CEC_PLATFORM_DRIVERS=y
641644
CONFIG_CEC_SAMSUNG_S5P=m
642645
CONFIG_VIDEO_ADV7180=m
646+
CONFIG_VIDEO_ADV7604=m
647+
CONFIG_VIDEO_ADV7604_CEC=y
643648
CONFIG_VIDEO_ML86V7667=m
644649
CONFIG_IMX_IPUV3_CORE=m
645650
CONFIG_DRM=y
@@ -901,6 +906,7 @@ CONFIG_RTC_DRV_EFI=m
901906
CONFIG_RTC_DRV_DIGICOLOR=m
902907
CONFIG_RTC_DRV_S3C=m
903908
CONFIG_RTC_DRV_SA1100=m
909+
CONFIG_RTC_DRV_SH=m
904910
CONFIG_RTC_DRV_PL031=y
905911
CONFIG_RTC_DRV_AT91RM9200=m
906912
CONFIG_RTC_DRV_AT91SAM9=m
@@ -945,7 +951,7 @@ CONFIG_SERIO_NVEC_PS2=y
945951
CONFIG_NVEC_POWER=y
946952
CONFIG_NVEC_PAZ00=y
947953
CONFIG_STAGING_BOARD=y
948-
CONFIG_MFD_CROS_EC=m
954+
CONFIG_MFD_CROS_EC_DEV=m
949955
CONFIG_CROS_EC_I2C=m
950956
CONFIG_CROS_EC_SPI=m
951957
CONFIG_COMMON_CLK_MAX77686=y
@@ -1126,3 +1132,6 @@ CONFIG_CMA_SIZE_MBYTES=64
11261132
CONFIG_PRINTK_TIME=y
11271133
CONFIG_MAGIC_SYSRQ=y
11281134
CONFIG_DEBUG_FS=y
1135+
CONFIG_CHROME_PLATFORMS=y
1136+
CONFIG_CROS_EC=m
1137+
CONFIG_CROS_EC_CHARDEV=m

arch/arm/configs/pxa_defconfig

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -391,7 +391,9 @@ CONFIG_SA1100_WATCHDOG=m
391391
CONFIG_MFD_AS3711=y
392392
CONFIG_MFD_BCM590XX=m
393393
CONFIG_MFD_AXP20X=y
394-
CONFIG_MFD_CROS_EC=m
394+
CONFIG_MFD_CROS_EC_DEV=m
395+
CONFIG_CHROME_PLATFORMS=y
396+
CONFIG_CROS_EC=m
395397
CONFIG_CROS_EC_I2C=m
396398
CONFIG_CROS_EC_SPI=m
397399
CONFIG_MFD_ASIC3=y

arch/arm/configs/sama5_defconfig

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,14 @@ CONFIG_IP_PNP_RARP=y
4949
# CONFIG_INET6_XFRM_MODE_TUNNEL is not set
5050
# CONFIG_INET6_XFRM_MODE_BEET is not set
5151
CONFIG_IPV6_SIT_6RD=y
52+
CONFIG_BRIDGE=m
53+
CONFIG_BRIDGE_VLAN_FILTERING=y
54+
CONFIG_NET_DSA=m
55+
CONFIG_VLAN_8021Q=m
5256
CONFIG_CAN=y
5357
CONFIG_CAN_AT91=y
5458
CONFIG_CAN_M_CAN=y
59+
CONFIG_CAN_M_CAN_PLATFORM=y
5560
CONFIG_CFG80211=y
5661
CONFIG_MAC80211=y
5762
CONFIG_MAC80211_LEDS=y
@@ -80,6 +85,8 @@ CONFIG_SCSI=y
8085
CONFIG_BLK_DEV_SD=y
8186
# CONFIG_SCSI_LOWLEVEL is not set
8287
CONFIG_NETDEVICES=y
88+
CONFIG_NET_DSA_MICROCHIP_KSZ9477=m
89+
CONFIG_NET_DSA_MICROCHIP_KSZ9477_SPI=m
8390
CONFIG_MACB=y
8491
# CONFIG_NET_VENDOR_BROADCOM is not set
8592
# CONFIG_NET_VENDOR_CIRRUS is not set
@@ -165,6 +172,7 @@ CONFIG_SND_SOC=y
165172
CONFIG_SND_ATMEL_SOC=y
166173
CONFIG_SND_ATMEL_SOC_WM8904=y
167174
# CONFIG_HID_GENERIC is not set
175+
CONFIG_SND_ATMEL_SOC_CLASSD=y
168176
CONFIG_SND_ATMEL_SOC_PDMIC=y
169177
CONFIG_SND_ATMEL_SOC_TSE850_PCM5142=m
170178
CONFIG_SND_ATMEL_SOC_I2S=y

arch/arm/configs/shmobile_defconfig

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@ CONFIG_SMP=y
1313
CONFIG_SCHED_MC=y
1414
CONFIG_NR_CPUS=8
1515
CONFIG_HIGHMEM=y
16-
CONFIG_ZBOOT_ROM_TEXT=0x0
17-
CONFIG_ZBOOT_ROM_BSS=0x0
1816
CONFIG_ARM_APPENDED_DTB=y
1917
CONFIG_KEXEC=y
2018
CONFIG_CPU_FREQ=y
@@ -67,6 +65,7 @@ CONFIG_INPUT_TOUCHSCREEN=y
6765
CONFIG_TOUCHSCREEN_EDT_FT5X06=y
6866
CONFIG_TOUCHSCREEN_ST1232=y
6967
CONFIG_INPUT_MISC=y
68+
CONFIG_INPUT_DA9063_ONKEY=y
7069
CONFIG_INPUT_ADXL34X=y
7170
# CONFIG_LEGACY_PTYS is not set
7271
CONFIG_SERIAL_8250=y
@@ -90,6 +89,7 @@ CONFIG_PINCTRL_RZA1=y
9089
CONFIG_PINCTRL_RZA2=y
9190
CONFIG_GPIO_EM=y
9291
CONFIG_GPIO_RCAR=y
92+
CONFIG_GPIO_PCA953X=y
9393
CONFIG_GPIO_PCF857X=y
9494
CONFIG_POWER_RESET=y
9595
CONFIG_POWER_RESET_RMOBILE=y
@@ -101,6 +101,7 @@ CONFIG_RCAR_THERMAL=y
101101
CONFIG_WATCHDOG=y
102102
CONFIG_DA9063_WATCHDOG=y
103103
CONFIG_RENESAS_WDT=y
104+
CONFIG_RENESAS_RZAWDT=y
104105
CONFIG_MFD_AS3711=y
105106
CONFIG_MFD_DA9063=y
106107
CONFIG_REGULATOR_FIXED_VOLTAGE=y
@@ -109,18 +110,19 @@ CONFIG_REGULATOR_DA9210=y
109110
CONFIG_REGULATOR_GPIO=y
110111
CONFIG_REGULATOR_MAX8973=y
111112
CONFIG_MEDIA_SUPPORT=y
113+
# CONFIG_MEDIA_SUBDRV_AUTOSELECT is not set
112114
CONFIG_MEDIA_CAMERA_SUPPORT=y
113-
CONFIG_MEDIA_CONTROLLER=y
114-
CONFIG_VIDEO_V4L2_SUBDEV_API=y
115+
CONFIG_MEDIA_PLATFORM_SUPPORT=y
115116
CONFIG_V4L_PLATFORM_DRIVERS=y
117+
CONFIG_VIDEO_RENESAS_CEU=y
116118
CONFIG_VIDEO_RCAR_VIN=y
117119
CONFIG_V4L_MEM2MEM_DRIVERS=y
118120
CONFIG_VIDEO_RENESAS_FDP1=y
119121
CONFIG_VIDEO_RENESAS_JPU=y
120122
CONFIG_VIDEO_RENESAS_VSP1=y
121-
# CONFIG_MEDIA_SUBDRV_AUTOSELECT is not set
122123
CONFIG_VIDEO_ADV7180=y
123124
CONFIG_VIDEO_ADV7604=y
125+
CONFIG_VIDEO_ADV7604_CEC=y
124126
CONFIG_VIDEO_ML86V7667=y
125127
CONFIG_DRM=y
126128
CONFIG_DRM_RCAR_DU=y
@@ -168,6 +170,7 @@ CONFIG_RTC_DRV_BQ32K=y
168170
CONFIG_RTC_DRV_S35390A=y
169171
CONFIG_RTC_DRV_RX8581=y
170172
CONFIG_RTC_DRV_DA9063=y
173+
CONFIG_RTC_DRV_SH=y
171174
CONFIG_DMADEVICES=y
172175
CONFIG_RCAR_DMAC=y
173176
CONFIG_RENESAS_USB_DMAC=y

arch/arm/configs/sunxi_defconfig

Lines changed: 33 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,45 +3,39 @@ CONFIG_HIGH_RES_TIMERS=y
33
CONFIG_CGROUPS=y
44
CONFIG_BLK_DEV_INITRD=y
55
CONFIG_PERF_EVENTS=y
6-
CONFIG_MODULES=y
7-
CONFIG_MODULE_UNLOAD=y
86
CONFIG_ARCH_SUNXI=y
97
CONFIG_SMP=y
108
CONFIG_NR_CPUS=8
11-
CONFIG_AEABI=y
129
CONFIG_HIGHMEM=y
13-
CONFIG_CMA=y
1410
CONFIG_ARM_APPENDED_DTB=y
1511
CONFIG_ARM_ATAG_DTB_COMPAT=y
1612
CONFIG_CPU_FREQ=y
1713
CONFIG_CPUFREQ_DT=y
1814
CONFIG_VFP=y
1915
CONFIG_NEON=y
16+
CONFIG_MODULES=y
17+
CONFIG_MODULE_UNLOAD=y
18+
CONFIG_CMA=y
2019
CONFIG_NET=y
2120
CONFIG_PACKET=y
2221
CONFIG_UNIX=y
2322
CONFIG_INET=y
2423
CONFIG_IP_PNP=y
2524
CONFIG_IP_PNP_DHCP=y
2625
CONFIG_IP_PNP_BOOTP=y
27-
# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
28-
# CONFIG_INET_XFRM_MODE_TUNNEL is not set
29-
# CONFIG_INET_XFRM_MODE_BEET is not set
3026
# CONFIG_INET_DIAG is not set
3127
# CONFIG_IPV6 is not set
3228
CONFIG_CAN=y
3329
CONFIG_CAN_SUN4I=y
3430
# CONFIG_WIRELESS is not set
3531
CONFIG_DEVTMPFS=y
3632
CONFIG_DEVTMPFS_MOUNT=y
37-
CONFIG_DMA_CMA=y
3833
CONFIG_BLK_DEV_SD=y
3934
CONFIG_ATA=y
4035
CONFIG_AHCI_SUNXI=y
4136
CONFIG_NETDEVICES=y
4237
CONFIG_SUN4I_EMAC=y
4338
# CONFIG_NET_VENDOR_ARC is not set
44-
# CONFIG_NET_CADENCE is not set
4539
# CONFIG_NET_VENDOR_BROADCOM is not set
4640
# CONFIG_NET_VENDOR_CIRRUS is not set
4741
# CONFIG_NET_VENDOR_FARADAY is not set
@@ -65,6 +59,7 @@ CONFIG_INPUT_TOUCHSCREEN=y
6559
CONFIG_TOUCHSCREEN_SUN4I=y
6660
CONFIG_INPUT_MISC=y
6761
CONFIG_INPUT_AXP20X_PEK=y
62+
CONFIG_SERIO_SUN4I_PS2=y
6863
CONFIG_SERIAL_8250=y
6964
CONFIG_SERIAL_8250_CONSOLE=y
7065
CONFIG_SERIAL_8250_NR_UARTS=8
@@ -95,19 +90,37 @@ CONFIG_REGULATOR=y
9590
CONFIG_REGULATOR_FIXED_VOLTAGE=y
9691
CONFIG_REGULATOR_AXP20X=y
9792
CONFIG_REGULATOR_GPIO=y
98-
CONFIG_MEDIA_SUPPORT=y
9993
CONFIG_RC_CORE=y
10094
CONFIG_RC_DEVICES=y
10195
CONFIG_IR_SUNXI=y
96+
CONFIG_MEDIA_SUPPORT=y
97+
CONFIG_MEDIA_PLATFORM_SUPPORT=y
98+
CONFIG_V4L_PLATFORM_DRIVERS=y
99+
CONFIG_VIDEO_SUN4I_CSI=y
100+
CONFIG_VIDEO_SUN6I_CSI=y
101+
CONFIG_V4L_MEM2MEM_DRIVERS=y
102+
CONFIG_VIDEO_SUN8I_DEINTERLACE=y
103+
CONFIG_VIDEO_SUN8I_ROTATE=y
102104
CONFIG_DRM=y
103105
CONFIG_DRM_SUN4I=y
106+
CONFIG_DRM_SUN4I_HDMI_CEC=y
107+
CONFIG_DRM_SUN8I_DW_HDMI=y
108+
CONFIG_DRM_PANEL_LVDS=y
109+
CONFIG_DRM_PANEL_SIMPLE=y
104110
CONFIG_DRM_SIMPLE_BRIDGE=y
111+
CONFIG_DRM_LIMA=y
105112
CONFIG_FB_SIMPLE=y
113+
CONFIG_BACKLIGHT_CLASS_DEVICE=y
114+
# CONFIG_BACKLIGHT_GENERIC is not set
115+
CONFIG_BACKLIGHT_PWM=y
106116
CONFIG_SOUND=y
107117
CONFIG_SND=y
108118
CONFIG_SND_SOC=y
109119
CONFIG_SND_SUN4I_CODEC=y
120+
CONFIG_SND_SUN8I_CODEC=y
110121
CONFIG_SND_SUN8I_CODEC_ANALOG=y
122+
CONFIG_SND_SUN4I_I2S=y
123+
CONFIG_SND_SUN4I_SPDIF=y
111124
CONFIG_USB=y
112125
CONFIG_USB_EHCI_HCD=y
113126
CONFIG_USB_EHCI_HCD_PLATFORM=y
@@ -132,15 +145,18 @@ CONFIG_RTC_DRV_AC100=y
132145
CONFIG_RTC_DRV_SUNXI=y
133146
CONFIG_DMADEVICES=y
134147
CONFIG_DMA_SUN6I=y
148+
CONFIG_STAGING=y
149+
CONFIG_STAGING_MEDIA=y
150+
CONFIG_VIDEO_SUNXI=y
151+
CONFIG_VIDEO_SUNXI_CEDRUS=y
152+
CONFIG_MAILBOX=y
135153
# CONFIG_IOMMU_SUPPORT is not set
136-
CONFIG_EXTCON=y
137154
CONFIG_IIO=y
138155
CONFIG_AXP20X_ADC=y
139156
CONFIG_PWM=y
140157
CONFIG_PWM_SUN4I=y
141158
CONFIG_PHY_SUN4I_USB=y
142159
CONFIG_PHY_SUN9I_USB=y
143-
CONFIG_NVMEM=y
144160
CONFIG_NVMEM_SUNXI_SID=y
145161
CONFIG_EXT4_FS=y
146162
CONFIG_VFAT_FS=y
@@ -151,8 +167,10 @@ CONFIG_NFS_V4=y
151167
CONFIG_ROOT_NFS=y
152168
CONFIG_NLS_CODEPAGE_437=y
153169
CONFIG_NLS_ISO8859_1=y
170+
CONFIG_CRYPTO_DEV_SUN4I_SS=y
171+
CONFIG_CRYPTO_DEV_SUN4I_SS_PRNG=y
172+
CONFIG_CRYPTO_DEV_SUN8I_CE=y
173+
CONFIG_CRYPTO_DEV_SUN8I_SS=y
174+
CONFIG_DMA_CMA=y
154175
CONFIG_PRINTK_TIME=y
155176
CONFIG_DEBUG_FS=y
156-
CONFIG_CRYPTO_DEV_ALLWINNER=y
157-
CONFIG_CRYPTO_DEV_SUN8I_CE=y
158-
CONFIG_CRYPTO_DEV_SUN4I_SS=y

0 commit comments

Comments
 (0)