Module Name: src
Committed By: jmcneill
Date: Fri Jun 2 14:30:58 UTC 2017
Modified Files:
src/sys/arch/arm/fdt: files.fdt
Added Files:
src/sys/arch/arm/fdt: plcom_fdt.c
Log Message:
Add fdt glue for ARM PrimeCell UART (PL011).
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/arm/fdt/files.fdt
cvs rdiff -u -r0 -r1.1 src/sys/arch/arm/fdt/plcom_fdt.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/fdt/files.fdt
diff -u src/sys/arch/arm/fdt/files.fdt:1.6 src/sys/arch/arm/fdt/files.fdt:1.7
--- src/sys/arch/arm/fdt/files.fdt:1.6 Fri Jun 2 11:04:01 2017
+++ src/sys/arch/arm/fdt/files.fdt Fri Jun 2 14:30:58 2017
@@ -1,4 +1,4 @@
-# $NetBSD: files.fdt,v 1.6 2017/06/02 11:04:01 jmcneill Exp $
+# $NetBSD: files.fdt,v 1.7 2017/06/02 14:30:58 jmcneill Exp $
device armfdt { }: bus_space_generic, fdtbus
attach armfdt at root with arm_fdt
@@ -15,6 +15,9 @@ device gic: mpcorebus
attach gic at fdt with gic_fdt
file arch/arm/fdt/gic_fdt.c gic_fdt
+attach plcom at fdt with plcom_fdt
+file arch/arm/fdt/plcom_fdt.c plcom_fdt
+
attach plmmc at fdt with plmmc_fdt
file arch/arm/fdt/plmmc_fdt.c plmmc_fdt
Added files:
Index: src/sys/arch/arm/fdt/plcom_fdt.c
diff -u /dev/null src/sys/arch/arm/fdt/plcom_fdt.c:1.1
--- /dev/null Fri Jun 2 14:30:58 2017
+++ src/sys/arch/arm/fdt/plcom_fdt.c Fri Jun 2 14:30:58 2017
@@ -0,0 +1,146 @@
+/* $NetBSD: plcom_fdt.c,v 1.1 2017/06/02 14:30:58 jmcneill Exp $ */
+
+/*-
+ * Copyright (c) 2017 Jared McNeill <jmcne...@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.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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: plcom_fdt.c,v 1.1 2017/06/02 14:30:58 jmcneill Exp $");
+
+#include <sys/param.h>
+#include <sys/bus.h>
+#include <sys/device.h>
+#include <sys/systm.h>
+#include <sys/kernel.h>
+
+#include <dev/fdt/fdtvar.h>
+
+#include <evbarm/dev/plcomreg.h>
+#include <evbarm/dev/plcomvar.h>
+
+static int plcom_fdt_match(device_t, cfdata_t, void *);
+static void plcom_fdt_attach(device_t, device_t, void *);
+
+static const char * const compatible[] = { "arm,pl011", NULL };
+
+CFATTACH_DECL_NEW(plcom_fdt, sizeof(struct plcom_softc),
+ plcom_fdt_match, plcom_fdt_attach, NULL, NULL);
+
+static int
+plcom_fdt_match(device_t parent, cfdata_t cf, void *aux)
+{
+ struct fdt_attach_args * const faa = aux;
+
+ return of_compatible(faa->faa_phandle, compatible) >= 0;
+}
+
+static void
+plcom_fdt_attach(device_t parent, device_t self, void *aux)
+{
+ struct plcom_softc * const sc = device_private(self);
+ struct fdt_attach_args * const faa = aux;
+ const int phandle = faa->faa_phandle;
+ struct clk *clk;
+ bus_addr_t addr;
+ bus_size_t size;
+ void *ih;
+
+ if (fdtbus_get_reg(phandle, 0, &addr, &size) != 0) {
+ aprint_error(": missing 'reg' property\n");
+ return;
+ }
+
+ sc->sc_dev = self;
+
+ /* Enable clocks */
+ for (int i = 0; (clk = fdtbus_clock_get_index(phandle, i)); i++) {
+ if (clk_enable(clk) != 0) {
+ aprint_error(": failed to enable clock #%d\n", i);
+ return;
+ }
+ /* First clock is UARTCLK */
+ if (i == 0)
+ sc->sc_frequency = clk_get_rate(clk);
+ }
+
+ sc->sc_hwflags = PLCOM_HW_TXFIFO_DISABLE;
+ sc->sc_swflags = 0;
+
+ sc->sc_pi.pi_type = PLCOM_TYPE_PL011;
+ sc->sc_pi.pi_flags = PLC_FLAG_32BIT_ACCESS;
+ sc->sc_pi.pi_iot = faa->faa_bst;
+ sc->sc_pi.pi_iobase = addr;
+ if (bus_space_map(faa->faa_bst, addr, size, 0, &sc->sc_pi.pi_ioh)) {
+ aprint_error(": couldn't map device\n");
+ return;
+ }
+ plcom_attach_subr(sc);
+
+ ih = fdtbus_intr_establish(phandle, 0, IPL_SERIAL, FDT_INTR_MPSAFE,
+ plcomintr, sc);
+ if (ih == NULL) {
+ aprint_error_dev(self, "couldn't install interrupt handler\n");
+ return;
+ }
+}
+
+static int
+plcom_fdt_console_match(int phandle)
+{
+ return of_match_compatible(phandle, compatible);
+}
+
+static void
+plcom_fdt_console_consinit(struct fdt_attach_args *faa, u_int uart_freq)
+{
+ static struct plcom_instance pi;
+ bus_addr_t addr;
+ bus_size_t size;
+ tcflag_t flags;
+ int speed;
+
+ if (fdtbus_get_reg(faa->faa_phandle, 0, &addr, &size) != 0)
+ return;
+
+ pi.pi_type = PLCOM_TYPE_PL011;
+ pi.pi_flags = PLC_FLAG_32BIT_ACCESS;
+ pi.pi_iot = faa->faa_bst;
+ pi.pi_iobase = addr;
+ pi.pi_size = size;
+
+ speed = fdtbus_get_stdout_speed();
+ if (speed < 0)
+ speed = 115200;
+ flags = fdtbus_get_stdout_flags();
+
+ plcomcnattach(&pi, speed, uart_freq, flags, -1);
+}
+
+static const struct fdt_console plcom_fdt_console = {
+ .match = plcom_fdt_console_match,
+ .consinit = plcom_fdt_console_consinit,
+};
+
+FDT_CONSOLE(plcom_fdt, &plcom_fdt_console);
