[PATCH 1/2] ARM: remove dmacap,memset from Device tree binding

Sebastian Hesselbarth sebastian.hesselbarth at gmail.com
Tue Jul 2 20:54:12 EST 2013


DMA_MEMSET support has been removed, so update the device tree files
and corresponding binding documentation for Marvell SoCs.

Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth at gmail.com>
---
Cc: Russell King <linux at arm.linux.org.uk> 
Cc: Jason Cooper <jason at lakedaemon.net>
Cc: Andrew Lunn <andrew at lunn.ch>
Cc: Thomas Petazzoni <thomas.petazzoni at free-electrons.com>
Cc: Gregory CLEMENT <gregory.clement at free-electrons.com> 
Cc: devicetree-discuss at lists.ozlabs.org 
Cc: linux-kernel at vger.kernel.org 
Cc: linux-arm-kernel at lists.infradead.org 
---
 Documentation/devicetree/bindings/dma/mv-xor.txt |    2 --
 arch/arm/boot/dts/armada-370.dtsi                |    2 --
 arch/arm/boot/dts/armada-xp.dtsi                 |    2 --
 arch/arm/boot/dts/dove.dtsi                      |    2 --
 arch/arm/boot/dts/kirkwood.dtsi                  |    2 --
 arch/arm/boot/dts/orion5x.dtsi                   |    1 -
 6 files changed, 0 insertions(+), 11 deletions(-)

diff --git a/Documentation/devicetree/bindings/dma/mv-xor.txt b/Documentation/devicetree/bindings/dma/mv-xor.txt
index 7c6cb7f..68f7004 100644
--- a/Documentation/devicetree/bindings/dma/mv-xor.txt
+++ b/Documentation/devicetree/bindings/dma/mv-xor.txt
@@ -14,7 +14,6 @@ properties:
 
 And the following optional properties:
 - dmacap,memcpy to indicate that the XOR channel is capable of memcpy operations
-- dmacap,memset to indicate that the XOR channel is capable of memset operations
 - dmacap,xor to indicate that the XOR channel is capable of xor operations
 
 Example:
@@ -35,6 +34,5 @@ xor at d0060900 {
 	      interrupts = <52>;
 	      dmacap,memcpy;
 	      dmacap,xor;
-	      dmacap,memset;
 	};
 };
diff --git a/arch/arm/boot/dts/armada-370.dtsi b/arch/arm/boot/dts/armada-370.dtsi
index fa3dfc6..a315ad1 100644
--- a/arch/arm/boot/dts/armada-370.dtsi
+++ b/arch/arm/boot/dts/armada-370.dtsi
@@ -132,7 +132,6 @@
 					interrupts = <52>;
 					dmacap,memcpy;
 					dmacap,xor;
-					dmacap,memset;
 				};
 			};
 
@@ -151,7 +150,6 @@
 					interrupts = <95>;
 					dmacap,memcpy;
 					dmacap,xor;
-					dmacap,memset;
 				};
 			};
 
diff --git a/arch/arm/boot/dts/armada-xp.dtsi b/arch/arm/boot/dts/armada-xp.dtsi
index 416eb94..4b3dd56 100644
--- a/arch/arm/boot/dts/armada-xp.dtsi
+++ b/arch/arm/boot/dts/armada-xp.dtsi
@@ -114,7 +114,6 @@
 					interrupts = <52>;
 					dmacap,memcpy;
 					dmacap,xor;
-					dmacap,memset;
 				};
 			};
 
@@ -134,7 +133,6 @@
 					interrupts = <95>;
 					dmacap,memcpy;
 					dmacap,xor;
-					dmacap,memset;
 				};
 			};
 
diff --git a/arch/arm/boot/dts/dove.dtsi b/arch/arm/boot/dts/dove.dtsi
index 6cab468..2cef34f 100644
--- a/arch/arm/boot/dts/dove.dtsi
+++ b/arch/arm/boot/dts/dove.dtsi
@@ -232,7 +232,6 @@
 
 			channel1 {
 				interrupts = <40>;
-				dmacap,memset;
 				dmacap,memcpy;
 				dmacap,xor;
 			};
@@ -253,7 +252,6 @@
 
 			channel1 {
 				interrupts = <43>;
-				dmacap,memset;
 				dmacap,memcpy;
 				dmacap,xor;
 			};
diff --git a/arch/arm/boot/dts/kirkwood.dtsi b/arch/arm/boot/dts/kirkwood.dtsi
index 9809fc1..078637c 100644
--- a/arch/arm/boot/dts/kirkwood.dtsi
+++ b/arch/arm/boot/dts/kirkwood.dtsi
@@ -126,7 +126,6 @@
 			      interrupts = <6>;
 			      dmacap,memcpy;
 			      dmacap,xor;
-			      dmacap,memset;
 			};
 		};
 
@@ -146,7 +145,6 @@
 			      interrupts = <8>;
 			      dmacap,memcpy;
 			      dmacap,xor;
-			      dmacap,memset;
 			};
 		};
 
diff --git a/arch/arm/boot/dts/orion5x.dtsi b/arch/arm/boot/dts/orion5x.dtsi
index 892c64e..f82ece7 100644
--- a/arch/arm/boot/dts/orion5x.dtsi
+++ b/arch/arm/boot/dts/orion5x.dtsi
@@ -120,7 +120,6 @@
 			      interrupts = <31>;
 			      dmacap,memcpy;
 			      dmacap,xor;
-			      dmacap,memset;
 			};
 		};
 
-- 
1.7.2.5



More information about the devicetree-discuss mailing list