From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id BB8EFC33CAF for ; Thu, 16 Jan 2020 19:20:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 959672073A for ; Thu, 16 Jan 2020 19:20:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579202400; bh=vQOnwgcSUZ3IxlVxZdTcxxPpd0marI6QGKQVbOiDRiM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=V9mLvKABqrFSGK8vSc4EEwYaHyv69hMHx16WxJAyeu0POnmUhL1daegmxBK3/26pc lCDBGmt/HHX6RzxZdr4LXIJV1Bkk3FmIYPKdJntWfHByeslPVNUMdicRW3sdoBRPnl 7+MUrjfxoJ2zgzVOv9mIJTGxlJdIZkVvG2WH/ecY= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729078AbgAPQyJ (ORCPT ); Thu, 16 Jan 2020 11:54:09 -0500 Received: from mail.kernel.org ([198.145.29.99]:38152 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731333AbgAPQx6 (ORCPT ); Thu, 16 Jan 2020 11:53:58 -0500 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id E10CE2073A; Thu, 16 Jan 2020 16:53:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579193637; bh=vQOnwgcSUZ3IxlVxZdTcxxPpd0marI6QGKQVbOiDRiM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=izVDGGLPYEIER6Dujtnnkp4QpVBX4Fch0ABxsIbhm/b+FTLFkAKm9YWf2AvWfQcA/ E0Dcx6T9LcGvkrNeZjDkAaZWrwuP8FKlYfsTLmTSj7R0sGLzS7sjeQgX6kU6j8Qdck PtxAuiO+Ux+dt4tyfASTQTVJrXEGLaPIe4N0onPM= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Nilkanth Ahirrao , Kuninori Morimoto , Jiada Wang , Andrew Gabbasov , Eugeniu Rosca , Mark Brown , Sasha Levin , alsa-devel@alsa-project.org Subject: [PATCH AUTOSEL 5.4 170/205] ASoC: rsnd: fix DALIGN register for SSIU Date: Thu, 16 Jan 2020 11:42:25 -0500 Message-Id: <20200116164300.6705-170-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200116164300.6705-1-sashal@kernel.org> References: <20200116164300.6705-1-sashal@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Nilkanth Ahirrao [ Upstream commit ef8e14794308a428b194f8b06ad9ae06b43466e4 ] The current driver only sets 0x76543210 and 0x67452301 for DALIGN. This doesn’t work well for TDM split and ex-split mode for all SSIU. This patch programs the DALIGN registers based on the SSIU number. Cc: Kuninori Morimoto Cc: Jiada Wang Cc: Andrew Gabbasov Fixes: a914e44693d41b ("ASoC: rsnd: more clear rsnd_get_dalign() for DALIGN") Signed-off-by: Nilkanth Ahirrao Signed-off-by: Eugeniu Rosca Acked-by: Kuninori Morimoto Link: https://lore.kernel.org/r/20191121111023.10976-1-erosca@de.adit-jv.com Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- sound/soc/sh/rcar/core.c | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/sound/soc/sh/rcar/core.c b/sound/soc/sh/rcar/core.c index e9596c2096cd..a6c1cf987e6e 100644 --- a/sound/soc/sh/rcar/core.c +++ b/sound/soc/sh/rcar/core.c @@ -376,6 +376,17 @@ u32 rsnd_get_adinr_bit(struct rsnd_mod *mod, struct rsnd_dai_stream *io) */ u32 rsnd_get_dalign(struct rsnd_mod *mod, struct rsnd_dai_stream *io) { + static const u32 dalign_values[8][2] = { + {0x76543210, 0x67452301}, + {0x00000032, 0x00000023}, + {0x00007654, 0x00006745}, + {0x00000076, 0x00000067}, + {0xfedcba98, 0xefcdab89}, + {0x000000ba, 0x000000ab}, + {0x0000fedc, 0x0000efcd}, + {0x000000fe, 0x000000ef}, + }; + int id = 0, inv; struct rsnd_mod *ssiu = rsnd_io_to_mod_ssiu(io); struct rsnd_mod *target; struct snd_pcm_runtime *runtime = rsnd_io_to_runtime(io); @@ -411,13 +422,18 @@ u32 rsnd_get_dalign(struct rsnd_mod *mod, struct rsnd_dai_stream *io) target = cmd ? cmd : ssiu; } + if (mod == ssiu) + id = rsnd_mod_id_sub(mod); + /* Non target mod or non 16bit needs normal DALIGN */ if ((snd_pcm_format_width(runtime->format) != 16) || (mod != target)) - return 0x76543210; + inv = 0; /* Target mod needs inverted DALIGN when 16bit */ else - return 0x67452301; + inv = 1; + + return dalign_values[id][inv]; } u32 rsnd_get_busif_shift(struct rsnd_dai_stream *io, struct rsnd_mod *mod) -- 2.20.1 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.0 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 64361C33CB3 for ; Thu, 16 Jan 2020 17:01:49 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id E8AED21582 for ; Thu, 16 Jan 2020 17:01:48 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=alsa-project.org header.i=@alsa-project.org header.b="BZ1adeX5"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=kernel.org header.i=@kernel.org header.b="izVDGGLP" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E8AED21582 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=alsa-devel-bounces@alsa-project.org Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id C85C017D4; Thu, 16 Jan 2020 18:00:55 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz C85C017D4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1579194105; bh=f7tKnFBXD1YnxvL6zhtyI3prrJqlVf0yKNM0Yzeubv4=; h=From:To:Date:In-Reply-To:References:Cc:Subject:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=BZ1adeX59KmNqgUX1BDGXLUGBVhNLHFtXpfDns1VKQAMroDUjQH668d4atDurdTo0 HeobUF5SRPlMXkjmvexs4f2MH6bGjugiVncfbFLtjf+t+VobpbcfmUVHF4YQGesRNN 3CSeez4AyGctBvne7jkzI34Cl+UI3lJEURpAEH+E= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 0DF46F8014D; Thu, 16 Jan 2020 18:00:52 +0100 (CET) Received: by alsa1.perex.cz (Postfix, from userid 50401) id D79F5F8022B; Thu, 16 Jan 2020 18:00:50 +0100 (CET) Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id 881B8F8016F for ; Thu, 16 Jan 2020 18:00:44 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 881B8F8016F Authentication-Results: alsa1.perex.cz; dkim=pass (1024-bit key) header.d=kernel.org header.i=@kernel.org header.b="izVDGGLP" Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id E10CE2073A; Thu, 16 Jan 2020 16:53:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579193637; bh=vQOnwgcSUZ3IxlVxZdTcxxPpd0marI6QGKQVbOiDRiM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=izVDGGLPYEIER6Dujtnnkp4QpVBX4Fch0ABxsIbhm/b+FTLFkAKm9YWf2AvWfQcA/ E0Dcx6T9LcGvkrNeZjDkAaZWrwuP8FKlYfsTLmTSj7R0sGLzS7sjeQgX6kU6j8Qdck PtxAuiO+Ux+dt4tyfASTQTVJrXEGLaPIe4N0onPM= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Date: Thu, 16 Jan 2020 11:42:25 -0500 Message-Id: <20200116164300.6705-170-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200116164300.6705-1-sashal@kernel.org> References: <20200116164300.6705-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Cc: Sasha Levin , alsa-devel@alsa-project.org, Andrew Gabbasov , Kuninori Morimoto , Jiada Wang , Nilkanth Ahirrao , Mark Brown , Eugeniu Rosca Subject: [alsa-devel] [PATCH AUTOSEL 5.4 170/205] ASoC: rsnd: fix DALIGN register for SSIU X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.15 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: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: alsa-devel-bounces@alsa-project.org Sender: "Alsa-devel" RnJvbTogTmlsa2FudGggQWhpcnJhbyA8YW5pbGthbnRoQGpwLmFkaXQtanYuY29tPgoKWyBVcHN0 cmVhbSBjb21taXQgZWY4ZTE0Nzk0MzA4YTQyOGIxOTRmOGIwNmFkOWFlMDZiNDM0NjZlNCBdCgpU aGUgY3VycmVudCBkcml2ZXIgb25seSBzZXRzIDB4NzY1NDMyMTAgYW5kIDB4Njc0NTIzMDEgZm9y IERBTElHTi4KVGhpcyBkb2VzbuKAmXQgd29yayB3ZWxsIGZvciBURE0gc3BsaXQgYW5kIGV4LXNw bGl0IG1vZGUgZm9yIGFsbCBTU0lVLgpUaGlzIHBhdGNoIHByb2dyYW1zIHRoZSBEQUxJR04gcmVn aXN0ZXJzIGJhc2VkIG9uIHRoZSBTU0lVIG51bWJlci4KCkNjOiBLdW5pbm9yaSBNb3JpbW90byA8 a3VuaW5vcmkubW9yaW1vdG8uZ3hAcmVuZXNhcy5jb20+CkNjOiBKaWFkYSBXYW5nIDxqaWFkYV93 YW5nQG1lbnRvci5jb20+CkNjOiBBbmRyZXcgR2FiYmFzb3YgPGFuZHJld19nYWJiYXNvdkBtZW50 b3IuY29tPgpGaXhlczogYTkxNGU0NDY5M2Q0MWIgKCJBU29DOiByc25kOiBtb3JlIGNsZWFyIHJz bmRfZ2V0X2RhbGlnbigpIGZvciBEQUxJR04iKQpTaWduZWQtb2ZmLWJ5OiBOaWxrYW50aCBBaGly cmFvIDxhbmlsa2FudGhAanAuYWRpdC1qdi5jb20+ClNpZ25lZC1vZmYtYnk6IEV1Z2VuaXUgUm9z Y2EgPGVyb3NjYUBkZS5hZGl0LWp2LmNvbT4KQWNrZWQtYnk6IEt1bmlub3JpIE1vcmltb3RvIDxr dW5pbm9yaS5tb3JpbW90by5neEByZW5lc2FzLmNvbT4KTGluazogaHR0cHM6Ly9sb3JlLmtlcm5l bC5vcmcvci8yMDE5MTEyMTExMTAyMy4xMDk3Ni0xLWVyb3NjYUBkZS5hZGl0LWp2LmNvbQpTaWdu ZWQtb2ZmLWJ5OiBNYXJrIEJyb3duIDxicm9vbmllQGtlcm5lbC5vcmc+ClNpZ25lZC1vZmYtYnk6 IFNhc2hhIExldmluIDxzYXNoYWxAa2VybmVsLm9yZz4KLS0tCiBzb3VuZC9zb2Mvc2gvcmNhci9j b3JlLmMgfCAyMCArKysrKysrKysrKysrKysrKystLQogMSBmaWxlIGNoYW5nZWQsIDE4IGluc2Vy dGlvbnMoKyksIDIgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvc291bmQvc29jL3NoL3JjYXIv Y29yZS5jIGIvc291bmQvc29jL3NoL3JjYXIvY29yZS5jCmluZGV4IGU5NTk2YzIwOTZjZC4uYTZj MWNmOTg3ZTZlIDEwMDY0NAotLS0gYS9zb3VuZC9zb2Mvc2gvcmNhci9jb3JlLmMKKysrIGIvc291 bmQvc29jL3NoL3JjYXIvY29yZS5jCkBAIC0zNzYsNiArMzc2LDE3IEBAIHUzMiByc25kX2dldF9h ZGlucl9iaXQoc3RydWN0IHJzbmRfbW9kICptb2QsIHN0cnVjdCByc25kX2RhaV9zdHJlYW0gKmlv KQogICovCiB1MzIgcnNuZF9nZXRfZGFsaWduKHN0cnVjdCByc25kX21vZCAqbW9kLCBzdHJ1Y3Qg cnNuZF9kYWlfc3RyZWFtICppbykKIHsKKwlzdGF0aWMgY29uc3QgdTMyIGRhbGlnbl92YWx1ZXNb OF1bMl0gPSB7CisJCXsweDc2NTQzMjEwLCAweDY3NDUyMzAxfSwKKwkJezB4MDAwMDAwMzIsIDB4 MDAwMDAwMjN9LAorCQl7MHgwMDAwNzY1NCwgMHgwMDAwNjc0NX0sCisJCXsweDAwMDAwMDc2LCAw eDAwMDAwMDY3fSwKKwkJezB4ZmVkY2JhOTgsIDB4ZWZjZGFiODl9LAorCQl7MHgwMDAwMDBiYSwg MHgwMDAwMDBhYn0sCisJCXsweDAwMDBmZWRjLCAweDAwMDBlZmNkfSwKKwkJezB4MDAwMDAwZmUs IDB4MDAwMDAwZWZ9LAorCX07CisJaW50IGlkID0gMCwgaW52OwogCXN0cnVjdCByc25kX21vZCAq c3NpdSA9IHJzbmRfaW9fdG9fbW9kX3NzaXUoaW8pOwogCXN0cnVjdCByc25kX21vZCAqdGFyZ2V0 OwogCXN0cnVjdCBzbmRfcGNtX3J1bnRpbWUgKnJ1bnRpbWUgPSByc25kX2lvX3RvX3J1bnRpbWUo aW8pOwpAQCAtNDExLDEzICs0MjIsMTggQEAgdTMyIHJzbmRfZ2V0X2RhbGlnbihzdHJ1Y3QgcnNu ZF9tb2QgKm1vZCwgc3RydWN0IHJzbmRfZGFpX3N0cmVhbSAqaW8pCiAJCXRhcmdldCA9IGNtZCA/ IGNtZCA6IHNzaXU7CiAJfQogCisJaWYgKG1vZCA9PSBzc2l1KQorCQlpZCA9IHJzbmRfbW9kX2lk X3N1Yihtb2QpOworCiAJLyogTm9uIHRhcmdldCBtb2Qgb3Igbm9uIDE2Yml0IG5lZWRzIG5vcm1h bCBEQUxJR04gKi8KIAlpZiAoKHNuZF9wY21fZm9ybWF0X3dpZHRoKHJ1bnRpbWUtPmZvcm1hdCkg IT0gMTYpIHx8CiAJICAgIChtb2QgIT0gdGFyZ2V0KSkKLQkJcmV0dXJuIDB4NzY1NDMyMTA7CisJ CWludiA9IDA7CiAJLyogVGFyZ2V0IG1vZCBuZWVkcyBpbnZlcnRlZCBEQUxJR04gd2hlbiAxNmJp dCAqLwogCWVsc2UKLQkJcmV0dXJuIDB4Njc0NTIzMDE7CisJCWludiA9IDE7CisKKwlyZXR1cm4g ZGFsaWduX3ZhbHVlc1tpZF1baW52XTsKIH0KIAogdTMyIHJzbmRfZ2V0X2J1c2lmX3NoaWZ0KHN0 cnVjdCByc25kX2RhaV9zdHJlYW0gKmlvLCBzdHJ1Y3QgcnNuZF9tb2QgKm1vZCkKLS0gCjIuMjAu MQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KQWxzYS1k ZXZlbCBtYWlsaW5nIGxpc3QKQWxzYS1kZXZlbEBhbHNhLXByb2plY3Qub3JnCmh0dHBzOi8vbWFp bG1hbi5hbHNhLXByb2plY3Qub3JnL21haWxtYW4vbGlzdGluZm8vYWxzYS1kZXZlbAo=