From patchwork Fri Nov 7 06:54:39 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Padmavathi Venna X-Patchwork-Id: 5250631 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 7DDB39F39B for ; Fri, 7 Nov 2014 07:03:54 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id ACD0E20138 for ; Fri, 7 Nov 2014 07:03:53 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id D3ABD200F3 for ; Fri, 7 Nov 2014 07:03:52 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1XmdY2-00067p-JQ; Fri, 07 Nov 2014 07:01:30 +0000 Received: from mailout4.samsung.com ([203.254.224.34]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1XmdXu-00063A-1n for linux-arm-kernel@lists.infradead.org; Fri, 07 Nov 2014 07:01:22 +0000 Received: from epcpsbgr3.samsung.com (u143.gpu120.samsung.co.kr [203.254.230.143]) by mailout4.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0NEN009GRQ67GA40@mailout4.samsung.com> for linux-arm-kernel@lists.infradead.org; Fri, 07 Nov 2014 16:01:19 +0900 (KST) Received: from epcpsbgm2.samsung.com ( [172.20.52.125]) by epcpsbgr3.samsung.com (EPCPMTA) with SMTP id 66.95.18484.F3E6C545; Fri, 07 Nov 2014 16:01:19 +0900 (KST) X-AuditID: cbfee68f-f791c6d000004834-42-545c6e3f20fd Received: from epmmp1.local.host ( [203.254.227.16]) by epcpsbgm2.samsung.com (EPCPMTA) with SMTP id 2F.32.09430.F3E6C545; Fri, 07 Nov 2014 16:01:19 +0900 (KST) Received: from chromebld-server.sisodomain.com ([107.108.73.106]) by mmp1.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0NEN004U2Q4LQI20@mmp1.samsung.com>; Fri, 07 Nov 2014 16:01:19 +0900 (KST) From: Padmavathi Venna To: padma.kvr@gmail.com, alsa-devel@alsa-project.org, linux-samsung-soc@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH 1/2] ASoC: Samsung: Add quirk for internal DMA Date: Fri, 07 Nov 2014 12:24:39 +0530 Message-id: <1415343280-18916-2-git-send-email-padma.v@samsung.com> X-Mailer: git-send-email 1.7.9.5 In-reply-to: <1415343280-18916-1-git-send-email-padma.v@samsung.com> References: <1415343280-18916-1-git-send-email-padma.v@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrELMWRmVeSWpSXmKPExsWyRsSkVtc+LybEYMJWKYsrFw8xWUx9+ITN onfBVTaLTY+vsVrMOL+PyaJ92RxWi983v7NZXFzxhcmBw2PD5yY2j52z7rJ7bFrVyeaxeUm9 R9+WVYwenzfJBbBFcdmkpOZklqUW6dslcGVsefiNueCRUMXnl3UNjKv4uxg5OSQETCTOTv3D AmGLSVy4t56ti5GLQ0hgKaNE47sWJpiio9+aGCESixgltk/cygrhTGCSWHP2NlA7BwebgI5E y1kXkAYRgXqJ67/2soPYzAI5EmcOPACzhQXsJI68mAY2lEVAVeLRqgmMIDavgLNE5/b17CBj JAQUJOZMsgEJcwq4SOy9u48NxBYCKvk3bT0zyFoJgVXsEl/bXrJBzBGQ+Db5EAtEr6zEpgPM EDdLShxccYNlAqPwAkaGVYyiqQXJBcVJ6UXGesWJucWleel6yfm5mxiBQX/637P+HYx3D1gf YhTgYFTi4b3BGxMixJpYVlyZe4jRFGjDRGYp0eR8YGzllcQbGpsZWZiamBobmVuaKYnzLpT6 GSwkkJ5YkpqdmlqQWhRfVJqTWnyIkYmDU6qBUSrcXvtK0KvzzQ1p04yOzHQQM+wvZDTnn/Fv jk+YqPQ11zVnwu9f+SKxrscxuDA2839Ut/9h/dmt5z8I52z2rQ6ZKaGcdmTh5/Jdyp2Vn5il zq/bdeRpQrxg0afYbtHTlYz/5lgfeb1VkP3rfBWel2EilrrXLyY5hH7e+nXnGia+nVpqhxua lFiKMxINtZiLihMBKbSVTXUCAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrDIsWRmVeSWpSXmKPExsVy+t9jAV37vJgQg5NXBC2uXDzEZDH14RM2 i94FV9ksNj2+xmox4/w+Jov2ZXNYLX7f/M5mcXHFFyYHDo8Nn5vYPHbOusvusWlVJ5vH5iX1 Hn1bVjF6fN4kF8AW1cBok5GamJJapJCal5yfkpmXbqvkHRzvHG9qZmCoa2hpYa6kkJeYm2qr 5OIToOuWmQN0kJJCWWJOKVAoILG4WEnfDtOE0BA3XQuYxghd35AguB4jAzSQsIYxY8vDb8wF j4QqPr+sa2Bcxd/FyMkhIWAicfRbEyOELSZx4d56ti5GLg4hgUWMEtsnbmWFcCYwSaw5e5ul i5GDg01AR6LlrAtIg4hAvcT1X3vZQWxmgRyJMwcegNnCAnYSR15MYwKxWQRUJR6tmgC2gFfA WaJz+3p2kDESAgoScybZgIQ5BVwk9t7dxwZiCwGV/Ju2nnkCI+8CRoZVjKKpBckFxUnpuUZ6 xYm5xaV56XrJ+bmbGMEx9Ux6B+OqBotDjAIcjEo8vDd4Y0KEWBPLiitzDzFKcDArifBKBQGF eFMSK6tSi/Lji0pzUosPMZoCHTWRWUo0OR8Y73kl8YbGJuamxqaWJhYmZpZK4rwHW60DhQTS E0tSs1NTC1KLYPqYODilGhitHu+eeYfVx/CE2s/swr8nVml7e068zyPQZraY4RtD0cLJlkda 5M0XeR/cfdJv1sSMHu43j7Tzr09/7HD3tEyWXZVWiLOTcHRu0w77o+q80Z+U3Za4TTz8f/r5 9dHrXc+KP9qj4zPjo67gQdPNL6fWlD3Yw7ng36dP55JCX6QqMt308ex690pHiaU4I9FQi7mo OBEAWMsgpb8CAAA= DLP-Filter: Pass X-MTR: 20000000000000000@CPGS X-CFilter-Loop: Reflected X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20141106_230122_228126_77CF4BB9 X-CRM114-Status: GOOD ( 12.64 ) X-Spam-Score: -5.6 (-----) Cc: sbkim73@samsung.com, kgene.kim@samsung.com, broonie@kernel.org, Padmavathi Venna X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-2.5 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_NONE, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Internal DMA is available only on some of Samsung platforms. So added a quirk for the same and made it optional. Signed-off-by: Padmavathi Venna --- include/linux/platform_data/asoc-s3c.h | 1 + sound/soc/samsung/i2s.c | 12 ++++++------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/include/linux/platform_data/asoc-s3c.h b/include/linux/platform_data/asoc-s3c.h index a6591c6..5e0bc77 100644 --- a/include/linux/platform_data/asoc-s3c.h +++ b/include/linux/platform_data/asoc-s3c.h @@ -27,6 +27,7 @@ struct samsung_i2s { #define QUIRK_NO_MUXPSR (1 << 2) #define QUIRK_NEED_RSTCLR (1 << 3) #define QUIRK_SUPPORTS_TDM (1 << 4) +#define QUIRK_SUPPORTS_IDMA (1 << 5) /* Quirks of the I2S controller */ u32 quirks; dma_addr_t idma_addr; diff --git a/sound/soc/samsung/i2s.c b/sound/soc/samsung/i2s.c index 9d51347..38b9a52 100644 --- a/sound/soc/samsung/i2s.c +++ b/sound/soc/samsung/i2s.c @@ -987,7 +987,7 @@ static int samsung_i2s_dai_probe(struct snd_soc_dai *dai) if (i2s->quirks & QUIRK_NEED_RSTCLR) writel(CON_RSTCLR, i2s->addr + I2SCON); - if (i2s->quirks & QUIRK_SEC_DAI) + if (i2s->quirks & QUIRK_SUPPORTS_IDMA) idma_reg_addr_init(i2s->addr, i2s->sec_dai->idma_playback.dma_addr); @@ -1199,10 +1199,9 @@ static int samsung_i2s_probe(struct platform_device *pdev) quirks = i2s_dai_data->quirks; if (of_property_read_u32(np, "samsung,idma-addr", &idma_addr)) { - if (quirks & QUIRK_SEC_DAI) { - dev_err(&pdev->dev, "idma address is not"\ + if (quirks & QUIRK_SUPPORTS_IDMA) { + dev_info(&pdev->dev, "idma address is not"\ "specified"); - return -EINVAL; } } } @@ -1309,13 +1308,14 @@ static const struct samsung_i2s_dai_data i2sv3_dai_type = { static const struct samsung_i2s_dai_data i2sv5_dai_type = { .dai_type = TYPE_PRI, - .quirks = QUIRK_PRI_6CHAN | QUIRK_SEC_DAI | QUIRK_NEED_RSTCLR, + .quirks = QUIRK_PRI_6CHAN | QUIRK_SEC_DAI | QUIRK_NEED_RSTCLR | + QUIRK_SUPPORTS_IDMA, }; static const struct samsung_i2s_dai_data i2sv6_dai_type = { .dai_type = TYPE_PRI, .quirks = QUIRK_PRI_6CHAN | QUIRK_SEC_DAI | QUIRK_NEED_RSTCLR | - QUIRK_SUPPORTS_TDM, + QUIRK_SUPPORTS_TDM | QUIRK_SUPPORTS_IDMA, }; static const struct samsung_i2s_dai_data samsung_dai_type_pri = {