From owner-svn-src-user@FreeBSD.ORG Mon Feb 27 13:04:10 2012 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 13114106564A; Mon, 27 Feb 2012 13:04:10 +0000 (UTC) (envelope-from jchandra@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 01AE98FC17; Mon, 27 Feb 2012 13:04:10 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q1RD49aT018625; Mon, 27 Feb 2012 13:04:09 GMT (envelope-from jchandra@svn.freebsd.org) Received: (from jchandra@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q1RD499o018623; Mon, 27 Feb 2012 13:04:09 GMT (envelope-from jchandra@svn.freebsd.org) Message-Id: <201202271304.q1RD499o018623@svn.freebsd.org> From: "Jayachandran C." Date: Mon, 27 Feb 2012 13:04:09 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r232208 - in user/jchandra/xlp-merge/sys/mips/nlm: . dev X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 27 Feb 2012 13:04:10 -0000 Author: jchandra Date: Mon Feb 27 13:04:09 2012 New Revision: 232208 URL: http://svn.freebsd.org/changeset/base/232208 Log: Move UART device to dev/ directory. Other drivers for the XLP SoC devices will be added here as well Added: user/jchandra/xlp-merge/sys/mips/nlm/dev/uart_pci_xlp.c - copied unchanged from r231964, user/jchandra/xlp-merge/sys/mips/nlm/uart_pci_xlp.c Deleted: user/jchandra/xlp-merge/sys/mips/nlm/uart_pci_xlp.c Modified: user/jchandra/xlp-merge/sys/mips/nlm/files.xlp Copied: user/jchandra/xlp-merge/sys/mips/nlm/dev/uart_pci_xlp.c (from r231964, user/jchandra/xlp-merge/sys/mips/nlm/uart_pci_xlp.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/jchandra/xlp-merge/sys/mips/nlm/dev/uart_pci_xlp.c Mon Feb 27 13:04:09 2012 (r232208, copy of r231964, user/jchandra/xlp-merge/sys/mips/nlm/uart_pci_xlp.c) @@ -0,0 +1,83 @@ +/*- + * Copyright (c) 2011 Netlogic Microsystems Inc. + * + * (based on dev/uart/uart_bus_pci.c) + * Copyright (c) 2006 Marcel Moolenaar + * Copyright (c) 2001 M. Warner Losh + * 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 +__FBSDID("$FreeBSD$"); + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include + +#include +#include +#include + +#include +#include + +static int uart_soc_probe(device_t dev); + +static device_method_t uart_soc_methods[] = { + /* Device interface */ + DEVMETHOD(device_probe, uart_soc_probe), + DEVMETHOD(device_attach, uart_bus_attach), + DEVMETHOD(device_detach, uart_bus_detach), + { 0, 0 } +}; + +static driver_t uart_soc_driver = { + uart_driver_name, + uart_soc_methods, + sizeof(struct uart_softc), +}; + +static int +uart_soc_probe(device_t dev) +{ + struct uart_softc *sc; + + if (pci_get_vendor(dev) != PCI_VENDOR_NETLOGIC || + pci_get_device(dev) != PCI_DEVICE_ID_NLM_UART) + return (ENXIO); + + sc = device_get_softc(dev); + sc->sc_class = &uart_ns8250_class; + device_set_desc(dev, "Netlogic SoC UART"); + return (uart_bus_probe(dev, 2, 133000000, 0, 0)); +} + +DRIVER_MODULE(uart_soc, pci, uart_soc_driver, uart_devclass, 0, 0); Modified: user/jchandra/xlp-merge/sys/mips/nlm/files.xlp ============================================================================== --- user/jchandra/xlp-merge/sys/mips/nlm/files.xlp Mon Feb 27 10:31:54 2012 (r232207) +++ user/jchandra/xlp-merge/sys/mips/nlm/files.xlp Mon Feb 27 13:04:09 2012 (r232208) @@ -13,12 +13,13 @@ mips/nlm/board_eeprom.c standard mips/nlm/board_cpld.c standard mips/nlm/xlp_pci.c optional pci mips/nlm/intern_dev.c optional pci -mips/nlm/uart_pci_xlp.c optional uart mips/nlm/uart_cpu_xlp.c optional uart mips/nlm/usb_init.c optional usb # -# Network driver and micro-core code +# Simple SoC devices +mips/nlm/dev/uart_pci_xlp.c optional uart # +# Network driver and micro-core code mips/nlm/dev/net/nae.c optional xlpge mips/nlm/dev/net/mdio.c optional xlpge mips/nlm/dev/net/sgmii.c optional xlpge