Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/dev/fdt Add fdtbus_todr_attach.



details:   https://anonhg.NetBSD.org/src/rev/3d0a8f5e4227
branches:  trunk
changeset: 823416:3d0a8f5e4227
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Sat Apr 22 13:24:20 2017 +0000

description:
Add fdtbus_todr_attach.

The kernel will only ever use the first RTC driver to call todr_attach.
When drivers use fdtbus_todr_attach, if an "rtc0" alias exists in the
devicetree, ensure that only that device node calls todr_attach.

diffstat:

 sys/dev/fdt/fdt_rtc.c |  58 +++++++++++++++++++++++++++++++++++++++++++++++++++
 sys/dev/fdt/fdtvar.h  |   6 ++++-
 sys/dev/fdt/files.fdt |   3 +-
 3 files changed, 65 insertions(+), 2 deletions(-)

diffs (104 lines):

diff -r cf9f5237497b -r 3d0a8f5e4227 sys/dev/fdt/fdt_rtc.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/dev/fdt/fdt_rtc.c     Sat Apr 22 13:24:20 2017 +0000
@@ -0,0 +1,58 @@
+/* $NetBSD: fdt_rtc.c,v 1.1 2017/04/22 13:24:20 jmcneill Exp $ */
+
+/*-
+ * Copyright (c) 2017 Jared D. 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 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: fdt_rtc.c,v 1.1 2017/04/22 13:24:20 jmcneill Exp $");
+
+#include <sys/param.h>
+#include <sys/bus.h>
+#include <sys/kmem.h>
+
+#include <libfdt.h>
+#include <dev/fdt/fdtvar.h>
+
+int
+fdtbus_todr_attach(device_t dev, int phandle, todr_chip_handle_t tch)
+{
+       const char *prop;
+
+       /*
+        * The kernel will only use the first device to register with
+        * todr_attach. If we have an "rtc0" alias, ensure that it matches
+        * this phandle and ignore all other RTC devices.
+        */
+       prop = fdt_get_alias(fdtbus_get_data(), "rtc0");
+       if (prop != NULL && OF_finddevice(prop) != phandle) {
+               device_printf(dev, "disabled\n");
+               return EINVAL;
+       }
+
+       todr_attach(tch);
+
+       return 0;
+}
diff -r cf9f5237497b -r 3d0a8f5e4227 sys/dev/fdt/fdtvar.h
--- a/sys/dev/fdt/fdtvar.h      Sat Apr 22 12:22:31 2017 +0000
+++ b/sys/dev/fdt/fdtvar.h      Sat Apr 22 13:24:20 2017 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: fdtvar.h,v 1.10 2017/04/21 23:35:01 jmcneill Exp $ */
+/* $NetBSD: fdtvar.h,v 1.11 2017/04/22 13:24:20 jmcneill Exp $ */
 
 /*-
  * Copyright (c) 2015 Jared D. McNeill <jmcneill%invisible.ca@localhost>
@@ -35,6 +35,8 @@
 #include <dev/i2c/i2cvar.h>
 #include <dev/clk/clk.h>
 
+#include <dev/clock_subr.h>
+
 #include <dev/ofw/openfirm.h>
 
 struct fdt_attach_args {
@@ -159,6 +161,8 @@
 int            fdtbus_reset_assert(struct fdtbus_reset *);
 int            fdtbus_reset_deassert(struct fdtbus_reset *);
 
+int            fdtbus_todr_attach(device_t, int, todr_chip_handle_t);
+
 bool           fdtbus_set_data(const void *);
 const void *   fdtbus_get_data(void);
 int            fdtbus_phandle2offset(int);
diff -r cf9f5237497b -r 3d0a8f5e4227 sys/dev/fdt/files.fdt
--- a/sys/dev/fdt/files.fdt     Sat Apr 22 12:22:31 2017 +0000
+++ b/sys/dev/fdt/files.fdt     Sat Apr 22 13:24:20 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: files.fdt,v 1.9 2017/04/16 12:29:20 jmcneill Exp $
+# $NetBSD: files.fdt,v 1.10 2017/04/22 13:24:20 jmcneill Exp $
 
 include        "external/bsd/libfdt/conf/files.libfdt"
 
@@ -30,4 +30,5 @@
 file   dev/fdt/fdt_intr.c                      fdtbus
 file   dev/fdt/fdt_regulator.c                 fdtbus
 file   dev/fdt/fdt_reset.c                     fdtbus
+file   dev/fdt/fdt_rtc.c                       fdtbus
 file   dev/fdt/fdt_pinctrl.c                   fdtbus



Home | Main Index | Thread Index | Old Index