Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys Rename sunxi_com to dw_apb_uart and move it to dev/fdt s...
details: https://anonhg.NetBSD.org/src/rev/452bc739027f
branches: trunk
changeset: 322994:452bc739027f
user: jmcneill <jmcneill%NetBSD.org@localhost>
date: Sun May 27 17:14:23 2018 +0000
description:
Rename sunxi_com to dw_apb_uart and move it to dev/fdt since it is not
sunxi-specific.
diffstat:
sys/arch/arm/sunxi/files.sunxi | 6 +-
sys/arch/arm/sunxi/sunxi_com.c | 186 -----------------------------------------
sys/dev/fdt/dw_apb_uart.c | 185 ++++++++++++++++++++++++++++++++++++++++
sys/dev/fdt/files.fdt | 6 +-
4 files changed, 191 insertions(+), 192 deletions(-)
diffs (truncated from 419 to 300 lines):
diff -r 52df4fecd35c -r 452bc739027f sys/arch/arm/sunxi/files.sunxi
--- a/sys/arch/arm/sunxi/files.sunxi Sun May 27 17:05:06 2018 +0000
+++ b/sys/arch/arm/sunxi/files.sunxi Sun May 27 17:14:23 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: files.sunxi,v 1.55 2018/05/10 00:00:21 jmcneill Exp $
+# $NetBSD: files.sunxi,v 1.56 2018/05/27 17:14:23 jmcneill Exp $
#
# Configuration info for Allwinner sunxi family SoCs
#
@@ -117,10 +117,6 @@
file arch/arm/sunxi/sun50i_a64_gpio.c sunxi_gpio & soc_sun50i_a64
file arch/arm/sunxi/sun50i_h6_gpio.c sunxi_gpio & soc_sun50i_h6
-# UART
-attach com at fdt with sunxi_com
-file arch/arm/sunxi/sunxi_com.c sunxi_com needs-flag
-
# PWM
device sunxipwm: pwm
attach sunxipwm at fdt with sunxi_pwm
diff -r 52df4fecd35c -r 452bc739027f sys/arch/arm/sunxi/sunxi_com.c
--- a/sys/arch/arm/sunxi/sunxi_com.c Sun May 27 17:05:06 2018 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,186 +0,0 @@
-/* $NetBSD: sunxi_com.c,v 1.5 2018/05/27 17:05:06 jmcneill Exp $ */
-
-/*-
- * Copyright (c) 2017 Jared McNeill <jmcneill%invisible.ca@localhost>
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND 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 THE FOUNDATION OR CONTRIBUTORS
- * 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(1, "$NetBSD: sunxi_com.c,v 1.5 2018/05/27 17:05:06 jmcneill Exp $");
-
-#include <sys/param.h>
-#include <sys/bus.h>
-#include <sys/device.h>
-#include <sys/intr.h>
-#include <sys/systm.h>
-#include <sys/time.h>
-#include <sys/termios.h>
-
-#include <dev/ic/comvar.h>
-
-#include <dev/fdt/fdtvar.h>
-
-static int sunxi_com_match(device_t, cfdata_t, void *);
-static void sunxi_com_attach(device_t, device_t, void *);
-
-static const char * const compatible[] = {
- "snps,dw-apb-uart",
- NULL
-};
-
-struct sunxi_com_softc {
- struct com_softc ssc_sc;
- void *ssc_ih;
-
- struct clk *ssc_clk;
- struct fdtbus_reset *ssc_rst;
-};
-
-CFATTACH_DECL_NEW(sunxi_com, sizeof(struct sunxi_com_softc),
- sunxi_com_match, sunxi_com_attach, NULL, NULL);
-
-static int
-sunxi_com_match(device_t parent, cfdata_t cf, void *aux)
-{
- struct fdt_attach_args * const faa = aux;
-
- return of_match_compatible(faa->faa_phandle, compatible);
-}
-
-static void
-sunxi_com_attach(device_t parent, device_t self, void *aux)
-{
- struct sunxi_com_softc * const ssc = device_private(self);
- struct com_softc * const sc = &ssc->ssc_sc;
- struct fdt_attach_args * const faa = aux;
- bus_space_handle_t bsh;
- bus_space_tag_t bst;
- char intrstr[128];
- bus_addr_t addr;
- bus_size_t size;
- u_int reg_shift;
- int error;
-
- if (fdtbus_get_reg(faa->faa_phandle, 0, &addr, &size) != 0) {
- aprint_error(": couldn't get registers\n");
- return;
- }
-
- if (of_getprop_uint32(faa->faa_phandle, "reg-shift", ®_shift)) {
- /* missing or bad reg-shift property, assume 2 */
- bst = faa->faa_a4x_bst;
- } else {
- if (reg_shift == 2) {
- bst = faa->faa_a4x_bst;
- } else if (reg_shift == 0) {
- bst = faa->faa_bst;
- } else {
- aprint_error(": unsupported reg-shift value %d\n",
- reg_shift);
- return;
- }
- }
-
- sc->sc_dev = self;
-
- ssc->ssc_clk = fdtbus_clock_get_index(faa->faa_phandle, 0);
- if (ssc->ssc_clk == NULL) {
- aprint_error(": couldn't get clock\n");
- return;
- }
- if (clk_enable(ssc->ssc_clk) != 0) {
- aprint_error(": couldn't enable clock\n");
- return;
- }
-
- ssc->ssc_rst = fdtbus_reset_get_index(faa->faa_phandle, 0);
- if (ssc->ssc_rst && fdtbus_reset_deassert(ssc->ssc_rst) != 0) {
- aprint_error(": couldn't de-assert reset\n");
- return;
- }
-
- sc->sc_frequency = clk_get_rate(ssc->ssc_clk);
- sc->sc_type = COM_TYPE_DW_APB;
-
- error = bus_space_map(bst, addr, size, 0, &bsh);
- if (error) {
- aprint_error(": couldn't map %#llx: %d", (uint64_t)addr, error);
- return;
- }
-
- COM_INIT_REGS(sc->sc_regs, bst, bsh, addr);
-
- com_attach_subr(sc);
- aprint_naive("\n");
-
- if (!fdtbus_intr_str(faa->faa_phandle, 0, intrstr, sizeof(intrstr))) {
- aprint_error_dev(self, "failed to decode interrupt\n");
- return;
- }
-
- ssc->ssc_ih = fdtbus_intr_establish(faa->faa_phandle, 0, IPL_SERIAL,
- FDT_INTR_MPSAFE, comintr, sc);
- if (ssc->ssc_ih == NULL) {
- aprint_error_dev(self, "failed to establish interrupt on %s\n",
- intrstr);
- }
- aprint_normal_dev(self, "interrupting on %s\n", intrstr);
-}
-
-/*
- * Console support
- */
-
-static int
-sunxi_com_console_match(int phandle)
-{
- return of_match_compatible(phandle, compatible);
-}
-
-static void
-sunxi_com_console_consinit(struct fdt_attach_args *faa, u_int uart_freq)
-{
- const int phandle = faa->faa_phandle;
- bus_space_tag_t bst = faa->faa_a4x_bst;
- bus_addr_t addr;
- tcflag_t flags;
- int speed;
-
- fdtbus_get_reg(phandle, 0, &addr, NULL);
- speed = fdtbus_get_stdout_speed();
- if (speed < 0)
- speed = 115200; /* default */
- flags = fdtbus_get_stdout_flags();
-
- if (comcnattach(bst, addr, speed, uart_freq, COM_TYPE_DW_APB, flags))
- panic("Cannot initialize sunxi com console");
-}
-
-static const struct fdt_console sunxi_com_console = {
- .match = sunxi_com_console_match,
- .consinit = sunxi_com_console_consinit,
-};
-
-FDT_CONSOLE(sunxi_com, &sunxi_com_console);
diff -r 52df4fecd35c -r 452bc739027f sys/dev/fdt/dw_apb_uart.c
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/dev/fdt/dw_apb_uart.c Sun May 27 17:14:23 2018 +0000
@@ -0,0 +1,185 @@
+/* $NetBSD: dw_apb_uart.c,v 1.1 2018/05/27 17:14:23 jmcneill Exp $ */
+
+/*-
+ * Copyright (c) 2017 Jared McNeill <jmcneill%invisible.ca@localhost>
+ * 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.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND 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 THE FOUNDATION OR CONTRIBUTORS
+ * 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(1, "$NetBSD: dw_apb_uart.c,v 1.1 2018/05/27 17:14:23 jmcneill Exp $");
+
+#include <sys/param.h>
+#include <sys/bus.h>
+#include <sys/device.h>
+#include <sys/intr.h>
+#include <sys/systm.h>
+#include <sys/time.h>
+#include <sys/termios.h>
+
+#include <dev/ic/comvar.h>
+
+#include <dev/fdt/fdtvar.h>
+
+static int dw_apb_uart_match(device_t, cfdata_t, void *);
+static void dw_apb_uart_attach(device_t, device_t, void *);
+
+static const char * const compatible[] = {
+ "snps,dw-apb-uart",
+ NULL
+};
+
+struct dw_apb_uart_softc {
+ struct com_softc ssc_sc;
+ void *ssc_ih;
+
+ struct clk *ssc_clk;
+ struct fdtbus_reset *ssc_rst;
+};
+
+CFATTACH_DECL_NEW(dw_apb_uart, sizeof(struct dw_apb_uart_softc),
+ dw_apb_uart_match, dw_apb_uart_attach, NULL, NULL);
+
+static int
+dw_apb_uart_match(device_t parent, cfdata_t cf, void *aux)
+{
+ struct fdt_attach_args * const faa = aux;
+
+ return of_match_compatible(faa->faa_phandle, compatible);
+}
+
+static void
+dw_apb_uart_attach(device_t parent, device_t self, void *aux)
+{
+ struct dw_apb_uart_softc * const ssc = device_private(self);
+ struct com_softc * const sc = &ssc->ssc_sc;
+ struct fdt_attach_args * const faa = aux;
+ bus_space_handle_t bsh;
+ bus_space_tag_t bst;
+ char intrstr[128];
+ bus_addr_t addr;
+ bus_size_t size;
+ u_int reg_shift;
+ int error;
+
+ if (fdtbus_get_reg(faa->faa_phandle, 0, &addr, &size) != 0) {
Home |
Main Index |
Thread Index |
Old Index