Merge remote-tracking branches 'spi/fix/s3c64xx', 'spi/fix/samsung' and 'spi/fix...

diff --combined Documentation/devicetree/bindings/spi/spi-samsung.txt
index 86aa061f069fda0d8e9e38f3eb04a06b8d2325ef,2d29dacdfed1c3829f08aa4c8dd5f4af34dd4dbc,655b6654dc45742f9e4786762ff7b4c19c20bc60,86aa061f069fda0d8e9e38f3eb04a06b8d2325ef..792efbaedc54ced63a949793d1189aa252d2b8ac
--- 1/Documentation/devicetree/bindings/spi/spi-samsung.txt
--- 2/Documentation/devicetree/bindings/spi/spi-samsung.txt
--- 3/Documentation/devicetree/bindings/spi/spi-samsung.txt
--- 4/Documentation/devicetree/bindings/spi/spi-samsung.txt
+++ b/Documentation/devicetree/bindings/spi/spi-samsung.txt
@@@@@ -18,14 -18,14 -18,11 -18,14 +18,11 @@@@@ 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]
++ +- dmas : Two or more DMA channel specifiers following the convention outlined
++ +  in bindings/dma/dma.txt
    
-- -- tx-dma-channel: The dma channel specifier for tx operations. The format of
-- -  the dma specifier depends on the dma controller.
-- -
-- -- rx-dma-channel: The dma channel specifier for rx operations. The format of
-- -  the dma specifier depends on the dma controller.
++ +- dma-names: Names for the dma channels. There must be at least one channel
++ +  named "tx" for transmit and named "rx" for receive.
    
    Required Board Specific Properties:
    
@@@@@ -42,15 -42,13 -39,15 -42,15 +39,13 @@@@@ Optional Board Specific Properties
    - num-cs: Specifies the number of chip select lines supported. If
      not specified, the default number of chip select lines is set to 1.
    
+ ++- cs-gpios: should specify GPIOs used for chipselects (see spi-bus.txt)
+ ++
    SPI Controller specific data in SPI slave nodes:
    
    - The spi slave nodes should provide the following information which is required
      by the spi controller.
    
- --  - cs-gpio: A gpio specifier that specifies the gpio line used as
- --    the slave select line by the spi controller. The format of the gpio
- --    specifier depends on the gpio controller.
- --
      - samsung,spi-feedback-delay: The sampling phase shift to be applied on the
        miso line (to account for any lag in the miso line). The following are the
        valid values.
@@@@@ -74,8 -72,8 -71,11 -74,8 +69,11 @@@@@ Example
                compatible = "samsung,exynos4210-spi";
                reg = <0x12d20000 0x100>;
                interrupts = <0 66 0>;
-- -            tx-dma-channel = <&pdma0 5>;
-- -            rx-dma-channel = <&pdma0 4>;
++ +            dmas = <&pdma0 5
++ +                    &pdma0 4>;
++ +            dma-names = "tx", "rx";
++ +            #address-cells = <1>;
++ +            #size-cells = <0>;
        };
    
    - Board Specific Portion:
@@@@@ -85,6 -83,7 -85,6 -85,6 +83,7 @@@@@
                #size-cells = <0>;
                pinctrl-names = "default";
                pinctrl-0 = <&spi0_bus>;
+ ++            cs-gpios = <&gpa2 5 0>;
    
                w25q80bw@0 {
                        #address-cells = <1>;
@@@@@ -94,7 -93,6 -94,7 -94,7 +93,6 @@@@@
                        spi-max-frequency = <10000>;
    
                        controller-data {
- --                            cs-gpio = <&gpa2 5 1 0 3>;
                                samsung,spi-feedback-delay = <0>;
                        };