Fri Sep 2 19:06:58 2016 UTC ()
Source of pll_p_out5 is not div_pllp_out5 but div_pll_p_out5.


(jakllsch)
diff -r1.4 -r1.5 src/sys/arch/arm/nvidia/tegra124_car.c
cvs diff -r1.4 -r1.5 src/sys/arch/arm/nvidia/tegra124_car.c (expand / switch to unified diff)

--- src/sys/arch/arm/nvidia/tegra124_car.c 2016/08/17 19:08:18 1.4
+++ src/sys/arch/arm/nvidia/tegra124_car.c 2016/09/02 19:06:58 1.5
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: tegra124_car.c,v 1.4 2016/08/17 19:08:18 jakllsch Exp $ */ 1/* $NetBSD: tegra124_car.c,v 1.5 2016/09/02 19:06:58 jakllsch Exp $ */
2 2
3/*- 3/*-
4 * Copyright (c) 2015 Jared D. McNeill <jmcneill@invisible.ca> 4 * Copyright (c) 2015 Jared D. McNeill <jmcneill@invisible.ca>
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without 7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions 8 * modification, are permitted provided that the following conditions
9 * are met: 9 * are met:
10 * 1. Redistributions of source code must retain the above copyright 10 * 1. Redistributions of source code must retain the above copyright
11 * notice, this list of conditions and the following disclaimer. 11 * notice, this list of conditions and the following disclaimer.
12 * 2. Redistributions in binary form must reproduce the above copyright 12 * 2. Redistributions in binary form must reproduce the above copyright
13 * notice, this list of conditions and the following disclaimer in the 13 * notice, this list of conditions and the following disclaimer in the
14 * documentation and/or other materials provided with the distribution. 14 * documentation and/or other materials provided with the distribution.
@@ -17,27 +17,27 @@ @@ -17,27 +17,27 @@
17 * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES 17 * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
18 * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. 18 * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
19 * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, 19 * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
20 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, 20 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
21 * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 21 * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
22 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED 22 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
23 * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, 23 * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
24 * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 24 * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
25 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 25 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
26 * SUCH DAMAGE. 26 * SUCH DAMAGE.
27 */ 27 */
28 28
29#include <sys/cdefs.h> 29#include <sys/cdefs.h>
30__KERNEL_RCSID(0, "$NetBSD: tegra124_car.c,v 1.4 2016/08/17 19:08:18 jakllsch Exp $"); 30__KERNEL_RCSID(0, "$NetBSD: tegra124_car.c,v 1.5 2016/09/02 19:06:58 jakllsch Exp $");
31 31
32#include <sys/param.h> 32#include <sys/param.h>
33#include <sys/bus.h> 33#include <sys/bus.h>
34#include <sys/device.h> 34#include <sys/device.h>
35#include <sys/intr.h> 35#include <sys/intr.h>
36#include <sys/systm.h> 36#include <sys/systm.h>
37#include <sys/kernel.h> 37#include <sys/kernel.h>
38#include <sys/rndpool.h> 38#include <sys/rndpool.h>
39#include <sys/rndsource.h> 39#include <sys/rndsource.h>
40#include <sys/atomic.h> 40#include <sys/atomic.h>
41#include <sys/kmem.h> 41#include <sys/kmem.h>
42 42
43#include <dev/clk/clk_backend.h> 43#include <dev/clk/clk_backend.h>
@@ -591,27 +591,27 @@ static struct tegra_clk tegra124_car_clo @@ -591,27 +591,27 @@ static struct tegra_clk tegra124_car_clo
591 CAR_PLLE_AUX_REG, CAR_PLLE_AUX_CML1_OEN), 591 CAR_PLLE_AUX_REG, CAR_PLLE_AUX_CML1_OEN),
592 CLK_GATE_V("hda2codec_2x", "div_hda2codec_2x", CAR_DEV_V_HDA2CODEC_2X), 592 CLK_GATE_V("hda2codec_2x", "div_hda2codec_2x", CAR_DEV_V_HDA2CODEC_2X),
593 CLK_GATE_V("hda", "div_hda", CAR_DEV_V_HDA), 593 CLK_GATE_V("hda", "div_hda", CAR_DEV_V_HDA),
594 CLK_GATE_W("hda2hdmi", "clk_m", CAR_DEV_W_HDA2HDMICODEC), 594 CLK_GATE_W("hda2hdmi", "clk_m", CAR_DEV_W_HDA2HDMICODEC),
595 CLK_GATE_H("fuse", "clk_m", CAR_DEV_H_FUSE), 595 CLK_GATE_H("fuse", "clk_m", CAR_DEV_H_FUSE),
596 CLK_GATE_U("soc_therm", "div_soc_therm", CAR_DEV_U_SOC_THERM), 596 CLK_GATE_U("soc_therm", "div_soc_therm", CAR_DEV_U_SOC_THERM),
597 CLK_GATE_V("tsensor", "div_tsensor", CAR_DEV_V_TSENSOR), 597 CLK_GATE_V("tsensor", "div_tsensor", CAR_DEV_V_TSENSOR),
598 CLK_GATE_SIMPLE("watchdog", "clk_m", CAR_RST_SOURCE_REG, 598 CLK_GATE_SIMPLE("watchdog", "clk_m", CAR_RST_SOURCE_REG,
599 CAR_RST_SOURCE_WDT_EN|CAR_RST_SOURCE_WDT_SYS_RST_EN), 599 CAR_RST_SOURCE_WDT_EN|CAR_RST_SOURCE_WDT_SYS_RST_EN),
600 CLK_GATE_L("host1x", "div_host1x", CAR_DEV_L_HOST1X), 600 CLK_GATE_L("host1x", "div_host1x", CAR_DEV_L_HOST1X),
601 CLK_GATE_L("disp1", "mux_disp1", CAR_DEV_L_DISP1), 601 CLK_GATE_L("disp1", "mux_disp1", CAR_DEV_L_DISP1),
602 CLK_GATE_L("disp2", "mux_disp2", CAR_DEV_L_DISP2), 602 CLK_GATE_L("disp2", "mux_disp2", CAR_DEV_L_DISP2),
603 CLK_GATE_H("hdmi", "div_hdmi", CAR_DEV_H_HDMI), 603 CLK_GATE_H("hdmi", "div_hdmi", CAR_DEV_H_HDMI),
604 CLK_GATE_SIMPLE("pll_p_out5", "div_pllp_out5", 604 CLK_GATE_SIMPLE("pll_p_out5", "div_pll_p_out5",
605 CAR_PLLP_OUTC_REG, CAR_PLLP_OUTC_OUT5_CLKEN), 605 CAR_PLLP_OUTC_REG, CAR_PLLP_OUTC_OUT5_CLKEN),
606}; 606};
607 607
608struct tegra124_car_rst { 608struct tegra124_car_rst {
609 u_int set_reg; 609 u_int set_reg;
610 u_int clr_reg; 610 u_int clr_reg;
611 u_int mask; 611 u_int mask;
612}; 612};
613 613
614static struct tegra124_car_reset_reg { 614static struct tegra124_car_reset_reg {
615 u_int set_reg; 615 u_int set_reg;
616 u_int clr_reg; 616 u_int clr_reg;
617} tegra124_car_reset_regs[] = { 617} tegra124_car_reset_regs[] = {