diff options
author | Kevin Hilman <khilman@deeprootsystems.com> | 2009-05-29 13:54:14 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-05-29 14:59:13 -0400 |
commit | b0958aed1ea39825439a7848544bfb2e267273b4 (patch) | |
tree | 32a25d648072dcef6ceeef2d8217b8c95ec5bfca /arch | |
parent | 42f1d2e06a25628ae4ceaadccc4fa67c7787e2b4 (diff) |
[ARM] 5529/1: davinci: MMC platform support: DMA_32BIT_MASK --> DMA_BIT_MASK(32)
Some DMA_32BIT_MASK usage snuck in with the MMC platform support.
Convert these to the new preferred DMA_BIT_MASK(32).
Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/mach-davinci/devices.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mach-davinci/devices.c b/arch/arm/mach-davinci/devices.c index c85091c25d11..de16f347566a 100644 --- a/arch/arm/mach-davinci/devices.c +++ b/arch/arm/mach-davinci/devices.c | |||
@@ -62,7 +62,7 @@ void __init davinci_init_i2c(struct davinci_i2c_platform_data *pdata) | |||
62 | 62 | ||
63 | #if defined(CONFIG_MMC_DAVINCI) || defined(CONFIG_MMC_DAVINCI_MODULE) | 63 | #if defined(CONFIG_MMC_DAVINCI) || defined(CONFIG_MMC_DAVINCI_MODULE) |
64 | 64 | ||
65 | static u64 mmcsd0_dma_mask = DMA_32BIT_MASK; | 65 | static u64 mmcsd0_dma_mask = DMA_BIT_MASK(32); |
66 | 66 | ||
67 | static struct resource mmcsd0_resources[] = { | 67 | static struct resource mmcsd0_resources[] = { |
68 | { | 68 | { |
@@ -95,13 +95,13 @@ static struct platform_device davinci_mmcsd0_device = { | |||
95 | .id = 0, | 95 | .id = 0, |
96 | .dev = { | 96 | .dev = { |
97 | .dma_mask = &mmcsd0_dma_mask, | 97 | .dma_mask = &mmcsd0_dma_mask, |
98 | .coherent_dma_mask = DMA_32BIT_MASK, | 98 | .coherent_dma_mask = DMA_BIT_MASK(32), |
99 | }, | 99 | }, |
100 | .num_resources = ARRAY_SIZE(mmcsd0_resources), | 100 | .num_resources = ARRAY_SIZE(mmcsd0_resources), |
101 | .resource = mmcsd0_resources, | 101 | .resource = mmcsd0_resources, |
102 | }; | 102 | }; |
103 | 103 | ||
104 | static u64 mmcsd1_dma_mask = DMA_32BIT_MASK; | 104 | static u64 mmcsd1_dma_mask = DMA_BIT_MASK(32); |
105 | 105 | ||
106 | static struct resource mmcsd1_resources[] = { | 106 | static struct resource mmcsd1_resources[] = { |
107 | { | 107 | { |
@@ -132,7 +132,7 @@ static struct platform_device davinci_mmcsd1_device = { | |||
132 | .id = 1, | 132 | .id = 1, |
133 | .dev = { | 133 | .dev = { |
134 | .dma_mask = &mmcsd1_dma_mask, | 134 | .dma_mask = &mmcsd1_dma_mask, |
135 | .coherent_dma_mask = DMA_32BIT_MASK, | 135 | .coherent_dma_mask = DMA_BIT_MASK(32), |
136 | }, | 136 | }, |
137 | .num_resources = ARRAY_SIZE(mmcsd1_resources), | 137 | .num_resources = ARRAY_SIZE(mmcsd1_resources), |
138 | .resource = mmcsd1_resources, | 138 | .resource = mmcsd1_resources, |