diff options
| author | Jin Qian <jqian@nvidia.com> | 2010-12-29 17:35:51 -0800 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@nvidia.com> | 2011-11-30 21:42:04 -0800 |
| commit | 5e5b184182c787e95f1994862eb448d4baa58ade (patch) | |
| tree | e6b8f55eef027e397d9191f50fe04a2d7b14738b /arch/arm/mach-tegra/dma.c | |
| parent | ddc253f002d7a67f31f1da4d6f845c27e4703ed3 (diff) | |
Merge remote branch 'git-master/android-tegra-2.6.36' into merge-android
Conflicts:
arch/arm/configs/tegra_defconfig
arch/arm/mach-tegra/Kconfig
arch/arm/mach-tegra/Makefile
arch/arm/mach-tegra/board-ventana-power.c
arch/arm/mach-tegra/board-ventana-sensors.c
arch/arm/mach-tegra/board-ventana.c
arch/arm/mach-tegra/clock.c
arch/arm/mach-tegra/common.c
arch/arm/mach-tegra/cpu-tegra.c
arch/arm/mach-tegra/fuse.c
arch/arm/mach-tegra/headsmp.S
arch/arm/mach-tegra/tegra2_dvfs.c
arch/arm/tools/mach-types
drivers/rtc/rtc-tegra.c
drivers/usb/gadget/fsl_udc_core.c
drivers/video/tegra/host/dev.c
drivers/video/tegra/host/nvhost_channel.c
drivers/video/tegra/host/nvhost_intr.c
Original-Change-Id: I1e9b6d0e761cf1e95cf90b78b5932b53fcb9bb5e
(cherry picked from commit 2f331e046f7c4cfc6ab54fca3193035b3bf3a14f)
Reviewed-on: http://git-master/r/14572
Reviewed-by: Scott Williams <scwilliams@nvidia.com>
Tested-by: Scott Williams <scwilliams@nvidia.com>
Original-Change-Id: I29db8796b2e27a8d218c332de36f880a7cf4bcb2
Rebase-Id: R54dfb0d8e2534ea0c13c1157933d30a4198acbbf
Diffstat (limited to 'arch/arm/mach-tegra/dma.c')
| -rw-r--r-- | arch/arm/mach-tegra/dma.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/mach-tegra/dma.c b/arch/arm/mach-tegra/dma.c index e9c28465b114..0ddb2c7b24df 100644 --- a/arch/arm/mach-tegra/dma.c +++ b/arch/arm/mach-tegra/dma.c @@ -533,6 +533,10 @@ static void tegra_dma_update_hw(struct tegra_dma_channel *ch, case TEGRA_DMA_REQ_SEL_SL2B2: case TEGRA_DMA_REQ_SEL_SL2B3: case TEGRA_DMA_REQ_SEL_SL2B4: +#ifdef CONFIG_ARCH_TEGRA_3x_SOC + case TEGRA_DMA_REQ_SEL_SL2B5: + case TEGRA_DMA_REQ_SEL_SL2B6: +#endif case TEGRA_DMA_REQ_SEL_SPI: /* For spi/slink the burst size based on transfer size * i.e. if multiple of 32 bytes then busrt is |