Module Name: src
Committed By: snj
Date: Sat Jun 10 05:57:08 UTC 2017
Modified Files:
src/sys/arch/arm/fdt [netbsd-8]: files.fdt
src/sys/arch/evbarm/conf [netbsd-8]: VEXPRESS_A15
src/sys/conf [netbsd-8]: files
Added Files:
src/sys/arch/arm/fdt [netbsd-8]: plrtc_fdt.c
src/sys/dev/ic [netbsd-8]: pl031.c pl031var.h
Log Message:
Pull up following revision(s) (requested by jmcneill in ticket #19):
sys/arch/arm/fdt/files.fdt: revision 1.11
sys/arch/arm/fdt/plrtc_fdt.c: revision 1.1
sys/arch/evbarm/conf/VEXPRESS_A15: revision 1.16
sys/conf/files: revision 1.1175
sys/dev/ic/pl031.c: revision 1.1
sys/dev/ic/pl031var.h: revision 1.1
Add driver for ARM PrimeCell PL031 (RTC) Real Time Clock.
--
Add fdt glue for plrtc
--
Add plrtc driver
To generate a diff of this commit:
cvs rdiff -u -r1.9.2.1 -r1.9.2.2 src/sys/arch/arm/fdt/files.fdt
cvs rdiff -u -r0 -r1.1.2.2 src/sys/arch/arm/fdt/plrtc_fdt.c
cvs rdiff -u -r1.12.2.2 -r1.12.2.3 src/sys/arch/evbarm/conf/VEXPRESS_A15
cvs rdiff -u -r1.1173.2.1 -r1.1173.2.2 src/sys/conf/files
cvs rdiff -u -r0 -r1.1.2.2 src/sys/dev/ic/pl031.c src/sys/dev/ic/pl031var.h
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.9.2.1 src/sys/arch/arm/fdt/files.fdt:1.9.2.2
--- src/sys/arch/arm/fdt/files.fdt:1.9.2.1 Fri Jun 9 16:59:20 2017
+++ src/sys/arch/arm/fdt/files.fdt Sat Jun 10 05:57:08 2017
@@ -1,4 +1,4 @@
-# $NetBSD: files.fdt,v 1.9.2.1 2017/06/09 16:59:20 snj Exp $
+# $NetBSD: files.fdt,v 1.9.2.2 2017/06/10 05:57:08 snj Exp $
include "dev/pckbport/files.pckbport"
@@ -35,5 +35,8 @@ file arch/arm/fdt/smsh_fdt.c smsh_fdt
attach aaci at fdt with aaci_fdt
file arch/arm/fdt/aaci_fdt.c aaci_fdt
+attach plrtc at fdt with plrtc_fdt
+file arch/arm/fdt/plrtc_fdt.c plrtc_fdt
+
# Console parameters
defparam opt_fdt_arm.h CONSADDR
Index: src/sys/arch/evbarm/conf/VEXPRESS_A15
diff -u src/sys/arch/evbarm/conf/VEXPRESS_A15:1.12.2.2 src/sys/arch/evbarm/conf/VEXPRESS_A15:1.12.2.3
--- src/sys/arch/evbarm/conf/VEXPRESS_A15:1.12.2.2 Fri Jun 9 16:59:20 2017
+++ src/sys/arch/evbarm/conf/VEXPRESS_A15 Sat Jun 10 05:57:08 2017
@@ -1,5 +1,5 @@
#
-# $NetBSD: VEXPRESS_A15,v 1.12.2.2 2017/06/09 16:59:20 snj Exp $
+# $NetBSD: VEXPRESS_A15,v 1.12.2.3 2017/06/10 05:57:08 snj Exp $
#
# ARM Versatile Express A15
#
@@ -54,6 +54,9 @@ ukphy* at mii? phy ?
# UART
plcom* at fdt? # ARM PL011 UART
+# RTC
+plrtc* at fdt? # ARM PrimeCell RTC
+
# SDMMC
plmmc* at fdt? # ARM PrimeCell MCI
sdmmc* at sdmmcbus?
Index: src/sys/conf/files
diff -u src/sys/conf/files:1.1173.2.1 src/sys/conf/files:1.1173.2.2
--- src/sys/conf/files:1.1173.2.1 Fri Jun 9 16:59:20 2017
+++ src/sys/conf/files Sat Jun 10 05:57:08 2017
@@ -1,4 +1,4 @@
-# $NetBSD: files,v 1.1173.2.1 2017/06/09 16:59:20 snj Exp $
+# $NetBSD: files,v 1.1173.2.2 2017/06/10 05:57:08 snj Exp $
# @(#)files.newconf 7.5 (Berkeley) 5/10/93
version 20150846
@@ -1315,6 +1315,10 @@ defflag opt_dwc_mmc.h DWC_MMC_DEBUG
device dwcmmc: sdmmcbus
file dev/ic/dwc_mmc.c dwcmmc
+# ARM PrimeCell PL031 (RTC) real time clock
+device plrtc
+file dev/ic/pl031.c plrtc
+
# ARM PrimeCell PL041 (AACI) Advanced Audio CODEC interface
device aaci: audiobus, auconv, aurateconv, mulaw, ac97
file dev/ic/pl041.c aaci
Added files:
Index: src/sys/arch/arm/fdt/plrtc_fdt.c
diff -u /dev/null src/sys/arch/arm/fdt/plrtc_fdt.c:1.1.2.2
--- /dev/null Sat Jun 10 05:57:08 2017
+++ src/sys/arch/arm/fdt/plrtc_fdt.c Sat Jun 10 05:57:08 2017
@@ -0,0 +1,85 @@
+/* $NetBSD: plrtc_fdt.c,v 1.1.2.2 2017/06/10 05:57:08 snj 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: plrtc_fdt.c,v 1.1.2.2 2017/06/10 05:57:08 snj 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 <dev/ic/pl031var.h>
+
+static int plrtc_fdt_match(device_t, cfdata_t, void *);
+static void plrtc_fdt_attach(device_t, device_t, void *);
+
+static const char * const compatible[] = {
+ "arm,pl031",
+ NULL
+};
+
+CFATTACH_DECL_NEW(plrtc_fdt, sizeof(struct plrtc_softc),
+ plrtc_fdt_match, plrtc_fdt_attach, NULL, NULL);
+
+static int
+plrtc_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
+plrtc_fdt_attach(device_t parent, device_t self, void *aux)
+{
+ struct plrtc_softc * const 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;
+
+ if (fdtbus_get_reg(phandle, 0, &addr, &size) != 0) {
+ aprint_error(": missing 'reg' property\n");
+ return;
+ }
+
+ sc->sc_dev = self;
+ sc->sc_bst = faa->faa_bst;
+ if (bus_space_map(faa->faa_bst, addr, size, 0, &sc->sc_bsh)) {
+ aprint_error(": couldn't map device\n");
+ return;
+ }
+
+ plrtc_attach(sc);
+
+ fdtbus_todr_attach(self, phandle, &sc->sc_todr);
+}
Index: src/sys/dev/ic/pl031.c
diff -u /dev/null src/sys/dev/ic/pl031.c:1.1.2.2
--- /dev/null Sat Jun 10 05:57:08 2017
+++ src/sys/dev/ic/pl031.c Sat Jun 10 05:57:08 2017
@@ -0,0 +1,84 @@
+/* $NetBSD: pl031.c,v 1.1.2.2 2017/06/10 05:57:08 snj 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: pl031.c,v 1.1.2.2 2017/06/10 05:57:08 snj Exp $");
+
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/device.h>
+#include <sys/kmem.h>
+#include <sys/bus.h>
+
+#include <dev/clock_subr.h>
+
+#include <dev/ic/pl031var.h>
+
+#define RTCDR 0x000
+#define RTCLR 0x008
+#define RTCCR 0x00c
+#define RTCCR_START __BIT(0)
+
+#define RTC_READ(sc, reg) \
+ bus_space_read_4((sc)->sc_bst, (sc)->sc_bsh, (reg))
+#define RTC_WRITE(sc, reg, val) \
+ bus_space_write_4((sc)->sc_bst, (sc)->sc_bsh, (reg), (val))
+
+static int
+plrtc_gettime(todr_chip_handle_t tch, struct timeval *tv)
+{
+ struct plrtc_softc * const sc = tch->cookie;
+
+ tv->tv_sec = RTC_READ(sc, RTCDR);
+ tv->tv_usec = 0;
+
+ return 0;
+}
+
+static int
+plrtc_settime(todr_chip_handle_t tch, struct timeval *tv)
+{
+ struct plrtc_softc * const sc = tch->cookie;
+
+ RTC_WRITE(sc, RTCLR, tv->tv_sec);
+
+ return 0;
+}
+
+void
+plrtc_attach(struct plrtc_softc *sc)
+{
+ aprint_naive("\n");
+ aprint_normal(": RTC\n");
+
+ sc->sc_todr.todr_gettime = plrtc_gettime;
+ sc->sc_todr.todr_settime = plrtc_settime;
+ sc->sc_todr.cookie = sc;
+
+ RTC_WRITE(sc, RTCCR, RTCCR_START);
+}
Index: src/sys/dev/ic/pl031var.h
diff -u /dev/null src/sys/dev/ic/pl031var.h:1.1.2.2
--- /dev/null Sat Jun 10 05:57:08 2017
+++ src/sys/dev/ic/pl031var.h Sat Jun 10 05:57:08 2017
@@ -0,0 +1,42 @@
+/* $NetBSD: pl031var.h,v 1.1.2.2 2017/06/10 05:57:08 snj 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.
+ */
+
+#ifndef _PL041VAR_H
+#define _PL041VAR_H
+
+struct plrtc_softc {
+ device_t sc_dev;
+ bus_space_tag_t sc_bst;
+ bus_space_handle_t sc_bsh;
+
+ struct todr_chip_handle sc_todr;
+};
+
+void plrtc_attach(struct plrtc_softc *);
+
+#endif /* !_PL041VAR_H */
