[PATCH master 2/4] ARM: psci: client: match most specific compatible first
Ahmad Fatoum
a.fatoum at pengutronix.de
Mon Oct 31 23:26:40 PDT 2022
The PSCI client driver will use the barebox compatible to determine
whether it's safe to use the ARM_PSCI_0_2_FN_PSCI_VERSION command.
For this reason, we need to match against the newer PSCI compatibles
first, because otherwise
compatible = "arm,psci-1.0", "arm,psci-0.2", "arm,psci";
would have us end up with PSCI v0.1 instead.
Signed-off-by: Ahmad Fatoum <a.fatoum at pengutronix.de>
---
arch/arm/cpu/psci-client.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm/cpu/psci-client.c b/arch/arm/cpu/psci-client.c
index 7d5b3768b59e..8e151177c2d7 100644
--- a/arch/arm/cpu/psci-client.c
+++ b/arch/arm/cpu/psci-client.c
@@ -176,9 +176,9 @@ static int __init psci_probe(struct device_d *dev)
}
static __maybe_unused struct of_device_id psci_dt_ids[] = {
- { .compatible = "arm,psci", .data = (void*)ARM_PSCI_VER(0,1) },
- { .compatible = "arm,psci-0.2", .data = (void*)ARM_PSCI_VER(0,2) },
{ .compatible = "arm,psci-1.0", .data = (void*)ARM_PSCI_VER(1,0) },
+ { .compatible = "arm,psci-0.2", .data = (void*)ARM_PSCI_VER(0,2) },
+ { .compatible = "arm,psci", .data = (void*)ARM_PSCI_VER(0,1) },
{ /* sentinel */ },
};
--
2.30.2
More information about the barebox
mailing list