From patchwork Wed Feb 6 06:18:45 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Padmavathi Venna X-Patchwork-Id: 2102101 Return-Path: X-Original-To: patchwork-linux-samsung-soc@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id 50ADB3FCFC for ; Wed, 6 Feb 2013 06:18:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751932Ab3BFGS1 (ORCPT ); Wed, 6 Feb 2013 01:18:27 -0500 Received: from mailout3.samsung.com ([203.254.224.33]:60470 "EHLO mailout3.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751890Ab3BFGS0 (ORCPT ); Wed, 6 Feb 2013 01:18:26 -0500 Received: from epcpsbgm2.samsung.com (epcpsbgm2 [203.254.230.27]) by mailout3.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0MHS00ESTC6I63N0@mailout3.samsung.com> for linux-samsung-soc@vger.kernel.org; Wed, 06 Feb 2013 15:18:25 +0900 (KST) Received: from epcpsbgm2.samsung.com ( [172.20.52.124]) by epcpsbgm2.samsung.com (EPCPMTA) with SMTP id 37.1F.03880.1B5F1115; Wed, 06 Feb 2013 15:18:25 +0900 (KST) X-AuditID: cbfee61b-b7fb06d000000f28-6b-5111f5b1a0a4 Received: from epmmp1.local.host ( [203.254.227.16]) by epcpsbgm2.samsung.com (EPCPMTA) with SMTP id 06.1F.03880.0B5F1115; Wed, 06 Feb 2013 15:18:25 +0900 (KST) Received: from padma-linuxpc.sisodomain.com ([107.108.83.35]) by mmp1.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0MHS001KWC6CC970@mmp1.samsung.com> for linux-samsung-soc@vger.kernel.org; Wed, 06 Feb 2013 15:18:24 +0900 (KST) From: Padmavathi Venna To: linux-samsung-soc@vger.kernel.org, devicetree-discuss@lists.ozlabs.org, linux-arm-kernel@lists.infradead.org, padma.v@samsung.com, padma.kvr@gmail.com Cc: sbkim73@samsung.com, broonie@opensource.wolfsonmicro.com, kgene.kim@samsung.com, jassisinghbrar@gmail.com, arnd@arndb.de, vinod.koul@intel.com, grant.likely@secretlab.ca, jon-hunter@ti.com, boojin.kim@samsung.com, thomas.abraham@linaro.org Subject: [PATCH V3 1/5] DMA: PL330: Add new pl330 filter for DT case. Date: Wed, 06 Feb 2013 11:48:45 +0530 Message-id: <1360131529-2847-2-git-send-email-padma.v@samsung.com> X-Mailer: git-send-email 1.7.4.4 In-reply-to: <1360131529-2847-1-git-send-email-padma.v@samsung.com> References: <1360131529-2847-1-git-send-email-padma.v@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrELMWRmVeSWpSXmKPExsWyRsSkRnfjV8FAg4OPBCxmnN/H5MDo8XmT XABjFJdNSmpOZllqkb5dAlfGvvd1Bef4KvZ9OcbcwPibu4uRk0NCwERiVd8fFghbTOLCvfVs XYxcHEICSxklTvTuZoUp2tP5jRUisYhR4vSyw8wgCSGBTUwSj17ZdzFycLAJ6Ei0nHUBqRER mMMo0bx9BiOIwyzwk1HiRd9jsEnCAq4SW27+ALNZBFQlLl2/D7aaV8BJYv+m28wQ2xQkjk39 ClbDKeAssayjjxFimZPEy7XXwa6QELjMJrHv3CcmiEECEt8mH2IBuUJCQFZi0wGoOZISB1fc YJnAKLyAkWEVo2hqQXJBcVJ6rpFecWJucWleul5yfu4mRmAInv73THoH46oGi0OMAhyMSjy8 N/QEA4VYE8uKK3MPMUpwMCuJ8Np+BgrxpiRWVqUW5ccXleakFh9iTAZaPpFZSjQ5HxgfeSXx hsYm5qbGppZGRmampqQJK4nzMp56EiAkkJ5YkpqdmlqQWgSzhYmDU6qBkSdRQ680fOrWDUvO 1rKenXr7enzp/jantSrvGPQ3P3l2XfbFhGkfCjY6s1zxP7hBXfpi/s8bu86f91356mSXZude IeHOyZ1Vebce7VWoWKTpY5Y61yc3vWS3A9t63X8TjnL/VdE/IzfDqoMl5ULfNvO9Bye/eeA4 c+eLzLXcryZNOmt1tfLulSlKLMUZiYZazEXFiQBcdXUKhQIAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrAIsWRmVeSWpSXmKPExsVy+t9jAd2NXwUDDeYoWsw4v4/JgdHj8ya5 AMaoBkabjNTElNQihdS85PyUzLx0WyXv4HjneFMzA0NdQ0sLcyWFvMTcVFslF58AXbfMHKCh SgpliTmlQKGAxOJiJX07TBNCQ9x0LWAaI3R9Q4LgeowM0EDCGsaMfe/rCs7xVez7coy5gfE3 dxcjJ4eEgInEns5vrBC2mMSFe+vZuhi5OIQEFjFKnF52mBkkISSwiUni0Sv7LkYODjYBHYmW sy4gNSICcxglmrfPYARxmAV+Mkq86HsMNklYwFViy80fYDaLgKrEpev3WUBsXgEnif2bbjND bFOQODb1K1gNp4CzxLKOPkaIZU4SL9deZ53AyLuAkWEVo2hqQXJBcVJ6rpFecWJucWleul5y fu4mRnB4P5PewbiqweIQowAHoxIP7w09wUAh1sSy4srcQ4wSHMxKIry2n4FCvCmJlVWpRfnx RaU5qcWHGJOBrprILCWanA+MvbySeENjE3NTY1NLEwsTM0vShJXEeRlPPQkQEkhPLEnNTk0t SC2C2cLEwSnVwNg0U7Iu385H8o/o85ApO10baqZ/NChWmVezcYnngdz6D0WZuobmshM3ZhjM 9jkYMzuC73Nj1JJVYcuKpRbFm5jO5mEpzcy+xlut2bDyO2+IycTpLqvbu3Wu/xb8aBOhIbV0 QqVhQne4iMXW11smmwe+WmQh3cdznH0Oh2YAZ/DCuK2b923+o8RSnJFoqMVcVJwIALB2Es6z AgAA DLP-Filter: Pass X-MTR: 20000000000000000@CPGS X-CFilter-Loop: Reflected Sender: linux-samsung-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-samsung-soc@vger.kernel.org This patch adds a new pl330_dt_filter for DT case to filter the required channel based on the new filter params and modifies the old filter only for non-DT case as suggested by Arnd Bergmann. Signed-off-by: Padmavathi Venna Acked-by: Arnd Bergmann --- drivers/dma/pl330.c | 29 +++++++++++++++-------------- 1 files changed, 15 insertions(+), 14 deletions(-) diff --git a/drivers/dma/pl330.c b/drivers/dma/pl330.c index 80680ee..87110f2 100644 --- a/drivers/dma/pl330.c +++ b/drivers/dma/pl330.c @@ -606,6 +606,11 @@ struct dma_pl330_desc { struct dma_pl330_chan *pchan; }; +struct dma_pl330_filter_args { + struct dma_pl330_dmac *pdmac; + unsigned int chan_id; +}; + static inline void _callback(struct pl330_req *r, enum pl330_op_err err) { if (r && r->xfer_cb) @@ -2352,6 +2357,16 @@ static void dma_pl330_rqcb(void *token, enum pl330_op_err err) tasklet_schedule(&pch->task); } +static bool pl330_dt_filter(struct dma_chan *chan, void *param) +{ + struct dma_pl330_filter_args *fargs = param; + + if (chan->device != &fargs->pdmac->ddma) + return false; + + return (chan->chan_id == fargs->chan_id); +} + bool pl330_filter(struct dma_chan *chan, void *param) { u8 *peri_id; @@ -2359,20 +2374,6 @@ bool pl330_filter(struct dma_chan *chan, void *param) if (chan->device->dev->driver != &pl330_driver.drv) return false; -#ifdef CONFIG_OF - if (chan->device->dev->of_node) { - const __be32 *prop_value; - phandle phandle; - struct device_node *node; - - prop_value = ((struct property *)param)->value; - phandle = be32_to_cpup(prop_value++); - node = of_find_node_by_phandle(phandle); - return ((chan->private == node) && - (chan->chan_id == be32_to_cpup(prop_value))); - } -#endif - peri_id = chan->private; return *peri_id == (unsigned)param; }