Received: by 2002:a25:ab43:0:0:0:0:0 with SMTP id u61csp3566656ybi; Mon, 27 May 2019 02:09:46 -0700 (PDT) X-Google-Smtp-Source: APXvYqzviH+AQR/37HxlXnj04kJpq4w0ll531fwmsrhMSygcz+zEkAyI6ZquSjdgtwhh8lsj/jAR X-Received: by 2002:a65:4786:: with SMTP id e6mr13704696pgs.85.1558948185899; Mon, 27 May 2019 02:09:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1558948185; cv=none; d=google.com; s=arc-20160816; b=ivt3kKScopnFaxu6Wy/jL88MHseby51Tg0fvGPujdPZsRW10KEM7RLuYb4Z7B8BcfV GuYu6JeffyGhbdq2BZnbNjfsrv66vMvVpjTRdJ9grIibN9ejo5vXChPMsLgzBxz7DgnM CA4dgxvcUHJmYV+8iPTtjLHcT5lF66yZ4xgj6InnqP3QdTUREiE8EIt4mR+BrTBfFCiJ +O7uKxUbdmLYDlRGQX05EmI5a1LZJCoeqOOGZNg0XrrXL7gjnH71Rpkzza/ibeSciSSR TDX8M1/iKZk868svTj8nnnyxCH0nV8B4I+63fbmWWJ04bkQkOvy5u/QiGbvvCE+/CV0R sPGw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:user-agent:in-reply-to :content-disposition:mime-version:references:message-id:subject:cc :to:from:date; bh=S0prJrEnIXM4gUSftq9qymLrlLiCShzAWJpD4BwAgpk=; b=CkcuHehlX/H5C7IXV28bVeui78TyNPbLe/UB3s8Q8ontDZ9V4GxtNTZAYZa0Ol54sj zsGuYmExK2fDKDkMFSI0mt+8kmrvKpJs8AK1hojewNMZoTgKEX0YK07xe2/w+hQ+AxIC dn0vhtzPn6VRbb69H+qdedroI6y3mP0y9DcqBD0lbD/90JMLroyP2rEH7pKvA7xSxxjQ 3MeZ3cmAhzMKfzG4hsqXRd9hNYjF7A985R2+nbL3mzwDo8ROCt9uhyzE3oqP+4QXiD5Q 3Yn86aYnqSGw5TiP9Oz7C7GFOj+GJ6wLwyG1m3y4nY1NUqQFVnQEDnIDkgEyyjHferlk gVTw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id r5si20171350pfg.152.2019.05.27.02.09.30; Mon, 27 May 2019 02:09:45 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726635AbfE0JIY (ORCPT + 99 others); Mon, 27 May 2019 05:08:24 -0400 Received: from metis.ext.pengutronix.de ([85.220.165.71]:45455 "EHLO metis.ext.pengutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726063AbfE0JIX (ORCPT ); Mon, 27 May 2019 05:08:23 -0400 Received: from ptx.hi.pengutronix.de ([2001:67c:670:100:1d::c0]) by metis.ext.pengutronix.de with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1hVBc7-0004fQ-KN; Mon, 27 May 2019 11:08:15 +0200 Received: from sha by ptx.hi.pengutronix.de with local (Exim 4.89) (envelope-from ) id 1hVBc6-0001ZE-VS; Mon, 27 May 2019 11:08:14 +0200 Date: Mon, 27 May 2019 11:08:14 +0200 From: Sascha Hauer To: yibin.gong@nxp.com Cc: robh@kernel.org, shawnguo@kernel.org, festevam@gmail.com, mark.rutland@arm.com, vkoul@kernel.org, dan.j.williams@intel.com, linux-imx@nxp.com, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, dmaengine@vger.kernel.org, devicetree@vger.kernel.org, kernel@pengutronix.de Subject: Re: [PATCH v2 4/7] dmaengine: fsl-edma-common: version check for v2 instead Message-ID: <20190527090814.qfjiksqi24x2jrs3@pengutronix.de> References: <20190527085118.40423-1-yibin.gong@nxp.com> <20190527085118.40423-5-yibin.gong@nxp.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20190527085118.40423-5-yibin.gong@nxp.com> X-Sent-From: Pengutronix Hildesheim X-URL: http://www.pengutronix.de/ X-IRC: #ptxdist @freenode X-Accept-Language: de,en X-Accept-Content-Type: text/plain X-Uptime: 11:07:14 up 9 days, 15:25, 72 users, load average: 0.12, 0.20, 0.16 User-Agent: NeoMutt/20170113 (1.7.2) X-SA-Exim-Connect-IP: 2001:67c:670:100:1d::c0 X-SA-Exim-Mail-From: sha@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-kernel@vger.kernel.org Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, May 27, 2019 at 04:51:15PM +0800, yibin.gong@nxp.com wrote: > From: Robin Gong > > The next v3 i.mx7ulp edma is based on v1, so change version > check logic for v2 instead. > > Signed-off-by: Robin Gong > --- > drivers/dma/fsl-edma-common.c | 40 ++++++++++++++++++++-------------------- > 1 file changed, 20 insertions(+), 20 deletions(-) > > diff --git a/drivers/dma/fsl-edma-common.c b/drivers/dma/fsl-edma-common.c > index bb24251..45d70d3 100644 > --- a/drivers/dma/fsl-edma-common.c > +++ b/drivers/dma/fsl-edma-common.c > @@ -657,26 +657,26 @@ void fsl_edma_setup_regs(struct fsl_edma_engine *edma) > edma->regs.erql = edma->membase + EDMA_ERQ; > edma->regs.eeil = edma->membase + EDMA_EEI; > > - edma->regs.serq = edma->membase + ((edma->version == v1) ? > - EDMA_SERQ : EDMA64_SERQ); > - edma->regs.cerq = edma->membase + ((edma->version == v1) ? > - EDMA_CERQ : EDMA64_CERQ); > - edma->regs.seei = edma->membase + ((edma->version == v1) ? > - EDMA_SEEI : EDMA64_SEEI); > - edma->regs.ceei = edma->membase + ((edma->version == v1) ? > - EDMA_CEEI : EDMA64_CEEI); > - edma->regs.cint = edma->membase + ((edma->version == v1) ? > - EDMA_CINT : EDMA64_CINT); > - edma->regs.cerr = edma->membase + ((edma->version == v1) ? > - EDMA_CERR : EDMA64_CERR); > - edma->regs.ssrt = edma->membase + ((edma->version == v1) ? > - EDMA_SSRT : EDMA64_SSRT); > - edma->regs.cdne = edma->membase + ((edma->version == v1) ? > - EDMA_CDNE : EDMA64_CDNE); > - edma->regs.intl = edma->membase + ((edma->version == v1) ? > - EDMA_INTR : EDMA64_INTL); > - edma->regs.errl = edma->membase + ((edma->version == v1) ? > - EDMA_ERR : EDMA64_ERRL); > + edma->regs.serq = edma->membase + ((edma->version == v2) ? > + EDMA64_SERQ : EDMA_SERQ); > + edma->regs.cerq = edma->membase + ((edma->version == v2) ? > + EDMA64_CERQ : EDMA_CERQ); > + edma->regs.seei = edma->membase + ((edma->version == v2) ? > + EDMA64_SEEI : EDMA_SEEI); > + edma->regs.ceei = edma->membase + ((edma->version == v2) ? > + EDMA64_CEEI : EDMA_CEEI); > + edma->regs.cint = edma->membase + ((edma->version == v2) ? > + EDMA64_CINT : EDMA_CINT); > + edma->regs.cerr = edma->membase + ((edma->version == v2) ? > + EDMA64_CERR : EDMA_CERR); > + edma->regs.ssrt = edma->membase + ((edma->version == v2) ? > + EDMA64_SSRT : EDMA_SSRT); > + edma->regs.cdne = edma->membase + ((edma->version == v2) ? > + EDMA64_CDNE : EDMA_CDNE); > + edma->regs.intl = edma->membase + ((edma->version == v2) ? > + EDMA64_INTL : EDMA_INTR); > + edma->regs.errl = edma->membase + ((edma->version == v2) ? > + EDMA64_ERRL : EDMA_ERR); Following to what I have said to 6/7 you can put the register offsets into that new struct aswell. Sascha -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |