Date: Wed, 6 May 2009 02:46:04 +0000 (UTC) From: Oleksandr Tymoshenko <gonzo@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r191840 - in projects/mips/sys/mips: atheros conf Message-ID: <200905060246.n462k4aZ001738@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: gonzo Date: Wed May 6 02:46:04 2009 New Revision: 191840 URL: http://svn.freebsd.org/changeset/base/191840 Log: - Rollback to the hack with 3-bytes offset in base address. uart_bus_XXXXX resources are handled in uart(4) code and we need more sophysticated way to define which space should be used for device based on hints Modified: projects/mips/sys/mips/atheros/uart_bus_ar71xx.c projects/mips/sys/mips/conf/AR71XX.hints Modified: projects/mips/sys/mips/atheros/uart_bus_ar71xx.c ============================================================================== --- projects/mips/sys/mips/atheros/uart_bus_ar71xx.c Wed May 6 02:34:35 2009 (r191839) +++ projects/mips/sys/mips/atheros/uart_bus_ar71xx.c Wed May 6 02:46:04 2009 (r191840) @@ -72,6 +72,12 @@ uart_ar71xx_probe(device_t dev) sc->sc_sysdev = SLIST_FIRST(&uart_sysdevs); sc->sc_class = &uart_ns8250_class; bcopy(&sc->sc_sysdev->bas, &sc->sc_bas, sizeof(sc->sc_bas)); + sc->sc_sysdev->bas.regshft = 2; + sc->sc_sysdev->bas.bst = mips_bus_space_generic; + sc->sc_sysdev->bas.bsh = MIPS_PHYS_TO_KSEG1(AR71XX_UART_ADDR) + 3; + sc->sc_bas.regshft = 2; + sc->sc_bas.bst = mips_bus_space_generic; + sc->sc_bas.bsh = MIPS_PHYS_TO_KSEG1(AR71XX_UART_ADDR) + 3; return (uart_bus_probe(dev, 2, 85000000, 0, 0)); } Modified: projects/mips/sys/mips/conf/AR71XX.hints ============================================================================== --- projects/mips/sys/mips/conf/AR71XX.hints Wed May 6 02:34:35 2009 (r191839) +++ projects/mips/sys/mips/conf/AR71XX.hints Wed May 6 02:46:04 2009 (r191840) @@ -1,13 +1,11 @@ # $FreeBSD$ hint.apb.0.at="nexus0" -hint.apb.0.maddr=0x18000000 -hint.apb.0.msize=0x06000000 hint.apb.0.irq=4 # uart0 hint.uart.0.at="apb0" # see atheros/uart_cpu_ar71xx.c why +3 -hint.uart.0.maddr=0x18020000 +hint.uart.0.maddr=0x18020003 hint.uart.0.msize=0x18 hint.uart.0.irq=3
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200905060246.n462k4aZ001738>