Skip to content

Commit 9dd1901

Browse files
committed
Merge tag 'qcom-defconfig-for-5.3' of git://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux into arm/defconfig
Qualcomm ARM Based defconfig Updates for v5.3 * Add support for USB networking * Add support for display related options * tag 'qcom-defconfig-for-5.3' of git://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux: ARM: qcom_defconfig: add support for USB networking ARM: qcom_defconfig: add display-related options Signed-off-by: Olof Johansson <[email protected]>
2 parents e737f13 + 817bbbb commit 9dd1901

File tree

1 file changed

+6
-0
lines changed

1 file changed

+6
-0
lines changed

arch/arm/configs/qcom_defconfig

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ CONFIG_ARM_CPUIDLE=y
3737
CONFIG_VFP=y
3838
CONFIG_NEON=y
3939
# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
40+
CONFIG_CMA=y
4041
CONFIG_NET=y
4142
CONFIG_PACKET=y
4243
CONFIG_UNIX=y
@@ -146,11 +147,13 @@ CONFIG_REGULATOR_QCOM_SMD_RPM=y
146147
CONFIG_REGULATOR_QCOM_SPMI=y
147148
CONFIG_MEDIA_SUPPORT=y
148149
CONFIG_DRM=y
150+
CONFIG_DRM_PANEL_SIMPLE=y
149151
CONFIG_FB=y
150152
CONFIG_FRAMEBUFFER_CONSOLE=y
151153
# CONFIG_LCD_CLASS_DEVICE is not set
152154
CONFIG_BACKLIGHT_CLASS_DEVICE=y
153155
# CONFIG_BACKLIGHT_GENERIC is not set
156+
CONFIG_BACKLIGHT_LM3630A=y
154157
CONFIG_BACKLIGHT_LP855X=y
155158
CONFIG_SOUND=y
156159
CONFIG_SND=y
@@ -182,6 +185,7 @@ CONFIG_USB_CONFIGFS_NCM=y
182185
CONFIG_USB_CONFIGFS_ECM=y
183186
CONFIG_USB_CONFIGFS_F_FS=y
184187
CONFIG_USB_ULPI_BUS=y
188+
CONFIG_USB_ETH=m
185189
CONFIG_MMC=y
186190
CONFIG_MMC_BLOCK_MINORS=32
187191
CONFIG_MMC_ARMMMCI=y
@@ -261,6 +265,8 @@ CONFIG_NLS_CODEPAGE_437=y
261265
CONFIG_NLS_ASCII=y
262266
CONFIG_NLS_ISO8859_1=y
263267
CONFIG_NLS_UTF8=y
268+
CONFIG_DMA_CMA=y
269+
CONFIG_CMA_SIZE_MBYTES=256
264270
CONFIG_PRINTK_TIME=y
265271
CONFIG_DYNAMIC_DEBUG=y
266272
CONFIG_DEBUG_INFO=y

0 commit comments

Comments
 (0)