Revert "qcom: socinfo: Code cleanup to remove unused features"

This reverts commit 1c2037c5c9.

Reverting as there were regressions seen in vendor builds.

Change-Id: I7d25eda8f55fd0c9304f6ec09055d328e78f80cc
Signed-off-by: Bruce Levy <quic_blevy@quicinc.com>
This commit is contained in:
Bruce Levy 2023-05-01 11:33:26 -07:00
parent f79900f046
commit 84a14b5670
2 changed files with 1513 additions and 268 deletions

File diff suppressed because it is too large Load Diff

View File

@ -1,7 +1,7 @@
/* SPDX-License-Identifier: GPL-2.0-only */
/*
* Copyright (c) 2019-2021, The Linux Foundation. All rights reserved.
* Copyright (c) 2022-2023, Qualcomm Innovation Center, Inc. All rights reserved.
* Copyright (c) 2022, Qualcomm Innovation Center, Inc. All rights reserved.
*/
#ifndef __SOC_QCOM_SOCINFO_H__
@ -93,6 +93,10 @@ enum subset_part_type {
NUM_PARTS_MAX,
};
enum subset_cluster_type {
CLUSTER_CPUSS,
NUM_CLUSTERS_MAX,
};
#if IS_ENABLED(CONFIG_QCOM_SOCINFO)
uint32_t socinfo_get_id(void);
@ -103,6 +107,9 @@ int socinfo_get_pcode(void);
char *socinfo_get_partinfo_part_name(unsigned int part_id);
uint32_t socinfo_get_partinfo_chip_id(unsigned int part_id);
uint32_t socinfo_get_partinfo_vulkan_id(unsigned int part_id);
int socinfo_get_oem_variant_id(void);
uint32_t socinfo_get_cluster_info(enum subset_cluster_type cluster);
bool socinfo_get_part_info(enum subset_part_type part);
#else
static inline uint32_t socinfo_get_id(void)
{
@ -118,7 +125,6 @@ static inline const char *socinfo_get_id_string(void)
{
return "N/A";
}
int socinfo_get_feature_code(void)
{
return -EINVAL;
@ -139,6 +145,18 @@ uint32_t socinfo_get_partinfo_vulkan_id(unsigned int part_id)
{
return 0;
}
int socinfo_get_oem_variant_id(void)
{
return -EINVAL;
}
uint32_t socinfo_get_cluster_info(enum subset_cluster_type cluster)
{
return 0;
}
bool socinfo_get_part_info(enum subset_part_type part)
{
return false;
}
#endif /* CONFIG_QCOM_SOCINFO */
#endif /* __SOC_QCOM_SOCINFO_H__ */