Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 163383
b: refs/heads/master
c: edc67b2
h: refs/heads/master
i:
  163381: 990e99b
  163379: 39cd251
  163375: d40aeb0
v: v3
  • Loading branch information
Kuninori Morimoto authored and Paul Mundt committed Aug 4, 2009
1 parent 0e21e7a commit 52c5373
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 4f3243117ad42b4d1faeecd452f7b24306fcfc4a
refs/heads/master: edc67b29425b12312356fe9a92352ce6b7307c68
1 change: 1 addition & 0 deletions trunk/arch/sh/include/asm/dma-sh.h
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@

/* DMAOR contorl: The DMAOR access size is different by CPU.*/
#if defined(CONFIG_CPU_SUBTYPE_SH7723) || \
defined(CONFIG_CPU_SUBTYPE_SH7724) || \
defined(CONFIG_CPU_SUBTYPE_SH7780) || \
defined(CONFIG_CPU_SUBTYPE_SH7785)
#define dmaor_read_reg(n) \
Expand Down
3 changes: 2 additions & 1 deletion trunk/arch/sh/include/cpu-sh4/cpu/dma-sh4a.h
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@
#define DMAE0_IRQ 38
#define SH_DMAC_BASE0 0xFF608020
#define SH_DMARS_BASE 0xFF609000
#elif defined(CONFIG_CPU_SUBTYPE_SH7723)
#elif defined(CONFIG_CPU_SUBTYPE_SH7723) || \
defined(CONFIG_CPU_SUBTYPE_SH7724)
#define DMTE0_IRQ 48 /* DMAC0A*/
#define DMTE4_IRQ 40 /* DMAC0B */
#define DMTE6_IRQ 42
Expand Down

0 comments on commit 52c5373

Please sign in to comment.