summaryrefslogtreecommitdiffstats
path: root/include/linux/psci.h
diff options
context:
space:
mode:
authorSudeep Holla <sudeep.holla@arm.com>2020-05-18 10:12:19 +0100
committerWill Deacon <will@kernel.org>2020-05-20 19:10:37 +0100
commitad5a57dfe434b02ab28852703d7ad5510998ccef (patch)
tree30dcc37435310c442d1a41c8dd8b71287a23ba8c /include/linux/psci.h
parent0441bfe7f00acaae7c4937ba0ca48ee1de9b709f (diff)
downloadlinux-ad5a57dfe434b02ab28852703d7ad5510998ccef.tar.gz
linux-ad5a57dfe434b02ab28852703d7ad5510998ccef.tar.bz2
linux-ad5a57dfe434b02ab28852703d7ad5510998ccef.zip
firmware: smccc: Drop smccc_version enum and use ARM_SMCCC_VERSION_1_x instead
Instead of maintaining 2 sets of enums/macros for tracking SMCCC version, let us drop smccc_version enum and use ARM_SMCCC_VERSION_1_x directly instead. This is in preparation to drop smccc_version here and move it separately under drivers/firmware/smccc. Signed-off-by: Sudeep Holla <sudeep.holla@arm.com> Tested-by: Etienne Carriere <etienne.carriere@st.com> Reviewed-by: Steven Price <steven.price@arm.com> Reviewed-by: Etienne Carriere <etienne.carriere@st.com> Acked-by: Mark Rutland <mark.rutland@arm.com> Link: https://lore.kernel.org/r/20200518091222.27467-5-sudeep.holla@arm.com Signed-off-by: Will Deacon <will@kernel.org>
Diffstat (limited to 'include/linux/psci.h')
-rw-r--r--include/linux/psci.h7
1 files changed, 1 insertions, 6 deletions
diff --git a/include/linux/psci.h b/include/linux/psci.h
index a67712b73b6c..29bd0671e5bb 100644
--- a/include/linux/psci.h
+++ b/include/linux/psci.h
@@ -21,11 +21,6 @@ bool psci_power_state_is_valid(u32 state);
int psci_set_osi_mode(void);
bool psci_has_osi_support(void);
-enum smccc_version {
- SMCCC_VERSION_1_0,
- SMCCC_VERSION_1_1,
-};
-
struct psci_operations {
u32 (*get_version)(void);
int (*cpu_suspend)(u32 state, unsigned long entry_point);
@@ -36,7 +31,7 @@ struct psci_operations {
unsigned long lowest_affinity_level);
int (*migrate_info_type)(void);
enum arm_smccc_conduit conduit;
- enum smccc_version smccc_version;
+ u32 smccc_version;
};
extern struct psci_operations psci_ops;