3 files changed, 15 insertions, 12 deletions

diff --git a/Documentation/devicetree/bindings/spi/spi-samsung.txt b/Documentation/devicetree/bindings/spi/spi-samsung.txt
index 59bfc4f9feb3..a15ffeddfba4 100644
--- a/Documentation/devicetree/bindings/spi/spi-samsung.txt
+++ b/Documentation/devicetree/bindings/spi/spi-samsung.txt
@@ -18,6 +18,9 @@ Required SoC Specific Properties:
 - interrupts: The interrupt number to the cpu. The interrupt specifier format
   depends on the interrupt controller.
 
+[PRELIMINARY: the dma channel allocation will change once there are
+official DMA bindings]
+
 - tx-dma-channel: The dma channel specifier for tx operations. The format of
   the dma specifier depends on the dma controller.
 
diff --git a/arch/arm/boot/dts/exynos4210.dtsi b/arch/arm/boot/dts/exynos4210.dtsi
index 6904d9dfbf28..02891fe876e4 100644
--- a/arch/arm/boot/dts/exynos4210.dtsi
+++ b/arch/arm/boot/dts/exynos4210.dtsi
@@ -168,8 +168,8 @@
                 compatible = "samsung,exynos4210-spi";
                 reg = <0x13920000 0x100>;
                 interrupts = <0 66 0>;
-                tx-dma-channel = <&pdma0 7>;
-                rx-dma-channel = <&pdma0 6>;
+                tx-dma-channel = <&pdma0 7>; /* preliminary */
+                rx-dma-channel = <&pdma0 6>; /* preliminary */
                 #address-cells = <1>;
                 #size-cells = <0>;
         };
@@ -178,8 +178,8 @@
                 compatible = "samsung,exynos4210-spi";
                 reg = <0x13930000 0x100>;
                 interrupts = <0 67 0>;
-                tx-dma-channel = <&pdma1 7>;
-                rx-dma-channel = <&pdma1 6>;
+                tx-dma-channel = <&pdma1 7>; /* preliminary */
+                rx-dma-channel = <&pdma1 6>; /* preliminary */
                 #address-cells = <1>;
                 #size-cells = <0>;
         };
@@ -188,8 +188,8 @@
                 compatible = "samsung,exynos4210-spi";
                 reg = <0x13940000 0x100>;
                 interrupts = <0 68 0>;
-                tx-dma-channel = <&pdma0 9>;
-                rx-dma-channel = <&pdma0 8>;
+                tx-dma-channel = <&pdma0 9>; /* preliminary */
+                rx-dma-channel = <&pdma0 8>; /* preliminary */
                 #address-cells = <1>;
                 #size-cells = <0>;
         };
diff --git a/arch/arm/boot/dts/exynos5250.dtsi b/arch/arm/boot/dts/exynos5250.dtsi
index a3a2eb2598d7..004aaa8d123c 100644
--- a/arch/arm/boot/dts/exynos5250.dtsi
+++ b/arch/arm/boot/dts/exynos5250.dtsi
@@ -156,8 +156,8 @@
                 compatible = "samsung,exynos4210-spi";
                 reg = <0x12d20000 0x100>;
                 interrupts = <0 66 0>;
-                tx-dma-channel = <&pdma0 5>;
-                rx-dma-channel = <&pdma0 4>;
+                tx-dma-channel = <&pdma0 5>; /* preliminary */
+                rx-dma-channel = <&pdma0 4>; /* preliminary */
                 #address-cells = <1>;
                 #size-cells = <0>;
         };
@@ -166,8 +166,8 @@
                 compatible = "samsung,exynos4210-spi";
                 reg = <0x12d30000 0x100>;
                 interrupts = <0 67 0>;
-                tx-dma-channel = <&pdma1 5>;
-                rx-dma-channel = <&pdma1 4>;
+                tx-dma-channel = <&pdma1 5>; /* preliminary */
+                rx-dma-channel = <&pdma1 4>; /* preliminary */
                 #address-cells = <1>;
                 #size-cells = <0>;
         };
@@ -176,8 +176,8 @@
                 compatible = "samsung,exynos4210-spi";
                 reg = <0x12d40000 0x100>;
                 interrupts = <0 68 0>;
-                tx-dma-channel = <&pdma0 7>;
-                rx-dma-channel = <&pdma0 6>;
+                tx-dma-channel = <&pdma0 7>; /* preliminary */
+                rx-dma-channel = <&pdma0 6>; /* preliminary */
                 #address-cells = <1>;
                 #size-cells = <0>;
         };