diff options
| author | Rafael J. Wysocki <rjw@sisk.pl> | 2012-07-11 17:02:18 -0400 |
|---|---|---|
| committer | Rafael J. Wysocki <rjw@sisk.pl> | 2012-07-11 17:02:18 -0400 |
| commit | 0b14121f93e330a8231f6dafc1c6eaf888f3dbe6 (patch) | |
| tree | ac596fd6bdf9191534f36cf87f6e3950181f1b16 /arch/arm/mach-shmobile/include | |
| parent | b0a1e7532b69e07ab64db622d9d998af0a6e2f97 (diff) | |
| parent | 6088b422706af496d72065e8c539929f2d4a7e8b (diff) | |
Merge branch 'renesas-sh73a0' into renesas-soc
* renesas-sh73a0:
ARM: shmobile: use common DMAEngine definitions on sh73a0
ARM: shmobile: sh73a0: add DMAEngine support for MPDMAC
ARM: shmobile: sh73a0: add USB clock support
Diffstat (limited to 'arch/arm/mach-shmobile/include')
| -rw-r--r-- | arch/arm/mach-shmobile/include/mach/sh73a0.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/arm/mach-shmobile/include/mach/sh73a0.h b/arch/arm/mach-shmobile/include/mach/sh73a0.h index 398e2c10913b..fe950f25d793 100644 --- a/arch/arm/mach-shmobile/include/mach/sh73a0.h +++ b/arch/arm/mach-shmobile/include/mach/sh73a0.h | |||
| @@ -516,6 +516,13 @@ enum { | |||
| 516 | SHDMA_SLAVE_SDHI2_RX, | 516 | SHDMA_SLAVE_SDHI2_RX, |
| 517 | SHDMA_SLAVE_MMCIF_TX, | 517 | SHDMA_SLAVE_MMCIF_TX, |
| 518 | SHDMA_SLAVE_MMCIF_RX, | 518 | SHDMA_SLAVE_MMCIF_RX, |
| 519 | SHDMA_SLAVE_FSI2A_TX, | ||
| 520 | SHDMA_SLAVE_FSI2A_RX, | ||
| 521 | SHDMA_SLAVE_FSI2B_TX, | ||
| 522 | SHDMA_SLAVE_FSI2B_RX, | ||
| 523 | SHDMA_SLAVE_FSI2C_TX, | ||
| 524 | SHDMA_SLAVE_FSI2C_RX, | ||
| 525 | SHDMA_SLAVE_FSI2D_RX, | ||
| 519 | }; | 526 | }; |
| 520 | 527 | ||
| 521 | /* | 528 | /* |