Deleted Added
full compact
uart_bus_at91usart.c (185265) uart_bus_at91usart.c (187602)
1/*-
2 * Copyright (c) 2005 Olivier Houchard. All rights reserved.
3 *
4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions
6 * are met:
7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer.

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

21 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
22 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
23 * SUCH DAMAGE.
24 */
25
26#include "opt_uart.h"
27
28#include <sys/cdefs.h>
1/*-
2 * Copyright (c) 2005 Olivier Houchard. All rights reserved.
3 *
4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions
6 * are met:
7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer.

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

21 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
22 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
23 * SUCH DAMAGE.
24 */
25
26#include "opt_uart.h"
27
28#include <sys/cdefs.h>
29__FBSDID("$FreeBSD: head/sys/arm/at91/uart_bus_at91usart.c 185265 2008-11-25 00:13:26Z imp $");
29__FBSDID("$FreeBSD: head/sys/arm/at91/uart_bus_at91usart.c 187602 2009-01-22 21:56:41Z imp $");
30
31#include <sys/param.h>
32#include <sys/systm.h>
33#include <sys/bus.h>
34#include <sys/conf.h>
35#include <sys/kernel.h>
36#include <sys/module.h>
37#include <machine/bus.h>
38#include <sys/rman.h>
39#include <machine/resource.h>
40
30
31#include <sys/param.h>
32#include <sys/systm.h>
33#include <sys/bus.h>
34#include <sys/conf.h>
35#include <sys/kernel.h>
36#include <sys/module.h>
37#include <machine/bus.h>
38#include <sys/rman.h>
39#include <machine/resource.h>
40
41#include <dev/pci/pcivar.h>
42
43#include <dev/uart/uart.h>
44#include <dev/uart/uart_bus.h>
45#include <dev/uart/uart_cpu.h>
46
47#include <arm/at91/at91rm92reg.h>
41#include <dev/uart/uart.h>
42#include <dev/uart/uart_bus.h>
43#include <dev/uart/uart_cpu.h>
44
45#include <arm/at91/at91rm92reg.h>
46#include <arm/at91/at91var.h>
48
49#include "uart_if.h"
50
51static int usart_at91rm92_probe(device_t dev);
52
53extern struct uart_class at91_usart_class;
54
55static device_method_t usart_at91rm92_methods[] = {

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

98 case 3:
99 device_set_desc(dev, "USART2");
100 break;
101 case 4:
102 device_set_desc(dev, "USART3");
103 break;
104 }
105 sc->sc_class = &at91_usart_class;
47
48#include "uart_if.h"
49
50static int usart_at91rm92_probe(device_t dev);
51
52extern struct uart_class at91_usart_class;
53
54static device_method_t usart_at91rm92_methods[] = {

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

97 case 3:
98 device_set_desc(dev, "USART2");
99 break;
100 case 4:
101 device_set_desc(dev, "USART3");
102 break;
103 }
104 sc->sc_class = &at91_usart_class;
105 if (sc->sc_class->uc_rclk == 0)
106 sc->sc_class->uc_rclk = at91_master_clock;
106 return (uart_bus_probe(dev, 0, 0, 0, device_get_unit(dev)));
107}
108
109
110DRIVER_MODULE(uart, atmelarm, usart_at91rm92_driver, uart_devclass, 0, 0);
107 return (uart_bus_probe(dev, 0, 0, 0, device_get_unit(dev)));
108}
109
110
111DRIVER_MODULE(uart, atmelarm, usart_at91rm92_driver, uart_devclass, 0, 0);