Deleted Added
full compact
zy7_machdep.c (295509) zy7_machdep.c (298068)
1/*-
2 * Copyright (c) 2013 Thomas Skibo
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 * 1. Redistributions of source code must retain the above copyright

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

18 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
19 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
20 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
21 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
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 *
1/*-
2 * Copyright (c) 2013 Thomas Skibo
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 * 1. Redistributions of source code must retain the above copyright

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

18 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
19 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
20 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
21 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
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 * $FreeBSD: head/sys/arm/xilinx/zy7_machdep.c 295509 2016-02-11 11:49:27Z andrew $
26 * $FreeBSD: head/sys/arm/xilinx/zy7_machdep.c 298068 2016-04-15 16:05:41Z andrew $
27 */
28
29/*
30 * Machine dependent code for Xilinx Zynq-7000 Soc.
31 *
32 * Reference: Zynq-7000 All Programmable SoC Technical Reference Manual.
33 * (v1.4) November 16, 2012. Xilinx doc UG585.
34 */
35
36#include <sys/cdefs.h>
27 */
28
29/*
30 * Machine dependent code for Xilinx Zynq-7000 Soc.
31 *
32 * Reference: Zynq-7000 All Programmable SoC Technical Reference Manual.
33 * (v1.4) November 16, 2012. Xilinx doc UG585.
34 */
35
36#include <sys/cdefs.h>
37__FBSDID("$FreeBSD: head/sys/arm/xilinx/zy7_machdep.c 295509 2016-02-11 11:49:27Z andrew $");
37__FBSDID("$FreeBSD: head/sys/arm/xilinx/zy7_machdep.c 298068 2016-04-15 16:05:41Z andrew $");
38
39#define _ARM32_BUS_DMA_PRIVATE
40#include <sys/param.h>
41#include <sys/systm.h>
42#include <sys/bus.h>
43
44#include <vm/vm.h>
45#include <vm/pmap.h>

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

93 return (0);
94}
95
96
97struct fdt_fixup_entry fdt_fixup_table[] = {
98 { NULL, NULL }
99};
100
38
39#define _ARM32_BUS_DMA_PRIVATE
40#include <sys/param.h>
41#include <sys/systm.h>
42#include <sys/bus.h>
43
44#include <vm/vm.h>
45#include <vm/pmap.h>

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

93 return (0);
94}
95
96
97struct fdt_fixup_entry fdt_fixup_table[] = {
98 { NULL, NULL }
99};
100
101#ifndef ARM_INTRNG
101#ifndef INTRNG
102static int
103fdt_gic_decode_ic(phandle_t node, pcell_t *intr, int *interrupt, int *trig,
104 int *pol)
105{
106
107 if (!fdt_is_compatible(node, "arm,gic"))
108 return (ENXIO);
109

--- 37 unchanged lines hidden ---
102static int
103fdt_gic_decode_ic(phandle_t node, pcell_t *intr, int *interrupt, int *trig,
104 int *pol)
105{
106
107 if (!fdt_is_compatible(node, "arm,gic"))
108 return (ENXIO);
109

--- 37 unchanged lines hidden ---