Deleted Added
full compact
pxa_timer.c (256281) pxa_timer.c (278613)
1/*-
2 * Copyright (c) 2006 Benno Rice. 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.

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

18 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
19 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
20 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
21 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
22 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
23 */
24
25#include <sys/cdefs.h>
1/*-
2 * Copyright (c) 2006 Benno Rice. 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.

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

18 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
19 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
20 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
21 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
22 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
23 */
24
25#include <sys/cdefs.h>
26__FBSDID("$FreeBSD: stable/10/sys/arm/xscale/pxa/pxa_timer.c 179595 2008-06-06 05:08:09Z benno $");
26__FBSDID("$FreeBSD: stable/10/sys/arm/xscale/pxa/pxa_timer.c 278613 2015-02-12 03:50:33Z ian $");
27
28#include <sys/param.h>
29#include <sys/systm.h>
30#include <sys/bus.h>
31#include <sys/kernel.h>
32#include <sys/module.h>
33#include <sys/malloc.h>
34#include <sys/rman.h>
35#include <sys/timetc.h>
27
28#include <sys/param.h>
29#include <sys/systm.h>
30#include <sys/bus.h>
31#include <sys/kernel.h>
32#include <sys/module.h>
33#include <sys/malloc.h>
34#include <sys/rman.h>
35#include <sys/timetc.h>
36#include <machine/armreg.h>
36#include <machine/bus.h>
37#include <machine/cpu.h>
38#include <machine/frame.h>
39#include <machine/intr.h>
40
41#include <arm/xscale/pxa/pxavar.h>
42#include <arm/xscale/pxa/pxareg.h>
43

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

185 tc_init(&pxa_timer_timecounter);
186}
187
188void
189cpu_reset(void)
190{
191 uint32_t val;
192
37#include <machine/bus.h>
38#include <machine/cpu.h>
39#include <machine/frame.h>
40#include <machine/intr.h>
41
42#include <arm/xscale/pxa/pxavar.h>
43#include <arm/xscale/pxa/pxareg.h>
44

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

186 tc_init(&pxa_timer_timecounter);
187}
188
189void
190cpu_reset(void)
191{
192 uint32_t val;
193
193 (void)disable_interrupts(I32_bit|F32_bit);
194 (void)disable_interrupts(PSR_I|PSR_F);
194
195 val = pxa_timer_get_oscr();
196 val += PXA_TIMER_FREQUENCY;
197 pxa_timer_set_osmr(3, val);
198 pxa_timer_watchdog_enable();
199
200 for(;;);
201}

--- 116 unchanged lines hidden ---
195
196 val = pxa_timer_get_oscr();
197 val += PXA_TIMER_FREQUENCY;
198 pxa_timer_set_osmr(3, val);
199 pxa_timer_watchdog_enable();
200
201 for(;;);
202}

--- 116 unchanged lines hidden ---