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=-12.5 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_SIGNED,DKIM_VALID,FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable 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 0FA21C43464 for ; Mon, 21 Sep 2020 10:34:56 +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 6733D2145D for ; Mon, 21 Sep 2020 10:34:55 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=alsa-project.org header.i=@alsa-project.org header.b="t1LjpU7+"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="GQrVMr02" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6733D2145D Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com 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 E607D16EC; Mon, 21 Sep 2020 12:34:03 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz E607D16EC DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1600684494; bh=JSYUuxqyR7L0JutcxKz9SrjvS6niDrE7O917SS8zhBE=; h=From:To:Subject:Date:In-Reply-To:References:Cc:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=t1LjpU7+ZAtE0pDZWp5qbo9TF8LBBC31YqpkqYqeSVCBx01bZdOjKs1W+JQxYTs6Q L6848a3km059jXnvWVFbYzFoXi6UM6tDrsEN19SX05ffxUDvbGReOI3JtVNJgm70TR VGCCBd/AJfINTiszfQUX03eGwQZdi+j+X4YCUpNI= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id BFF9DF80331; Mon, 21 Sep 2020 12:28:34 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 937AFF8028E; Mon, 21 Sep 2020 12:28:07 +0200 (CEST) Received: from mail-wm1-x344.google.com (mail-wm1-x344.google.com [IPv6:2a00:1450:4864:20::344]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id 07E5BF8028E for ; Mon, 21 Sep 2020 12:27:44 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 07E5BF8028E Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="GQrVMr02" Received: by mail-wm1-x344.google.com with SMTP id k18so12040563wmj.5 for ; Mon, 21 Sep 2020 03:27:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=403l/Us7aRgOIyQKfBkM8buNZnuotwhLbaKDtAVk4oo=; b=GQrVMr02cQ1BeZlZeb2WVDwVRAOjy0EPLcpnRVoxLErUQ8L8BbXzAgcou4DBLILshT voB4HL19k+K58pZ9bWoiXJcWXcWdo4aTCYu8xUzFOIbsFPR1zHQXm2G7WqGccB8DtNKL GFUo276bbhz+KJWMWgKxOTcYQJKeRVpyTG4A+1AxMAWukIh/cDo1CPBA9oH1DE7LReQ2 J5nNNz0F2YJsVRKfKgl/sXXvpnPkFxsHI5HGyED3UkulTOrGyx85O52YBiuqzeZzDZPK 0UBMepEcvgqiP0vW1f8hWTuvUbQ54SPeh3/qTspCZfjP+qEvLo1FAuJry9vXmYnLzZoM FSUQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=403l/Us7aRgOIyQKfBkM8buNZnuotwhLbaKDtAVk4oo=; b=Z3WwfH6EgOCg79l2oVzl9a3dbV71Y57Bvqm9/SQ5H/nZ0r6wMv7VS1taZytI1ykheJ CvGLlyY6WqV8NAOOl7znyOTyN8KsjCRmn5SpRKrUbA9rm8dvY7Q+BD0buqVawe7lHcUY qZB9aD1cAYzxc3ai8S65fVZrT8V7rTXq9Px+5QPKIuTOkLOIQ5YeiMvtJBpHJPDyWxm9 Xx19He3EYzN0FiiRSoSezbSjd0a6Myxt3pIE5b1bKEdYtT0mg/wXDgaq21nlAP+UOTYP TykeiB43HB9rr8EYB3VrZQrFe3CyFIenSTfZGvl/WolagS0BbowxV0dr8IGdiD1T4xr3 dxag== X-Gm-Message-State: AOAM5318n8uOOaZMooJgI6gLVWmfz9j8gwehfBbKQHXQVZM63fDrMfY/ vZ3qNwXWyp8ISGw53s3wCbo= X-Google-Smtp-Source: ABdhPJwUf0cjcKP8Yw3D8f2JCJ2cf8UwK0nPxw2utggNBtLI1lebBlr4qIJnkeYxSyYALo3fFnCvLw== X-Received: by 2002:a05:600c:2257:: with SMTP id a23mr30634579wmm.102.1600684064389; Mon, 21 Sep 2020 03:27:44 -0700 (PDT) Received: from localhost.localdomain (lputeaux-656-1-11-33.w82-127.abo.wanadoo.fr. [82.127.142.33]) by smtp.gmail.com with ESMTPSA id h2sm20713774wrp.69.2020.09.21.03.27.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 21 Sep 2020 03:27:43 -0700 (PDT) From: =?UTF-8?q?Cl=C3=A9ment=20P=C3=A9ron?= To: Maxime Ripard , Chen-Yu Tsai , Rob Herring , Mark Brown , Liam Girdwood Subject: [PATCH v4 07/22] ASoC: sun4i-i2s: Fix sun8i volatile regs Date: Mon, 21 Sep 2020 12:27:16 +0200 Message-Id: <20200921102731.747736-8-peron.clem@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200921102731.747736-1-peron.clem@gmail.com> References: <20200921102731.747736-1-peron.clem@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: devicetree@vger.kernel.org, Jernej Skrabec , alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org, Takashi Iwai , Marcus Cooper , linux-sunxi@googlegroups.com, =?UTF-8?q?Cl=C3=A9ment=20P=C3=A9ron?= , linux-arm-kernel@lists.infradead.org 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: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: "Alsa-devel" The FIFO TX reg is volatile and sun8i i2s register mapping is different from sun4i. Even if in this case it's doesn't create an issue, Avoid setting some regs that are undefined in sun8i. Signed-off-by: Clément Péron Acked-by: Maxime Ripard --- sound/soc/sunxi/sun4i-i2s.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/sound/soc/sunxi/sun4i-i2s.c b/sound/soc/sunxi/sun4i-i2s.c index 60b2fec1bbe9..3f9110d70941 100644 --- a/sound/soc/sunxi/sun4i-i2s.c +++ b/sound/soc/sunxi/sun4i-i2s.c @@ -1152,12 +1152,19 @@ static bool sun8i_i2s_rd_reg(struct device *dev, unsigned int reg) static bool sun8i_i2s_volatile_reg(struct device *dev, unsigned int reg) { - if (reg == SUN8I_I2S_INT_STA_REG) + switch (reg) { + case SUN4I_I2S_FIFO_CTRL_REG: + case SUN4I_I2S_FIFO_RX_REG: + case SUN4I_I2S_FIFO_STA_REG: + case SUN4I_I2S_RX_CNT_REG: + case SUN4I_I2S_TX_CNT_REG: + case SUN8I_I2S_FIFO_TX_REG: + case SUN8I_I2S_INT_STA_REG: return true; - if (reg == SUN8I_I2S_FIFO_TX_REG) - return false; - return sun4i_i2s_volatile_reg(dev, reg); + default: + return false; + } } static const struct reg_default sun4i_i2s_reg_defaults[] = { -- 2.25.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=-12.5 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_SIGNED,DKIM_VALID,FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,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 1643CC43463 for ; Mon, 21 Sep 2020 10:30:31 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (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 B39FA206C9 for ; Mon, 21 Sep 2020 10:30:30 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="e9Brg/LV"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="GQrVMr02" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B39FA206C9 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=YXjImhtlBmKEvOXtRWZuyvIzOFKsnuL1qf6RYRcx2Y0=; b=e9Brg/LVYHr9ojGQd4e/6tCIn ttNB7XnPR99+KP8FdEsOkNh7NttRikyWbyw7qKjOJlmv4BklNAMAylbmLCLTsWTKFZQOIMO5TQ/4K B/I6a4TsNxbxkIuwjP1KsQxFlFYTZEXZ583oJDul+baH1O/4yZm7B91q2dgWXeb5DcN/LvNi0DV0l xsm8jTl/Xix2ywRkXyUbXDNDj/z93a9XBM/2bhwEG4xLQSy6Q5ad8SWbtaEdsd2A1cGbnWznv2uA5 zoC50frCt3d+2FUeyMfcpqsgIe8VkFFXclLqPmTBiKLgyPWK9z02BAXH1PKJraohla2nMjYpJa1vz l/jAqpxug==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kKJ3g-0007yU-FJ; Mon, 21 Sep 2020 10:28:32 +0000 Received: from mail-wm1-x344.google.com ([2a00:1450:4864:20::344]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kKJ2v-0007h3-Ab for linux-arm-kernel@lists.infradead.org; Mon, 21 Sep 2020 10:27:46 +0000 Received: by mail-wm1-x344.google.com with SMTP id q9so11586065wmj.2 for ; Mon, 21 Sep 2020 03:27:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=403l/Us7aRgOIyQKfBkM8buNZnuotwhLbaKDtAVk4oo=; b=GQrVMr02cQ1BeZlZeb2WVDwVRAOjy0EPLcpnRVoxLErUQ8L8BbXzAgcou4DBLILshT voB4HL19k+K58pZ9bWoiXJcWXcWdo4aTCYu8xUzFOIbsFPR1zHQXm2G7WqGccB8DtNKL GFUo276bbhz+KJWMWgKxOTcYQJKeRVpyTG4A+1AxMAWukIh/cDo1CPBA9oH1DE7LReQ2 J5nNNz0F2YJsVRKfKgl/sXXvpnPkFxsHI5HGyED3UkulTOrGyx85O52YBiuqzeZzDZPK 0UBMepEcvgqiP0vW1f8hWTuvUbQ54SPeh3/qTspCZfjP+qEvLo1FAuJry9vXmYnLzZoM FSUQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=403l/Us7aRgOIyQKfBkM8buNZnuotwhLbaKDtAVk4oo=; b=m30WslQsKuOZOxmblMxItmM7MCouAciaZU8sA2a8pWvVcupj9K3zBIhxcMlyQA8mA7 VcV8AT7KLGXb5QCY0EALuNXVNOP2Z5E/PyFJhkNE3lKqy2SyPXNWD7dB7LscyVAF1teu 8Nb7+8cktaDeXlTNez8wM3EpsJ8AlKNsvR5KoUEiZOmm7T1yG7lIzxyAeW055ObFHSWA FfSqE4uwumIwFlR9VMPvRtf8rpaexc5wBQ42T2+ysSm/SdSOT7I7qz+uqObHNJbllvo4 8r9pXIHL3FukC2onBTHenH/ciMXXBmdA3g9ttOO/vW0TQIr+61Fq3MZuZvBtd6I1kKg/ BjkQ== X-Gm-Message-State: AOAM5314ipuCUWfhg5hayDCUISYWA/mkHx+ZFY4IB11HCYuasKFiBTPT oDsBT80d8wuMzgLvQn9ruJc= X-Google-Smtp-Source: ABdhPJwUf0cjcKP8Yw3D8f2JCJ2cf8UwK0nPxw2utggNBtLI1lebBlr4qIJnkeYxSyYALo3fFnCvLw== X-Received: by 2002:a05:600c:2257:: with SMTP id a23mr30634579wmm.102.1600684064389; Mon, 21 Sep 2020 03:27:44 -0700 (PDT) Received: from localhost.localdomain (lputeaux-656-1-11-33.w82-127.abo.wanadoo.fr. [82.127.142.33]) by smtp.gmail.com with ESMTPSA id h2sm20713774wrp.69.2020.09.21.03.27.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 21 Sep 2020 03:27:43 -0700 (PDT) From: =?UTF-8?q?Cl=C3=A9ment=20P=C3=A9ron?= To: Maxime Ripard , Chen-Yu Tsai , Rob Herring , Mark Brown , Liam Girdwood Subject: [PATCH v4 07/22] ASoC: sun4i-i2s: Fix sun8i volatile regs Date: Mon, 21 Sep 2020 12:27:16 +0200 Message-Id: <20200921102731.747736-8-peron.clem@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200921102731.747736-1-peron.clem@gmail.com> References: <20200921102731.747736-1-peron.clem@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200921_062745_415965_2E76A2E3 X-CRM114-Status: GOOD ( 15.27 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, Jernej Skrabec , alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org, Takashi Iwai , Jaroslav Kysela , Marcus Cooper , linux-sunxi@googlegroups.com, =?UTF-8?q?Cl=C3=A9ment=20P=C3=A9ron?= , linux-arm-kernel@lists.infradead.org Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org VGhlIEZJRk8gVFggcmVnIGlzIHZvbGF0aWxlIGFuZCBzdW44aSBpMnMgcmVnaXN0ZXIKbWFwcGlu ZyBpcyBkaWZmZXJlbnQgZnJvbSBzdW40aS4KCkV2ZW4gaWYgaW4gdGhpcyBjYXNlIGl0J3MgZG9l c24ndCBjcmVhdGUgYW4gaXNzdWUsCkF2b2lkIHNldHRpbmcgc29tZSByZWdzIHRoYXQgYXJlIHVu ZGVmaW5lZCBpbiBzdW44aS4KClNpZ25lZC1vZmYtYnk6IENsw6ltZW50IFDDqXJvbiA8cGVyb24u Y2xlbUBnbWFpbC5jb20+CkFja2VkLWJ5OiBNYXhpbWUgUmlwYXJkIDxtcmlwYXJkQGtlcm5lbC5v cmc+Ci0tLQogc291bmQvc29jL3N1bnhpL3N1bjRpLWkycy5jIHwgMTUgKysrKysrKysrKystLS0t CiAxIGZpbGUgY2hhbmdlZCwgMTEgaW5zZXJ0aW9ucygrKSwgNCBkZWxldGlvbnMoLSkKCmRpZmYg LS1naXQgYS9zb3VuZC9zb2Mvc3VueGkvc3VuNGktaTJzLmMgYi9zb3VuZC9zb2Mvc3VueGkvc3Vu NGktaTJzLmMKaW5kZXggNjBiMmZlYzFiYmU5Li4zZjkxMTBkNzA5NDEgMTAwNjQ0Ci0tLSBhL3Nv dW5kL3NvYy9zdW54aS9zdW40aS1pMnMuYworKysgYi9zb3VuZC9zb2Mvc3VueGkvc3VuNGktaTJz LmMKQEAgLTExNTIsMTIgKzExNTIsMTkgQEAgc3RhdGljIGJvb2wgc3VuOGlfaTJzX3JkX3JlZyhz dHJ1Y3QgZGV2aWNlICpkZXYsIHVuc2lnbmVkIGludCByZWcpCiAKIHN0YXRpYyBib29sIHN1bjhp X2kyc192b2xhdGlsZV9yZWcoc3RydWN0IGRldmljZSAqZGV2LCB1bnNpZ25lZCBpbnQgcmVnKQog ewotCWlmIChyZWcgPT0gU1VOOElfSTJTX0lOVF9TVEFfUkVHKQorCXN3aXRjaCAocmVnKSB7CisJ Y2FzZSBTVU40SV9JMlNfRklGT19DVFJMX1JFRzoKKwljYXNlIFNVTjRJX0kyU19GSUZPX1JYX1JF RzoKKwljYXNlIFNVTjRJX0kyU19GSUZPX1NUQV9SRUc6CisJY2FzZSBTVU40SV9JMlNfUlhfQ05U X1JFRzoKKwljYXNlIFNVTjRJX0kyU19UWF9DTlRfUkVHOgorCWNhc2UgU1VOOElfSTJTX0ZJRk9f VFhfUkVHOgorCWNhc2UgU1VOOElfSTJTX0lOVF9TVEFfUkVHOgogCQlyZXR1cm4gdHJ1ZTsKLQlp ZiAocmVnID09IFNVTjhJX0kyU19GSUZPX1RYX1JFRykKLQkJcmV0dXJuIGZhbHNlOwogCi0JcmV0 dXJuIHN1bjRpX2kyc192b2xhdGlsZV9yZWcoZGV2LCByZWcpOworCWRlZmF1bHQ6CisJCXJldHVy biBmYWxzZTsKKwl9CiB9CiAKIHN0YXRpYyBjb25zdCBzdHJ1Y3QgcmVnX2RlZmF1bHQgc3VuNGlf aTJzX3JlZ19kZWZhdWx0c1tdID0gewotLSAKMi4yNS4xCgoKX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX18KbGludXgtYXJtLWtlcm5lbCBtYWlsaW5nIGxpc3QK bGludXgtYXJtLWtlcm5lbEBsaXN0cy5pbmZyYWRlYWQub3JnCmh0dHA6Ly9saXN0cy5pbmZyYWRl YWQub3JnL21haWxtYW4vbGlzdGluZm8vbGludXgtYXJtLWtlcm5lbAo= 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=-12.6 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,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 E07F5C43465 for ; Mon, 21 Sep 2020 10:28:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id AD162207BC for ; Mon, 21 Sep 2020 10:28:47 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="GQrVMr02" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726710AbgIUK2r (ORCPT ); Mon, 21 Sep 2020 06:28:47 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60256 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726703AbgIUK1q (ORCPT ); Mon, 21 Sep 2020 06:27:46 -0400 Received: from mail-wm1-x342.google.com (mail-wm1-x342.google.com [IPv6:2a00:1450:4864:20::342]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C1F2EC0613D0; Mon, 21 Sep 2020 03:27:45 -0700 (PDT) Received: by mail-wm1-x342.google.com with SMTP id w2so11584844wmi.1; Mon, 21 Sep 2020 03:27:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=403l/Us7aRgOIyQKfBkM8buNZnuotwhLbaKDtAVk4oo=; b=GQrVMr02cQ1BeZlZeb2WVDwVRAOjy0EPLcpnRVoxLErUQ8L8BbXzAgcou4DBLILshT voB4HL19k+K58pZ9bWoiXJcWXcWdo4aTCYu8xUzFOIbsFPR1zHQXm2G7WqGccB8DtNKL GFUo276bbhz+KJWMWgKxOTcYQJKeRVpyTG4A+1AxMAWukIh/cDo1CPBA9oH1DE7LReQ2 J5nNNz0F2YJsVRKfKgl/sXXvpnPkFxsHI5HGyED3UkulTOrGyx85O52YBiuqzeZzDZPK 0UBMepEcvgqiP0vW1f8hWTuvUbQ54SPeh3/qTspCZfjP+qEvLo1FAuJry9vXmYnLzZoM FSUQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=403l/Us7aRgOIyQKfBkM8buNZnuotwhLbaKDtAVk4oo=; b=LFAyZaHnaBgwjqw1QL1s7ajGexH27sAmPp2rcfalkWXObRAsvr7TErjE3yPQOlzy7X ynzCIOEc2/1tkn+pt9vXOCXeMoFPSEJeI3Gymne1KtqCMhuzeqcRdAQW8kxvePDVre5C miOsKwQeblnNNu+e6ZOFP/qSNm/Pj4iJwke/s2XTXxfmwEOKMcEjHsTIDyo1LrOiLH5x JJh+Ys2R5NyPtfoWJ/cIY3IMeb54NH+7CDFVVj6HVBVIoMPaGq8dpmhK5MLuLAdURyDC t0DWcSbtHCGJglOTMB/UYcx2u/1HmUjlhbxwuw4StGSBxbWR3sXzDHZAxbzYSA2m29eC 3Wkw== X-Gm-Message-State: AOAM533k2keXfqt/PjcW7WPkM4wrelHHvCDZM/Zbxj53X+35OUBKqosV Z94Mc7A/s/KL8FZXuoTBC0JNn2Nq4taAOTrZ X-Google-Smtp-Source: ABdhPJwUf0cjcKP8Yw3D8f2JCJ2cf8UwK0nPxw2utggNBtLI1lebBlr4qIJnkeYxSyYALo3fFnCvLw== X-Received: by 2002:a05:600c:2257:: with SMTP id a23mr30634579wmm.102.1600684064389; Mon, 21 Sep 2020 03:27:44 -0700 (PDT) Received: from localhost.localdomain (lputeaux-656-1-11-33.w82-127.abo.wanadoo.fr. [82.127.142.33]) by smtp.gmail.com with ESMTPSA id h2sm20713774wrp.69.2020.09.21.03.27.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 21 Sep 2020 03:27:43 -0700 (PDT) From: =?UTF-8?q?Cl=C3=A9ment=20P=C3=A9ron?= To: Maxime Ripard , Chen-Yu Tsai , Rob Herring , Mark Brown , Liam Girdwood Cc: Jaroslav Kysela , Takashi Iwai , Marcus Cooper , Jernej Skrabec , alsa-devel@alsa-project.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-sunxi@googlegroups.com, =?UTF-8?q?Cl=C3=A9ment=20P=C3=A9ron?= Subject: [PATCH v4 07/22] ASoC: sun4i-i2s: Fix sun8i volatile regs Date: Mon, 21 Sep 2020 12:27:16 +0200 Message-Id: <20200921102731.747736-8-peron.clem@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200921102731.747736-1-peron.clem@gmail.com> References: <20200921102731.747736-1-peron.clem@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org The FIFO TX reg is volatile and sun8i i2s register mapping is different from sun4i. Even if in this case it's doesn't create an issue, Avoid setting some regs that are undefined in sun8i. Signed-off-by: Clément Péron Acked-by: Maxime Ripard --- sound/soc/sunxi/sun4i-i2s.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/sound/soc/sunxi/sun4i-i2s.c b/sound/soc/sunxi/sun4i-i2s.c index 60b2fec1bbe9..3f9110d70941 100644 --- a/sound/soc/sunxi/sun4i-i2s.c +++ b/sound/soc/sunxi/sun4i-i2s.c @@ -1152,12 +1152,19 @@ static bool sun8i_i2s_rd_reg(struct device *dev, unsigned int reg) static bool sun8i_i2s_volatile_reg(struct device *dev, unsigned int reg) { - if (reg == SUN8I_I2S_INT_STA_REG) + switch (reg) { + case SUN4I_I2S_FIFO_CTRL_REG: + case SUN4I_I2S_FIFO_RX_REG: + case SUN4I_I2S_FIFO_STA_REG: + case SUN4I_I2S_RX_CNT_REG: + case SUN4I_I2S_TX_CNT_REG: + case SUN8I_I2S_FIFO_TX_REG: + case SUN8I_I2S_INT_STA_REG: return true; - if (reg == SUN8I_I2S_FIFO_TX_REG) - return false; - return sun4i_i2s_volatile_reg(dev, reg); + default: + return false; + } } static const struct reg_default sun4i_i2s_reg_defaults[] = { -- 2.25.1