 @@ -1,14 +1,14 @@
-/* $NetBSD: tegra_car.c,v 1.26 2015/08/01 21:20:11 jmcneill Exp $ */
+/* $NetBSD: tegra_car.c,v 1.27 2015/10/17 21:16:09 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.
 @@ -19,27 +19,27 @@
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * 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 "locators.h"
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tegra_car.c,v 1.26 2015/08/01 21:20:11 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tegra_car.c,v 1.27 2015/10/17 21:16:09 jmcneill Exp $");
 #include <sys/param.h>
 #include <sys/bus.h>
 #include <sys/device.h>
 #include <sys/intr.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/rndpool.h>
 #include <sys/rndsource.h>
 #include <arm/nvidia/tegra_reg.h>
 #include <arm/nvidia/tegra_carreg.h>
 #include <arm/nvidia/tegra_pmcreg.h>
 @@ -821,13 +821,42 @@ tegra_car_wdt_enable(u_int timer, bool e
 	tegra_car_get_bs(&bst, &bsh);
 	enable_bits = enable ?
 	    (CAR_RST_SOURCE_WDT_EN|CAR_RST_SOURCE_WDT_SYS_RST_EN) : 0;
 	tegra_reg_set_clear(bst, bsh, CAR_RST_SOURCE_REG,
 	    __SHIFTIN(timer - 1, CAR_RST_SOURCE_WDT_SEL) |
 	    enable_bits,
 	    CAR_RST_SOURCE_WDT_SYS_RST_EN |
 	    CAR_RST_SOURCE_WDT_SEL |
 	    CAR_RST_SOURCE_WDT_EN);
+}
 void
 tegra_car_gpu_enable(void)
+{
 	bus_space_tag_t bst;
 	bus_space_handle_t bsh;
 	tegra_car_get_bs(&bst, &bsh);
 	/* Enter reset, enable clock */
 	bus_space_write_4(bst, bsh, CAR_RST_DEV_X_SET_REG, CAR_DEV_X_GPU);
 	bus_space_write_4(bst, bsh, CAR_CLK_ENB_X_SET_REG, CAR_DEV_X_GPU);
 	/* Set PLLP_OUT5 to 204MHz */
 	const u_int rate = 204000000;
 	const u_int div = howmany(tegra_car_pllp0_rate() * 2, rate) - 2;
 	tegra_reg_set_clear(bst, bsh, CAR_PLLP_OUTC_REG,
 	    __SHIFTIN(div, CAR_PLLP_OUTC_OUT5_RATIO) |
 	    CAR_PLLP_OUTC_OUT5_CLKEN,
 	    CAR_PLLP_OUTC_OUT5_RATIO);
 	delay(20);
 	/* Remove clamping from 3D partition in the PMC */
 	tegra_pmc_remove_clamping(PMC_PARTID_TD);
 	delay(20);
 	/* Leave reset */
 	bus_space_write_4(bst, bsh, CAR_RST_DEV_X_CLR_REG, CAR_DEV_X_GPU);
+}

 @@ -1,14 +1,14 @@
-/* $NetBSD: tegra_carreg.h,v 1.20 2015/07/25 15:50:42 jmcneill Exp $ */
+/* $NetBSD: tegra_carreg.h,v 1.21 2015/10/17 21:16:09 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.
 @@ -53,26 +53,31 @@
 #define CAR_PLLP_BASE_DIVN		__BITS(17,8)
 #define CAR_PLLP_BASE_DIVM		__BITS(4,0)
 #define CAR_PLLP_OUTA_REG	0xa4
 #define CAR_PLLP_OUTB_REG	0xa8
 #define CAR_PLLP_OUTB_OUT4_RATIO	__BITS(31,24)
 #define CAR_PLLP_OUTB_OUT4_OVRRIDE	__BIT(18)
 #define CAR_PLLP_OUTB_OUT4_CLKEN	__BIT(17)
 #define CAR_PLLP_OUTB_OUT4_RSTN		__BIT(16)
 #define CAR_PLLP_OUTB_OUT3_RATIO	__BITS(15,8)
 #define CAR_PLLP_OUTB_OUT3_OVRRIDE	__BIT(2)
 #define CAR_PLLP_OUTB_OUT3_CLKEN	__BIT(1)
 #define CAR_PLLP_OUTB_OUT3_RSTN		__BIT(0)
 #define CAR_PLLP_OUTC_REG	0x67c
 #define CAR_PLLP_OUTC_OUT5_RATIO	__BITS(31,24)
 #define CAR_PLLP_OUTC_OUT5_OVERRIDE	__BIT(18)
 #define CAR_PLLP_OUTC_OUT5_CLKEN	__BIT(17)
 #define CAR_PLLP_OUTC_OUT5_RSTN		__BIT(16)
 #define CAR_PLLP_MISC_REG	0xac
 #define CAR_PLLC_BASE_REG	0x80
 #define CAR_PLLC_BASE_ENABLE		__BIT(30)
 #define CAR_PLLC_BASE_REF_DIS		__BIT(29)
 #define CAR_PLLC_BASE_LOCK_OVERRIDE	__BIT(28)
 #define CAR_PLLC_BASE_LOCK		__BIT(27)
 #define CAR_PLLC_BASE_DIVP		__BITS(23,20)
 #define CAR_PLLC_BASE_DIVN		__BITS(15,8)
 #define CAR_PLLC_BASE_DIVM		__BITS(7,0)
 #define CAR_PLLU_BASE_REG	0xc0
 #define CAR_PLLU_BASE_BYPASS		__BIT(31)

 @@ -1,14 +1,14 @@
-/* $NetBSD: tegra_var.h,v 1.24 2015/08/01 21:20:11 jmcneill Exp $ */
+/* $NetBSD: tegra_var.h,v 1.25 2015/10/17 21:16:09 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.
 @@ -98,26 +98,27 @@ u_int	tegra_car_uart_rate(u_int);
 u_int	tegra_car_periph_sdmmc_rate(u_int);
 int	tegra_car_periph_sdmmc_set_rate(u_int, u_int);
 int	tegra_car_periph_usb_enable(u_int);
 void	tegra_car_periph_hda_enable(void);
 void	tegra_car_periph_sata_enable(void);
 int	tegra_car_periph_i2c_enable(u_int, u_int);
 void	tegra_car_periph_cec_enable(void);
 void	tegra_car_utmip_init(void);
 void	tegra_car_utmip_enable(u_int);
 void	tegra_car_hdmi_enable(u_int);
 int	tegra_car_dc_enable(u_int);
 void	tegra_car_host1x_enable(void);
 void	tegra_car_wdt_enable(u_int, bool);
 void	tegra_car_gpu_enable(void);
 struct tegra_gpio_pin;
 struct tegra_gpio_pin *tegra_gpio_acquire(const char *, u_int);
 void	tegra_gpio_release(struct tegra_gpio_pin *);
 int	tegra_gpio_read(struct tegra_gpio_pin *);
 void	tegra_gpio_write(struct tegra_gpio_pin *, int);
 struct tegra_mpio_padctlgrp {
 	int	preemp;
 	int	hsm;
 	int	schmt;
 	int	drv_type;
 	int	drvdn;