Deleted Added
full compact
aml8726_machdep.c (295509) aml8726_machdep.c (298068)
1/*-
2 * Copyright 2013-2015 John Wehle <john@feith.com>
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

--- 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_global.h"
28
29#include <sys/cdefs.h>
1/*-
2 * Copyright 2013-2015 John Wehle <john@feith.com>
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

--- 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_global.h"
28
29#include <sys/cdefs.h>
30__FBSDID("$FreeBSD: head/sys/arm/amlogic/aml8726/aml8726_machdep.c 295509 2016-02-11 11:49:27Z andrew $");
30__FBSDID("$FreeBSD: head/sys/arm/amlogic/aml8726/aml8726_machdep.c 298068 2016-04-15 16:05:41Z andrew $");
31
32#include "opt_platform.h"
33
34#define _ARM32_BUS_DMA_PRIVATE
35#include <sys/param.h>
36#include <sys/systm.h>
37#include <sys/bus.h>
38

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

179
180 return (0);
181}
182
183struct fdt_fixup_entry fdt_fixup_table[] = {
184 { NULL, NULL }
185};
186
31
32#include "opt_platform.h"
33
34#define _ARM32_BUS_DMA_PRIVATE
35#include <sys/param.h>
36#include <sys/systm.h>
37#include <sys/bus.h>
38

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

179
180 return (0);
181}
182
183struct fdt_fixup_entry fdt_fixup_table[] = {
184 { NULL, NULL }
185};
186
187#ifndef ARM_INTRNG
187#ifndef INTRNG
188#ifndef DEV_GIC
189static int
190fdt_pic_decode_ic(phandle_t node, pcell_t *intr, int *interrupt, int *trig,
191 int *pol)
192{
193
194 /*
195 * The single core chips have just an Amlogic PIC.

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

208fdt_pic_decode_t fdt_pic_table[] = {
209#ifdef DEV_GIC
210 &gic_decode_fdt,
211#else
212 &fdt_pic_decode_ic,
213#endif
214 NULL
215};
188#ifndef DEV_GIC
189static int
190fdt_pic_decode_ic(phandle_t node, pcell_t *intr, int *interrupt, int *trig,
191 int *pol)
192{
193
194 /*
195 * The single core chips have just an Amlogic PIC.

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

208fdt_pic_decode_t fdt_pic_table[] = {
209#ifdef DEV_GIC
210 &gic_decode_fdt,
211#else
212 &fdt_pic_decode_ic,
213#endif
214 NULL
215};
216#endif /* ARM_INTRNG */
216#endif /* INTRNG */