diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /arch/arm/common/scoop.c | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'arch/arm/common/scoop.c')
| -rw-r--r-- | arch/arm/common/scoop.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/arm/common/scoop.c b/arch/arm/common/scoop.c index 9012004321dd..c11af1e4bad3 100644 --- a/arch/arm/common/scoop.c +++ b/arch/arm/common/scoop.c | |||
| @@ -44,12 +44,12 @@ void reset_scoop(struct device *dev) | |||
| 44 | { | 44 | { |
| 45 | struct scoop_dev *sdev = dev_get_drvdata(dev); | 45 | struct scoop_dev *sdev = dev_get_drvdata(dev); |
| 46 | 46 | ||
| 47 | iowrite16(0x0100, sdev->base + SCOOP_MCR); // 00 | 47 | iowrite16(0x0100, sdev->base + SCOOP_MCR); /* 00 */ |
| 48 | iowrite16(0x0000, sdev->base + SCOOP_CDR); // 04 | 48 | iowrite16(0x0000, sdev->base + SCOOP_CDR); /* 04 */ |
| 49 | iowrite16(0x0000, sdev->base + SCOOP_CCR); // 10 | 49 | iowrite16(0x0000, sdev->base + SCOOP_CCR); /* 10 */ |
| 50 | iowrite16(0x0000, sdev->base + SCOOP_IMR); // 18 | 50 | iowrite16(0x0000, sdev->base + SCOOP_IMR); /* 18 */ |
| 51 | iowrite16(0x00FF, sdev->base + SCOOP_IRM); // 14 | 51 | iowrite16(0x00FF, sdev->base + SCOOP_IRM); /* 14 */ |
| 52 | iowrite16(0x0000, sdev->base + SCOOP_ISR); // 1C | 52 | iowrite16(0x0000, sdev->base + SCOOP_ISR); /* 1C */ |
| 53 | iowrite16(0x0000, sdev->base + SCOOP_IRM); | 53 | iowrite16(0x0000, sdev->base + SCOOP_IRM); |
| 54 | } | 54 | } |
| 55 | 55 | ||