From 16b182b86fb829e6ff666dbceca2fdf193d57d1d Mon Sep 17 00:00:00 2001 From: Ram Prakash Gupta Date: Wed, 13 Mar 2024 11:07:13 +0530 Subject: [PATCH] defconfig: Enable ufs-phy driver for niobe Niobe UFS PHY is reused from pineapple, hence enable CONFIG_PHY_QCOM_UFS_V4_PINEAPPLE to enable ufs-phy driver for niobe SoCs. Also add UFS PHY module in modules.list.msm.niobe so that the module is loaded from the first stage RAM disk image during bootup. Also enable CONFIG_CHR_DEV_SG to support communication from kernel for underlying storage devices using the SCSI protoco. Change-Id: I41aeff30849bff1f998b75bba3272e762d9658b7 Signed-off-by: Ram Prakash Gupta --- arch/arm64/configs/vendor/niobe_GKI.config | 3 ++- modules.list.msm.niobe | 1 + niobe.bzl | 2 ++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/arch/arm64/configs/vendor/niobe_GKI.config b/arch/arm64/configs/vendor/niobe_GKI.config index ea4bfe906ac3..a3b34904370f 100644 --- a/arch/arm64/configs/vendor/niobe_GKI.config +++ b/arch/arm64/configs/vendor/niobe_GKI.config @@ -9,6 +9,7 @@ CONFIG_ARM_SMMU_QCOM=m # CONFIG_ARM_SMMU_QCOM_DEBUG is not set # CONFIG_ARM_SMMU_SELFTEST is not set CONFIG_CFG80211=m +CONFIG_CHR_DEV_SG=m CONFIG_COMMON_CLK_QCOM=m CONFIG_CORESIGHT=m CONFIG_CORESIGHT_CSR=m @@ -84,7 +85,7 @@ CONFIG_PHY_QCOM_UFS_QRBTC_SDM845=m 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_PINEAPPLE=m # CONFIG_PHY_QCOM_UFS_V4_WAIPIO is not set CONFIG_PINCTRL_MSM=m CONFIG_PINCTRL_NIOBE=m diff --git a/modules.list.msm.niobe b/modules.list.msm.niobe index b0aea77f149b..559c1f649df7 100644 --- a/modules.list.msm.niobe +++ b/modules.list.msm.niobe @@ -44,6 +44,7 @@ qcom_hwspinlock.ko smem.ko socinfo.ko qcom-ipcc.ko +phy-qcom-ufs-qmp-v4-pineapple.ko phy-qcom-ufs.ko phy-qcom-ufs-qrbtc-sdm845.ko spmi-pmic-arb.ko diff --git a/niobe.bzl b/niobe.bzl index 0f005a24cc18..affa10cd106e 100644 --- a/niobe.bzl +++ b/niobe.bzl @@ -82,6 +82,7 @@ def define_niobe(): "drivers/perf/qcom_llcc_pmu.ko", "drivers/phy/qualcomm/phy-qcom-ufs.ko", "drivers/phy/qualcomm/phy-qcom-ufs-qmp-v4.ko", + "drivers/phy/qualcomm/phy-qcom-ufs-qmp-v4-pineapple.ko", "drivers/phy/qualcomm/phy-qcom-ufs-qrbtc-sdm845.ko", "drivers/pinctrl/qcom/pinctrl-msm.ko", "drivers/pinctrl/qcom/pinctrl-niobe.ko", @@ -109,6 +110,7 @@ def define_niobe(): "drivers/rpmsg/qcom_glink_spss.ko", "drivers/rpmsg/qcom_smd.ko", "drivers/rtc/rtc-pm8xxx.ko", + "drivers/scsi/sg.ko", "drivers/slimbus/slim-qcom-ngd-ctrl.ko", "drivers/slimbus/slimbus.ko", "drivers/soc/qcom/altmode-glink.ko",