From patchwork Fri Jan 13 07:26:37 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Szyprowski X-Patchwork-Id: 9514723 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 14C5260762 for ; Fri, 13 Jan 2017 07:27:03 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0DB962866E for ; Fri, 13 Jan 2017 07:27:03 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 029E9286C3; Fri, 13 Jan 2017 07:27:03 +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.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI 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 51840286C0 for ; Fri, 13 Jan 2017 07:27:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751099AbdAMH1A (ORCPT ); Fri, 13 Jan 2017 02:27:00 -0500 Received: from mailout2.w1.samsung.com ([210.118.77.12]:8930 "EHLO mailout2.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751145AbdAMH04 (ORCPT ); Fri, 13 Jan 2017 02:26:56 -0500 Received: from eucas1p1.samsung.com (unknown [182.198.249.206]) by mailout2.w1.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTP id <0OJP00453JCSI030@mailout2.w1.samsung.com>; Fri, 13 Jan 2017 07:26:53 +0000 (GMT) Received: from eusmges3.samsung.com (unknown [203.254.199.242]) by eucas1p2.samsung.com (KnoxPortal) with ESMTP id 20170113072652eucas1p2e675c3c0f9b4390fd0988267694693f1~ZRBW3mWsx0130401304eucas1p2f; Fri, 13 Jan 2017 07:26:52 +0000 (GMT) Received: from eucas1p1.samsung.com ( [182.198.249.206]) by eusmges3.samsung.com (EUCPMTA) with SMTP id D8.E3.09557.B3188785; Fri, 13 Jan 2017 07:26:52 +0000 (GMT) Received: from eusmgms1.samsung.com (unknown [182.198.249.179]) by eucas1p2.samsung.com (KnoxPortal) with ESMTP id 20170113072651eucas1p214662327fe5a3dfbaa79d11c2a0b195a~ZRBWRXPWW3233432334eucas1p2T; Fri, 13 Jan 2017 07:26:51 +0000 (GMT) X-AuditID: cbfec7f2-f790f6d000002555-08-5878813b8ee1 Received: from eusync3.samsung.com ( [203.254.199.213]) by eusmgms1.samsung.com (EUCPMTA) with SMTP id 42.90.06687.17188785; Fri, 13 Jan 2017 07:27:45 +0000 (GMT) Received: from AMDC2765.digital.local ([106.116.147.25]) by eusync3.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTPA id <0OJP00H0WJCM0400@eusync3.samsung.com>; Fri, 13 Jan 2017 07:26:51 +0000 (GMT) From: Marek Szyprowski To: linux-samsung-soc@vger.kernel.org, dmaengine@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-pm@vger.kernel.org Cc: Marek Szyprowski , Krzysztof Kozlowski , Bartlomiej Zolnierkiewicz , Vinod Koul , Ulf Hansson , "Rafael J. Wysocki" , Inki Dae Subject: [PATCH v4 1/4] dmaengine: pl330: remove pdata based initialization Date: Fri, 13 Jan 2017 08:26:37 +0100 Message-id: <1484292400-29730-2-git-send-email-m.szyprowski@samsung.com> X-Mailer: git-send-email 1.9.1 In-reply-to: <1484292400-29730-1-git-send-email-m.szyprowski@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrMIsWRmVeSWpSXmKPExsWy7djPc7o2jRURBh2BFhtnrGe1WD31L6vF pPsTWCzOn9/AbrHp8TVWi8+9RxgtZpzfx2Sx9shddoszpy+xWhxfG27xsm8/iwO3x+I9L5k8 Nq3qZPO4c20Pm8fmJfUeW662s3j0bVnF6PF5k1wAexSXTUpqTmZZapG+XQJXxtLd61kKrmtV 3Di3gb2BcYFyFyMnh4SAicSsa1OYIGwxiQv31rN1MXJxCAksZZSY+WwpE4TzmVHi0rMPzDAd rf862EBsIYFljBLbDodDFDUwSXw+cxhsFJuAoUTX2y6wUSICTYwSb+cvZwRxmAWWMklsbn/J DlIlLOAt8XjfZLBRLAKqEn/mrALq5uDgFfCQuHzdAGKbnMTJY5NZQWxOAU+J2WfesoLMkRCY xy7x/XQfWL2EgKzEpgNQ17lI3D54kA3CFpZ4dXwLO4QtI9HZcRDqz35GiaZWbQh7BqPEube8 ELa1xOHjF8F2MQvwSUzaNp0ZYjyvREebEESJh0T35VlsEGFHiVlvpSB+nwM0pfUu8wRGmQWM DKsYRVJLi3PTU4uN9YoTc4tL89L1kvNzNzECo/70v+OfdjB+PWF1iFGAg1GJh3fC7fIIIdbE suLK3EOMEhzMSiK8P2orIoR4UxIrq1KL8uOLSnNSiw8xSnOwKInz7llwJVxIID2xJDU7NbUg tQgmy8TBKdXA2CG5YZXmhDflOwpunfqbuiP4/7fzpgfajGfP8RA8Ntnp3BUb2WPJUTlftsgs lMp6nF6ze+bJ59rtTp/e1CibGmStfritlEG14ZpXThG7y+SzEzOr4k9Kql74keIwq/Bt2tsk 9pK/zmevvWU69y19/kU+3pNbLH4lTj4T2Fl70LpC8FK50I3fIUosxRmJhlrMRcWJAN9C4hL2 AgAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFmphkeLIzCtJLcpLzFFi42I5/e/4Vd3CxooIg91nmCw2zljParF66l9W i0n3J7BYnD+/gd1i0+NrrBafe48wWsw4v4/JYu2Ru+wWZ05fYrU4vjbc4mXffhYHbo/Fe14y eWxa1cnmcefaHjaPzUvqPbZcbWfx6NuyitHj8ya5APYoN5uM1MSU1CKF1Lzk/JTMvHRbpdAQ N10LJYW8xNxUW6UIXd+QICWFssScUiDPyAANODgHuAcr6dsluGUs3b2epeC6VsWNcxvYGxgX KHcxcnJICJhItP7rYIOwxSQu3FsPZgsJLGGUuPVUrIuRC8huYpJ4dPUxI0iCTcBQouttF1iR iEATo8TBXx4gRcwCy5kktky/wA6SEBbwlni8bzJYEYuAqsSfOauYuhg5OHgFPCQuXzeAWCYn cfLYZFYQm1PAU2L2mbesEIs9JDq+/WKdwMi7gJFhFaNIamlxbnpusaFecWJucWleul5yfu4m RmAMbDv2c/MOxksbgw8xCnAwKvHwTrhdHiHEmlhWXJl7iFGCg1lJhPdHbUWEEG9KYmVValF+ fFFpTmrxIUZToJsmMkuJJucD4zOvJN7QxNDc0tDI2MLC3MhISZy35MOVcCGB9MSS1OzU1ILU Ipg+Jg5OqQZGwyVzbSqn6//7wanlcnp7ldZx21LdVeHtOzqPG15+tZVXJlfx5CG7T4cXe70P yvkc4N1y6RxLWvfk6cdnxi7OkmN4+zWnQ+OS9e68wAsnjs+8v7tqjVUmN//9ssdqTIUTT52d /Oxv6W/Rgr75mtVCNU/+djq5Mfbd3RyttOmTXMIO59Mpv/b7KrEUZyQaajEXFScCAHzCp0WX AgAA X-MTR: 20000000000000000@CPGS X-CMS-MailID: 20170113072651eucas1p214662327fe5a3dfbaa79d11c2a0b195a X-Msg-Generator: CA X-Sender-IP: 182.198.249.179 X-Local-Sender: =?UTF-8?B?TWFyZWsgU3p5cHJvd3NraRtTUlBPTC1LZXJuZWwgKFRQKRs=?= =?UTF-8?B?7IK87ISx7KCE7J6QG1NlbmlvciBTb2Z0d2FyZSBFbmdpbmVlcg==?= X-Global-Sender: =?UTF-8?B?TWFyZWsgU3p5cHJvd3NraRtTUlBPTC1LZXJuZWwgKFRQKRtT?= =?UTF-8?B?YW1zdW5nIEVsZWN0cm9uaWNzG1NlbmlvciBTb2Z0d2FyZSBFbmdpbmVlcg==?= X-Sender-Code: =?UTF-8?B?QzEwG0VIURtDMTBDRDAyQ0QwMjczOTI=?= CMS-TYPE: 201P X-HopCount: 7 X-CMS-RootMailID: 20170113072651eucas1p214662327fe5a3dfbaa79d11c2a0b195a X-RootMTR: 20170113072651eucas1p214662327fe5a3dfbaa79d11c2a0b195a References: <1484292400-29730-1-git-send-email-m.szyprowski@samsung.com> Sender: linux-samsung-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-samsung-soc@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This driver is now used only on platforms which support device tree, so it is safe to remove legacy platform data based initialization code. Signed-off-by: Marek Szyprowski Acked-by: Krzysztof Kozlowski --- arch/arm/plat-samsung/devs.c | 1 - drivers/dma/pl330.c | 42 ++++++++---------------------------------- include/linux/amba/pl330.h | 35 ----------------------------------- 3 files changed, 8 insertions(+), 70 deletions(-) delete mode 100644 include/linux/amba/pl330.h diff --git a/arch/arm/plat-samsung/devs.c b/arch/arm/plat-samsung/devs.c index 03fac123676d..dc269d9143bc 100644 --- a/arch/arm/plat-samsung/devs.c +++ b/arch/arm/plat-samsung/devs.c @@ -10,7 +10,6 @@ * published by the Free Software Foundation. */ -#include #include #include #include diff --git a/drivers/dma/pl330.c b/drivers/dma/pl330.c index 7539f73df9e0..78be12b45a45 100644 --- a/drivers/dma/pl330.c +++ b/drivers/dma/pl330.c @@ -22,7 +22,6 @@ #include #include #include -#include #include #include #include @@ -2076,18 +2075,6 @@ static void pl330_tasklet(unsigned long data) } } -bool pl330_filter(struct dma_chan *chan, void *param) -{ - u8 *peri_id; - - if (chan->device->dev->driver != &pl330_driver.drv) - return false; - - peri_id = chan->private; - return *peri_id == (unsigned long)param; -} -EXPORT_SYMBOL(pl330_filter); - static struct dma_chan *of_dma_pl330_xlate(struct of_phandle_args *dma_spec, struct of_dma *ofdma) { @@ -2832,7 +2819,6 @@ static int __maybe_unused pl330_resume(struct device *dev) static int pl330_probe(struct amba_device *adev, const struct amba_id *id) { - struct dma_pl330_platdata *pdat; struct pl330_config *pcfg; struct pl330_dmac *pl330; struct dma_pl330_chan *pch, *_p; @@ -2842,8 +2828,6 @@ static int __maybe_unused pl330_resume(struct device *dev) int num_chan; struct device_node *np = adev->dev.of_node; - pdat = dev_get_platdata(&adev->dev); - ret = dma_set_mask_and_coherent(&adev->dev, DMA_BIT_MASK(32)); if (ret) return ret; @@ -2856,7 +2840,7 @@ static int __maybe_unused pl330_resume(struct device *dev) pd = &pl330->ddma; pd->dev = &adev->dev; - pl330->mcbufsz = pdat ? pdat->mcbuf_sz : 0; + pl330->mcbufsz = 0; /* get quirk */ for (i = 0; i < ARRAY_SIZE(of_quirks); i++) @@ -2900,10 +2884,7 @@ static int __maybe_unused pl330_resume(struct device *dev) INIT_LIST_HEAD(&pd->channels); /* Initialize channel parameters */ - if (pdat) - num_chan = max_t(int, pdat->nr_valid_peri, pcfg->num_chan); - else - num_chan = max_t(int, pcfg->num_peri, pcfg->num_chan); + num_chan = max_t(int, pcfg->num_peri, pcfg->num_chan); pl330->num_peripherals = num_chan; @@ -2915,11 +2896,8 @@ static int __maybe_unused pl330_resume(struct device *dev) for (i = 0; i < num_chan; i++) { pch = &pl330->peripherals[i]; - if (!adev->dev.of_node) - pch->chan.private = pdat ? &pdat->peri_id[i] : NULL; - else - pch->chan.private = adev->dev.of_node; + pch->chan.private = adev->dev.of_node; INIT_LIST_HEAD(&pch->submitted_list); INIT_LIST_HEAD(&pch->work_list); INIT_LIST_HEAD(&pch->completed_list); @@ -2932,15 +2910,11 @@ static int __maybe_unused pl330_resume(struct device *dev) list_add_tail(&pch->chan.device_node, &pd->channels); } - if (pdat) { - pd->cap_mask = pdat->cap_mask; - } else { - dma_cap_set(DMA_MEMCPY, pd->cap_mask); - if (pcfg->num_peri) { - dma_cap_set(DMA_SLAVE, pd->cap_mask); - dma_cap_set(DMA_CYCLIC, pd->cap_mask); - dma_cap_set(DMA_PRIVATE, pd->cap_mask); - } + dma_cap_set(DMA_MEMCPY, pd->cap_mask); + if (pcfg->num_peri) { + dma_cap_set(DMA_SLAVE, pd->cap_mask); + dma_cap_set(DMA_CYCLIC, pd->cap_mask); + dma_cap_set(DMA_PRIVATE, pd->cap_mask); } pd->device_alloc_chan_resources = pl330_alloc_chan_resources; diff --git a/include/linux/amba/pl330.h b/include/linux/amba/pl330.h deleted file mode 100644 index fe93758e8403..000000000000 --- a/include/linux/amba/pl330.h +++ /dev/null @@ -1,35 +0,0 @@ -/* linux/include/linux/amba/pl330.h - * - * Copyright (C) 2010 Samsung Electronics Co. Ltd. - * Jaswinder Singh - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - */ - -#ifndef __AMBA_PL330_H_ -#define __AMBA_PL330_H_ - -#include - -struct dma_pl330_platdata { - /* - * Number of valid peripherals connected to DMAC. - * This may be different from the value read from - * CR0, as the PL330 implementation might have 'holes' - * in the peri list or the peri could also be reached - * from another DMAC which the platform prefers. - */ - u8 nr_valid_peri; - /* Array of valid peripherals */ - u8 *peri_id; - /* Operational capabilities */ - dma_cap_mask_t cap_mask; - /* Bytes to allocate for MC buffer */ - unsigned mcbuf_sz; -}; - -extern bool pl330_filter(struct dma_chan *chan, void *param); -#endif /* __AMBA_PL330_H_ */