Commit a996c70e authored Jun 15, 2021 by Olof Johansson

Merge tag 'samsung-defconfig-5.14' of...

Merge tag 'samsung-defconfig-5.14' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into arm/defconfig

Samsung defconfig changes for v5.14

1. Enable Exynos Universal Flash Storage (UFS) driver for Exynos7 arm64
   boards.
2. Restore framebuffer support in exynos_defconfig.

* tag 'samsung-defconfig-5.14' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux:
  ARM: exynos_defconfig: restore framebuffer support
  arm64: defconfig: Enable Exynos UFS driver

Link: https://lore.kernel.org/r/20210614193309.20248-3-krzysztof.kozlowski@canonical.com


Signed-off-by: Olof Johansson <olof@lixom.net>

parents dfde897b 38f61ef1

arch/arm/configs/exynos_defconfig

+1 −0

Original line number	Diff line number	Diff line
		@@ -236,6 +236,7 @@ CONFIG_DRM_SII9234=y
		CONFIG_DRM_TOSHIBA_TC358764=y
		CONFIG_DRM_LIMA=y
		CONFIG_DRM_PANFROST=y
		CONFIG_FB=y
		CONFIG_LCD_CLASS_DEVICE=y
		CONFIG_LCD_PLATFORM=y
		CONFIG_BACKLIGHT_PWM=y

arch/arm64/configs/defconfig

+2 −0

Original line number	Diff line number	Diff line
		@@ -289,6 +289,7 @@ CONFIG_SCSI_UFSHCD=y
		CONFIG_SCSI_UFSHCD_PLATFORM=y
		CONFIG_SCSI_UFS_QCOM=m
		CONFIG_SCSI_UFS_HISI=y
		CONFIG_SCSI_UFS_EXYNOS=y
		CONFIG_ATA=y
		CONFIG_SATA_AHCI=y
		CONFIG_SATA_AHCI_PLATFORM=y
		@@ -1114,6 +1115,7 @@ CONFIG_PHY_ROCKCHIP_INNO_USB2=y
		CONFIG_PHY_ROCKCHIP_INNO_DSIDPHY=m
		CONFIG_PHY_ROCKCHIP_PCIE=m
		CONFIG_PHY_ROCKCHIP_TYPEC=y
		CONFIG_PHY_SAMSUNG_UFS=y
		CONFIG_PHY_UNIPHIER_USB2=y
		CONFIG_PHY_UNIPHIER_USB3=y
		CONFIG_PHY_TEGRA_XUSB=y