queue-5.1/arm64-defconfig-update-ufshcd-for-hi3660-soc.patch

   1 From 1436c12ee0ed7954f2134ca2a2e690171bea6149 Mon Sep 17 00:00:00 2001
   2 From: Valentin Schneider <valentin.schneider@arm.com>
   3 Date: Tue, 16 Apr 2019 18:02:21 +0100
   4 Subject: arm64: defconfig: Update UFSHCD for Hi3660 soc
   5
   6 [ Upstream commit 7b3320e6b1795d68b7e30eb3fad0860f2664aedd ]
   7
   8 Commit 7ee7ef24d02d ("scsi: arm64: defconfig: enable configs for Hisilicon ufs")
   9 set 'CONFIG_SCSI_UFS_HISI=y', but the configs it depends
  10 on
  11
  12   (CONFIG_SCSI_HFSHCD_PLATFORM && CONFIG_SCSI_UFSHCD)
  13
  14 were left to being built as modules.
  15
  16 Commit 1f4fa50dd48f ("arm64: defconfig: Regenerate for v4.20") "fixed"
  17 that by reverting to 'CONFIG_SCSI_UFS_HISI=m'.
  18
  19 Thing is, if the rootfs is stored in the on-board flash (which
  20 is the "canonical" way of doing things), we either need these drivers
  21 to be built-in, or we need to fiddle with an initramfs to access that
  22 flash and eventually load the modules installed over there.
  23
  24 The former is the easiest, do that.
  25
  26 Signed-off-by: Valentin Schneider <valentin.schneider@arm.com>
  27 Reviewed-by: Leo Yan <leo.yan@linaro.org>
  28 Signed-off-by: Olof Johansson <olof@lixom.net>
  29 Signed-off-by: Sasha Levin <sashal@kernel.org>
  30 ---
  31  arch/arm64/configs/defconfig | 6 +++---
  32  1 file changed, 3 insertions(+), 3 deletions(-)
  33
  34 diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig
  35 index 2d9c39033c1a..32fb03503b0b 100644
  36 --- a/arch/arm64/configs/defconfig
  37 +++ b/arch/arm64/configs/defconfig
  38 @@ -222,10 +222,10 @@ CONFIG_BLK_DEV_SD=y
  39  CONFIG_SCSI_SAS_ATA=y
  40  CONFIG_SCSI_HISI_SAS=y
  41  CONFIG_SCSI_HISI_SAS_PCI=y
  42 -CONFIG_SCSI_UFSHCD=m
  43 -CONFIG_SCSI_UFSHCD_PLATFORM=m
  44 +CONFIG_SCSI_UFSHCD=y
  45 +CONFIG_SCSI_UFSHCD_PLATFORM=y
  46  CONFIG_SCSI_UFS_QCOM=m
  47 -CONFIG_SCSI_UFS_HISI=m
  48 +CONFIG_SCSI_UFS_HISI=y
  49  CONFIG_ATA=y
  50  CONFIG_SATA_AHCI=y
  51  CONFIG_SATA_AHCI_PLATFORM=y
  52 --
  53 2.20.1
  54