Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932975AbbFIKNQ (ORCPT ); Tue, 9 Jun 2015 06:13:16 -0400 Received: from eusmtp01.atmel.com ([212.144.249.243]:7490 "EHLO eusmtp01.atmel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932878AbbFIKNN (ORCPT ); Tue, 9 Jun 2015 06:13:13 -0400 Message-ID: <5576BBFD.2060605@atmel.com> Date: Tue, 9 Jun 2015 12:12:13 +0200 From: Nicolas Ferre Organization: atmel User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.7.0 MIME-Version: 1.0 To: Ludovic Desroches , Arnd Bergmann , Olof Johansson , Kevin Hilman CC: , , , Subject: Re: [PATCH] ARM: at91/dt: sama5d4: fix dma conf for aes, sha and tdes nodes References: <1433771754-4999-1-git-send-email-ludovic.desroches@atmel.com> In-Reply-To: <1433771754-4999-1-git-send-email-ludovic.desroches@atmel.com> Content-Type: text/plain; charset="windows-1252" Content-Transfer-Encoding: 8bit X-Originating-IP: [10.161.30.18] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3311 Lines: 86 Le 08/06/2015 15:55, Ludovic Desroches a ?crit : > The xdmac channel configuration is done in one cell not two. This error > prevents from probing devices correctly. > > Signed-off-by: Ludovic Desroches > Fixes: 83906783b766 ("ARM: at91/dt: sama5d4: add aes, sha and tdes nodes") > Cc: stable@vger.kernel.org # 4.1 Acked-by: Nicolas Ferre Arnd, Olof, Kevin, This patch is a fix concerning material that had been added to 4.1, so it's not exactly a regression. So, as we missed the last train to 4.1, I'd like to queue it for 4.2 but it's the only patch I have on top of my previous DT pull-request (at91-dt4, not taken by you, yet). So, should I build another pull-request (at91-dt5) or can you take this single patch when you pull the at91-dt4 material? BTW, here is the link to patchwork if it's easier: https://patchwork.kernel.org/patch/6565591/ Thanks, bye, > --- > arch/arm/boot/dts/sama5d4.dtsi | 20 ++++++++++---------- > 1 file changed, 10 insertions(+), 10 deletions(-) > > diff --git a/arch/arm/boot/dts/sama5d4.dtsi b/arch/arm/boot/dts/sama5d4.dtsi > index 6b1bb58..51ddec4 100644 > --- a/arch/arm/boot/dts/sama5d4.dtsi > +++ b/arch/arm/boot/dts/sama5d4.dtsi > @@ -1125,10 +1125,10 @@ > compatible = "atmel,at91sam9g46-aes"; > reg = <0xfc044000 0x100>; > interrupts = <12 IRQ_TYPE_LEVEL_HIGH 0>; > - dmas = <&dma0 (AT91_XDMAC_DT_MEM_IF(0) | AT91_XDMAC_DT_PER_IF(1)) > - AT91_XDMAC_DT_PERID(41)>, > - <&dma0 (AT91_XDMAC_DT_MEM_IF(0) | AT91_XDMAC_DT_PER_IF(1)) > - AT91_XDMAC_DT_PERID(40)>; > + dmas = <&dma0 (AT91_XDMAC_DT_MEM_IF(0) | AT91_XDMAC_DT_PER_IF(1) > + | AT91_XDMAC_DT_PERID(41))>, > + <&dma0 (AT91_XDMAC_DT_MEM_IF(0) | AT91_XDMAC_DT_PER_IF(1) > + | AT91_XDMAC_DT_PERID(40))>; > dma-names = "tx", "rx"; > clocks = <&aes_clk>; > clock-names = "aes_clk"; > @@ -1139,10 +1139,10 @@ > compatible = "atmel,at91sam9g46-tdes"; > reg = <0xfc04c000 0x100>; > interrupts = <14 IRQ_TYPE_LEVEL_HIGH 0>; > - dmas = <&dma0 (AT91_XDMAC_DT_MEM_IF(0) | AT91_XDMAC_DT_PER_IF(1)) > - AT91_XDMAC_DT_PERID(42)>, > - <&dma0 (AT91_XDMAC_DT_MEM_IF(0) | AT91_XDMAC_DT_PER_IF(1)) > - AT91_XDMAC_DT_PERID(43)>; > + dmas = <&dma0 (AT91_XDMAC_DT_MEM_IF(0) | AT91_XDMAC_DT_PER_IF(1) > + | AT91_XDMAC_DT_PERID(42))>, > + <&dma0 (AT91_XDMAC_DT_MEM_IF(0) | AT91_XDMAC_DT_PER_IF(1) > + | AT91_XDMAC_DT_PERID(43))>; > dma-names = "tx", "rx"; > clocks = <&tdes_clk>; > clock-names = "tdes_clk"; > @@ -1153,8 +1153,8 @@ > compatible = "atmel,at91sam9g46-sha"; > reg = <0xfc050000 0x100>; > interrupts = <15 IRQ_TYPE_LEVEL_HIGH 0>; > - dmas = <&dma0 (AT91_XDMAC_DT_MEM_IF(0) | AT91_XDMAC_DT_PER_IF(1)) > - AT91_XDMAC_DT_PERID(44)>; > + dmas = <&dma0 (AT91_XDMAC_DT_MEM_IF(0) | AT91_XDMAC_DT_PER_IF(1) > + | AT91_XDMAC_DT_PERID(44))>; > dma-names = "tx"; > clocks = <&sha_clk>; > clock-names = "sha_clk"; > -- Nicolas Ferre -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/