← Back to branch summary

~ubuntu-branches/ubuntu/vivid/u-boot/vivid

« back to all changes in this revision

Viewing changes to arch/x86/cpu/sc520/sc520_timer.c

  • Committer: Package Import Robot
  • Author(s): Clint Adams
  • Date: 2012-01-02 17:49:39 UTC
  • mfrom: (1.2.7)
  • Revision ID: package-import@ubuntu.com-20120102174939-iddq37p3372x10yp
Tags: 2011.12-1
* New upstream version.
  - Drop build-timestamp_autogenerated.h-without-config.patch (merged).
  - Drop ublimage-NAND-block-size-isn-t-set-at-build-time.patch (merged).
  - Update kerma-sheevaplug-mvsdio.diff
  - Update mipsel-native-endianness.diff
  - Drop dreamplug-v8.patch (merged).

Show diffs side-by-side

added added

removed removed

Lines of Context:
arch/x86/cpu/sc520/sc520_timer.c
27
27
#include <common.h>
28
28
#include <asm/io.h>
29
29
#include <asm/interrupt.h>
30
 
#include <asm/ic/sc520.h>
 
30
#include <asm/arch/sc520.h>
31
31
 
32
32
void sc520_timer_isr(void)
33
33
{
38
38
int timer_init(void)
39
39
{
40
40
        /* Register the SC520 specific timer interrupt handler */
41
 
        register_timer_isr (sc520_timer_isr);
 
41
        register_timer_isr(sc520_timer_isr);
42
42
 
43
43
        /* Install interrupt handler for GP Timer 1 */
44
44
        irq_install_handler (0, timer_isr, NULL);
62
62
        writew(100, &sc520_mmcr->gptmr1maxcmpa);
63
63
        writew(0xe009, &sc520_mmcr->gptmr1ctl);
64
64
 
65
 
        unmask_irq (0);
 
65
        unmask_irq(0);
66
66
 
67
67
        /* Clear the GP Timer 1 status register to get the show rolling*/
68
68
        writeb(0x02, &sc520_mmcr->gptmrsta);