diff options
| author | Olof Johansson <olof@lixom.net> | 2021-06-15 18:13:04 +0300 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2021-06-15 18:13:06 +0300 |
| commit | a996c70e4d7e08904674d2a65e25303400ac02e5 (patch) | |
| tree | df1f1a57021366ee1e2a61d40c1e2aeb8480f240 | |
| parent | dfde897bb1d5fe91824ace4aa3ed21c52081fdbe (diff) | |
| parent | 38f61ef1a0cefb4e3b37c3e7b16c0f68df34a3dc (diff) | |
| download | linux-a996c70e4d7e08904674d2a65e25303400ac02e5.tar.xz | |
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>
| -rw-r--r-- | arch/arm/configs/exynos_defconfig | 1 | ||||
| -rw-r--r-- | arch/arm64/configs/defconfig | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/configs/exynos_defconfig b/arch/arm/configs/exynos_defconfig index 513f56b3c059..f4e1873912a3 100644 --- a/arch/arm/configs/exynos_defconfig +++ b/arch/arm/configs/exynos_defconfig @@ -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 diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig index 9766a7c6195c..b63b8b091a41 100644 --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig @@ -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 |