 @@ -1,14 +1,14 @@
-/*	$NetBSD: obio_com.c,v 1.5 2014/04/09 21:02:31 hans Exp $	*/
+/*	$NetBSD: obio_com.c,v 1.6 2016/07/07 15:20:58 kiyohara Exp $	*/
 /*
  * Based on arch/arm/omap/omap_com.c
+ *
  * Copyright 2003 Wasabi Systems, Inc.
  * OMAP support Copyright (c) 2007 Microsoft
  * All rights reserved.
+ *
  * Written by Steve C. Woodford for Wasabi Systems, Inc.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
 @@ -29,94 +29,117 @@
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL WASABI SYSTEMS, INC
  * 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: obio_com.c,v 1.5 2014/04/09 21:02:31 hans Exp $");
+__KERNEL_RCSID(0, "$NetBSD: obio_com.c,v 1.6 2016/07/07 15:20:58 kiyohara Exp $");
 #include "opt_omap.h"
 #include "opt_com.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/termios.h>
 #include <machine/intr.h>
 #include <sys/bus.h>
 #include <dev/ic/comreg.h>
 #include <dev/ic/comvar.h>
 #include <arm/omap/omap2_obiovar.h>
 #include <arm/omap/omap2_reg.h>
 #include <arm/omap/omap_com.h>
 #include <arm/omap/omap2_prcm.h>
 #include <arm/omap/am335x_prcm.h>
 #include "locators.h"
 static int	obiouart_match(device_t, cfdata_t, void *);
 static void	obiouart_attach(device_t, device_t, void *);
-static int	uart_enable(struct obio_attach_args *);
+#if defined(TI_AM335X)
 static int	uart_enable_am335x(struct obio_attach_args *);
 #else
 static int	uart_enable_omap(struct obio_attach_args *);
 #endif
 static int	uart_enable(struct obio_attach_args *, bus_space_handle_t);
 static void	obiouart_callout(void *);
 #if defined(TI_AM335X)
 struct am335x_com {
 	bus_addr_t as_base_addr;
 	int as_intr;
 	struct omap_module as_module;
 };
 static const struct am335x_com am335x_com[] = {
 	{ 0x44e09000, 72, { AM335X_PRCM_CM_WKUP, 0xb4 } },
 	{ 0x48022000, 73, { AM335X_PRCM_CM_PER, 0x6c } },
 	{ 0x48024000, 74, { AM335X_PRCM_CM_PER, 0x70 } },
 	{ 0x481a6000, 44, { AM335X_PRCM_CM_PER, 0x74 } },
 	{ 0x481a8000, 45, { AM335X_PRCM_CM_PER, 0x78 } },
 	{ 0x481aa000, 46, { AM335X_PRCM_CM_PER, 0x38 } },
 };
 #endif
 struct com_obio_softc {
 	struct com_softc sc_sc;
 	struct callout sc_callout;
 };
 CFATTACH_DECL_NEW(obiouart, sizeof(struct com_obio_softc),
     obiouart_match, obiouart_attach, NULL, NULL);
 static int
 obiouart_match(device_t parent, cfdata_t cf, void *aux)
+{
 	struct obio_attach_args *obio = aux;
 	bus_space_handle_t bh;
 	int rv;
 	if (obio->obio_addr == OBIOCF_ADDR_DEFAULT)
 		panic("obiouart must have addr specified in config.");
 #if 0
 	/*
 	 * XXX this should be ifdefed on a board-dependent switch
 	 * We don't know what is the irq for com0 on the sdp2430
 	 */
 	if (obio->obio_intr == OBIOCF_INTR_DEFAULT)
 		panic("obiouart must have intr specified in config.");
 #endif
 	if (obio->obio_size == OBIOCF_SIZE_DEFAULT)
 		obio->obio_size = OMAP_COM_SIZE;
 	if (com_is_console(obio->obio_iot, obio->obio_addr, NULL))
 		return 1;
 	if (uart_enable(obio) != 0)
 		return 1;
 	if (bus_space_map(obio->obio_iot, obio->obio_addr, obio->obio_size,
-, &bh))
+, &bh) != 0)
-		return 1;
+		return 0;
 	rv = 0;
-	rv = comprobe1(obio->obio_iot, bh);
+	if (uart_enable(obio, bh) == 0)
 		rv = comprobe1(obio->obio_iot, bh);
 	bus_space_unmap(obio->obio_iot, bh, obio->obio_size);
 	return rv;
+}
 static void
 obiouart_attach(device_t parent, device_t self, void *aux)
+{
 	struct com_obio_softc *osc = device_private(self);
 	struct com_softc *sc = &osc->sc_sc;
 	struct obio_attach_args *obio = aux;
 	bus_space_tag_t iot;
 @@ -151,28 +174,49 @@ obiouart_attach(device_t parent, device_
 static void
 obiouart_callout(void *arg)
+{
 	struct com_obio_softc * const osc = arg;
 	int s;
 	s = splserial();
 	comintr(arg);
 	splx(s);
 	callout_schedule(&osc->sc_callout, 1);
+}
 #if defined(TI_AM335X)
 static int
-uart_enable(struct obio_attach_args *obio)
+uart_enable_am335x(struct obio_attach_args *obio)
+{
 	int i;
 	/* XXX Not really AM335X-specific.  */
 	for (i = 0; i < __arraycount(am335x_com); i++)
 		if ((obio->obio_addr == am335x_com[i].as_base_addr) &&
 		    (obio->obio_intr == am335x_com[i].as_intr)) {
 			prcm_module_enable(&am335x_com[i].as_module);
 			break;
+		}
 	KASSERT(i < __arraycount(am335x_com));
 	return 0;
+}
 #else
 static int
 uart_enable_omap(struct obio_attach_args *obio)
+{
 	bus_space_handle_t ioh;
 	uint32_t r;
 #if 0
 	uint32_t clksel2;
 #endif
 	uint32_t fclken1;
 	uint32_t iclken1;
 	int err __diagused;
 	int n=-1;
 	KASSERT(obio != NULL);
 @@ -212,13 +256,43 @@ printf("%s: UART#%d\n", __func__, n);
 	r = bus_space_read_4(obio->obio_iot, ioh, OMAP2_CM_FCLKEN1_CORE);
 	r |= fclken1;
 	bus_space_write_4(obio->obio_iot, ioh, OMAP2_CM_FCLKEN1_CORE, r);
 	r = bus_space_read_4(obio->obio_iot, ioh, OMAP2_CM_ICLKEN1_CORE);
 	r |= iclken1;
 	bus_space_write_4(obio->obio_iot, ioh, OMAP2_CM_ICLKEN1_CORE, r);
 err:
 //	bus_space_unmap(obio->obio_iot, ioh, OMAP2_CM_SIZE);
 	return 0;
+}
 #endif
 static int
 uart_enable(struct obio_attach_args *obio, bus_space_handle_t bh)
+{
 	uint32_t v;
 #if defined(TI_AM335X)
 	if (uart_enable_am335x(obio) != 0)
 		return -1;
 #else
 	if (uart_enable_omap(obio) != 0)
 		return -1;
 #endif
 	v = bus_space_read_4(obio->obio_iot, bh, OMAP_COM_SYSC);
 	v |= OMAP_COM_SYSC_SOFT_RESET;
 	bus_space_write_4(obio->obio_iot, bh, OMAP_COM_SYSC, v);
 	v = bus_space_read_4(obio->obio_iot, bh, OMAP_COM_SYSS);
 	while (!(v & OMAP_COM_SYSS_RESET_DONE))
 		v = bus_space_read_4(obio->obio_iot, bh, OMAP_COM_SYSS);
 	/* Disable smart idle */
 	v = bus_space_read_4(obio->obio_iot, bh, OMAP_COM_SYSC);
 	v |= OMAP_COM_SYSC_NO_IDLE;
 	bus_space_write_4(obio->obio_iot, bh, OMAP_COM_SYSC, v);
 	return 0;
+}