Skip to content

Commit 85bd5af

Browse files
committed
Merge tag 'sunxi-config-for-5.9-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux into arm/defconfig
A bunch of patches to generally make sunxi_defconfig more helpful and add all the new drivers merged recently. * tag 'sunxi-config-for-5.9-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux: 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 ARM: configs: sunxi: Enable the deinterlace and rotation engines ARM: configs: sunxi: Enable the CSI drivers ARM: configs: sunxi: Run savedefconfig Link: https://lore.kernel.org/r/c74e64c9-f1f2-40ee-b4cd-c1430d32cf8d.lettre@localhost Signed-off-by: Arnd Bergmann <[email protected]>
2 parents 5aa988a + 6129225 commit 85bd5af

File tree

1 file changed

+33
-15
lines changed

1 file changed

+33
-15
lines changed

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)