Merge pull request torvalds#224 from analogdevicesinc/cleanup-dt-dma

Remove depreacted axi-dmac bindings from devicetrees
commodo · Oct 25, 2018 · 9769f70 · 9769f70
2 parents 97bc83f + f0fd895
commit 9769f70
Show file tree

Hide file tree

Showing 63 changed files with 460 additions and 563 deletions.
diff --git a/arch/arm/boot/dts/adi-zynq-cn0363.dtsi b/arch/arm/boot/dts/adi-zynq-cn0363.dtsi
@@ -18,9 +18,17 @@
 		interrupts = <0 57 0>;
 		clocks = <&clkc 15>;
 
-		dma-channel {
-			adi,buswidth = <64>;
-			adi,type = <0>;
+		adi,channels {
+			#size-cells = <0>;
+			#address-cells = <1>;
+
+			dma-channel@0 {
+				reg = <0>;
+				adi,source-bus-width = <32>;
+				adi,source-bus-type = <2>;
+				adi,destination-bus-width = <64>;
+				adi,destination-bus-type = <0>;
+			};
 		};
 	};
 

diff --git a/arch/arm/boot/dts/socfpga_cyclone5_sockit_arradio.dts b/arch/arm/boot/dts/socfpga_cyclone5_sockit_arradio.dts
@@ -179,10 +179,18 @@
 					#dma-cells = <1>;
 					clocks = <&axi_dmac0_clk>;
 					clock-names = "axi_dmac0_clkin";
-					dma-channel {
-						adi,buswidth = <64>;
-						adi,type = <1>;
-						adi,cyclic;
+
+					adi,channels {
+						#address-cells = <1>;
+						#size-cells = <0>;
+
+						dma-channel@0 {
+							reg = <0>;
+							adi,source-bus-width = <64>;
+							adi,source-bus-type = <0>;
+							adi,destination-bus-width = <64>;
+							adi,destination-bus-type = <2>;
+						};
 					};
 				};
 
@@ -194,9 +202,18 @@
 					#dma-cells = <1>;
 					clocks = <&axi_dmac0_clk>;
 					clock-names = "axi_dmac0_clkin";
-					dma-channel {
-						adi,buswidth = <64>;
-						adi,type = <0>;
+
+					adi,channels {
+						#address-cells = <1>;
+						#size-cells = <0>;
+
+						dma-channel@0 {
+							reg = <0>;
+							adi,source-bus-width = <64>;
+							adi,source-bus-type = <2>;
+							adi,destination-bus-width = <64>;
+							adi,destination-bus-type = <0>;
+						};
 					};
 				};
 

diff --git a/arch/arm/boot/dts/zynq-adrv9361-z7035.dtsi b/arch/arm/boot/dts/zynq-adrv9361-z7035.dtsi
@@ -153,7 +153,6 @@
 					adi,source-bus-type = <2>;
 					adi,destination-bus-width = <64>;
 					adi,destination-bus-type = <0>;
-					adi,length-width = <24>;
 				};
 			};
 		};
@@ -175,8 +174,6 @@
 					adi,source-bus-type = <0>;
 					adi,destination-bus-width = <64>;
 					adi,destination-bus-type = <2>;
-					adi,length-width = <24>;
-					adi,cyclic;
 				};
 			};
 		};

diff --git a/arch/arm/boot/dts/zynq-adrv9364-z7020.dtsi b/arch/arm/boot/dts/zynq-adrv9364-z7020.dtsi
@@ -144,7 +144,6 @@
 					adi,source-bus-type = <2>;
 					adi,destination-bus-width = <64>;
 					adi,destination-bus-type = <0>;
-					adi,length-width = <24>;
 				};
 			};
 		};
@@ -166,8 +165,6 @@
 					adi,source-bus-type = <0>;
 					adi,destination-bus-width = <64>;
 					adi,destination-bus-type = <2>;
-					adi,length-width = <24>;
-					adi,cyclic;
 				};
 			};
 		};

diff --git a/arch/arm/boot/dts/zynq-e310.dts b/arch/arm/boot/dts/zynq-e310.dts
@@ -148,7 +148,6 @@
 					adi,source-bus-type = <2>;
 					adi,destination-bus-width = <64>;
 					adi,destination-bus-type = <0>;
-					adi,length-width = <24>;
 				};
 			};
 		};
@@ -170,8 +169,6 @@
 					adi,source-bus-type = <0>;
 					adi,destination-bus-width = <64>;
 					adi,destination-bus-type = <2>;
-					adi,length-width = <24>;
-					adi,cyclic;
 				};
 			};
 		};

diff --git a/arch/arm/boot/dts/zynq-mini-itx-adv7511-ad9361-fmcomms2-3.dts b/arch/arm/boot/dts/zynq-mini-itx-adv7511-ad9361-fmcomms2-3.dts
diff --git a/arch/arm/boot/dts/zynq-mini-itx-adv7511-ad9364-fmcomms4.dts b/arch/arm/boot/dts/zynq-mini-itx-adv7511-ad9364-fmcomms4.dts
diff --git a/arch/arm/boot/dts/zynq-mini-itx-adv7511.dts b/arch/arm/boot/dts/zynq-mini-itx-adv7511.dts