github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-07-30 03:01:41 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

Merge "arm64: defconfig: Enable socinfo and smem drivers for pineapple SoC"

Browse Source
This commit is contained in:
qctecmdr 2022-06-04 12:34:23 -07:00 committed by Gerrit - the friendly Code Review server
commit 5a682e3d5e
2 changed files with 15 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
arch/arm64/configs/vendor/pineapple_GKI.config vendored
View File

@ -3,6 +3,7 @@ CONFIG_ARM_SMMU=m
CONFIG_ARM_SMMU_DISABLE_BYPASS_BY_DEFAULT=y
CONFIG_ARM_SMMU_QCOM=m
CONFIG_COMMON_CLK_QCOM=m
CONFIG_HWSPINLOCK_QCOM=m
CONFIG_INTERCONNECT_QCOM=m
CONFIG_INTERCONNECT_QCOM_DEBUG=m
CONFIG_INTERCONNECT_QCOM_PINEAPPLE=m
@ -16,11 +17,24 @@ CONFIG_PINCTRL_MSM=m
CONFIG_PINCTRL_PINEAPPLE=m
CONFIG_QCOM_COMMAND_DB=m
CONFIG_QCOM_IOMMU_UTIL=m
# CONFIG_QCOM_MINIDUMP is not set
CONFIG_QCOM_PDC=m
# CONFIG_QCOM_Q6V5_ADSP is not set
# CONFIG_QCOM_Q6V5_MSS is not set
# CONFIG_QCOM_Q6V5_PAS is not set
# CONFIG_QCOM_Q6V5_WCSS is not set
CONFIG_QCOM_RPMH=m
CONFIG_QCOM_SCM=m
# CONFIG_QCOM_SCM_DOWNLOAD_MODE_DEFAULT is not set
CONFIG_QCOM_SMEM=m
# CONFIG_QCOM_SMP2P is not set
# CONFIG_QCOM_SMSM is not set
CONFIG_QCOM_SOCINFO=m
# CONFIG_QCOM_STATS is not set
# CONFIG_QCOM_WCNSS_PIL is not set
CONFIG_REGULATOR_STUB=m
# CONFIG_RPMSG_QCOM_GLINK_SMEM is not set
# CONFIG_RPMSG_QCOM_SMD is not set
CONFIG_SCSI_UFS_QCOM=m
CONFIG_SM_CAMCC_PINEAPPLE=m
CONFIG_SM_DISPCC_PINEAPPLE=m
@ -28,3 +42,4 @@ CONFIG_SM_GCC_PINEAPPLE=m
CONFIG_SM_VIDEOCC_PINEAPPLE=m
CONFIG_USB_DWC3_MSM=m
CONFIG_USB_QCOM_EMU_PHY=m
# CONFIG_VIDEO_QCOM_VENUS is not set

44
drivers/soc/qcom/socinfo.c
View File

@ -808,49 +808,6 @@ static const struct soc_id soc_id[] = {
{ 577, "PINEAPPLEP" },
};
struct soc_sku {
u32 id;
u32 feature_id;
const char *sku_name;
};
static const struct soc_sku soc_sku[] = {
{ 415, 0, "AB" },
{ 415, 8, "AC" },
};
static ssize_t msm_get_soc_sku(struct device *dev,
struct device_attribute *attr, char *buf)
{
const char *soc_sku_name = NULL;
int feature_id, idx;
u32 id;
id = socinfo_get_id();
feature_id = qcom_smem_get_feature_id();
if (feature_id < 0) {
dev_err(dev, "Cannot get feature_id\n");
return 0;
}
for (idx = 0; idx < ARRAY_SIZE(soc_sku); idx++) {
if (soc_sku[idx].id == id &&
soc_sku[idx].feature_id == feature_id) {
soc_sku_name = soc_sku[idx].sku_name;
break;
}
}
if (IS_ERR_OR_NULL(soc_sku_name)) {
dev_err(dev, "soc_sku_name not found\n");
return 0;
}
return scnprintf(buf, PAGE_SIZE, "%s\n", soc_sku_name);
}
ATTR_DEFINE(soc_sku);
static struct qcom_socinfo *qsocinfo;
static struct attribute *msm_custom_socinfo_attrs[35];
@ -1114,7 +1071,6 @@ static void socinfo_populate_sysfs(struct qcom_socinfo *qcom_socinfo)
switch (socinfo_format) {
case SOCINFO_VERSION(0, 15):
msm_custom_socinfo_attrs[i++] = &dev_attr_soc_sku.attr;
msm_custom_socinfo_attrs[i++] = &dev_attr_nmodem_supported.attr;
fallthrough;
case SOCINFO_VERSION(0, 14):