Merge "defconfig: Enable UFS for pitti platform"

arch/arm64/configs/vendor/pitti_GKI.config

@@ -15,6 +15,15 @@ CONFIG_MMC_SDHCI_MSM=m
 CONFIG_MPM_LEGACY=m
 # CONFIG_MSM_HAB is not set
 CONFIG_MSM_RPM_SMD=m
+CONFIG_PHY_QCOM_UFS=m
+CONFIG_PHY_QCOM_UFS_QRBTC_SDM845=m
+# CONFIG_PHY_QCOM_UFS_V3 is not set
+# CONFIG_PHY_QCOM_UFS_V3_SM4350 is not set
+CONFIG_PHY_QCOM_UFS_V4=m
+# CONFIG_PHY_QCOM_UFS_V4_BLAIR is not set
+# CONFIG_PHY_QCOM_UFS_V4_KALAMA is not set
+# CONFIG_PHY_QCOM_UFS_V4_PINEAPPLE is not set
+# CONFIG_PHY_QCOM_UFS_V4_WAIPIO is not set
 CONFIG_PINCTRL_MSM=m
 CONFIG_PINCTRL_PITTI=m
 CONFIG_QCOM_DMABUF_HEAPS=m
@@ -41,4 +50,5 @@ CONFIG_QCOM_STATS=m
 CONFIG_QCOM_WCD_USBSS_I2C=m
 CONFIG_QTI_RPM_STATS_LOG=m
 CONFIG_REGULATOR_STUB=m
+CONFIG_SCSI_UFS_QCOM=m
 CONFIG_SM_GCC_PITTI=m

arch/arm64/configs/vendor/pitti_consolidate.config

@@ -14,3 +14,4 @@ CONFIG_RCU_TORTURE_TEST=m
 CONFIG_RUNTIME_TESTING_MENU=y
 CONFIG_SDHCI_MSM_DBG=y
 CONFIG_TEST_USER_COPY=m
+CONFIG_UFS_DBG=y

modules.list.msm.pitti

@@ -24,3 +24,6 @@ mem_buf.ko
 qcom_dma_heaps.ko
 msm_dma_iommu_mapping.ko
 gcc-pitti.ko
+phy-qcom-ufs.ko
+phy-qcom-ufs-qrbtc-sdm845.ko
+ufs_qcom.ko

pitti.bzl

@@ -23,6 +23,9 @@ def define_pitti():
         "drivers/mailbox/qcom-ipcc.ko",
         "drivers/mmc/host/cqhci.ko",
         "drivers/mmc/host/sdhci-msm.ko",
+        "drivers/phy/qualcomm/phy-qcom-ufs.ko",
+        "drivers/phy/qualcomm/phy-qcom-ufs-qmp-v4.ko",
+        "drivers/phy/qualcomm/phy-qcom-ufs-qrbtc-sdm845.ko",
         "drivers/pinctrl/qcom/pinctrl-msm.ko",
         "drivers/pinctrl/qcom/pinctrl-pitti.ko",
         "drivers/regulator/stub-regulator.ko",
@@ -35,6 +38,7 @@ def define_pitti():
         "drivers/soc/qcom/smem.ko",
         "drivers/soc/qcom/socinfo.ko",
         "drivers/soc/qcom/wcd_usbss_i2c.ko",
+        "drivers/ufs/host/ufs_qcom.ko",
     ]
 
     _pitti_consolidate_in_tree_modules = _pitti_in_tree_modules + [