From owner-svn-src-head@FreeBSD.ORG Tue Mar 27 14:48:41 2012 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0B1C2106564A; Tue, 27 Mar 2012 14:48:41 +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 E8E248FC08; Tue, 27 Mar 2012 14:48:40 +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 q2REmeFl090397; Tue, 27 Mar 2012 14:48:40 GMT (envelope-from jchandra@svn.freebsd.org) Received: (from jchandra@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q2REmeeY090392; Tue, 27 Mar 2012 14:48:40 GMT (envelope-from jchandra@svn.freebsd.org) Message-Id: <201203271448.q2REmeeY090392@svn.freebsd.org> From: "Jayachandran C." Date: Tue, 27 Mar 2012 14:48:40 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r233549 - in head/sys/mips/nlm: . dev X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 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: Tue, 27 Mar 2012 14:48:41 -0000 Author: jchandra Date: Tue Mar 27 14:48:40 2012 New Revision: 233549 URL: http://svn.freebsd.org/changeset/base/233549 Log: XLP UART code udpate. Move XLP PCI UART device to sys/mips/nlm/dev/ directory. Other drivers for the XLP SoC devices will be added here as well. Update uart_cpu_xlp.c and uart_pci_xlp.c use macros for uart port, speed and IO frequency. Added: head/sys/mips/nlm/dev/uart_pci_xlp.c - copied, changed from r233508, head/sys/mips/nlm/uart_pci_xlp.c Deleted: head/sys/mips/nlm/uart_pci_xlp.c Modified: head/sys/mips/nlm/board.h head/sys/mips/nlm/files.xlp head/sys/mips/nlm/uart_cpu_xlp.c Modified: head/sys/mips/nlm/board.h ============================================================================== --- head/sys/mips/nlm/board.h Tue Mar 27 14:24:46 2012 (r233548) +++ head/sys/mips/nlm/board.h Tue Mar 27 14:48:40 2012 (r233549) @@ -43,6 +43,10 @@ #define EEPROM_SIZE 48 #define EEPROM_MACADDR_OFFSET 2 +/* used if there is no FDT */ +#define BOARD_CONSOLE_SPEED 115200 +#define BOARD_CONSOLE_UART 0 + /* * EVP board CPLD chip select and daughter card info field */ Copied and modified: head/sys/mips/nlm/dev/uart_pci_xlp.c (from r233508, head/sys/mips/nlm/uart_pci_xlp.c) ============================================================================== --- head/sys/mips/nlm/uart_pci_xlp.c Mon Mar 26 13:02:31 2012 (r233508, copy source) +++ head/sys/mips/nlm/dev/uart_pci_xlp.c Tue Mar 27 14:48:40 2012 (r233549) @@ -1,30 +1,29 @@ /*- - * 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. + * Copyright (c) 2003-2012 Broadcom Corporation + * 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. + * 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 BROADCOM ``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 BROADCOM 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 @@ -56,7 +55,8 @@ static device_method_t uart_soc_methods[ DEVMETHOD(device_probe, uart_soc_probe), DEVMETHOD(device_attach, uart_bus_attach), DEVMETHOD(device_detach, uart_bus_detach), - { 0, 0 } + + DEVMETHOD_END }; static driver_t uart_soc_driver = { @@ -77,7 +77,7 @@ uart_soc_probe(device_t dev) 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)); + return (uart_bus_probe(dev, 2, XLP_IO_CLK, 0, 0)); } DRIVER_MODULE(uart_soc, pci, uart_soc_driver, uart_devclass, 0, 0); Modified: head/sys/mips/nlm/files.xlp ============================================================================== --- head/sys/mips/nlm/files.xlp Tue Mar 27 14:24:46 2012 (r233548) +++ head/sys/mips/nlm/files.xlp Tue Mar 27 14:48:40 2012 (r233549) @@ -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 Modified: head/sys/mips/nlm/uart_cpu_xlp.c ============================================================================== --- head/sys/mips/nlm/uart_cpu_xlp.c Tue Mar 27 14:24:46 2012 (r233548) +++ head/sys/mips/nlm/uart_cpu_xlp.c Tue Mar 27 14:48:40 2012 (r233549) @@ -58,15 +58,18 @@ __FBSDID("$FreeBSD$"); #include #include +#include #include +#include + bus_space_tag_t uart_bus_space_io; bus_space_tag_t uart_bus_space_mem; int uart_cpu_eqres(struct uart_bas *b1, struct uart_bas *b2) { - return ((b1->bsh == b2->bsh && b1->bst == b2->bst) ? 1 : 0); + return (b1->bsh == b2->bsh && b1->bst == b2->bst); } int @@ -75,12 +78,12 @@ uart_cpu_getdev(int devtype, struct uart di->ops = uart_getops(&uart_ns8250_class); di->bas.chan = 0; di->bas.bst = rmi_uart_bus_space; - di->bas.bsh = nlm_get_uart_regbase(0, 0); + di->bas.bsh = nlm_get_uart_regbase(0, BOARD_CONSOLE_UART); di->bas.regshft = 2; /* divisor = rclk / (baudrate * 16); */ - di->bas.rclk = 133000000; - di->baudrate = 115200; + di->bas.rclk = XLP_IO_CLK; + di->baudrate = BOARD_CONSOLE_SPEED; di->databits = 8; di->stopbits = 1; di->parity = UART_PARITY_NONE;