Deleted Added
full compact
mv_machdep.c (250292) mv_machdep.c (250293)
1/*-
2 * Copyright (c) 1994-1998 Mark Brinicombe.
3 * Copyright (c) 1994 Brini.
4 * All rights reserved.
5 *
6 * This code is derived from software written for Brini by Mark Brinicombe
7 *
8 * Redistribution and use in source and binary forms, with or without

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

34 *
35 * from: FreeBSD: //depot/projects/arm/src/sys/arm/at91/kb920x_machdep.c, rev 45
36 */
37
38#include "opt_ddb.h"
39#include "opt_platform.h"
40
41#include <sys/cdefs.h>
1/*-
2 * Copyright (c) 1994-1998 Mark Brinicombe.
3 * Copyright (c) 1994 Brini.
4 * All rights reserved.
5 *
6 * This code is derived from software written for Brini by Mark Brinicombe
7 *
8 * Redistribution and use in source and binary forms, with or without

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

34 *
35 * from: FreeBSD: //depot/projects/arm/src/sys/arm/at91/kb920x_machdep.c, rev 45
36 */
37
38#include "opt_ddb.h"
39#include "opt_platform.h"
40
41#include <sys/cdefs.h>
42__FBSDID("$FreeBSD: head/sys/arm/mv/mv_machdep.c 250292 2013-05-06 13:52:49Z gber $");
42__FBSDID("$FreeBSD: head/sys/arm/mv/mv_machdep.c 250293 2013-05-06 14:12:36Z gber $");
43
44#define _ARM32_BUS_DMA_PRIVATE
45#include <sys/param.h>
46#include <sys/systm.h>
47#include <sys/bus.h>
48
49#include <vm/vm.h>
50#include <vm/pmap.h>

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

57#include <arm/mv/mvreg.h> /* XXX */
58#include <arm/mv/mvvar.h> /* XXX eventually this should be eliminated */
59#include <arm/mv/mvwin.h>
60
61#include <dev/fdt/fdt_common.h>
62
63static int platform_mpp_init(void);
64#if defined(SOC_MV_ARMADAXP)
43
44#define _ARM32_BUS_DMA_PRIVATE
45#include <sys/param.h>
46#include <sys/systm.h>
47#include <sys/bus.h>
48
49#include <vm/vm.h>
50#include <vm/pmap.h>

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

57#include <arm/mv/mvreg.h> /* XXX */
58#include <arm/mv/mvvar.h> /* XXX eventually this should be eliminated */
59#include <arm/mv/mvwin.h>
60
61#include <dev/fdt/fdt_common.h>
62
63static int platform_mpp_init(void);
64#if defined(SOC_MV_ARMADAXP)
65void armadaxp_init_coher_fabric(void);
65void armadaxp_l2_init(void);
66#endif
67
68#define MPP_PIN_MAX 68
69#define MPP_PIN_CELLS 2
70#define MPP_PINS_PER_REG 8
71#define MPP_SEL(pin,func) (((func) & 0xf) << \
72 (((pin) % MPP_PINS_PER_REG) * 4))

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

232 if (soc_decode_win() != 0)
233 printf("WARNING: could not re-initialise decode windows! "
234 "Running with existing settings...\n");
235#else
236 /* Disable watchdog and timers */
237 write_cpu_ctrl(CPU_TIMERS_BASE + CPU_TIMER_CONTROL, 0);
238#endif
239#if defined(SOC_MV_ARMADAXP)
66void armadaxp_l2_init(void);
67#endif
68
69#define MPP_PIN_MAX 68
70#define MPP_PIN_CELLS 2
71#define MPP_PINS_PER_REG 8
72#define MPP_SEL(pin,func) (((func) & 0xf) << \
73 (((pin) % MPP_PINS_PER_REG) * 4))

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

233 if (soc_decode_win() != 0)
234 printf("WARNING: could not re-initialise decode windows! "
235 "Running with existing settings...\n");
236#else
237 /* Disable watchdog and timers */
238 write_cpu_ctrl(CPU_TIMERS_BASE + CPU_TIMER_CONTROL, 0);
239#endif
240#if defined(SOC_MV_ARMADAXP)
241#if !defined(SMP)
242 /* For SMP case it should be initialized after APs are booted */
243 armadaxp_init_coher_fabric();
244#endif
240 armadaxp_l2_init();
241#endif
242}
243
244#define FDT_DEVMAP_MAX (MV_WIN_CPU_MAX + 2)
245static struct pmap_devmap fdt_devmap[FDT_DEVMAP_MAX] = {
246 { 0, 0, 0, 0, 0, }
247};

--- 216 unchanged lines hidden ---
245 armadaxp_l2_init();
246#endif
247}
248
249#define FDT_DEVMAP_MAX (MV_WIN_CPU_MAX + 2)
250static struct pmap_devmap fdt_devmap[FDT_DEVMAP_MAX] = {
251 { 0, 0, 0, 0, 0, }
252};

--- 216 unchanged lines hidden ---