Sun Apr 16 12:26:04 2017 UTC ()

get cpu pll clock from devicetree


(jmcneill)

diff -r1.13 -r1.14 src/sys/arch/arm/nvidia/soc_tegra124.c

--- src/sys/arch/arm/nvidia/soc_tegra124.c 2017/04/13 21:20:44	1.13
+++ src/sys/arch/arm/nvidia/soc_tegra124.c 2017/04/16 12:26:04	1.14

 @@ -1,14 +1,14 @@
-/* $NetBSD: soc_tegra124.c,v 1.13 2017/04/13 21:20:44 jmcneill Exp $ */
+/* $NetBSD: soc_tegra124.c,v 1.14 2017/04/16 12:26:04 jmcneill Exp $ */
 /*-
  * Copyright (c) 2015 Jared D. McNeill <jmcneill@invisible.ca>
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -20,27 +20,27 @@
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
  * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
  * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
  * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
  * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #include "opt_tegra.h"
 #include "opt_multiprocessor.h"
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: soc_tegra124.c,v 1.13 2017/04/13 21:20:44 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: soc_tegra124.c,v 1.14 2017/04/16 12:26:04 jmcneill Exp $");
 #include <sys/param.h>
 #include <sys/bus.h>
 #include <sys/cpu.h>
 #include <sys/device.h>
 #include <uvm/uvm_extern.h>
 #include <dev/clk/clk.h>
 #include <dev/i2c/i2cvar.h>
 #include <dev/fdt/fdtvar.h>
 #include <arm/cpufunc.h>
 @@ -106,54 +106,56 @@ static struct tegra124_speedo {
 	u_int soc_speedo_id;
 	u_int gpu_speedo_id;
 } tegra124_speedo = {
 	.cpu_speedo_id = 0,
 	.soc_speedo_id = 0,
 	.gpu_speedo_id = 0
 };
 static struct clk *tegra124_clk_pllx = NULL;
 void
 tegra124_cpuinit(void)
+{
-	int node = OF_finddevice("/i2c@7000d000");
+	int i2c_node = OF_finddevice("/i2c@7000d000");
-	if (node == -1)
+	if (i2c_node == -1)
-		node = OF_finddevice("/i2c@0,7000d000"); /* old DTB */
+		i2c_node = OF_finddevice("/i2c@0,7000d000"); /* old DTB */
-	if (node == -1) {
+	if (i2c_node == -1) {
 		aprint_error("cpufreq: ERROR: couldn't find i2c@7000d000\n");
 		return;
+	}
-	i2c_tag_t ic = fdtbus_get_i2c_tag(node);
+	i2c_tag_t ic = fdtbus_get_i2c_tag(i2c_node);
 	/* Set VDD_CPU voltage to 1.4V */
 	const u_int target_mv = 1400;
 	const u_int sd0_vsel = (target_mv - 600) / 10;
 	uint8_t data[2] = { 0x00, sd0_vsel };
 	iic_acquire_bus(ic, I2C_F_POLL);
 	const int error = iic_exec(ic, I2C_OP_WRITE_WITH_STOP, 0x40,
 	    NULL, 0, data, sizeof(data), I2C_F_POLL);
 	iic_release_bus(ic, I2C_F_POLL);
 	if (error) {
 		aprint_error("cpufreq: ERROR: couldn't set VDD_CPU: %d\n",
 		    error);
 		return;
+	}
 	delay(10000);
 	tegra124_speedo_init();
-	tegra124_clk_pllx = clk_get("pll_x");
+	int cpu_node = OF_finddevice("/cpus/cpu@0");
 	if (cpu_node != -1)
 		tegra124_clk_pllx = fdtbus_clock_get(cpu_node, "pll_x");
 	if (tegra124_clk_pllx == NULL) {
 		aprint_error("cpufreq: ERROR: couldn't find pll_x\n");
 		return;
+	}
 	tegra_cpufreq_register(&tegra124_cpufreq_func);
+}
 static void
 tegra124_speedo_init(void)
+{
 	uint32_t sku_id;