diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2018-02-08 19:03:36 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2018-02-08 19:03:36 -0800 |
| commit | 5d7bc6e4bb550066d443b852356c455201ee92f9 (patch) | |
| tree | 3ecd973d7d435c42a04cd886651310ccd71166bd | |
| parent | 18f6c1a5fbc14c50bd9bb6a15483cc228c749d3a (diff) | |
| parent | 24c543be8577aa9d425e0867be32355dfcb5b831 (diff) | |
Merge "drivers/firmware: Expose psci_get_version through psci_ops structure"
| -rw-r--r-- | drivers/firmware/psci.c | 2 | ||||
| -rw-r--r-- | include/linux/psci.h | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/drivers/firmware/psci.c b/drivers/firmware/psci.c index c7382d46c673..07dc692851d8 100644 --- a/drivers/firmware/psci.c +++ b/drivers/firmware/psci.c @@ -431,6 +431,8 @@ static void __init psci_init_migrate(void) static void __init psci_0_2_set_functions(void) { pr_info("Using standard PSCI v0.2 function IDs\n"); + psci_ops.get_version = psci_get_version; + psci_function_id[PSCI_FN_CPU_SUSPEND] = PSCI_FN_NATIVE(0_2, CPU_SUSPEND); psci_ops.cpu_suspend = psci_cpu_suspend; diff --git a/include/linux/psci.h b/include/linux/psci.h index 393efe2edf9a..66499dd612f5 100644 --- a/include/linux/psci.h +++ b/include/linux/psci.h @@ -28,6 +28,7 @@ int psci_cpu_init_idle(unsigned int cpu); int psci_cpu_suspend_enter(unsigned long index); struct psci_operations { + u32 (*get_version)(void); int (*cpu_suspend)(u32 state, unsigned long entry_point); int (*cpu_off)(u32 state); int (*cpu_on)(unsigned long cpuid, unsigned long entry_point); |