From patchwork Mon Jan 9 16:06:46 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexandre Bailon X-Patchwork-Id: 9505347 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 0C392606E1 for ; Mon, 9 Jan 2017 16:08:30 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id F2F6528474 for ; Mon, 9 Jan 2017 16:08:29 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E7DC328493; Mon, 9 Jan 2017 16:08:29 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.3 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DD4A328497 for ; Mon, 9 Jan 2017 16:08:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S970269AbdAIQIZ (ORCPT ); Mon, 9 Jan 2017 11:08:25 -0500 Received: from mail-wm0-f48.google.com ([74.125.82.48]:37160 "EHLO mail-wm0-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S970208AbdAIQHU (ORCPT ); Mon, 9 Jan 2017 11:07:20 -0500 Received: by mail-wm0-f48.google.com with SMTP id c206so37925656wme.0 for ; Mon, 09 Jan 2017 08:07:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=vgVwuTnWcLYynBPIJJiIqh3aLulKr/TI3wuV4R5v8JA=; b=lTPzssVnyCILonCwyEw6gkSd0YgG5dKUHg9gJrWXAVa3tezCqzGnWljot7ObrS2sQw fpZSUOAcm97YVZ+MuTFDWkGOTxp91JxpZoXqnYwWfDr5edrJR/sYPhubrvCjeyfa9qsw XoA4o6Ra1yGTYnBLvhLORr5PR7fH1fGEm/emPnQqx+rT2H3Eaqmacb6g+4TRGxX4O49J n5e+iaWbTYjbiin0iaOyXgYSsrXIvGaTikD9aZ0hUWJPW11TzTGp0hEoJW3l/2qWWWXI uOPLHh16IvYXOTkJa/IRLRq+1LYBD0hStvb97wp5cty4fT06ci45sSPjE4+ILY9j9/Gc QblA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=vgVwuTnWcLYynBPIJJiIqh3aLulKr/TI3wuV4R5v8JA=; b=JJqnUcFkkQ8FUV2ytlbzvrATSJknZELmr0JSJ9wN3GXW37t8hOdV7b8OxQPfd2c2cw h7T9jRvSP5YHWKpFxU2NvVOsSV7h6Ha9YewXg495Ckk1tA3tBKG6M9uG+MFtJxjNvYrG R3+VLBODO4cggB3IKiwKuGu18hqWAavDywJfKMVs5Vm0K3zO1pWh1S1ZvlGA5WvXVvpR OzsLkxKjxm4DpgaaP5CO3lzjOYugIc5tFefmuqBREkDj5/seVK4ftbPC8r+3NoVTSe2N wQkWCcwq5Cm/Ptj+rN/jwJfdxc8GLjdSSiVEcDp0XCobw2LDJcGR6DsdahV0zeNov4b6 koMw== X-Gm-Message-State: AIkVDXKDTK6naMHJYdrFCsjaQCdcMo3DlkxcHWcivBbRuWlWT3IAygJ2SO5+6ibkN322QmGW X-Received: by 10.223.151.138 with SMTP id s10mr247226wrb.65.1483978038698; Mon, 09 Jan 2017 08:07:18 -0800 (PST) Received: from localhost.localdomain ([90.63.244.31]) by smtp.gmail.com with ESMTPSA id w18sm19656244wme.9.2017.01.09.08.07.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 09 Jan 2017 08:07:18 -0800 (PST) From: Alexandre Bailon To: vinod.koul@intel.com Cc: dmaengine@vger.kernel.org, linux-usb@vger.kernel.org, nsekhar@ti.com, khilman@baylibre.com, ptitiano@baylibre.com, tony@atomide.com, linux-omap@vger.kernel.org, devicetree@vger.kernel.org, robh+dt@kernel.org, b-liu@ti.com, Alexandre Bailon Subject: [PATCH 01/11] dmaengine: cppi41: rename platform variables Date: Mon, 9 Jan 2017 17:06:46 +0100 Message-Id: <20170109160656.3470-2-abailon@baylibre.com> X-Mailer: git-send-email 2.10.2 In-Reply-To: <20170109160656.3470-1-abailon@baylibre.com> References: <20170109160656.3470-1-abailon@baylibre.com> Sender: dmaengine-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: dmaengine@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Currently, only the am335x is supported by the driver. Though the driver has a glue layer to support different platforms, some platform variable names are not prefixed with the platform name. To facilitate the addition of a new platform, rename some variables owned by the am335x glue. Currently, only the am335x is supported by the driver. Though the driver provide a glue layer that should be used to support another platforms. Rename variable specifics to the am335x glue. Signed-off-by: Alexandre Bailon --- drivers/dma/cppi41.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/drivers/dma/cppi41.c b/drivers/dma/cppi41.c index d5ba43a..25ee71d 100644 --- a/drivers/dma/cppi41.c +++ b/drivers/dma/cppi41.c @@ -156,7 +156,7 @@ struct cppi41_dd { }; #define FIST_COMPLETION_QUEUE 93 -static struct chan_queues usb_queues_tx[] = { +static struct chan_queues am335x_usb_queues_tx[] = { /* USB0 ENDP 1 */ [ 0] = { .submit = 32, .complete = 93}, [ 1] = { .submit = 34, .complete = 94}, @@ -192,7 +192,7 @@ static struct chan_queues usb_queues_tx[] = { [29] = { .submit = 90, .complete = 139}, }; -static const struct chan_queues usb_queues_rx[] = { +static const struct chan_queues am335x_usb_queues_rx[] = { /* USB0 ENDP 1 */ [ 0] = { .submit = 1, .complete = 109}, [ 1] = { .submit = 2, .complete = 110}, @@ -918,8 +918,9 @@ static bool cpp41_dma_filter_fn(struct dma_chan *chan, void *param) else queues = cdd->queues_rx; - BUILD_BUG_ON(ARRAY_SIZE(usb_queues_rx) != ARRAY_SIZE(usb_queues_tx)); - if (WARN_ON(cchan->port_num > ARRAY_SIZE(usb_queues_rx))) + BUILD_BUG_ON(ARRAY_SIZE(am335x_usb_queues_rx) != + ARRAY_SIZE(am335x_usb_queues_tx)); + if (WARN_ON(cchan->port_num > ARRAY_SIZE(am335x_usb_queues_rx))) return false; cchan->q_num = queues[cchan->port_num].submit; @@ -947,15 +948,15 @@ static struct dma_chan *cppi41_dma_xlate(struct of_phandle_args *dma_spec, &dma_spec->args[0]); } -static const struct cppi_glue_infos usb_infos = { +static const struct cppi_glue_infos am335x_usb_infos = { .isr = cppi41_irq, - .queues_rx = usb_queues_rx, - .queues_tx = usb_queues_tx, + .queues_rx = am335x_usb_queues_rx, + .queues_tx = am335x_usb_queues_tx, .td_queue = { .submit = 31, .complete = 0 }, }; static const struct of_device_id cppi41_dma_ids[] = { - { .compatible = "ti,am3359-cppi41", .data = &usb_infos}, + { .compatible = "ti,am3359-cppi41", .data = &am335x_usb_infos}, {}, }; MODULE_DEVICE_TABLE(of, cppi41_dma_ids);