From patchwork Fri May 3 19:49:38 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 16709 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-vb0-f69.google.com (mail-vb0-f69.google.com [209.85.212.69]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 9A0F923905 for ; Fri, 3 May 2013 19:50:07 +0000 (UTC) Received: by mail-vb0-f69.google.com with SMTP id 12sf3318015vbf.4 for ; Fri, 03 May 2013 12:49:56 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:x-beenthere:x-received:received-spf:x-received :x-forwarded-to:x-forwarded-for:delivered-to:x-received:received-spf :from:to:cc:subject:date:message-id:x-mailer:mime-version :x-gm-message-state:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-google-group-id:list-post:list-help:list-archive:list-unsubscribe :content-type; bh=UU7LVf2NkfojQtOGzG7P+1V5pEVNTZ8yCVf+8fuj0Sg=; b=Pi8ec5gsuDKW5T8zEnBJgKDsBnfRDt2iSSoaOydmS3q5gWTM3cU0gdwQRUPLEL9rTf HtJeF4b09mmRZZsYQVprEM2qXiAo5DMthHXdRdAQXTC5QRmZ9OTNLIdWxpMCHeENxSwL 0w7GJnABLP1ydW6xed0QT5IAof74RwMBDYTxJ23YLuW2nn4NmlewvRBesNhlr787i1/F DXcBr4B4j80+Ll4yL+xQYu6IvAx4+S6ebg0RL8JR9J9QRHbnbJgvRHc3gx4GfOZazWpj hJ28ICjYpYlTFLWhgzpegD3Lvt15NrbqEq+GmdZxa+qBzG8PJVbFJ0x6tXJL6U55QHtP 4nBw== X-Received: by 10.236.143.177 with SMTP id l37mr9605939yhj.9.1367610596398; Fri, 03 May 2013 12:49:56 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.73.39 with SMTP id i7ls2103470qev.48.gmail; Fri, 03 May 2013 12:49:56 -0700 (PDT) X-Received: by 10.52.65.144 with SMTP id x16mr3475967vds.123.1367610596022; Fri, 03 May 2013 12:49:56 -0700 (PDT) Received: from mail-vc0-f169.google.com (mail-vc0-f169.google.com [209.85.220.169]) by mx.google.com with ESMTPS id s1si5688424vcc.44.2013.05.03.12.49.55 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 03 May 2013 12:49:55 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.220.169 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.220.169; Received: by mail-vc0-f169.google.com with SMTP id gd11so1734307vcb.14 for ; Fri, 03 May 2013 12:49:55 -0700 (PDT) X-Received: by 10.52.66.101 with SMTP id e5mr3498430vdt.57.1367610595437; Fri, 03 May 2013 12:49:55 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.58.127.98 with SMTP id nf2csp37001veb; Fri, 3 May 2013 12:49:54 -0700 (PDT) X-Received: by 10.15.26.6 with SMTP id m6mr35085622eeu.4.1367610593948; Fri, 03 May 2013 12:49:53 -0700 (PDT) Received: from eu1sys200aog104.obsmtp.com (eu1sys200aog104.obsmtp.com [207.126.144.117]) by mx.google.com with SMTP id m43si15594885een.3.2013.05.03.12.49.50 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Fri, 03 May 2013 12:49:53 -0700 (PDT) Received-SPF: neutral (google.com: 207.126.144.117 is neither permitted nor denied by best guess record for domain of linus.walleij@stericsson.com) client-ip=207.126.144.117; Received: from beta.dmz-eu.st.com ([164.129.1.35]) (using TLSv1) by eu1sys200aob104.postini.com ([207.126.147.11]) with SMTP ID DSNKUYQU3BtLNKcUT4kiguh6XjkIaZNR+fTR@postini.com; Fri, 03 May 2013 19:49:53 UTC Received: from zeta.dmz-eu.st.com (zeta.dmz-eu.st.com [164.129.230.9]) by beta.dmz-eu.st.com (STMicroelectronics) with ESMTP id 04D41B3; Fri, 3 May 2013 19:49:44 +0000 (GMT) Received: from relay1.stm.gmessaging.net (unknown [10.230.100.17]) by zeta.dmz-eu.st.com (STMicroelectronics) with ESMTP id 8287CA19D; Fri, 3 May 2013 19:49:36 +0000 (GMT) Received: from exdcvycastm022.EQ1STM.local (alteon-source-exch [10.230.100.61]) (using TLSv1 with cipher RC4-MD5 (128/128 bits)) (Client CN "exdcvycastm022", Issuer "exdcvycastm022" (not verified)) by relay1.stm.gmessaging.net (Postfix) with ESMTPS id 2AB0624C07C; Fri, 3 May 2013 21:49:34 +0200 (CEST) Received: from steludxu4075.lud.stericsson.com (10.230.100.153) by smtp.stericsson.com (10.230.100.30) with Microsoft SMTP Server (TLS) id 8.3.279.5; Fri, 3 May 2013 21:49:44 +0200 From: Linus Walleij To: Vinod Koul Cc: , Dan Williams , Anmar Oueja , Linus Walleij , Lee Jones Subject: [PATCH] dma: ste_dma40: fix up static memcpy event lines Date: Fri, 3 May 2013 21:49:38 +0200 Message-ID: <1367610578-2437-1-git-send-email-linus.walleij@stericsson.com> X-Mailer: git-send-email 1.7.11.3 MIME-Version: 1.0 X-Gm-Message-State: ALoCoQkI37fIaV04yOs+h/22uz0P+folZemAyR9BXHHoUevAcN1G+KZK34r/L0whyvirSxupAR+D X-Original-Sender: linus.walleij@stericsson.com X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.220.169 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , From: Linus Walleij The commit "dmaengine: ste_dma40: Assign memcpy channels in the driver" had two problems: - It assigned magic numbers to the memcpy event lines instead of giving them symbolic names. - It seems to have missed one of the memcpy event lines, number 51. This patch fixes it up. Cc: Lee Jones Signed-off-by: Linus Walleij --- Vinod: seeking an ACK for this to take it with the rest of Lee's patches in a DMA40 branch in ARM SoC. --- drivers/dma/ste_dma40.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/drivers/dma/ste_dma40.c b/drivers/dma/ste_dma40.c index 12de79e..cd7b480 100644 --- a/drivers/dma/ste_dma40.c +++ b/drivers/dma/ste_dma40.c @@ -56,7 +56,21 @@ #define MAX(a, b) (((a) < (b)) ? (b) : (a)) /* Reserved event lines for memcpy only. */ -static int dma40_memcpy_channels[] = { 56, 57, 58, 59, 60 }; +#define DB8500_DMA_MEMCPY_EV_0 51 +#define DB8500_DMA_MEMCPY_EV_1 56 +#define DB8500_DMA_MEMCPY_EV_2 57 +#define DB8500_DMA_MEMCPY_EV_3 58 +#define DB8500_DMA_MEMCPY_EV_4 59 +#define DB8500_DMA_MEMCPY_EV_5 60 + +static int dma40_memcpy_channels[] = { + DB8500_DMA_MEMCPY_EV_0, + DB8500_DMA_MEMCPY_EV_1, + DB8500_DMA_MEMCPY_EV_2, + DB8500_DMA_MEMCPY_EV_3, + DB8500_DMA_MEMCPY_EV_4, + DB8500_DMA_MEMCPY_EV_5, +}; /** * enum 40_command - The different commands and/or statuses.