Module Name: src
Committed By: martin
Date: Sun Jun 7 13:20:01 UTC 2020
Modified Files:
src/sys/arch/arm/ti [netbsd-9]: ti_cpufreq.c
Log Message:
Pull up following revision(s) (requested by jmcneill in ticket #943):
sys/arch/arm/ti/ti_cpufreq.c: revision 1.3
Fix SoC revision detection. BeagleBone Black reports 1GHz as a supported
frequency again.
To generate a diff of this commit:
cvs rdiff -u -r1.2.2.2 -r1.2.2.3 src/sys/arch/arm/ti/ti_cpufreq.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/ti/ti_cpufreq.c
diff -u src/sys/arch/arm/ti/ti_cpufreq.c:1.2.2.2 src/sys/arch/arm/ti/ti_cpufreq.c:1.2.2.3
--- src/sys/arch/arm/ti/ti_cpufreq.c:1.2.2.2 Wed Nov 27 13:46:44 2019
+++ src/sys/arch/arm/ti/ti_cpufreq.c Sun Jun 7 13:20:01 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: ti_cpufreq.c,v 1.2.2.2 2019/11/27 13:46:44 martin Exp $ */
+/* $NetBSD: ti_cpufreq.c,v 1.2.2.3 2020/06/07 13:20:01 martin Exp $ */
/*-
* Copyright (c) 2019 Jared McNeill <jmcne...@invisible.ca>
@@ -29,7 +29,7 @@
#include "opt_soc.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ti_cpufreq.c,v 1.2.2.2 2019/11/27 13:46:44 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ti_cpufreq.c,v 1.2.2.3 2020/06/07 13:20:01 martin Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -62,7 +62,7 @@ am33xx_opp_supported(const int opp_table
int len;
syscon_lock(ti_opp_syscon);
- rev = __SHIFTOUT(syscon_read_4(ti_opp_syscon, AM33XX_REV_OFFSET), AM33XX_REV_MASK);
+ rev = __BIT(__SHIFTOUT(syscon_read_4(ti_opp_syscon, AM33XX_REV_OFFSET), AM33XX_REV_MASK));
efuse = __SHIFTOUT(syscon_read_4(ti_opp_syscon, AM33XX_EFUSE_OFFSET), AM33XX_EFUSE_MASK);
syscon_unlock(ti_opp_syscon);
