From 550e39fe9a9d23301c14328bc2b051e777a508d2 Mon Sep 17 00:00:00 2001 From: Rabin Vincent Date: Tue, 12 Oct 2010 13:00:53 +0000 Subject: [PATCH] --- yaml --- r: 218816 b: refs/heads/master c: 4a6aed3c4eb69702335ed3689132d07eabaaf86d h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-ux500/devices-db8500.c | 1 - trunk/arch/arm/plat-nomadik/include/plat/ste_dma40.h | 5 ----- 3 files changed, 1 insertion(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 2a55c174c124..f0768ff06093 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 20a5b6d043a9a12d01cec76993ba3658a6d36ba7 +refs/heads/master: 4a6aed3c4eb69702335ed3689132d07eabaaf86d diff --git a/trunk/arch/arm/mach-ux500/devices-db8500.c b/trunk/arch/arm/mach-ux500/devices-db8500.c index 2f84fe607afb..d9ceddc22fc2 100644 --- a/trunk/arch/arm/mach-ux500/devices-db8500.c +++ b/trunk/arch/arm/mach-ux500/devices-db8500.c @@ -147,7 +147,6 @@ struct stedma40_chan_cfg dma40_memcpy_conf_phy = { }; /* Default configuration for logical memcpy */ struct stedma40_chan_cfg dma40_memcpy_conf_log = { - .channel_type = STEDMA40_NO_TIM_FOR_LINK, .dir = STEDMA40_MEM_TO_MEM, .src_info.endianess = STEDMA40_LITTLE_ENDIAN, diff --git a/trunk/arch/arm/plat-nomadik/include/plat/ste_dma40.h b/trunk/arch/arm/plat-nomadik/include/plat/ste_dma40.h index eb7242390ae5..d57f37e1b7b3 100644 --- a/trunk/arch/arm/plat-nomadik/include/plat/ste_dma40.h +++ b/trunk/arch/arm/plat-nomadik/include/plat/ste_dma40.h @@ -38,11 +38,6 @@ enum stedma40_mode_opt { STEDMA40_LCHAN_SRC_LOG_DST_PHY, }; -/* Interrupt */ -#define STEDMA40_INFO_TIM_POS 10 -#define STEDMA40_NO_TIM_FOR_LINK (0x0 << STEDMA40_INFO_TIM_POS) -#define STEDMA40_TIM_FOR_LINK (0x1 << STEDMA40_INFO_TIM_POS) - /* End of channel_type configuration */ #define STEDMA40_ESIZE_8_BIT 0x0