lkml.org 
[lkml]   [2018]   [Jun]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Date
    Subject[PATCH 3.16 117/410] arm: spear13xx: Fix dmas cells
    3.16.57-rc1 review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Viresh Kumar <viresh.kumar@linaro.org>

    commit cdd10409914184c7eee5ae3e11beb890c9c16c61 upstream.

    The "dmas" cells for the designware DMA controller need to have only 3
    properties apart from the phandle: request line, src master and
    destination master. But the commit 6e8887f60f60 updated it incorrectly
    while moving from platform code to DT. Fix it.

    Fixes: 6e8887f60f60 ("ARM: SPEAr13xx: Pass generic DW DMAC platform data from DT")
    Reported-by: Arnd Bergmann <arnd@arndb.de>
    Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
    Signed-off-by: Olof Johansson <olof@lixom.net>
    Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
    ---
    Documentation/devicetree/bindings/dma/snps-dma.txt | 2 +-
    arch/arm/boot/dts/spear1340.dtsi | 4 ++--
    arch/arm/boot/dts/spear13xx.dtsi | 6 +++---
    3 files changed, 6 insertions(+), 6 deletions(-)

    --- a/Documentation/devicetree/bindings/dma/snps-dma.txt
    +++ b/Documentation/devicetree/bindings/dma/snps-dma.txt
    @@ -58,6 +58,6 @@ Example:
    interrupts = <0 35 0x4>;
    status = "disabled";
    dmas = <&dmahost 12 0 1>,
    - <&dmahost 13 0 1 0>;
    + <&dmahost 13 1 0>;
    dma-names = "rx", "rx";
    };
    --- a/arch/arm/boot/dts/spear1340.dtsi
    +++ b/arch/arm/boot/dts/spear1340.dtsi
    @@ -113,8 +113,8 @@
    reg = <0xb4100000 0x1000>;
    interrupts = <0 105 0x4>;
    status = "disabled";
    - dmas = <&dwdma0 0x600 0 0 1>, /* 0xC << 11 */
    - <&dwdma0 0x680 0 1 0>; /* 0xD << 7 */
    + dmas = <&dwdma0 12 0 1>,
    + <&dwdma0 13 1 0>;
    dma-names = "tx", "rx";
    };

    --- a/arch/arm/boot/dts/spear13xx.dtsi
    +++ b/arch/arm/boot/dts/spear13xx.dtsi
    @@ -100,7 +100,7 @@
    reg = <0xb2800000 0x1000>;
    interrupts = <0 29 0x4>;
    status = "disabled";
    - dmas = <&dwdma0 0 0 0 0>;
    + dmas = <&dwdma0 0 0 0>;
    dma-names = "data";
    };

    @@ -283,8 +283,8 @@
    #size-cells = <0>;
    interrupts = <0 31 0x4>;
    status = "disabled";
    - dmas = <&dwdma0 0x2000 0 0 0>, /* 0x4 << 11 */
    - <&dwdma0 0x0280 0 0 0>; /* 0x5 << 7 */
    + dmas = <&dwdma0 4 0 0>,
    + <&dwdma0 5 0 0>;
    dma-names = "tx", "rx";
    };

    \
     
     \ /
      Last update: 2018-06-07 17:03    [W:4.081 / U:0.584 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site