From owner-svn-src-head@freebsd.org Thu Dec 3 09:37:22 2015 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 4F087A3CE84; Thu, 3 Dec 2015 09:37:22 +0000 (UTC) (envelope-from ganbold@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 mx1.freebsd.org (Postfix) with ESMTPS id 075F1196D; Thu, 3 Dec 2015 09:37:21 +0000 (UTC) (envelope-from ganbold@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tB39bLFk038117; Thu, 3 Dec 2015 09:37:21 GMT (envelope-from ganbold@FreeBSD.org) Received: (from ganbold@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tB39bK7p038114; Thu, 3 Dec 2015 09:37:20 GMT (envelope-from ganbold@FreeBSD.org) Message-Id: <201512030937.tB39bK7p038114@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ganbold set sender to ganbold@FreeBSD.org using -f From: Ganbold Tsagaankhuu Date: Thu, 3 Dec 2015 09:37:20 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r291683 - in head/sys: arm/amlogic/aml8726 boot/fdt/dts/arm X-SVN-Group: head 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.20 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: Thu, 03 Dec 2015 09:37:22 -0000 Author: ganbold Date: Thu Dec 3 09:37:20 2015 New Revision: 291683 URL: https://svnweb.freebsd.org/changeset/base/291683 Log: Add glue driver for Amlogic Meson Gigabit Ethernet Controller and enable it for Odroid C1 board. Together with r291676 change, dwc(4) can receive packets now. Added: head/sys/arm/amlogic/aml8726/aml8726_if_dwc.c (contents, props changed) Modified: head/sys/arm/amlogic/aml8726/files.aml8726 head/sys/boot/fdt/dts/arm/odroidc1.dts Added: head/sys/arm/amlogic/aml8726/aml8726_if_dwc.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sys/arm/amlogic/aml8726/aml8726_if_dwc.c Thu Dec 3 09:37:20 2015 (r291683) @@ -0,0 +1,98 @@ +/*- + * Copyright (c) 2015 Ganbold Tsagaankhuu + * 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 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 AUTHOR 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 "if_dwc_if.h" + +static int +aml8726_if_dwc_probe(device_t dev) +{ + + if (!ofw_bus_status_okay(dev)) + return (ENXIO); + if (!ofw_bus_is_compatible(dev, "amlogic,meson6-dwmac")) + return (ENXIO); + device_set_desc(dev, "Amlogic Meson Gigabit Ethernet Controller"); + + return (BUS_PROBE_DEFAULT); +} + +static int +aml8726_if_dwc_init(device_t dev) +{ + + return (0); +} + +static int +aml8726_if_dwc_mac_type(device_t dev) +{ + + return (DWC_GMAC_ALT_DESC); +} + +static int +aml8726_if_dwc_mii_clk(device_t dev) +{ + + return (GMAC_MII_CLK_100_150M_DIV62); +} + +static device_method_t aml8726_dwc_methods[] = { + DEVMETHOD(device_probe, aml8726_if_dwc_probe), + + DEVMETHOD(if_dwc_init, aml8726_if_dwc_init), + DEVMETHOD(if_dwc_mac_type, aml8726_if_dwc_mac_type), + DEVMETHOD(if_dwc_mii_clk, aml8726_if_dwc_mii_clk), + + DEVMETHOD_END +}; + +static devclass_t aml8726_dwc_devclass; + +extern driver_t dwc_driver; + +DEFINE_CLASS_1(dwc, aml8726_dwc_driver, aml8726_dwc_methods, + sizeof(struct dwc_softc), dwc_driver); +DRIVER_MODULE(aml8726_dwc, simplebus, aml8726_dwc_driver, + aml8726_dwc_devclass, 0, 0); + +MODULE_DEPEND(aml8726_dwc, dwc, 1, 1, 1); Modified: head/sys/arm/amlogic/aml8726/files.aml8726 ============================================================================== --- head/sys/arm/amlogic/aml8726/files.aml8726 Thu Dec 3 08:06:10 2015 (r291682) +++ head/sys/arm/amlogic/aml8726/files.aml8726 Thu Dec 3 09:37:20 2015 (r291683) @@ -28,3 +28,4 @@ arm/amlogic/aml8726/aml8726_pinctrl.c o arm/amlogic/aml8726/uart_dev_aml8726.c optional uart arm/amlogic/aml8726/aml8726_usb_phy-m3.c optional dwcotg usb gpio arm/amlogic/aml8726/aml8726_usb_phy-m6.c optional dwcotg usb gpio +arm/amlogic/aml8726/aml8726_if_dwc.c optional dwc Modified: head/sys/boot/fdt/dts/arm/odroidc1.dts ============================================================================== --- head/sys/boot/fdt/dts/arm/odroidc1.dts Thu Dec 3 08:06:10 2015 (r291682) +++ head/sys/boot/fdt/dts/arm/odroidc1.dts Thu Dec 3 09:37:20 2015 (r291683) @@ -323,7 +323,7 @@ eth@c9410000 { /* ethernet */ - compatible = "snps,dwmac"; + compatible = "amlogic,meson6-dwmac"; reg = <0xc9410000 0x2000>; /* ahbbus 0x410000 */ interrupts = <0 8 1>; #address-cells = <1>;