summaryrefslogtreecommitdiff
path: root/arch/arm
diff options
context:
space:
mode:
authorVinod Koul <vinod.koul@intel.com>2016-05-17 10:14:16 +0530
committerVinod Koul <vinod.koul@intel.com>2016-05-17 10:14:16 +0530
commit56214883c586a235ea73c07a423b27ee62ea2810 (patch)
tree8718f223dd672d029bb15893c4846a0f94c1c3ce /arch/arm
parent95c4dc7b2c622a3cc41535f67f46dd31332186c8 (diff)
parent3a14c66d43d018baed96ceb74f9ab548878c09b8 (diff)
downloadlinux-56214883c586a235ea73c07a423b27ee62ea2810.tar.gz
Merge branch 'topic/dw' into for-linus
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/boot/dts/spear13xx.dtsi4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/spear13xx.dtsi b/arch/arm/boot/dts/spear13xx.dtsi
index 14594ce8c18a..449acf0d8272 100644
--- a/arch/arm/boot/dts/spear13xx.dtsi
+++ b/arch/arm/boot/dts/spear13xx.dtsi
@@ -117,7 +117,7 @@
chan_priority = <1>;
block_size = <0xfff>;
dma-masters = <2>;
- data_width = <3 3>;
+ data-width = <8 8>;
};
dma@eb000000 {
@@ -133,7 +133,7 @@
chan_allocation_order = <1>;
chan_priority = <1>;
block_size = <0xfff>;
- data_width = <3 3>;
+ data-width = <8 8>;
};
fsmc: flash@b0000000 {