diff options
Diffstat (limited to 'arch/arm/mach-at91')
-rw-r--r-- | arch/arm/mach-at91/at91sam9g45_devices.c | 1 | ||||
-rw-r--r-- | arch/arm/mach-at91/include/mach/at_hdmac.h | 15 |
2 files changed, 0 insertions, 16 deletions
diff --git a/arch/arm/mach-at91/at91sam9g45_devices.c b/arch/arm/mach-at91/at91sam9g45_devices.c index 4320b2096789..698479f1e197 100644 --- a/arch/arm/mach-at91/at91sam9g45_devices.c +++ b/arch/arm/mach-at91/at91sam9g45_devices.c | |||
@@ -437,7 +437,6 @@ void __init at91_add_device_mci(short mmc_id, struct mci_platform_data *data) | |||
437 | 437 | ||
438 | /* DMA slave channel configuration */ | 438 | /* DMA slave channel configuration */ |
439 | atslave->dma_dev = &at_hdmac_device.dev; | 439 | atslave->dma_dev = &at_hdmac_device.dev; |
440 | atslave->reg_width = AT_DMA_SLAVE_WIDTH_32BIT; | ||
441 | atslave->cfg = ATC_FIFOCFG_HALFFIFO | 440 | atslave->cfg = ATC_FIFOCFG_HALFFIFO |
442 | | ATC_SRC_H2SEL_HW | ATC_DST_H2SEL_HW; | 441 | | ATC_SRC_H2SEL_HW | ATC_DST_H2SEL_HW; |
443 | atslave->ctrla = ATC_SCSIZE_16 | ATC_DCSIZE_16; | 442 | atslave->ctrla = ATC_SCSIZE_16 | ATC_DCSIZE_16; |
diff --git a/arch/arm/mach-at91/include/mach/at_hdmac.h b/arch/arm/mach-at91/include/mach/at_hdmac.h index 187cb58345c0..fff48d1a0f4e 100644 --- a/arch/arm/mach-at91/include/mach/at_hdmac.h +++ b/arch/arm/mach-at91/include/mach/at_hdmac.h | |||
@@ -24,18 +24,6 @@ struct at_dma_platform_data { | |||
24 | }; | 24 | }; |
25 | 25 | ||
26 | /** | 26 | /** |
27 | * enum at_dma_slave_width - DMA slave register access width. | ||
28 | * @AT_DMA_SLAVE_WIDTH_8BIT: Do 8-bit slave register accesses | ||
29 | * @AT_DMA_SLAVE_WIDTH_16BIT: Do 16-bit slave register accesses | ||
30 | * @AT_DMA_SLAVE_WIDTH_32BIT: Do 32-bit slave register accesses | ||
31 | */ | ||
32 | enum at_dma_slave_width { | ||
33 | AT_DMA_SLAVE_WIDTH_8BIT = 0, | ||
34 | AT_DMA_SLAVE_WIDTH_16BIT, | ||
35 | AT_DMA_SLAVE_WIDTH_32BIT, | ||
36 | }; | ||
37 | |||
38 | /** | ||
39 | * struct at_dma_slave - Controller-specific information about a slave | 27 | * struct at_dma_slave - Controller-specific information about a slave |
40 | * @dma_dev: required DMA master device | 28 | * @dma_dev: required DMA master device |
41 | * @tx_reg: physical address of data register used for | 29 | * @tx_reg: physical address of data register used for |
@@ -48,9 +36,6 @@ enum at_dma_slave_width { | |||
48 | */ | 36 | */ |
49 | struct at_dma_slave { | 37 | struct at_dma_slave { |
50 | struct device *dma_dev; | 38 | struct device *dma_dev; |
51 | dma_addr_t tx_reg; | ||
52 | dma_addr_t rx_reg; | ||
53 | enum at_dma_slave_width reg_width; | ||
54 | u32 cfg; | 39 | u32 cfg; |
55 | u32 ctrla; | 40 | u32 ctrla; |
56 | }; | 41 | }; |