 @@ -1,14 +1,14 @@
-/* $NetBSD: sunxi_debe.c,v 1.8 2018/04/07 18:09:33 bouyer Exp $ */
+/* $NetBSD: sunxi_debe.c,v 1.9 2018/06/01 17:18:44 bouyer Exp $ */
 /*-
  * Copyright (c) 2018 Manuel Bouyer <bouyer@antioche.eu.org>
  * All rights reserved.
+ *
  * Copyright (c) 2014 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.
 @@ -28,27 +28,27 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #include "genfb.h"
 #ifndef SUNXI_DEBE_VIDEOMEM
 #define SUNXI_DEBE_VIDEOMEM	(16 * 1024 * 1024)
 #endif
 #define SUNXI_DEBE_CURMAX	64
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sunxi_debe.c,v 1.8 2018/04/07 18:09:33 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sunxi_debe.c,v 1.9 2018/06/01 17:18:44 bouyer 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/mutex.h>
 #include <sys/condvar.h>
 #include <dev/fdt/fdtvar.h>
 #include <dev/fdt/fdt_port.h>
 @@ -67,26 +67,28 @@ enum sunxi_debe_type {
 struct sunxi_debe_softc {
 	device_t sc_dev;
 	device_t sc_fbdev;
 	enum sunxi_debe_type sc_type;
 	bus_space_tag_t sc_bst;
 	bus_space_handle_t sc_bsh;
 	bus_dma_tag_t sc_dmat;
 	struct clk *sc_clk_ahb;
 	struct clk *sc_clk_mod;
 	struct clk *sc_clk_ram;
 	struct fdtbus_reset *sc_rst;
 	bus_dma_segment_t sc_dmasegs[1];
 	bus_size_t sc_dmasize;
 	bus_dmamap_t sc_dmamap;
 	void *sc_dmap;
 	bool sc_cursor_enable;
 	int sc_cursor_x, sc_cursor_y;
 	int sc_hot_x, sc_hot_y;
 	uint8_t sc_cursor_bitmap[8 * SUNXI_DEBE_CURMAX];
 	uint8_t sc_cursor_mask[8 * SUNXI_DEBE_CURMAX];
 	int	sc_phandle;
 	struct fdt_device_ports sc_ports;
 @@ -142,118 +144,135 @@ sunxi_debe_match(device_t parent, cfdata
 	struct fdt_attach_args * const faa = aux;
 	return of_match_compat_data(faa->faa_phandle, compat_data);
+}
 static void
 sunxi_debe_attach(device_t parent, device_t self, void *aux)
+{
 	struct sunxi_debe_softc *sc = device_private(self);
 	struct fdt_attach_args * const faa = aux;
 	const int phandle = faa->faa_phandle;
 	bus_addr_t addr;
 	bus_size_t size;
 	struct fdtbus_reset *rst;
 	int error;
 	sc->sc_dev = self;
 	sc->sc_phandle = phandle;
 	sc->sc_bst = faa->faa_bst;
 	sc->sc_dmat = faa->faa_dmat;
 	if (fdtbus_get_reg(phandle, 0, &addr, &size) != 0) {
 		aprint_error(": couldn't get registers\n");
+	}
 	if (bus_space_map(sc->sc_bst, addr, size, 0, &sc->sc_bsh) != 0) {
 		aprint_error(": couldn't map registers\n");
 		return;
+	}
 	sc->sc_clk_ahb = fdtbus_clock_get(phandle, "ahb");
 	sc->sc_clk_mod = fdtbus_clock_get(phandle, "mod");
 	sc->sc_clk_ram = fdtbus_clock_get(phandle, "ram");
 	rst = fdtbus_reset_get_index(phandle, 0);
 	if (rst == NULL) {
 		aprint_error(": couldn't get reset\n");
 		return;
 	if (fdtbus_reset_assert(rst) != 0) {
 		aprint_error(": couldn't assert reset\n");
 		return;
 	delay(1);
 	if (fdtbus_reset_deassert(rst) != 0) {
 		aprint_error(": couldn't de-assert reset\n");
 		return;
 	if (sc->sc_clk_ahb == NULL || sc->sc_clk_mod == NULL
 	    || sc->sc_clk_ram == NULL) {
 		aprint_error(": couldn't get clocks\n");
 		aprint_debug_dev(self, "clk ahb %s mod %s ram %s\n",
 		    sc->sc_clk_ahb == NULL ? "missing" : "present",
 		    sc->sc_clk_mod == NULL ? "missing" : "present",
 		    sc->sc_clk_ram == NULL ? "missing" : "present");
 		return;
+	}
-	error = clk_set_rate(sc->sc_clk_mod, 300000000);
+	sc->sc_rst = fdtbus_reset_get_index(phandle, 0);
-	if (error) {
+	if (sc->sc_rst == NULL) {
-		aprint_error("couln't set mod clock rate (%d)\n", error);
+		aprint_error(": couldn't get reset\n");
 		return;
 	if (clk_enable(sc->sc_clk_ahb) != 0 ||
 	    clk_enable(sc->sc_clk_mod) != 0) {
 		aprint_error(": couldn't enable clocks\n");
 		return;
+	}
 	if (clk_disable(sc->sc_clk_ram) != 0) {
 		aprint_error(": couldn't disable ram clock\n");
 	sc->sc_type = of_search_compatible(faa->faa_phandle, compat_data)->data;
 	aprint_naive("\n");
 	aprint_normal(": Display Engine Backend (%s)\n",
 	    fdtbus_get_string(phandle, "name"));
 	for (unsigned int reg = 0x800; reg < 0x1000; reg += 4) {
 		DEBE_WRITE(sc, reg, 0);
 	DEBE_WRITE(sc, SUNXI_DEBE_MODCTL_REG, SUNXI_DEBE_MODCTL_EN);
 	sc->sc_dmasize = SUNXI_DEBE_VIDEOMEM;
 	DEBE_WRITE(sc, SUNXI_DEBE_HWC_PALETTE_TABLE, 0);
 	error = sunxi_debe_alloc_videomem(sc);
 	if (error) {
 		aprint_error_dev(sc->sc_dev,
 		    "couldn't allocate video memory, error = %d\n", error);
 		return;
+	}
 	sc->sc_unit = -1;
 	sc->sc_ports.dp_ep_connect = sunxi_debe_ep_connect;
 	sc->sc_ports.dp_ep_enable = sunxi_debe_ep_enable;
 	fdt_ports_register(&sc->sc_ports, self, phandle, EP_OTHER);
+}
-	if (clk_disable(sc->sc_clk_ahb) != 0 ||
+static void
-	    clk_disable(sc->sc_clk_mod) != 0) {
+sunxi_debe_doreset(void)
 		aprint_error(": couldn't disable clocks\n");
-		return;
+	device_t dev;
 	struct sunxi_debe_softc *sc;
 	int error;
 	for (int i = 0;;i++) {
 		dev = device_find_by_driver_unit("sunxidebe", i);
 		if (dev == NULL)
 			return;
 		sc = device_private(dev);
 		if (fdtbus_reset_assert(sc->sc_rst) != 0) {
 			aprint_error_dev(dev, ": couldn't assert reset\n");
 			return;
+		}
 		delay(1);
 		if (fdtbus_reset_deassert(sc->sc_rst) != 0) {
 			aprint_error_dev(dev, ": couldn't de-assert reset\n");
 			return;
+		}
 		error = clk_set_rate(sc->sc_clk_mod, 300000000);
 		if (error) {
 			aprint_error_dev(dev,
 			    "couln't set mod clock rate (%d)\n", error);
 			return;
+		}
 		if (clk_enable(sc->sc_clk_ahb) != 0 ||
 		    clk_enable(sc->sc_clk_mod) != 0) {
 			aprint_error_dev(dev, ": couldn't enable clocks\n");
 			return;
+		}
 		if (clk_disable(sc->sc_clk_ram) != 0) {
 			aprint_error_dev(dev, ": couldn't disable ram clock\n");
+		}
 		for (unsigned int reg = 0x800; reg < 0x1000; reg += 4) {
 			DEBE_WRITE(sc, reg, 0);
+		}
 		DEBE_WRITE(sc, SUNXI_DEBE_MODCTL_REG, SUNXI_DEBE_MODCTL_EN);
 		DEBE_WRITE(sc, SUNXI_DEBE_HWC_PALETTE_TABLE, 0);
 		if (clk_disable(sc->sc_clk_ahb) != 0 ||
 		    clk_disable(sc->sc_clk_mod) != 0) {
 			aprint_error_dev(sc->sc_dev,
 			    ": couldn't disable clocks\n");
+		}
+	}
+}
 static void
 sunxi_debe_ep_connect(device_t self, struct fdt_endpoint *ep, bool connect)
+{
 	struct sunxi_debe_softc *sc = device_private(self);
 	struct fdt_endpoint *rep = fdt_endpoint_remote(ep);
 	int rep_idx = fdt_endpoint_index(rep);
 	KASSERT(device_is_a(self, "sunxidebe"));
 	if (!connect) {
 		aprint_error_dev(self, "endpoint disconnect not supported\n");
 @@ -831,38 +850,46 @@ sunxi_befb_set_videomode(device_t dev, u
 	if (sc->sc_gen.sc_width != width || sc->sc_gen.sc_height != height) {
 		device_printf(sc->sc_gen.sc_dev,
 		    "mode switching not yet supported\n");
+	}
+}
 int
 sunxi_debe_pipeline(int phandle, bool active)
+{
 	device_t dev;
 	struct sunxi_debe_softc *sc;
 	struct fdt_endpoint *ep;
 	int i, error;
 	static bool reset_done = false;
 	if (!active)
 		return EOPNOTSUPP;
 	for (i = 0;;i++) {
 		dev = device_find_by_driver_unit("sunxidebe", i);
 		if (dev == NULL)
 			return ENODEV;
 		sc = device_private(dev);
 		if (sc->sc_phandle == phandle)
 			break;
+	}
 	if (!reset_done) {
 		sunxi_debe_doreset();
 		sunxi_tcon_doreset();
 		sunxi_hdmi_doreset();
 		reset_done = true;
+	}
 	aprint_normal("activate %s\n", device_xname(dev));
 	if (clk_enable(sc->sc_clk_ahb) != 0 ||
 	    clk_enable(sc->sc_clk_mod) != 0) {
 		aprint_error_dev(dev, "couldn't enable clocks\n");
 		return EIO;
+	}
 	/* connect debd0 to tcon0, debe1 to tcon1 */
 	ep = fdt_endpoint_get_from_index(&sc->sc_ports, SUNXI_PORT_OUTPUT,
 	    sc->sc_unit);
 	if (ep == NULL) {
 		aprint_error_dev(dev, "no output endpoint for %d\n",
 		    sc->sc_unit);
 		return ENODEV;

 @@ -1,14 +1,14 @@
-/* $NetBSD: sunxi_hdmi.c,v 1.3 2018/04/03 16:17:59 bouyer Exp $ */
+/* $NetBSD: sunxi_hdmi.c,v 1.4 2018/06/01 17:18:44 bouyer Exp $ */
 /*-
  * Copyright (c) 2014 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 "opt_ddb.h"
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sunxi_hdmi.c,v 1.3 2018/04/03 16:17:59 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sunxi_hdmi.c,v 1.4 2018/06/01 17:18:44 bouyer 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/proc.h>
 #include <sys/mutex.h>
 #include <sys/kthread.h>
 #include <dev/fdt/fdtvar.h>
 #include <dev/fdt/fdt_port.h>
 @@ -155,27 +155,26 @@ sunxi_hdmi_match(device_t parent, cfdata
 	return of_match_compat_data(faa->faa_phandle, compat_data);
+}
 static void
 sunxi_hdmi_attach(device_t parent, device_t self, void *aux)
+{
 	struct sunxi_hdmi_softc *sc = device_private(self);
 	struct fdt_attach_args * const faa = aux;
 	const int phandle = faa->faa_phandle;
 	bus_addr_t addr;
 	bus_size_t size;
 	uint32_t ver;
 	int error;
 	sc->sc_dev = self;
 	sc->sc_phandle = phandle;
 	sc->sc_bst = faa->faa_bst;
 	sc->sc_type = of_search_compatible(faa->faa_phandle, compat_data)->data;
 	if (fdtbus_get_reg(phandle, 0, &addr, &size) != 0) {
 		aprint_error(": couldn't get registers\n");
+	}
 	if (bus_space_map(sc->sc_bst, addr, size, 0, &sc->sc_bsh) != 0) {
 		aprint_error(": couldn't map registers\n");
 		return;
 @@ -187,69 +186,84 @@ sunxi_hdmi_attach(device_t parent, devic
 	sc->sc_clk_pll1 = fdtbus_clock_get(phandle, "pll-1");
 	if (sc->sc_clk_ahb == NULL || sc->sc_clk_mod == NULL
 	    || sc->sc_clk_pll0 == NULL || sc->sc_clk_pll1 == NULL) {
 		aprint_error(": couldn't get clocks\n");
 		aprint_debug_dev(self, "clk ahb %s mod %s pll-0 %s pll-1 %s\n",
 		    sc->sc_clk_ahb == NULL ? "missing" : "present",
 		    sc->sc_clk_mod == NULL ? "missing" : "present",
 		    sc->sc_clk_pll0 == NULL ? "missing" : "present",
 		    sc->sc_clk_pll1 == NULL ? "missing" : "present");
 		return;
+	}
 	error = clk_disable(sc->sc_clk_mod);
 	if (error) {
 		aprint_error(": couldn't disable mod clock\n");
 		return;
 	if (clk_enable(sc->sc_clk_ahb) != 0) {
 		aprint_error(": couldn't enable ahb clock\n");
 		return;
+	}
 #if defined(SUNXI_HDMI_DEBUG)
 	sunxi_hdmi_dump_regs();
 #endif
 	/*
 	 * reset device, in case it has been setup by firmware in an
 	 * incompatible way
 	 */
 	for (int i = 0; i <= 0x500; i += 4) {
 		HDMI_WRITE(sc, i, 0);
 	ver = HDMI_READ(sc, SUNXI_HDMI_VERSION_ID_REG);
 	const int vmaj = __SHIFTOUT(ver, SUNXI_HDMI_VERSION_ID_H);
 	const int vmin = __SHIFTOUT(ver, SUNXI_HDMI_VERSION_ID_L);
 	aprint_naive("\n");
 	aprint_normal(": HDMI %d.%d\n", vmaj, vmin);
 	sc->sc_ver = ver;
 	sc->sc_i2c_blklen = 16;
 	sc->sc_ports.dp_ep_activate = sunxi_hdmi_ep_activate;
 	sc->sc_ports.dp_ep_enable = sunxi_hdmi_ep_enable;
 	fdt_ports_register(&sc->sc_ports, self, phandle, EP_OTHER);
 	mutex_init(&sc->sc_pwr_lock, MUTEX_DEFAULT, IPL_NONE);
 	sunxi_hdmi_i2c_init(sc);
+}
-	if (clk_disable(sc->sc_clk_ahb) != 0) {
+void
-		aprint_error(": couldn't disable ahb clock\n");
+sunxi_hdmi_doreset(void)
 		return;
 	device_t dev;
 	struct sunxi_hdmi_softc *sc;
 	int error;
 	for (int i = 0;;i++) {
 		dev = device_find_by_driver_unit("sunxihdmi", i);
 		if (dev == NULL)
 			return;
 		sc = device_private(dev);
 		error = clk_disable(sc->sc_clk_mod);
 		if (error) {
 			aprint_error_dev(dev, ": couldn't disable mod clock\n");
 			return;
+		}
 #if defined(SUNXI_HDMI_DEBUG)
 		sunxi_hdmi_dump_regs();
 #endif
 		/*
 		 * reset device, in case it has been setup by firmware in an
 		 * incompatible way
 		 */
 		for (int j = 0; j <= 0x500; j += 4) {
 			HDMI_WRITE(sc, j, 0);
+		}
 		if (clk_disable(sc->sc_clk_ahb) != 0) {
 			aprint_error_dev(dev, ": couldn't disable ahb clock\n");
 			return;
+		}
+	}
+}
 static void
 sunxi_hdmi_i2c_init(struct sunxi_hdmi_softc *sc)
+{
 	struct i2c_controller *ic = &sc->sc_ic;
 	mutex_init(&sc->sc_ic_lock, MUTEX_DEFAULT, IPL_NONE);
 	ic->ic_cookie = sc;
 	ic->ic_acquire_bus = sunxi_hdmi_i2c_acquire_bus;
 	ic->ic_release_bus = sunxi_hdmi_i2c_release_bus;

 @@ -1,14 +1,14 @@
-/* $NetBSD: sunxi_tcon.c,v 1.6 2018/04/07 18:09:33 bouyer Exp $ */
+/* $NetBSD: sunxi_tcon.c,v 1.7 2018/06/01 17:18:44 bouyer Exp $ */
 /*-
  * Copyright (c) 2018 Manuel Bouyer <bouyer@antioche.eu.org>
  * All rights reserved.
+ *
  * Copyright (c) 2014 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.
 @@ -20,27 +20,27 @@
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * 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 <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sunxi_tcon.c,v 1.6 2018/04/07 18:09:33 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sunxi_tcon.c,v 1.7 2018/06/01 17:18:44 bouyer 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/mutex.h>
 #include <sys/condvar.h>
 #include <dev/fdt/fdtvar.h>
 #include <dev/fdt/fdt_port.h>
 #include <dev/fdt/panel_fdt.h>
 @@ -55,26 +55,27 @@ __KERNEL_RCSID(0, "$NetBSD: sunxi_tcon.c
 enum sunxi_tcon_type {
 	TCON_A10 = 1,
 };
 struct sunxi_tcon_softc {
 	device_t sc_dev;
 	enum sunxi_tcon_type sc_type;
 	int sc_phandle;
 	bus_space_tag_t sc_bst;
 	bus_space_handle_t sc_bsh;
 	struct clk *sc_clk_ahb;
 	struct clk *sc_clk_ch0;
 	struct clk *sc_clk_ch1;
 	struct fdtbus_reset *sc_rst, *sc_lvds_rst;
 	unsigned int sc_output_type;
 #define OUTPUT_HDMI 0
 #define OUTPUT_LVDS 1
 #define OUTPUT_VGA 2
 	struct fdt_device_ports sc_ports;
 	int sc_unit; /* tcon0 or tcon1 */
 	struct fdt_endpoint *sc_in_ep;
 	struct fdt_endpoint *sc_in_rep;
 	struct fdt_endpoint *sc_out_ep;
 };
 static bus_space_handle_t tcon_mux_bsh;
 static bool tcon_mux_inited = false;
 @@ -110,28 +111,26 @@ sunxi_tcon_match(device_t parent, cfdata
 	struct fdt_attach_args * const faa = aux;
 	return of_match_compat_data(faa->faa_phandle, compat_data);
+}
 static void
 sunxi_tcon_attach(device_t parent, device_t self, void *aux)
+{
 	struct sunxi_tcon_softc *sc = device_private(self);
 	struct fdt_attach_args * const faa = aux;
 	const int phandle = faa->faa_phandle;
 	bus_addr_t addr;
 	bus_size_t size;
 	struct fdtbus_reset *rst, *lvds_rst;
 	sc->sc_dev = self;
 	sc->sc_phandle = phandle;
 	sc->sc_bst = faa->faa_bst;
 	if (fdtbus_get_reg(phandle, 0, &addr, &size) != 0) {
 		aprint_error(": couldn't get registers\n");
+	}
 	if (bus_space_map(sc->sc_bst, addr, size, 0, &sc->sc_bsh) != 0) {
 		aprint_error(": couldn't map registers\n");
 		return;
+	}
 @@ -139,104 +138,121 @@ sunxi_tcon_attach(device_t parent, devic
 	sc->sc_clk_ch0 = fdtbus_clock_get(phandle, "tcon-ch0");
 	sc->sc_clk_ch1 = fdtbus_clock_get(phandle, "tcon-ch1");
 	if (sc->sc_clk_ahb == NULL || sc->sc_clk_ch0 == NULL
 	    || sc->sc_clk_ch1 == NULL) {
 		aprint_error(": couldn't get clocks\n");
 		aprint_debug_dev(self, "clk ahb %s tcon-ch0 %s tcon-ch1 %s\n",
 		    sc->sc_clk_ahb == NULL ? "missing" : "present",
 		    sc->sc_clk_ch0 == NULL ? "missing" : "present",
 		    sc->sc_clk_ch1 == NULL ? "missing" : "present");
 		return;
+	}
-	rst = fdtbus_reset_get(phandle, "lcd");
+	sc->sc_rst = fdtbus_reset_get(phandle, "lcd");
-	if (rst == NULL) {
+	if (sc->sc_rst == NULL) {
 		aprint_error(": couldn't get lcd reset\n");
 		return;
+	}
-	lvds_rst = fdtbus_reset_get(phandle, "lvds");
+	sc->sc_lvds_rst = fdtbus_reset_get(phandle, "lvds");
 	if (clk_disable(sc->sc_clk_ahb) != 0) {
 		aprint_error(": couldn't disable ahb clock\n");
 		return;
 	if (clk_disable(sc->sc_clk_ch0) != 0) {
 		aprint_error(": couldn't disable ch0 clock\n");
 		return;
 	if (clk_disable(sc->sc_clk_ch1) != 0) {
 		aprint_error(": couldn't disable ch1 clock\n");
 		return;
 	if (fdtbus_reset_assert(rst) != 0) {
 		aprint_error(": couldn't assert lcd reset\n");
 		return;
 	if (lvds_rst != NULL) {
 		if (fdtbus_reset_assert(lvds_rst) != 0) {
 			aprint_error(": couldn't assert lvds reset\n");
 			return;
 	delay(1);
 	if (fdtbus_reset_deassert(rst) != 0) {
 		aprint_error(": couldn't de-assert lcd reset\n");
 		return;
 	if (lvds_rst != NULL) {
 		if (fdtbus_reset_deassert(lvds_rst) != 0) {
 			aprint_error(": couldn't de-assert lvds reset\n");
 			return;
 	if (clk_enable(sc->sc_clk_ahb) != 0) {
 		aprint_error(": couldn't enable ahb clock\n");
 		return;
 	sc->sc_type = of_search_compatible(faa->faa_phandle, compat_data)->data;
 	aprint_naive("\n");
 	aprint_normal(": LCD/TV timing controller (%s)\n",
 	    fdtbus_get_string(phandle, "name"));
 	sc->sc_unit = -1;
 	sc->sc_ports.dp_ep_connect = sunxi_tcon_ep_connect;
 	sc->sc_ports.dp_ep_activate = sunxi_tcon_ep_activate;
 	sc->sc_ports.dp_ep_enable = sunxi_tcon_ep_enable;
 	fdt_ports_register(&sc->sc_ports, self, phandle, EP_OTHER);
+}
-	TCON_WRITE(sc, SUNXI_TCON_GINT0_REG, 0);
+void
-	TCON_WRITE(sc, SUNXI_TCON_GINT1_REG,
+sunxi_tcon_doreset(void)
 	    __SHIFTIN(0x20, SUNXI_TCON_GINT1_TCON0_LINENO));
-	TCON_WRITE(sc, SUNXI_TCON0_DCLK_REG, 0xf0000000);
+	device_t dev;
-	TCON_WRITE(sc, SUNXI_TCON0_LVDS_IF_REG, 0x0);
+	struct sunxi_tcon_softc *sc;
-	TCON_WRITE(sc, SUNXI_TCON0_CTL_REG, 0);
+	for (int i = 0;;i++) {
-	TCON_WRITE(sc, SUNXI_TCON0_IO_TRI_REG, 0xffffffff);
+		dev = device_find_by_driver_unit("sunxitcon", i);
-	TCON_WRITE(sc, SUNXI_TCON1_CTL_REG, 0);
+		if (dev == NULL)
-	TCON_WRITE(sc, SUNXI_TCON1_IO_TRI_REG, 0xffffffff);
+			return;
-	TCON_WRITE(sc, SUNXI_TCON_GCTL_REG, 0);
+		sc = device_private(dev);
 	/* clock needed for the mux in unit 0 */
 	if (sc->sc_unit != 0) {
 		if (clk_disable(sc->sc_clk_ahb) != 0) {
-			aprint_error(": couldn't disable ahb clock\n");
+			aprint_error_dev(dev, ": couldn't disable ahb clock\n");
 			return;
+		}
 		if (clk_disable(sc->sc_clk_ch0) != 0) {
 			aprint_error_dev(dev, ": couldn't disable ch0 clock\n");
 			return;
+		}
 		if (clk_disable(sc->sc_clk_ch1) != 0) {
 			aprint_error_dev(dev, ": couldn't disable ch1 clock\n");
 			return;
+		}
 		if (fdtbus_reset_assert(sc->sc_rst) != 0) {
 			aprint_error_dev(dev, ": couldn't assert lcd reset\n");
 			return;
+		}
 		if (sc->sc_lvds_rst != NULL) {
 			if (fdtbus_reset_assert(sc->sc_lvds_rst) != 0) {
 				aprint_error_dev(dev,
 				    ": couldn't assert lvds reset\n");
 				return;
+			}
+		}
 		delay(1);
 		if (fdtbus_reset_deassert(sc->sc_rst) != 0) {
 			aprint_error_dev(dev,
 			    ": couldn't de-assert lcd reset\n");
 			return;
+		}
 		if (sc->sc_lvds_rst != NULL) {
 			if (fdtbus_reset_deassert(sc->sc_lvds_rst) != 0) {
 				aprint_error_dev(dev,
 				    ": couldn't de-assert lvds reset\n");
 				return;
+			}
+		}
 		if (clk_enable(sc->sc_clk_ahb) != 0) {
 			aprint_error_dev(dev, ": couldn't enable ahb clock\n");
 			return;
+		}
 		TCON_WRITE(sc, SUNXI_TCON_GINT0_REG, 0);
 		TCON_WRITE(sc, SUNXI_TCON_GINT1_REG,
 		    __SHIFTIN(0x20, SUNXI_TCON_GINT1_TCON0_LINENO));
 		TCON_WRITE(sc, SUNXI_TCON0_DCLK_REG, 0xf0000000);
 		TCON_WRITE(sc, SUNXI_TCON0_LVDS_IF_REG, 0x0);
 		TCON_WRITE(sc, SUNXI_TCON0_CTL_REG, 0);
 		TCON_WRITE(sc, SUNXI_TCON0_IO_TRI_REG, 0xffffffff);
 		TCON_WRITE(sc, SUNXI_TCON1_CTL_REG, 0);
 		TCON_WRITE(sc, SUNXI_TCON1_IO_TRI_REG, 0xffffffff);
 		TCON_WRITE(sc, SUNXI_TCON_GCTL_REG, 0);
 		/* clock needed for the mux in unit 0 */
 		if (sc->sc_unit != 0) {
 			if (clk_disable(sc->sc_clk_ahb) != 0) {
 				aprint_error_dev(dev,
 				    ": couldn't disable ahb clock\n");
 				return;
+			}
+		}
+	}
+}
 static void
 sunxi_tcon_ep_connect(device_t self, struct fdt_endpoint *ep, bool connect)
+{
 	struct sunxi_tcon_softc *sc = device_private(self);
 	struct fdt_endpoint *rep = fdt_endpoint_remote(ep);
 	int rep_idx = fdt_endpoint_index(rep);
 	KASSERT(device_is_a(self, "sunxitcon"));
 	if (!connect) {
 		aprint_error_dev(self, "endpoint disconnect not supported\n");

 @@ -1,14 +1,14 @@
-/*	$NetBSD: sunxi_display.h,v 1.2 2018/04/07 18:09:33 bouyer Exp $	*/
+/*	$NetBSD: sunxi_display.h,v 1.3 2018/06/01 17:18:44 bouyer Exp $	*/
 /*-
  * Copyright (c) 2018 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Manuel Bouyer.
+ *
  * 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.
 @@ -28,13 +28,16 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #define SUNXI_PORT_INPUT	0
 #define SUNXI_PORT_OUTPUT	1
 struct videomode;
 int sunxi_debe_pipeline(int, bool);
 void sunxi_tcon1_set_videomode(device_t, const struct videomode *);
 void sunxi_debe_set_videomode(device_t, const struct videomode *);
 bool sunxi_tcon_is_console(device_t, const char *);
 void sunxi_tcon_doreset(void);
 void sunxi_hdmi_doreset(void);