Module Name: src
Committed By: jakllsch
Date: Wed Sep 26 19:06:33 UTC 2018
Modified Files:
src/sys/arch/x86/pci: dwiic_pci.c
src/sys/dev/fdt: files.fdt
src/sys/dev/ic: dwiic.c
Added Files:
src/sys/dev/fdt: dwiic_fdt.c
Log Message:
Add dwiic_fdt attachment for "snps,designware-i2c".
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/x86/pci/dwiic_pci.c
cvs rdiff -u -r0 -r1.1 src/sys/dev/fdt/dwiic_fdt.c
cvs rdiff -u -r1.37 -r1.38 src/sys/dev/fdt/files.fdt
cvs rdiff -u -r1.4 -r1.5 src/sys/dev/ic/dwiic.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/x86/pci/dwiic_pci.c
diff -u src/sys/arch/x86/pci/dwiic_pci.c:1.1 src/sys/arch/x86/pci/dwiic_pci.c:1.2
--- src/sys/arch/x86/pci/dwiic_pci.c:1.1 Sun Dec 10 17:12:54 2017
+++ src/sys/arch/x86/pci/dwiic_pci.c Wed Sep 26 19:06:33 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: dwiic_pci.c,v 1.1 2017/12/10 17:12:54 bouyer Exp $ */
+/* $NetBSD: dwiic_pci.c,v 1.2 2018/09/26 19:06:33 jakllsch Exp $ */
/*-
* Copyright (c) 2017 The NetBSD Foundation, Inc.
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dwiic_pci.c,v 1.1 2017/12/10 17:12:54 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dwiic_pci.c,v 1.2 2018/09/26 19:06:33 jakllsch Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -177,6 +177,8 @@ pci_dwiic_attach(device_t parent, device
dwiic_attach(&sc->sc_dwiic);
+ config_found_ia(self, "i2cbus", &sc->sc_dwiic.sc_iba, iicbus_print);
+
pmf_device_register(self, dwiic_suspend, dwiic_resume);
out:
Index: src/sys/dev/fdt/files.fdt
diff -u src/sys/dev/fdt/files.fdt:1.37 src/sys/dev/fdt/files.fdt:1.38
--- src/sys/dev/fdt/files.fdt:1.37 Mon Sep 3 23:15:12 2018
+++ src/sys/dev/fdt/files.fdt Wed Sep 26 19:06:33 2018
@@ -1,4 +1,4 @@
-# $NetBSD: files.fdt,v 1.37 2018/09/03 23:15:12 jmcneill Exp $
+# $NetBSD: files.fdt,v 1.38 2018/09/26 19:06:33 jakllsch Exp $
include "external/bsd/libfdt/conf/files.libfdt"
@@ -130,3 +130,7 @@ file dev/fdt/pl061gpio_fdt.c pl061gpio
# AHCI SATA controller
attach ahcisata at fdt with ahcisata_fdt
file dev/fdt/ahcisata_fdt.c ahcisata_fdt
+
+# Designware I2C
+attach dwiic at fdt with dwiic_fdt
+file dev/fdt/dwiic_fdt.c dwiic_fdt
Index: src/sys/dev/ic/dwiic.c
diff -u src/sys/dev/ic/dwiic.c:1.4 src/sys/dev/ic/dwiic.c:1.5
--- src/sys/dev/ic/dwiic.c:1.4 Wed Sep 26 18:32:51 2018
+++ src/sys/dev/ic/dwiic.c Wed Sep 26 19:06:33 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: dwiic.c,v 1.4 2018/09/26 18:32:51 jakllsch Exp $ */
+/* $NetBSD: dwiic.c,v 1.5 2018/09/26 19:06:33 jakllsch Exp $ */
/* $OpenBSD: dwiic.c,v 1.4 2018/05/23 22:08:00 kettenis Exp $ */
@@ -49,7 +49,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dwiic.c,v 1.4 2018/09/26 18:32:51 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dwiic.c,v 1.5 2018/09/26 19:06:33 jakllsch Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -198,7 +198,8 @@ dwiic_attach(struct dwiic_softc *sc)
sc->sc_iba.iba_tag = &sc->sc_i2c_tag;
- config_found_ia(sc->sc_dev, "i2cbus", &sc->sc_iba, iicbus_print);
+ /* config_found_ia for "i2cbus" is done in the bus-attachment glue */
+
return 1;
}
Added files:
Index: src/sys/dev/fdt/dwiic_fdt.c
diff -u /dev/null src/sys/dev/fdt/dwiic_fdt.c:1.1
--- /dev/null Wed Sep 26 19:06:33 2018
+++ src/sys/dev/fdt/dwiic_fdt.c Wed Sep 26 19:06:33 2018
@@ -0,0 +1,131 @@
+/* $NetBSD: dwiic_fdt.c,v 1.1 2018/09/26 19:06:33 jakllsch Exp $ */
+
+/*-
+ * Copyright (c) 2017 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Manuel Bouyer.
+ *
+ * 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.
+ */
+/*
+ * Synopsys DesignWare I2C controller, FDT front-end
+ */
+
+#include <sys/cdefs.h>
+__KERNEL_RCSID(0, "$NetBSD: dwiic_fdt.c,v 1.1 2018/09/26 19:06:33 jakllsch Exp $");
+
+#include <sys/param.h>
+#include <sys/systm.h>
+
+#include <dev/fdt/fdtvar.h>
+#include <dev/ic/dwiic_var.h>
+
+static const char * const compatible[] = {
+ "snps,designware-i2c",
+ NULL
+};
+
+struct dwiic_fdt_softc {
+ struct dwiic_softc sc_dwiic;
+};
+
+static int dwiic_fdt_match(device_t, cfdata_t, void *);
+static void dwiic_fdt_attach(device_t, device_t, void *);
+static i2c_tag_t dwiic_fdt_i2c_get_tag(device_t);
+
+struct fdtbus_i2c_controller_func dwiic_fdt_i2c_funcs = {
+ .get_tag = dwiic_fdt_i2c_get_tag,
+};
+
+CFATTACH_DECL_NEW(dwiic_fdt, sizeof(struct dwiic_fdt_softc),
+ dwiic_fdt_match, dwiic_fdt_attach, dwiic_detach, NULL);
+
+int
+dwiic_fdt_match(device_t parent, cfdata_t match, void *aux)
+{
+ struct fdt_attach_args * const faa = aux;
+
+ return of_match_compatible(faa->faa_phandle, compatible);
+}
+
+void
+dwiic_fdt_attach(device_t parent, device_t self, void *aux)
+{
+ struct dwiic_fdt_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;
+ char intrstr[128];
+
+ sc->sc_dwiic.sc_dev = self;
+ sc->sc_dwiic.sc_power = NULL;
+ sc->sc_dwiic.sc_type = dwiic_type_generic;
+
+ if (fdtbus_get_reg(phandle, 0, &addr, &size) != 0) {
+ aprint_error(": couldn't get registers\n");
+ return;
+ }
+
+ sc->sc_dwiic.sc_iot = faa->faa_bst;
+ if (bus_space_map(sc->sc_dwiic.sc_iot, addr, size, 0, &sc->sc_dwiic.sc_ioh) != 0) {
+ aprint_error(": couldn't map registers\n");
+ return;
+ }
+
+ aprint_naive(": I2C controller\n");
+ aprint_normal(": I2C controller\n");
+
+ if (!fdtbus_intr_str(phandle, 0, intrstr, sizeof(intrstr))) {
+ aprint_error_dev(self, "failed to decode interrupt\n");
+ return;
+ }
+ aprint_normal_dev(self, "interrupting on %s\n", intrstr);
+
+ sc->sc_dwiic.sc_ih = fdtbus_intr_establish(phandle, 0, IPL_VM, 0,
+ dwiic_intr, &sc->sc_dwiic);
+ if (sc->sc_dwiic.sc_ih == NULL) {
+ aprint_error_dev(self, "couldn't establish interrupt\n");
+ goto out;
+ }
+
+ dwiic_attach(&sc->sc_dwiic);
+
+ pmf_device_register(self, dwiic_suspend, dwiic_resume);
+
+ fdtbus_register_i2c_controller(self, phandle, &dwiic_fdt_i2c_funcs);
+
+ fdtbus_attach_i2cbus(self, phandle, &sc->sc_dwiic.sc_i2c_tag, iicbus_print);
+
+out:
+ return;
+}
+
+static i2c_tag_t
+dwiic_fdt_i2c_get_tag(device_t dev)
+{
+ struct dwiic_fdt_softc * const sc = device_private(dev);
+
+ return &sc->sc_dwiic.sc_i2c_tag;
+}
