Merge tag 'qcom-defconfig-for-5.3' of git://git.kernel.org/pub/scm/linux/kernel/git...

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]>

diff --combined arch/arm/configs/qcom_defconfig
index e8a17b41b2db1f970d2eecd209000145cf6c72d8,f26103eae564f2299c93cb34fa3c296dffe693d8..34433bf5885d049869d75ad731f34ec071fc52c1
--- 1/arch/arm/configs/qcom_defconfig
--- 2/arch/arm/configs/qcom_defconfig
+++ b/arch/arm/configs/qcom_defconfig
@@@ -37,6 -37,7 +37,7 @@@ CONFIG_ARM_CPUIDLE=
  CONFIG_VFP=y
  CONFIG_NEON=y
  # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
+ CONFIG_CMA=y
  CONFIG_NET=y
  CONFIG_PACKET=y
  CONFIG_UNIX=y
@@@ -146,11 -147,14 +147,13 @@@ CONFIG_REGULATOR_QCOM_SMD_RPM=
  CONFIG_REGULATOR_QCOM_SPMI=y
  CONFIG_MEDIA_SUPPORT=y
  CONFIG_DRM=y
+ CONFIG_DRM_PANEL_SIMPLE=y
  CONFIG_FB=y
  CONFIG_FRAMEBUFFER_CONSOLE=y
 -CONFIG_BACKLIGHT_LCD_SUPPORT=y
  # CONFIG_LCD_CLASS_DEVICE is not set
  CONFIG_BACKLIGHT_CLASS_DEVICE=y
  # CONFIG_BACKLIGHT_GENERIC is not set
+ CONFIG_BACKLIGHT_LM3630A=y
  CONFIG_BACKLIGHT_LP855X=y
  CONFIG_SOUND=y
  CONFIG_SND=y
@@@ -182,6 -186,7 +185,7 @@@ CONFIG_USB_CONFIGFS_NCM=
  CONFIG_USB_CONFIGFS_ECM=y
  CONFIG_USB_CONFIGFS_F_FS=y
  CONFIG_USB_ULPI_BUS=y
+ CONFIG_USB_ETH=m
  CONFIG_MMC=y
  CONFIG_MMC_BLOCK_MINORS=32
  CONFIG_MMC_ARMMMCI=y
@@@ -261,6 -266,8 +265,8 @@@ CONFIG_NLS_CODEPAGE_437=
  CONFIG_NLS_ASCII=y
  CONFIG_NLS_ISO8859_1=y
  CONFIG_NLS_UTF8=y
+ CONFIG_DMA_CMA=y
+ CONFIG_CMA_SIZE_MBYTES=256
  CONFIG_PRINTK_TIME=y
  CONFIG_DYNAMIC_DEBUG=y
  CONFIG_DEBUG_INFO=y