Deleted Added
full compact
uart_cpu_ixp425.c (168281) uart_cpu_ixp425.c (170109)
1/*-
2 * Copyright (c) 2003 Marcel Moolenaar
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 *

--- 11 unchanged lines hidden (view full) ---

20 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
21 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
22 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
23 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
24 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
25 */
26
27#include <sys/cdefs.h>
1/*-
2 * Copyright (c) 2003 Marcel Moolenaar
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 *

--- 11 unchanged lines hidden (view full) ---

20 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
21 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
22 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
23 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
24 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
25 */
26
27#include <sys/cdefs.h>
28__FBSDID("$FreeBSD: head/sys/arm/xscale/ixp425/uart_cpu_ixp425.c 168281 2007-04-02 22:00:22Z marcel $");
28__FBSDID("$FreeBSD: head/sys/arm/xscale/ixp425/uart_cpu_ixp425.c 170109 2007-05-29 18:10:42Z jhay $");
29
30#include <sys/param.h>
31#include <sys/systm.h>
32#include <sys/bus.h>
33#include <sys/cons.h>
34#include <machine/bus.h>
35
36#include <dev/uart/uart.h>

--- 9 unchanged lines hidden (view full) ---

46uart_cpu_eqres(struct uart_bas *b1, struct uart_bas *b2)
47{
48 return ((b1->bsh == b2->bsh && b1->bst == b2->bst) ? 1 : 0);
49}
50
51int
52uart_cpu_getdev(int devtype, struct uart_devinfo *di)
53{
29
30#include <sys/param.h>
31#include <sys/systm.h>
32#include <sys/bus.h>
33#include <sys/cons.h>
34#include <machine/bus.h>
35
36#include <dev/uart/uart.h>

--- 9 unchanged lines hidden (view full) ---

46uart_cpu_eqres(struct uart_bas *b1, struct uart_bas *b2)
47{
48 return ((b1->bsh == b2->bsh && b1->bst == b2->bst) ? 1 : 0);
49}
50
51int
52uart_cpu_getdev(int devtype, struct uart_devinfo *di)
53{
54 di->ops = uart_getops(&uart_ns8250_class);
55 di->bas.chan = 0;
56 di->bas.bst = &ixp425_a4x_bs_tag;
57 di->bas.regshft = 0;
58 di->bas.rclk = IXP425_UART_FREQ;
59 di->baudrate = 115200;
60 di->databits = 8;
61 di->stopbits = 1;
62 di->parity = UART_PARITY_NONE;
63 uart_bus_space_io = &ixp425_a4x_bs_tag;
64 uart_bus_space_mem = NULL;
65 di->bas.bsh = IXP425_UART0_VBASE;
66 return (0);
54 uint32_t i, ivar, vaddr;
55
56 /*
57 * Scan the hints. The IXP425 only have 2 serial ports, so only
58 * scan them.
59 */
60 for (i = 0; i < 2; i++) {
61 if (resource_int_value("uart", i, "flags", &ivar))
62 continue;
63 if (devtype == UART_DEV_CONSOLE && !UART_FLAGS_CONSOLE(ivar))
64 continue;
65 if (devtype == UART_DEV_DBGPORT && !UART_FLAGS_DBGPORT(ivar))
66 continue;
67 /*
68 * We have a possible device. Make sure it's enabled and
69 * that we have an I/O port.
70 */
71 if (resource_int_value("uart", i, "disabled", &ivar) == 0 &&
72 ivar != 0)
73 continue;
74 if (resource_int_value("uart", i, "addr", &ivar) != 0 ||
75 ivar == 0)
76 continue;
77 /* Got it. Fill in the instance and return it. */
78 di->ops = uart_getops(&uart_ns8250_class);
79 di->bas.chan = 0;
80 di->bas.bst = &ixp425_a4x_bs_tag;
81 di->bas.regshft = 0;
82 di->bas.rclk = IXP425_UART_FREQ;
83 di->baudrate = 115200;
84 di->databits = 8;
85 di->stopbits = 1;
86 di->parity = UART_PARITY_NONE;
87 uart_bus_space_io = NULL;
88 uart_bus_space_mem = &ixp425_a4x_bs_tag;
89
90 getvbase(ivar, IXP425_REG_SIZE, &vaddr);
91 di->bas.bsh = vaddr;
92 return (0);
93 }
94
95 return (ENXIO);
67}
96}