From owner-svn-src-head@freebsd.org Fri Dec 20 03:40:51 2019 Return-Path: Delivered-To: svn-src-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 7E6821CB1B9; Fri, 20 Dec 2019 03:40:51 +0000 (UTC) (envelope-from philip@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 47fDzl2p5bz4Qcd; Fri, 20 Dec 2019 03:40:51 +0000 (UTC) (envelope-from philip@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 5A27820CFA; Fri, 20 Dec 2019 03:40:51 +0000 (UTC) (envelope-from philip@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id xBK3epwQ063598; Fri, 20 Dec 2019 03:40:51 GMT (envelope-from philip@FreeBSD.org) Received: (from philip@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id xBK3epN5063596; Fri, 20 Dec 2019 03:40:51 GMT (envelope-from philip@FreeBSD.org) Message-Id: <201912200340.xBK3epN5063596@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: philip set sender to philip@FreeBSD.org using -f From: Philip Paeps Date: Fri, 20 Dec 2019 03:40:51 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r355924 - in head/sys: conf dev/iicbus X-SVN-Group: head X-SVN-Commit-Author: philip X-SVN-Commit-Paths: in head/sys: conf dev/iicbus X-SVN-Commit-Revision: 355924 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 20 Dec 2019 03:40:51 -0000 Author: philip Date: Fri Dec 20 03:40:50 2019 New Revision: 355924 URL: https://svnweb.freebsd.org/changeset/base/355924 Log: iicoc: add FDT bus attachment This adds support for OpenCores I2C master controllers on FDT systems. Reviewed by: kp Sponsored by: Axiado Added: head/sys/dev/iicbus/iicoc_fdt.c (contents, props changed) Modified: head/sys/conf/files Modified: head/sys/conf/files ============================================================================== --- head/sys/conf/files Fri Dec 20 03:40:46 2019 (r355923) +++ head/sys/conf/files Fri Dec 20 03:40:50 2019 (r355924) @@ -1797,6 +1797,7 @@ dev/iicbus/iiconf.c optional iicbus dev/iicbus/iicsmb.c optional iicsmb \ dependency "iicbus_if.h" dev/iicbus/iicoc.c optional iicoc +dev/iicbus/iicoc_fdt.c optional iicoc fdt dev/iicbus/iicoc_pci.c optional iicoc pci dev/iicbus/isl12xx.c optional isl12xx dev/iicbus/lm75.c optional lm75 Added: head/sys/dev/iicbus/iicoc_fdt.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sys/dev/iicbus/iicoc_fdt.c Fri Dec 20 03:40:50 2019 (r355924) @@ -0,0 +1,188 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * + * Copyright (c) 2019 Axiado Corporation. + * All rights reserved. + * + * This software was developed in part by Philip Paeps under contract for + * Axiado Corporation. + * + * 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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 +__FBSDID("$FreeBSD$"); + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include + +#include +#include + +#include +#include + +#include "iicbus_if.h" +#include "iicoc.h" + +static struct ofw_compat_data compat_data[] = { + { "opencores,i2c-ocores", 1 }, + { NULL, 0 } +}; + +static struct resource_spec iicoc_spec[] = { + { SYS_RES_MEMORY, 0, RF_ACTIVE }, + RESOURCE_SPEC_END +}; + +static phandle_t +iicoc_get_node(device_t bus, device_t dev) +{ + + /* Share controller node with iicbus device. */ + return (ofw_bus_get_node(bus)); +} + +static int +iicoc_attach(device_t dev) +{ + struct iicoc_softc *sc; + phandle_t node; + clk_t clock; + uint64_t clockfreq; + int error; + + sc = device_get_softc(dev); + sc->dev = dev; + + mtx_init(&sc->sc_mtx, "iicoc", "iicoc", MTX_DEF); + + error = bus_alloc_resources(dev, iicoc_spec, &sc->mem_res); + if (error) { + device_printf(dev, "Could not allocate bus resource.\n"); + goto fail; + } + + node = ofw_bus_get_node(dev); + sc->reg_shift = 0; + OF_getencprop(node, "reg-shift", &sc->reg_shift, + sizeof(sc->reg_shift)); + + error = clk_get_by_ofw_index(dev, 0, 0, &clock); + if (error) { + device_printf(dev, "Couldn't get clock\n"); + goto fail; + } + error = clk_enable(clock); + if (error) { + device_printf(dev, "Couldn't enable clock\n"); + goto fail1; + } + error = clk_get_freq(clock, &clockfreq); + if (error) { + device_printf(dev, "Couldn't get clock frequency\n"); + goto fail1; + } + if (clockfreq > UINT_MAX) { + device_printf(dev, "Unsupported clock frequency\n"); + goto fail1; + } + sc->clockfreq = (u_int)clockfreq; + sc->i2cfreq = XLP_I2C_FREQ; + iicoc_init(dev); + + sc->iicbus = device_add_child(dev, "iicbus", -1); + if (sc->iicbus == NULL) { + device_printf(dev, "Could not allocate iicbus instance.\n"); + error = ENXIO; + goto fail1; + } + + /* Probe and attach the iicbus when interrupts are available. */ + config_intrhook_oneshot((ich_func_t)bus_generic_attach, dev); + + return (0); + +fail1: + clk_disable(clock); + +fail: + bus_release_resources(dev, iicoc_spec, &sc->mem_res); + mtx_destroy(&sc->sc_mtx); + return (error); +} + +static int +iicoc_probe(device_t dev) +{ + + if (!ofw_bus_status_okay(dev)) + return (ENXIO); + + if (ofw_bus_search_compatible(dev, compat_data)->ocd_data == 0) + return (ENXIO); + + device_set_desc(dev, "OpenCores I2C master controller"); + + return (BUS_PROBE_DEFAULT); +} + +static device_method_t iicoc_methods[] = { + /* device interface */ + DEVMETHOD(device_probe, iicoc_probe), + DEVMETHOD(device_attach, iicoc_attach), + + /* ofw interface */ + DEVMETHOD(ofw_bus_get_node, iicoc_get_node), + + /* iicbus interface */ + DEVMETHOD(iicbus_callback, iicbus_null_callback), + DEVMETHOD(iicbus_repeated_start, iicoc_iicbus_repeated_start), + DEVMETHOD(iicbus_start, iicoc_iicbus_start), + DEVMETHOD(iicbus_stop, iicoc_iicbus_stop), + DEVMETHOD(iicbus_reset, iicoc_iicbus_reset), + DEVMETHOD(iicbus_write, iicoc_iicbus_write), + DEVMETHOD(iicbus_read, iicoc_iicbus_read), + DEVMETHOD(iicbus_transfer, iicbus_transfer_gen), + + DEVMETHOD_END +}; + +static driver_t iicoc_driver = { + "iicoc", + iicoc_methods, + sizeof(struct iicoc_softc), +}; + +DRIVER_MODULE(iicoc, simplebus, iicoc_driver, iicoc_devclass, 0, 0); +DRIVER_MODULE(ofw_iicbus, iicoc, ofw_iicbus_driver, ofw_iicbus_devclass, 0, 0); +MODULE_DEPEND(iicoc, iicbus, 1, 1, 1); +MODULE_DEPEND(iicoc, ofw_iicbus, 1, 1, 1);