diff options
author | Andy Shevchenko <andriy.shevchenko@linux.intel.com> | 2015-01-13 12:08:14 -0500 |
---|---|---|
committer | Vinod Koul <vinod.koul@intel.com> | 2015-02-05 01:39:44 -0500 |
commit | d8ded50f8b26a224df48f9f93e49440c6a39b77f (patch) | |
tree | 7c7620107180b0a2c3ea77770ef8fb9bccfa8341 /arch | |
parent | cfd8fef322305bbe9955817464f0d2054ce545c0 (diff) |
dmaengine: dw: define DW_DMA_MAX_NR_MASTERS
Instead of using magic number in the code the patch provides
DW_DMA_MAX_NR_MASTERS constant.
While here, restrict the reading of data width array by amount of the actual
number of AHB masters.
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arc/boot/dts/abilis_tb10x.dtsi | 2 | ||||
-rw-r--r-- | arch/arm/boot/dts/spear13xx.dtsi | 4 | ||||
-rw-r--r-- | arch/avr32/mach-at32ap/at32ap700x.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/arch/arc/boot/dts/abilis_tb10x.dtsi b/arch/arc/boot/dts/abilis_tb10x.dtsi index a098d7c05e96..cfb5052239a1 100644 --- a/arch/arc/boot/dts/abilis_tb10x.dtsi +++ b/arch/arc/boot/dts/abilis_tb10x.dtsi | |||
@@ -112,7 +112,7 @@ | |||
112 | chan_allocation_order = <0>; | 112 | chan_allocation_order = <0>; |
113 | chan_priority = <1>; | 113 | chan_priority = <1>; |
114 | block_size = <0x7ff>; | 114 | block_size = <0x7ff>; |
115 | data_width = <2 0 0 0>; | 115 | data_width = <2>; |
116 | clocks = <&ahb_clk>; | 116 | clocks = <&ahb_clk>; |
117 | clock-names = "hclk"; | 117 | clock-names = "hclk"; |
118 | }; | 118 | }; |
diff --git a/arch/arm/boot/dts/spear13xx.dtsi b/arch/arm/boot/dts/spear13xx.dtsi index a6eb5436d26d..40accc87e3a2 100644 --- a/arch/arm/boot/dts/spear13xx.dtsi +++ b/arch/arm/boot/dts/spear13xx.dtsi | |||
@@ -117,7 +117,7 @@ | |||
117 | chan_priority = <1>; | 117 | chan_priority = <1>; |
118 | block_size = <0xfff>; | 118 | block_size = <0xfff>; |
119 | dma-masters = <2>; | 119 | dma-masters = <2>; |
120 | data_width = <3 3 0 0>; | 120 | data_width = <3 3>; |
121 | }; | 121 | }; |
122 | 122 | ||
123 | dma@eb000000 { | 123 | dma@eb000000 { |
@@ -133,7 +133,7 @@ | |||
133 | chan_allocation_order = <1>; | 133 | chan_allocation_order = <1>; |
134 | chan_priority = <1>; | 134 | chan_priority = <1>; |
135 | block_size = <0xfff>; | 135 | block_size = <0xfff>; |
136 | data_width = <3 3 0 0>; | 136 | data_width = <3 3>; |
137 | }; | 137 | }; |
138 | 138 | ||
139 | fsmc: flash@b0000000 { | 139 | fsmc: flash@b0000000 { |
diff --git a/arch/avr32/mach-at32ap/at32ap700x.c b/arch/avr32/mach-at32ap/at32ap700x.c index cc92cdb9994c..1d8b147282cf 100644 --- a/arch/avr32/mach-at32ap/at32ap700x.c +++ b/arch/avr32/mach-at32ap/at32ap700x.c | |||
@@ -607,7 +607,7 @@ static struct dw_dma_platform_data dw_dmac0_data = { | |||
607 | .nr_channels = 3, | 607 | .nr_channels = 3, |
608 | .block_size = 4095U, | 608 | .block_size = 4095U, |
609 | .nr_masters = 2, | 609 | .nr_masters = 2, |
610 | .data_width = { 2, 2, 0, 0 }, | 610 | .data_width = { 2, 2 }, |
611 | }; | 611 | }; |
612 | 612 | ||
613 | static struct resource dw_dmac0_resource[] = { | 613 | static struct resource dw_dmac0_resource[] = { |