diff options
author | psen <pankaj.sen@stericsson.com> | 2010-05-06 20:00:59 +0530 |
---|---|---|
committer | John Rigby <john.rigby@linaro.org> | 2010-09-02 22:45:15 -0600 |
commit | f3758d853ae340c4cef0489c92f4284a70da40af (patch) | |
tree | 98c3bcb6a56732b48a30292cc31c609c3b3f130c /arch/arm/mach-ux500/include/mach | |
parent | fad9e14a8a9eb06a850c60b9310fbacefc11d19d (diff) |
equivalent to Android patches 1.11.5
Change-Id: Ieb25a0b2e28f8f4873161a6ae78c23b907158140
Diffstat (limited to 'arch/arm/mach-ux500/include/mach')
-rwxr-xr-x | arch/arm/mach-ux500/include/mach/dma_40-8500.h | 14 | ||||
-rwxr-xr-x | arch/arm/mach-ux500/include/mach/hardware.h | 16 |
2 files changed, 17 insertions, 13 deletions
diff --git a/arch/arm/mach-ux500/include/mach/dma_40-8500.h b/arch/arm/mach-ux500/include/mach/dma_40-8500.h index 819f67b917c..4ba9b79f95d 100755 --- a/arch/arm/mach-ux500/include/mach/dma_40-8500.h +++ b/arch/arm/mach-ux500/include/mach/dma_40-8500.h @@ -498,8 +498,8 @@ enum dma_src_dev_type { DMA_DEV_SD_MM2_RX, DMA_DEV_SD_MM0_RX, DMA_DEV_MSP1_RX, - DMA_SLIM0_CH0_RX, - DMA_DEV_MSP0_RX = DMA_SLIM0_CH0_RX, + DMA_SLIM0_CH0_RX, /* 31 */ + DMA_DEV_MSP0_RX = DMA_SLIM0_CH0_RX, /* 31 */ DMA_DEV_SD_MM1_RX, DMA_DEV_SPI2_RX, DMA_DEV_I2C3_RX2, @@ -522,7 +522,7 @@ enum dma_src_dev_type { DMA_DEV_SRC_SXA4_RX_TX, DMA_DEV_SRC_SXA5_RX_TX, DMA_DEV_SRC_SXA6_RX_TX, - DMA_DEV_SRC_SXA7_RX_TX, + DMA_DEV_SRC_SXA7_RX_TX, /* 47 */ DMA_DEV_CAC1_RX, DMA_DEV_MSHC_RX = 51, DMA_DEV_SLIM1_CH0_RX_HSI_RX_CH4, @@ -547,7 +547,7 @@ enum dma_dest_dev_type { DMA_DEV_UART1_TX, DMA_DEV_UART0_TX, DMA_DEV_MSP2_TX, - DMA_DEV_I2C0_TX, + DMA_DEV_I2C0_TX, /* 15 */ #ifndef CONFIG_USB_U8500_EVENT_LINES DMA_DEV_USB_OTG_OEP_8 , DMA_DEV_USB_OTG_OEP_1_9 , @@ -570,8 +570,8 @@ enum dma_dest_dev_type { DMA_DEV_SD_MM2_TX, DMA_DEV_SD_MM0_TX, DMA_DEV_MSP1_TX, - DMA_SLIM0_CH0_TX, - DMA_DEV_MSP0_TX = DMA_SLIM0_CH0_TX, + DMA_SLIM0_CH0_TX, /* 31 */ + DMA_DEV_MSP0_TX = DMA_SLIM0_CH0_TX, /* 31 */ DMA_DEV_SD_MM1_TX, DMA_DEV_SPI2_TX, DMA_DEV_I2C3_TX2, @@ -594,7 +594,7 @@ enum dma_dest_dev_type { DMA_DEV_DST_SXA4_RX_TX, DMA_DEV_DST_SXA5_RX_TX, DMA_DEV_DST_SXA6_RX_TX, - DMA_DEV_DST_SXA7_RX_TX, + DMA_DEV_DST_SXA7_RX_TX, /* 47 */ DMA_DEV_CAC1_TX, DMA_DEV_CAC1_TX_HAC1_TX, DMA_DEV_HAC1_TX, diff --git a/arch/arm/mach-ux500/include/mach/hardware.h b/arch/arm/mach-ux500/include/mach/hardware.h index 031ad6213fe..2cd5a48d02a 100755 --- a/arch/arm/mach-ux500/include/mach/hardware.h +++ b/arch/arm/mach-ux500/include/mach/hardware.h @@ -85,12 +85,16 @@ #define UX500_USBOTG_BASE UX500(USBOTG) -#define U8500_ESRAM_BASE 0x40000000 -#define U8500_ESRAM_DMA_LCLA_OFFSET 0x80000 -#define U8500_ESRAM_DMA_LCPA_OFFSET 0x84000 - -#define U8500_DMA_LCLA_BASE (U8500_ESRAM_BASE + U8500_ESRAM_DMA_LCLA_OFFSET) -#define U8500_DMA_LCPA_BASE (U8500_ESRAM_BASE + U8500_ESRAM_DMA_LCPA_OFFSET) +#define U8500_ESRAM_BASE 0x40000000 +/* on ED this register is secure so leaving mem init value + will not conflict with MCDE driver as on ED MCDE is using bank 6 */ +#define U8500_ESRAM_DMA_LCPA_OFFSET_ED 0x84000 +/* on V1 DMA uses 4KB for logical parameters + position is right after the 64KB reserved for security */ +#define U8500_ESRAM_DMA_LCPA_OFFSET 0x10000 + +#define U8500_DMA_LCPA_BASE (U8500_ESRAM_BASE + U8500_ESRAM_DMA_LCPA_OFFSET) +#define U8500_DMA_LCPA_BASE_ED (U8500_ESRAM_BASE + U8500_ESRAM_DMA_LCPA_OFFSET_ED) /* SSP specific declaration */ #define SSP_PER_ID 0x01080022 |