Module Name: src Committed By: jakllsch Date: Fri Jun 15 16:03:59 UTC 2018
Modified Files: src/sys/arch/arm/fdt: psci_fdt.c Log Message: Fix PSCI 0.1 detection. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/arch/arm/fdt/psci_fdt.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/arch/arm/fdt/psci_fdt.c diff -u src/sys/arch/arm/fdt/psci_fdt.c:1.4 src/sys/arch/arm/fdt/psci_fdt.c:1.5 --- src/sys/arch/arm/fdt/psci_fdt.c:1.4 Sat May 26 22:49:03 2018 +++ src/sys/arch/arm/fdt/psci_fdt.c Fri Jun 15 16:03:59 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: psci_fdt.c,v 1.4 2018/05/26 22:49:03 jmcneill Exp $ */ +/* $NetBSD: psci_fdt.c,v 1.5 2018/06/15 16:03:59 jakllsch Exp $ */ /*- * Copyright (c) 2017 Jared McNeill <jmcne...@invisible.ca> @@ -29,7 +29,7 @@ #include "opt_multiprocessor.h" #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: psci_fdt.c,v 1.4 2018/05/26 22:49:03 jmcneill Exp $"); +__KERNEL_RCSID(0, "$NetBSD: psci_fdt.c,v 1.5 2018/06/15 16:03:59 jakllsch Exp $"); #include <sys/param.h> #include <sys/bus.h> @@ -126,8 +126,7 @@ psci_fdt_init(const int phandle) return EINVAL; } - const char * const compat_0_1[] = { "arm,psci", NULL }; - if (of_match_compatible(phandle, compat_0_1)) { + if (of_match_compatible(phandle, compatible) == 1) { psci_clearfunc(); if (of_getprop_uint32(phandle, "cpu_on", &val) == 0) psci_setfunc(PSCI_FUNC_CPU_ON, val);