lkml.org 
[lkml]   [2015]   [Dec]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.1 28/95] ARM: at91/dt: corrections to i2c1 declaration to sama5d4
    Date
    4.1-stable review patch.  If anyone has any objections, please let me know.

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

    From: Holger Busse <h.busse@kathrein-sachsen.de>

    commit d1a9c24ad16ab2b26f1574bc3f2c165a7beff5df upstream.

    Correcting the dma declaration for i2c1 dma.

    Signed-off-by: Holger Busse <h.busse@kathrein-sachsen.de>
    Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
    Fixes: 4cc7cdf35c5f ("ARM: at91/dt: add i2c1 declaration to sama5d4")
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    arch/arm/boot/dts/sama5d4.dtsi | 8 ++++----
    1 file changed, 4 insertions(+), 4 deletions(-)

    --- a/arch/arm/boot/dts/sama5d4.dtsi
    +++ b/arch/arm/boot/dts/sama5d4.dtsi
    @@ -918,11 +918,11 @@
    reg = <0xf8018000 0x4000>;
    interrupts = <33 IRQ_TYPE_LEVEL_HIGH 6>;
    dmas = <&dma1
    - (AT91_XDMAC_DT_MEM_IF(0) | AT91_XDMAC_DT_PER_IF(1))
    - AT91_XDMAC_DT_PERID(4)>,
    + (AT91_XDMAC_DT_MEM_IF(0) | AT91_XDMAC_DT_PER_IF(1)
    + | AT91_XDMAC_DT_PERID(4))>,
    <&dma1
    - (AT91_XDMAC_DT_MEM_IF(0) | AT91_XDMAC_DT_PER_IF(1))
    - AT91_XDMAC_DT_PERID(5)>;
    + (AT91_XDMAC_DT_MEM_IF(0) | AT91_XDMAC_DT_PER_IF(1)
    + | AT91_XDMAC_DT_PERID(5))>;
    dma-names = "tx", "rx";
    pinctrl-names = "default";
    pinctrl-0 = <&pinctrl_i2c1>;



    \
     
     \ /
      Last update: 2015-12-07 17:41    [W:2.754 / U:0.892 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site