From patchwork Wed Dec 2 07:34:28 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 7743361 Return-Path: X-Original-To: patchwork-alsa-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id DB9259F350 for ; Wed, 2 Dec 2015 07:34:56 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 1C2EB203AE for ; Wed, 2 Dec 2015 07:34:56 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.kernel.org (Postfix) with ESMTP id B51392061E for ; Wed, 2 Dec 2015 07:34:54 +0000 (UTC) Received: by alsa0.perex.cz (Postfix, from userid 1000) id 533032664E8; Wed, 2 Dec 2015 08:34:53 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Spam-Status: No, score=-2.6 required=5.0 tests=BAD_ENC_HEADER,BAYES_00, RCVD_IN_DNSWL_LOW, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 427A8261B0E; Wed, 2 Dec 2015 08:34:44 +0100 (CET) X-Original-To: alsa-devel@alsa-project.org Delivered-To: alsa-devel@alsa-project.org Received: by alsa0.perex.cz (Postfix, from userid 1000) id 71F97264EF3; Wed, 2 Dec 2015 08:34:43 +0100 (CET) Received: from relmlie3.idc.renesas.com (relmlor4.renesas.com [210.160.252.174]) by alsa0.perex.cz (Postfix) with ESMTP id 28058261A5E for ; Wed, 2 Dec 2015 08:34:34 +0100 (CET) Received: from unknown (HELO relmlir1.idc.renesas.com) ([10.200.68.151]) by relmlie3.idc.renesas.com with ESMTP; 02 Dec 2015 16:34:31 +0900 Received: from relmlac2.idc.renesas.com (relmlac2.idc.renesas.com [10.200.69.22]) by relmlir1.idc.renesas.com (Postfix) with ESMTP id 997C1638D8; Wed, 2 Dec 2015 16:34:31 +0900 (JST) Received: by relmlac2.idc.renesas.com (Postfix, from userid 0) id 7ECD92806E; Wed, 2 Dec 2015 16:34:31 +0900 (JST) Received: from relmlac2.idc.renesas.com (localhost [127.0.0.1]) by relmlac2.idc.renesas.com (Postfix) with ESMTP id 7AC462806D; Wed, 2 Dec 2015 16:34:31 +0900 (JST) Received: from relmlii2.idc.renesas.com [10.200.68.66] by relmlac2.idc.renesas.com with ESMTP id SAD09141; Wed, 2 Dec 2015 16:34:31 +0900 X-IronPort-AV: E=Sophos;i="5.20,371,1444662000"; d="scan'";a="200946808" Received: from mail-sg2apc01lp0244.outbound.protection.outlook.com (HELO APC01-SG2-obe.outbound.protection.outlook.com) ([65.55.88.244]) by relmlii2.idc.renesas.com with ESMTP/TLS/AES256-SHA; 02 Dec 2015 16:34:30 +0900 Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=kuninori.morimoto.gx@renesas.com; Received: from morimoto-PC.renesas.com (211.11.155.144) by HKXPR06MB1013.apcprd06.prod.outlook.com (10.161.137.28) with Microsoft SMTP Server (TLS) id 15.1.331.20; Wed, 2 Dec 2015 07:34:28 +0000 Message-ID: <87r3j5jogm.wl%kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto User-Agent: Wanderlust/2.15.9 Emacs/24.3 Mule/6.0 To: Mark Brown MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Date: Wed, 2 Dec 2015 07:34:28 +0000 X-Originating-IP: [211.11.155.144] X-ClientProxiedBy: HK2PR02CA0035.apcprd02.prod.outlook.com (25.163.104.173) To HKXPR06MB1013.apcprd06.prod.outlook.com (25.161.137.28) X-Microsoft-Exchange-Diagnostics: 1; HKXPR06MB1013; 2:BtrzlzndAK7uzBHN9qOlDLHSwKnib+VpkQfX+JGCWrsEzXPq6BIdH8iJcweYkk9vu2XIeeZvcSCQdizwpE0JAUowyBIgCv3ytFverNNnBkEANO0XVkNyb66O0mbC9IaxQjdvZJ2Zsjr33JZjvUcC5A==; 3:YLAhbPIcOG6sEtbyuRG08TzsgER0EVIkVyCVVmTCqc8l7SHZ8ZNw+E3DU7V4gwfK76Zaqw7BMZW1UygsRaBdZXIYOPn8DcUaxrNecVjkoH/W90cHyG+gd7XtWydqMaqJ; 25:FuqsLQJM7efKrqu/yAOeBe34+wmIDzMBSz7p3GvYDL82WSBemk18261CseNfrQ1rDSAdQyKA9QyZyE90MwEU4srdh/tWGB6SGdZRWwFNiWAyy+/wypy9sTLgCYwlkzr6lY3ILh9ZgeKBswvOx5eha+5waArakcKArujjD1n7CWQhUUAgP0XvAugaC+VzOdVvU3AAuQxFPWfRgT3Fyex8nckm910OCwFYm9zoFPR/j4kg3bCRvCiUg75lHTT/RbtP X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:HKXPR06MB1013; X-Microsoft-Exchange-Diagnostics: 1; HKXPR06MB1013; 20:xF/C66UjZRQC7+dxuvwrGrKnZUCAn92nqkU4OkyHWUd1YhQ/ASsMFvZl2fvcfenusbkdYD8HP0cTPFB6w5IxyCYgXzuYg2k1HX7SrqRW76jLklCkNeOTqRiqPOJI0XJvU1JQ/DLzHtdT8czhhcZw5Cfv2nPQ0DTyyBz/ptBzcVkCIVGt9P8VNDU9JYsD5dfMboESrmW9CYg52n+fgTqscIAmPAG+IPbyk1CwYFY4W0gBi7676nyhIvvnyMIxdVYAssNt5OU46bP7CvQdnezzwt8VXeuevXgfkpj0w9FZr0PusMGjb1yy7aYQj3NDp52N77OgIcI7Pmc7VscQTPp+S2EEjGyOu7F1Hg63E3eF3jbWkO1US/yGT4yR1vIX+d3ICYab1oyHdemLQTZWXiqGwehBwVurjb987PHEyXGxRaXCCGkh6yxAZ5oc+kOo+nIu50Yi46++MbYMU1iB6znPWKbjPhObqycZWOd3OvB3iG2dcuJbX6VkF+p3uTZy1UHA; 4://lvW95sd9EtTmKKxKweaaH8+nC4CisAKvQw2CMEHcF2ErjFE6xlfn8wDofSjl7vpx0RXD3q5FetygnIR+Zma7nXkSUrWmnjx0M71uczZaYU5LGpPOz2KmVkVucXDGlzZOQEQd5Q42sJgfZMCpgc4AGpyn6IsWj1gX9oWlaWetsNt6Kad4BSfvyLbr7iir1Z85sf/Qi452/cWJ+pYM7C+Sqdh3TM6kjA3cN/niP9zL6I0EWRErnVdyRxBAdiJ8O42RQcImBJ9WWUs7kLbUdR89Sne66E39GjkE+4yGeSbe1+WJ0fCMxNeeF4XbFzvglWB3OGN7aRqIiqh/SYsFDmE3y1fKXAwGa01xoPBBy34KQB2C8Mxe9P29I4nI23W902/ir7rdae1synpldyC2QXwwBTGiAvnodlf9/m4OqGc6c= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(85106069007906); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(2401047)(5005006)(520078)(8121501046)(3002001)(10201501046); SRVR:HKXPR06MB1013; BCL:0; PCL:0; RULEID:; SRVR:HKXPR06MB1013; X-Forefront-PRVS: 077884B8B5 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(6009001)(189002)(199003)(97736004)(229853001)(19580405001)(5001960100002)(5004730100002)(19580395003)(110136002)(81156007)(189998001)(92566002)(4001350100001)(36756003)(83506001)(122386002)(53416004)(42186005)(46406003)(6116002)(101416001)(69596002)(87976001)(50466002)(86362001)(77096005)(54356999)(66066001)(40100003)(1096002)(47776003)(33646002)(105586002)(3846002)(50986999)(5008740100001)(106356001)(23726003)(586003); DIR:OUT; SFP:1102; SCL:1; SRVR:HKXPR06MB1013; H:morimoto-PC.renesas.com; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; HKXPR06MB1013; 23:V0LJcNkCcN7T5DILBSMsQ3rLeOzmJVIUohLxLVTKs?= =?us-ascii?Q?BOyHMdCSTSGDz9t6A6ZT/ZIbyW5KJ9Cr9JrSihA28Rp1nTFEItbgHiGEWW6S?= =?us-ascii?Q?PICqGI84PfZBdnvIFcwszySq9Ra0zBEg0zug1se4mDei4sjZ56O1rnkUmsm/?= =?us-ascii?Q?WinjJqEKFbrIVZCMKfS8aZCJoAG0cFjEg80IvlnrxlB/ar3w1Syni2IPn351?= =?us-ascii?Q?SWqpZwSTBtthhNKyo9krozLRL9oU2z7ihKV2oDxr/joaoFIFZtvmVE1ugGp2?= =?us-ascii?Q?paQpBvRwS11eYmA3HsN1xewLkcLmdcJ0fVwHDmUBxmAplGvr5HFyevIP4Czq?= =?us-ascii?Q?ixp/NWg40aVW+ePZlgic3+TH0WuXN5BmuthC10d0vkUzaJtZ/mfbzPtWJxN1?= =?us-ascii?Q?+qV4MSkU5cQuBPTmfw/a/rcXLVli5d202a5a8TSu1HTNMrihwN6JwPTPNs0i?= =?us-ascii?Q?d3xu4ahIkENTT4C7LN5dmPJc0GBF+Zv3/44q63exn/B5FkMyRNmuqM86xBEq?= =?us-ascii?Q?lFMQJ3IZNgPG+dOcIRnOAN9ldz/A3+HxS0qdsdzF+eo0t/7xeaYDOIhilVss?= =?us-ascii?Q?r3mc733dec/19gVSUhohPDkQkl48d7C3LWD2P5RR1vhfMMIkC+aeVNlYDGZ5?= =?us-ascii?Q?t7Buwy6a7IH8IFY8XmT3lpVqz2+RuhFf4DYI4i9zJ/FipYBFFMMnjAitT1ZM?= =?us-ascii?Q?2IsHjbaxiTbKXG483CarOF6ELn2MPK1y7irnp82heivkkoUTF7vDqQ00t7vb?= =?us-ascii?Q?7VwBNLH08e65SjuzIKbn66HymP/p5lDmy+TAdx3BCpHTT55W7dwuCAXu1D1L?= =?us-ascii?Q?NFXM8WWJ7qgdZ0LB/A3AArNVqMHqyFvE8k6/TS49yFU+ckR5h70d+7pwhhlW?= =?us-ascii?Q?9/91p0lHoJfiAoW0hGTY4SZCqDRN133VHOh0qfaiY2Tw3sbKiIttsnY1vpXI?= =?us-ascii?Q?uKToNP93oBncI4nVi//fcNQ1MSVwm7wLhu0xluPnINH4er9nUhh3L8CQOnqC?= =?us-ascii?Q?//+y+j6XKL9Ff0+iSpewXv5yqsUPXADtY1D9MFtTMgmjpWItYuKhDXxo0CI7?= =?us-ascii?Q?VKrDz8=3D?= X-Microsoft-Exchange-Diagnostics: 1; HKXPR06MB1013; 5:SfmPxY6L89+jjCvLevGKdQzgbY/zEGIPD/1MGwQ7aVkcDIzGQTk60zKYxytuPgGJOAljzQUii/DAFjddCRvhdOTh7burps177UBxbaeXXB2vWn+Z1pFiBJ5TP5M4oroq75FGjMUGtJ/hUcvkJiytXQ==; 24:sN9JPHHtgeSvL3MfhCZ1GK1wJtm6W5XKhtapckQawOItOdrmLvpuXW4RsACrfWDpqNB2zCLPVj/Kgy55ldLlw4RuO4N4I+UP2DUi47L7RwI=; 20:97KcdCz1F7p9BbVGeDMZ7DhkIxKOZzKBz1moMnbnozAuZGnXJr4kRPFMjzadHNls/yyMNssaC7EWGqN3V7U7G3TGw1UIQP8uO/ya1vsrS5ptCrYLRJHpq4qaa7H5v2aKD213zlAh9Wn00UwH75Fku7ZDzn5zLYohZGUvEndFZfM= SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Dec 2015 07:34:28.6576 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: HKXPR06MB1013 Cc: Linux-ALSA , Simon , Liam Girdwood Subject: [alsa-devel] [PATCH] ASoC: rsnd: care SWSP bit for TDM/non-TDM X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org X-Virus-Scanned: ClamAV using ClamSMTP From: Kuninori Morimoto SSICR::SWSP bit controls WS signal low/high, but in case of TDM it is inverted. This patch solves this issue. Signed-off-by: Kuninori Morimoto --- sound/soc/sh/rcar/ssi.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/sound/soc/sh/rcar/ssi.c b/sound/soc/sh/rcar/ssi.c index 628739f..79c3211 100644 --- a/sound/soc/sh/rcar/ssi.c +++ b/sound/soc/sh/rcar/ssi.c @@ -265,6 +265,9 @@ static int rsnd_ssi_config_init(struct rsnd_ssi *ssi, u32 cr_own; u32 cr_mode; u32 wsr; + int is_tdm; + + is_tdm = (rsnd_get_slot_runtime(io) >= 6) ? 1 : 0; /* * always use 32bit system word. @@ -274,7 +277,7 @@ static int rsnd_ssi_config_init(struct rsnd_ssi *ssi, if (rdai->bit_clk_inv) cr_own |= SCKP; - if (rdai->frm_clk_inv) + if (rdai->frm_clk_inv ^ is_tdm) cr_own |= SWSP; if (rdai->data_alignment) cr_own |= SDTA; @@ -307,7 +310,7 @@ static int rsnd_ssi_config_init(struct rsnd_ssi *ssi, * rsnd_ssiu_init_gen2() */ wsr = ssi->wsr; - if (rsnd_get_slot_runtime(io) >= 6) { + if (is_tdm) { wsr |= WS_MODE; cr_own |= CHNL_8; }