From: kettenis <kettenis@openbsd.org>
Date: Fri, 29 Dec 2017 15:53:09 +0000 (+0000)
Subject: Remove the RK3399-specific cpuspeed implementation as the generic one works
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=5626b605c74c3d0a4adcaf9cf3e33ea79b95aeeb;p=openbsd

Remove the RK3399-specific cpuspeed implementation as the generic one works
fine for this SoC.
---

diff --git a/sys/dev/fdt/rkclock.c b/sys/dev/fdt/rkclock.c
index d1bd82aec9b..06ed92f652c 100644
--- a/sys/dev/fdt/rkclock.c
+++ b/sys/dev/fdt/rkclock.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rkclock.c,v 1.18 2017/12/29 13:52:52 kettenis Exp $	*/
+/*	$OpenBSD: rkclock.c,v 1.19 2017/12/29 15:53:09 kettenis Exp $	*/
 /*
  * Copyright (c) 2017 Mark Kettenis <kettenis@openbsd.org>
  *
@@ -114,8 +114,6 @@ struct cfdriver rkclock_cd = {
 	NULL, "rkclock", DV_DULL
 };
 
-struct rkclock_softc *rkclock_cpuspeed_sc;
-
 void	rk3288_init(struct rkclock_softc *);
 uint32_t rk3288_get_frequency(void *, uint32_t *);
 int	rk3288_set_frequency(void *, uint32_t *, uint32_t);
@@ -127,7 +125,6 @@ uint32_t rk3399_get_frequency(void *, uint32_t *);
 int	rk3399_set_frequency(void *, uint32_t *, uint32_t);
 void	rk3399_enable(void *, uint32_t *, int);
 void	rk3399_reset(void *, uint32_t *, int);
-int	rk3399_cpuspeed(int *);
 
 void	rk3399_pmu_init(struct rkclock_softc *);
 uint32_t rk3399_pmu_get_frequency(void *, uint32_t *);
@@ -533,9 +530,6 @@ rk3399_init(struct rkclock_softc *sc)
 {
 	int node;
 
-	rkclock_cpuspeed_sc = sc;
-	cpu_cpuspeed = rk3399_cpuspeed;
-
 	/* PMUCRU instance should attach before us. */
 	KASSERT(rk3399_pmucru_sc != NULL);
 
@@ -978,15 +972,6 @@ rk3399_reset(void *cookie, uint32_t *cells, int on)
 	    mask << 16 | (on ? mask : 0));
 }
 
-int
-rk3399_cpuspeed(int *freq)
-{
-	uint32_t idx = RK3399_ARMCLKL;
-
-	*freq = rk3399_get_frequency(rkclock_cpuspeed_sc, &idx) / 1000000;
-	return 0;
-}
-
 /* PMUCRU */
 
 void