Deleted Added
full compact
at91.c (266277) at91.c (278613)
1/*-
2 * Copyright (c) 2005 Olivier Houchard. All rights reserved.
3 * Copyright (c) 2010 Greg Ansley. 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 * 1. Redistributions of source code must retain the above copyright

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

22 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
23 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
24 * SUCH DAMAGE.
25 */
26
27#include "opt_platform.h"
28
29#include <sys/cdefs.h>
1/*-
2 * Copyright (c) 2005 Olivier Houchard. All rights reserved.
3 * Copyright (c) 2010 Greg Ansley. 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 * 1. Redistributions of source code must retain the above copyright

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

22 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
23 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
24 * SUCH DAMAGE.
25 */
26
27#include "opt_platform.h"
28
29#include <sys/cdefs.h>
30__FBSDID("$FreeBSD: stable/10/sys/arm/at91/at91.c 266277 2014-05-17 00:53:12Z ian $");
30__FBSDID("$FreeBSD: stable/10/sys/arm/at91/at91.c 278613 2015-02-12 03:50:33Z ian $");
31
32#include <sys/param.h>
33#include <sys/systm.h>
34#include <sys/bus.h>
35#include <sys/kernel.h>
36#include <sys/malloc.h>
37#include <sys/module.h>
38
39#include <vm/vm.h>
40#include <vm/vm_kern.h>
41#include <vm/pmap.h>
42#include <vm/vm_page.h>
43#include <vm/vm_extern.h>
44
31
32#include <sys/param.h>
33#include <sys/systm.h>
34#include <sys/bus.h>
35#include <sys/kernel.h>
36#include <sys/malloc.h>
37#include <sys/module.h>
38
39#include <vm/vm.h>
40#include <vm/vm_kern.h>
41#include <vm/pmap.h>
42#include <vm/vm_page.h>
43#include <vm/vm_extern.h>
44
45#include <machine/armreg.h>
45#define _ARM32_BUS_DMA_PRIVATE
46#include <machine/bus.h>
47#include <machine/devmap.h>
48#include <machine/intr.h>
49
50#include <arm/at91/at91var.h>
51#include <arm/at91/at91_pmcvar.h>
52#include <arm/at91/at91_aicreg.h>

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

298 /*
299 * Add this device's children...
300 */
301 at91_cpu_add_builtin_children(dev, soc_info.soc_data->soc_children);
302 soc_info.soc_data->soc_clock_init();
303
304 bus_generic_probe(dev);
305 bus_generic_attach(dev);
46#define _ARM32_BUS_DMA_PRIVATE
47#include <machine/bus.h>
48#include <machine/devmap.h>
49#include <machine/intr.h>
50
51#include <arm/at91/at91var.h>
52#include <arm/at91/at91_pmcvar.h>
53#include <arm/at91/at91_aicreg.h>

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

299 /*
300 * Add this device's children...
301 */
302 at91_cpu_add_builtin_children(dev, soc_info.soc_data->soc_children);
303 soc_info.soc_data->soc_clock_init();
304
305 bus_generic_probe(dev);
306 bus_generic_attach(dev);
306 enable_interrupts(I32_bit | F32_bit);
307 enable_interrupts(PSR_I | PSR_F);
307 return (0);
308}
309
310static struct resource *
311at91_alloc_resource(device_t dev, device_t child, int type, int *rid,
312 u_long start, u_long end, u_long count, u_int flags)
313{
314 struct at91_softc *sc = device_get_softc(dev);

--- 219 unchanged lines hidden ---
308 return (0);
309}
310
311static struct resource *
312at91_alloc_resource(device_t dev, device_t child, int type, int *rid,
313 u_long start, u_long end, u_long count, u_int flags)
314{
315 struct at91_softc *sc = device_get_softc(dev);

--- 219 unchanged lines hidden ---