From patchwork Fri Apr 22 00:25:32 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Horman X-Patchwork-Id: 8905031 Return-Path: X-Original-To: patchwork-linux-mmc@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 89F46BF29F for ; Fri, 22 Apr 2016 00:25:41 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 9FE5F200C6 for ; Fri, 22 Apr 2016 00:25:40 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0F03A202E9 for ; Fri, 22 Apr 2016 00:25:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751718AbcDVAZg (ORCPT ); Thu, 21 Apr 2016 20:25:36 -0400 Received: from kirsty.vergenet.net ([202.4.237.240]:40867 "EHLO kirsty.vergenet.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751681AbcDVAZg (ORCPT ); Thu, 21 Apr 2016 20:25:36 -0400 Received: from penelope.kanocho.kobe.vergenet.net (124-171-1-229.dyn.iinet.net.au [124.171.1.229]) by kirsty.vergenet.net (Postfix) with ESMTPSA id 983B425B76B; Fri, 22 Apr 2016 10:25:32 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=verge.net.au; s=mail; t=1461284732; bh=n6ZSIsc6LcL8Rm7eP0MCqc/NFrTTPX2pAxeHLbT1rX8=; h=Date:From:To:Cc:Subject:In-Reply-To:From; b=hlPgygJxPqBJpFowD4wr+ruHoxXExRhjlZvSqCq88A4Xkwu9tS2uE2n6VD+CrmcYz EqG6ahAKYyIsM//N4CDz/geiA90sIx0qMFQ0Sz4oIw2F0CNahARl9ZQqe/rWsQAdfj 8cyBGXSj9wqlbpjP1jF4pM8l+a4YFz7DqVS1fSo0= Received: by penelope.kanocho.kobe.vergenet.net (Postfix, from userid 7100) id 389EE60296; Fri, 22 Apr 2016 10:25:32 +1000 (AEST) Date: Fri, 22 Apr 2016 10:25:32 +1000 From: Simon Horman To: Geert Uytterhoeven Cc: Ulrich Hecht , linux-renesas-soc@vger.kernel.org, Linux MMC List , Magnus Damm , Sergei Shtylyov Subject: Re: [PATCH v2 1/2] ARM: dts: r8a7793: Add SDHI controllers Message-ID: <20160422002531.GD25416@verge.net.au> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: Organisation: Horms Solutions Ltd. User-Agent: Mutt/1.5.23 (2014-03-12) Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org X-Spam-Status: No, score=-6.3 required=5.0 tests=BAYES_00,DKIM_SIGNED, FAKE_REPLY_C,RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP On Thu, Apr 21, 2016 at 02:54:30PM +0200, Geert Uytterhoeven wrote: > On Mon, Apr 18, 2016 at 6:02 PM, Ulrich Hecht > wrote: > > --- a/arch/arm/boot/dts/r8a7793.dtsi > > +++ b/arch/arm/boot/dts/r8a7793.dtsi > > @@ -510,6 +510,42 @@ > > reg = <0 0xe6060000 0 0x250>; > > }; > > > > + sdhi0: sd@ee100000 { > > + compatible = "renesas,sdhi-r8a7793"; > > + reg = <0 0xee100000 0 0x328>; > > + interrupts = <0 165 IRQ_TYPE_LEVEL_HIGH>; > > GIC_SPI (x3) Thanks, I should have noticed that. On Thu, Apr 21, 2016 at 02:55:06PM +0200, Geert Uytterhoeven wrote: > On Thu, Apr 21, 2016 at 5:27 AM, Simon Horman wrote: > > > > We are back to one DMA controller this week so I updated your patch and > > queued up the following. > > > > From: Ulrich Hecht > > Date: Mon, 18 Apr 2016 18:02:56 +0200 > > Subject: [PATCH] ARM: dts: r8a7793: Add SDHI controllers > > > > Same as on r8a7791. > > > > Signed-off-by: Ulrich Hecht > > Signed-off-by: Simon Horman > > --- > > arch/arm/boot/dts/r8a7793.dtsi | 33 +++++++++++++++++++++++++++++++++ > > 1 file changed, 33 insertions(+) > > > > diff --git a/arch/arm/boot/dts/r8a7793.dtsi b/arch/arm/boot/dts/r8a7793.dtsi > > index fc552629ed4a..a93d509732a8 100644 > > --- a/arch/arm/boot/dts/r8a7793.dtsi > > +++ b/arch/arm/boot/dts/r8a7793.dtsi > > @@ -507,6 +507,39 @@ > > reg = <0 0xe6060000 0 0x250>; > > }; > > > > + sdhi0: sd@ee100000 { > > + compatible = "renesas,sdhi-r8a7793"; > > + reg = <0 0xee100000 0 0x328>; > > + interrupts = <0 165 IRQ_TYPE_LEVEL_HIGH>; > > + clocks = <&mstp3_clks R8A7793_CLK_SDHI0>; > > + dmas = <&dmac0 0xcd>, <&dmac0 0xce>; > > + dma-names = "tx", "rx", "tx", "rx"; > > If you drop the last two dma values, you should drop the last two > dma-names values, too. Sorry about that, I'm unsure how I managed to mess that up. I have updated the patch and re-queued the following. From: Ulrich Hecht Date: Mon, 18 Apr 2016 18:02:56 +0200 Subject: [PATCH] ARM: dts: r8a7793: Add SDHI controllers Same as on r8a7791. Signed-off-by: Ulrich Hecht Signed-off-by: Simon Horman --- arch/arm/boot/dts/r8a7793.dtsi | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/arch/arm/boot/dts/r8a7793.dtsi b/arch/arm/boot/dts/r8a7793.dtsi index bddc31283bd9..6186179fd66d 100644 --- a/arch/arm/boot/dts/r8a7793.dtsi +++ b/arch/arm/boot/dts/r8a7793.dtsi @@ -507,6 +507,39 @@ reg = <0 0xe6060000 0 0x250>; }; + sdhi0: sd@ee100000 { + compatible = "renesas,sdhi-r8a7793"; + reg = <0 0xee100000 0 0x328>; + interrupts = ; + clocks = <&mstp3_clks R8A7793_CLK_SDHI0>; + dmas = <&dmac0 0xcd>, <&dmac0 0xce>; + dma-names = "tx", "rx"; + power-domains = <&cpg_clocks>; + status = "disabled"; + }; + + sdhi1: sd@ee140000 { + compatible = "renesas,sdhi-r8a7793"; + reg = <0 0xee140000 0 0x100>; + interrupts = ; + clocks = <&mstp3_clks R8A7793_CLK_SDHI1>; + dmas = <&dmac0 0xc1>, <&dmac0 0xc2>; + dma-names = "tx", "rx"; + power-domains = <&cpg_clocks>; + status = "disabled"; + }; + + sdhi2: sd@ee160000 { + compatible = "renesas,sdhi-r8a7793"; + reg = <0 0xee160000 0 0x100>; + interrupts = ; + clocks = <&mstp3_clks R8A7793_CLK_SDHI2>; + dmas = <&dmac0 0xd3>, <&dmac0 0xd4>; + dma-names = "tx", "rx"; + power-domains = <&cpg_clocks>; + status = "disabled"; + }; + scifa0: serial@e6c40000 { compatible = "renesas,scifa-r8a7793", "renesas,rcar-gen2-scifa", "renesas,scifa";