From mboxrd@z Thu Jan 1 00:00:00 1970 From: =?UTF-8?q?Cl=C3=A9ment=20P=C3=A9ron?= Subject: [PATCH v4 3/7] ASoC: sun4i-spdif: Add TX fifo bit flush quirks Date: Mon, 27 May 2019 22:06:23 +0200 Message-ID: <20190527200627.8635-4-peron.clem@gmail.com> References: <20190527200627.8635-1-peron.clem@gmail.com> Reply-To: peron.clem-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Return-path: Sender: linux-sunxi-/JYPxA39Uh5TLH3MbocFFw@public.gmane.org In-Reply-To: <20190527200627.8635-1-peron.clem-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , To: Liam Girdwood , Mark Brown , Rob Herring , Mark Rutland , Maxime Ripard , Chen-Yu Tsai , Jaroslav Kysela , Takashi Iwai , Jagan Teki Cc: alsa-devel-K7yf7f+aM1XWsZ/bQMPhNw@public.gmane.org, devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org, linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-sunxi-/JYPxA39Uh5TLH3MbocFFw@public.gmane.org, =?UTF-8?q?Cl=C3=A9ment=20P=C3=A9ron?= List-Id: alsa-devel@alsa-project.org Allwinner H6 has a different bit to flush the TX FIFO. Add a quirks to prepare introduction of H6 SoC. Signed-off-by: Cl=C3=A9ment P=C3=A9ron --- sound/soc/sunxi/sun4i-spdif.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/sound/soc/sunxi/sun4i-spdif.c b/sound/soc/sunxi/sun4i-spdif.c index b6c66a62e915..045d0cc4b62a 100644 --- a/sound/soc/sunxi/sun4i-spdif.c +++ b/sound/soc/sunxi/sun4i-spdif.c @@ -166,10 +166,12 @@ * * @reg_dac_tx_data: TX FIFO offset for DMA config. * @has_reset: SoC needs reset deasserted. + * @val_fctl_ftx: TX FIFO flush bitmask. */ struct sun4i_spdif_quirks { unsigned int reg_dac_txdata; bool has_reset; + unsigned int val_fctl_ftx; }; =20 struct sun4i_spdif_dev { @@ -180,16 +182,19 @@ struct sun4i_spdif_dev { struct snd_soc_dai_driver cpu_dai_drv; struct regmap *regmap; struct snd_dmaengine_dai_dma_data dma_params_tx; + const struct sun4i_spdif_quirks *quirks; }; =20 static void sun4i_spdif_configure(struct sun4i_spdif_dev *host) { + const struct sun4i_spdif_quirks *quirks =3D host->quirks; + /* soft reset SPDIF */ regmap_write(host->regmap, SUN4I_SPDIF_CTL, SUN4I_SPDIF_CTL_RESET); =20 /* flush TX FIFO */ regmap_update_bits(host->regmap, SUN4I_SPDIF_FCTL, - SUN4I_SPDIF_FCTL_FTX, SUN4I_SPDIF_FCTL_FTX); + quirks->val_fctl_ftx, quirks->val_fctl_ftx); =20 /* clear TX counter */ regmap_write(host->regmap, SUN4I_SPDIF_TXCNT, 0); @@ -418,15 +423,18 @@ static struct snd_soc_dai_driver sun4i_spdif_dai =3D = { =20 static const struct sun4i_spdif_quirks sun4i_a10_spdif_quirks =3D { .reg_dac_txdata =3D SUN4I_SPDIF_TXFIFO, + .val_fctl_ftx =3D SUN4I_SPDIF_FCTL_FTX, }; =20 static const struct sun4i_spdif_quirks sun6i_a31_spdif_quirks =3D { .reg_dac_txdata =3D SUN4I_SPDIF_TXFIFO, + .val_fctl_ftx =3D SUN4I_SPDIF_FCTL_FTX, .has_reset =3D true, }; =20 static const struct sun4i_spdif_quirks sun8i_h3_spdif_quirks =3D { .reg_dac_txdata =3D SUN8I_SPDIF_TXFIFO, + .val_fctl_ftx =3D SUN4I_SPDIF_FCTL_FTX, .has_reset =3D true, }; =20 @@ -507,6 +515,7 @@ static int sun4i_spdif_probe(struct platform_device *pd= ev) dev_err(&pdev->dev, "Failed to determine the quirks to use\n"); return -ENODEV; } + host->quirks =3D quirks; =20 host->regmap =3D devm_regmap_init_mmio(&pdev->dev, base, &sun4i_spdif_regmap_config); --=20 2.20.1 --=20 You received this message because you are subscribed to the Google Groups "= linux-sunxi" group. To unsubscribe from this group and stop receiving emails from it, send an e= mail to linux-sunxi+unsubscribe-/JYPxA39Uh5TLH3MbocFF+G/Ez6ZCGd0@public.gmane.org To view this discussion on the web, visit https://groups.google.com/d/msgid= /linux-sunxi/20190527200627.8635-4-peron.clem%40gmail.com. For more options, visit https://groups.google.com/d/optout. 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=-8.8 required=3.0 tests=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 CF47DC04AB3 for ; Mon, 27 May 2019 20:10:55 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (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 A61FC208C3 for ; Mon, 27 May 2019 20:10:55 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="l/HMpG+2"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="psgmVbWc" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A61FC208C3 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+infradead-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=bombadil.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=BrF9/uZ+LytsugYMi/p1baJoo6bwk2qjsYyNdeRzL/w=; b=l/HMpG+2kaJns9 7GBeZTwauT68lRZz/kJKyDJjgvYMu8+m4pLVNyHxU4xCj1MhmGlf1sFHnr51scU/BaCIXm18FlVT/ BiJgjDiy56k0c/oaBNEIPfqAo/6bnXBiBQFHl7EW6HDbU/bx+BlAu813f7LUEuXF6WTArhaWCuLDF gW2WIl2zt1EXG5S6Wrd1APqWxwjk09MdKjIMLU20UaorWt3nTeoV/K2HIROb3yEFBEeuz79g3jIvE I5Vug1VZzVDbWou8T2S1Zz7fQyag50Re7WClDDyFRL40k99M8JfVSK4LyhH4DMYeezihhvetYj0+y 8xMMzB91MwPxnBbqJEGA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1hVLxI-0003SM-EA; Mon, 27 May 2019 20:10:48 +0000 Received: from mail-wm1-x344.google.com ([2a00:1450:4864:20::344]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1hVLwn-0002nn-Ra for linux-arm-kernel@lists.infradead.org; Mon, 27 May 2019 20:10:20 +0000 Received: by mail-wm1-x344.google.com with SMTP id v22so531678wml.1 for ; Mon, 27 May 2019 13:10:17 -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=wv4bRiRVjlotB3NJW4BQD8xcTUogsyFuw65oZfNvb1s=; b=psgmVbWcSlCI1+YNxxBbHm4Laul+Afg6UqNDgL6/++9kS667P0ea4J6kdRN5MJyZyp Y9XA+ZjsPBzbXsFrDMFZtdGdVsP0BQhcJB1LTxy1II8/8K7SjS97AMbgL6F7TJlgUieH cIKMyAUHumWxoz7j8JUMvw7FOa9AhQGdnotivIlitt6aH7z4CPJ1gslea3eeQjiR3dLt D2U8+gdYAeWrqVvEbaOYDCeuRbU7wBMcj4ZTD2Zi9nr4bhzkDvAW14S234U2a58G6snQ HWMc4xR3bTKVDmjHBdYWlUxnRlQdOLf1o8SSX26DlT/bkB/baJ5EuESmYzDDFeI9HTkg IA8g== 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=wv4bRiRVjlotB3NJW4BQD8xcTUogsyFuw65oZfNvb1s=; b=Aurqqv2ALCpAXtmy73HlKt/uf3O/wty6IlGl1+aql1wCTuWhnH7tTC6JuEfQJy6VLl 4ODSK0n4MuATeDz/Tr6YJ6wCDZ8ycWLENA7HBRZX0geZ476bNefJrlGdGBVgbVYMDhXq oQZba3jApa7PQfe+IRVkg5TYC1cRhKvlMv4fs1sW4GNMlMQZSXs9pWy17JlK2ARrlik+ 823zPqUAbQY1TEsaSr4wHS57qti+D1cTLmOoVVcGW1xZOBKkWuba83OIzaaznq2S/iKU nrZIULPy/6WvlORCC4HxoEJrD3kd3ylGG6dnhxE9mYy6aM+8MESkbsNjKwFL6zPR+2XS 7k4w== X-Gm-Message-State: APjAAAWWAV4Q7OfNfsDk3Gu+2Jar7h8ZQgrkTS+/9KzGXHDV0xahMpvf o2QdH/pzZFd2iwsD+jh8xbA= X-Google-Smtp-Source: APXvYqzRen9k8IsaoDFCRgz5uh2Kh75YVlp6HkmpKHkpJQcDv7nSUTkHyUNb9OYwV/fN7pzBgLzz9A== X-Received: by 2002:a1c:f50a:: with SMTP id t10mr508352wmh.86.1558987816422; Mon, 27 May 2019 13:10:16 -0700 (PDT) Received: from localhost.localdomain ([2a01:e0a:1f1:d0f0::4e2b:d7ca]) by smtp.gmail.com with ESMTPSA id s127sm308523wmf.48.2019.05.27.13.10.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 27 May 2019 13:10:15 -0700 (PDT) From: =?UTF-8?q?Cl=C3=A9ment=20P=C3=A9ron?= To: Liam Girdwood , Mark Brown , Rob Herring , Mark Rutland , Maxime Ripard , Chen-Yu Tsai , Jaroslav Kysela , Takashi Iwai , Jagan Teki Subject: [PATCH v4 3/7] ASoC: sun4i-spdif: Add TX fifo bit flush quirks Date: Mon, 27 May 2019 22:06:23 +0200 Message-Id: <20190527200627.8635-4-peron.clem@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190527200627.8635-1-peron.clem@gmail.com> References: <20190527200627.8635-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-20190527_131018_096591_6BF1864E X-CRM114-Status: GOOD ( 16.12 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org, 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+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org QWxsd2lubmVyIEg2IGhhcyBhIGRpZmZlcmVudCBiaXQgdG8gZmx1c2ggdGhlIFRYIEZJRk8uCgpB ZGQgYSBxdWlya3MgdG8gcHJlcGFyZSBpbnRyb2R1Y3Rpb24gb2YgSDYgU29DLgoKU2lnbmVkLW9m Zi1ieTogQ2zDqW1lbnQgUMOpcm9uIDxwZXJvbi5jbGVtQGdtYWlsLmNvbT4KLS0tCiBzb3VuZC9z b2Mvc3VueGkvc3VuNGktc3BkaWYuYyB8IDExICsrKysrKysrKystCiAxIGZpbGUgY2hhbmdlZCwg MTAgaW5zZXJ0aW9ucygrKSwgMSBkZWxldGlvbigtKQoKZGlmZiAtLWdpdCBhL3NvdW5kL3NvYy9z dW54aS9zdW40aS1zcGRpZi5jIGIvc291bmQvc29jL3N1bnhpL3N1bjRpLXNwZGlmLmMKaW5kZXgg YjZjNjZhNjJlOTE1Li4wNDVkMGNjNGI2MmEgMTAwNjQ0Ci0tLSBhL3NvdW5kL3NvYy9zdW54aS9z dW40aS1zcGRpZi5jCisrKyBiL3NvdW5kL3NvYy9zdW54aS9zdW40aS1zcGRpZi5jCkBAIC0xNjYs MTAgKzE2NiwxMiBAQAogICoKICAqIEByZWdfZGFjX3R4X2RhdGE6IFRYIEZJRk8gb2Zmc2V0IGZv ciBETUEgY29uZmlnLgogICogQGhhc19yZXNldDogU29DIG5lZWRzIHJlc2V0IGRlYXNzZXJ0ZWQu CisgKiBAdmFsX2ZjdGxfZnR4OiBUWCBGSUZPIGZsdXNoIGJpdG1hc2suCiAgKi8KIHN0cnVjdCBz dW40aV9zcGRpZl9xdWlya3MgewogCXVuc2lnbmVkIGludCByZWdfZGFjX3R4ZGF0YTsKIAlib29s IGhhc19yZXNldDsKKwl1bnNpZ25lZCBpbnQgdmFsX2ZjdGxfZnR4OwogfTsKIAogc3RydWN0IHN1 bjRpX3NwZGlmX2RldiB7CkBAIC0xODAsMTYgKzE4MiwxOSBAQCBzdHJ1Y3Qgc3VuNGlfc3BkaWZf ZGV2IHsKIAlzdHJ1Y3Qgc25kX3NvY19kYWlfZHJpdmVyIGNwdV9kYWlfZHJ2OwogCXN0cnVjdCBy ZWdtYXAgKnJlZ21hcDsKIAlzdHJ1Y3Qgc25kX2RtYWVuZ2luZV9kYWlfZG1hX2RhdGEgZG1hX3Bh cmFtc190eDsKKwljb25zdCBzdHJ1Y3Qgc3VuNGlfc3BkaWZfcXVpcmtzICpxdWlya3M7CiB9Owog CiBzdGF0aWMgdm9pZCBzdW40aV9zcGRpZl9jb25maWd1cmUoc3RydWN0IHN1bjRpX3NwZGlmX2Rl diAqaG9zdCkKIHsKKwljb25zdCBzdHJ1Y3Qgc3VuNGlfc3BkaWZfcXVpcmtzICpxdWlya3MgPSBo b3N0LT5xdWlya3M7CisKIAkvKiBzb2Z0IHJlc2V0IFNQRElGICovCiAJcmVnbWFwX3dyaXRlKGhv c3QtPnJlZ21hcCwgU1VONElfU1BESUZfQ1RMLCBTVU40SV9TUERJRl9DVExfUkVTRVQpOwogCiAJ LyogZmx1c2ggVFggRklGTyAqLwogCXJlZ21hcF91cGRhdGVfYml0cyhob3N0LT5yZWdtYXAsIFNV TjRJX1NQRElGX0ZDVEwsCi0JCQkgICBTVU40SV9TUERJRl9GQ1RMX0ZUWCwgU1VONElfU1BESUZf RkNUTF9GVFgpOworCQkJICAgcXVpcmtzLT52YWxfZmN0bF9mdHgsIHF1aXJrcy0+dmFsX2ZjdGxf ZnR4KTsKIAogCS8qIGNsZWFyIFRYIGNvdW50ZXIgKi8KIAlyZWdtYXBfd3JpdGUoaG9zdC0+cmVn bWFwLCBTVU40SV9TUERJRl9UWENOVCwgMCk7CkBAIC00MTgsMTUgKzQyMywxOCBAQCBzdGF0aWMg c3RydWN0IHNuZF9zb2NfZGFpX2RyaXZlciBzdW40aV9zcGRpZl9kYWkgPSB7CiAKIHN0YXRpYyBj b25zdCBzdHJ1Y3Qgc3VuNGlfc3BkaWZfcXVpcmtzIHN1bjRpX2ExMF9zcGRpZl9xdWlya3MgPSB7 CiAJLnJlZ19kYWNfdHhkYXRhCT0gU1VONElfU1BESUZfVFhGSUZPLAorCS52YWxfZmN0bF9mdHgg ICA9IFNVTjRJX1NQRElGX0ZDVExfRlRYLAogfTsKIAogc3RhdGljIGNvbnN0IHN0cnVjdCBzdW40 aV9zcGRpZl9xdWlya3Mgc3VuNmlfYTMxX3NwZGlmX3F1aXJrcyA9IHsKIAkucmVnX2RhY190eGRh dGEJPSBTVU40SV9TUERJRl9UWEZJRk8sCisJLnZhbF9mY3RsX2Z0eCAgID0gU1VONElfU1BESUZf RkNUTF9GVFgsCiAJLmhhc19yZXNldAk9IHRydWUsCiB9OwogCiBzdGF0aWMgY29uc3Qgc3RydWN0 IHN1bjRpX3NwZGlmX3F1aXJrcyBzdW44aV9oM19zcGRpZl9xdWlya3MgPSB7CiAJLnJlZ19kYWNf dHhkYXRhCT0gU1VOOElfU1BESUZfVFhGSUZPLAorCS52YWxfZmN0bF9mdHggICA9IFNVTjRJX1NQ RElGX0ZDVExfRlRYLAogCS5oYXNfcmVzZXQJPSB0cnVlLAogfTsKIApAQCAtNTA3LDYgKzUxNSw3 IEBAIHN0YXRpYyBpbnQgc3VuNGlfc3BkaWZfcHJvYmUoc3RydWN0IHBsYXRmb3JtX2RldmljZSAq cGRldikKIAkJZGV2X2VycigmcGRldi0+ZGV2LCAiRmFpbGVkIHRvIGRldGVybWluZSB0aGUgcXVp cmtzIHRvIHVzZVxuIik7CiAJCXJldHVybiAtRU5PREVWOwogCX0KKwlob3N0LT5xdWlya3MgPSBx dWlya3M7CiAKIAlob3N0LT5yZWdtYXAgPSBkZXZtX3JlZ21hcF9pbml0X21taW8oJnBkZXYtPmRl diwgYmFzZSwKIAkJCQkJCSZzdW40aV9zcGRpZl9yZWdtYXBfY29uZmlnKTsKLS0gCjIuMjAuMQoK Cl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmxpbnV4LWFy bS1rZXJuZWwgbWFpbGluZyBsaXN0CmxpbnV4LWFybS1rZXJuZWxAbGlzdHMuaW5mcmFkZWFkLm9y ZwpodHRwOi8vbGlzdHMuaW5mcmFkZWFkLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2xpbnV4LWFybS1r ZXJuZWwK 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=-8.9 required=3.0 tests=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 497D5C04AB3 for ; Mon, 27 May 2019 20:10:24 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1F9702182B for ; Mon, 27 May 2019 20:10:24 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="psgmVbWc" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727295AbfE0UKX (ORCPT ); Mon, 27 May 2019 16:10:23 -0400 Received: from mail-wm1-f68.google.com ([209.85.128.68]:38183 "EHLO mail-wm1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727152AbfE0UKT (ORCPT ); Mon, 27 May 2019 16:10:19 -0400 Received: by mail-wm1-f68.google.com with SMTP id t5so528678wmh.3; Mon, 27 May 2019 13:10:17 -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=wv4bRiRVjlotB3NJW4BQD8xcTUogsyFuw65oZfNvb1s=; b=psgmVbWcSlCI1+YNxxBbHm4Laul+Afg6UqNDgL6/++9kS667P0ea4J6kdRN5MJyZyp Y9XA+ZjsPBzbXsFrDMFZtdGdVsP0BQhcJB1LTxy1II8/8K7SjS97AMbgL6F7TJlgUieH cIKMyAUHumWxoz7j8JUMvw7FOa9AhQGdnotivIlitt6aH7z4CPJ1gslea3eeQjiR3dLt D2U8+gdYAeWrqVvEbaOYDCeuRbU7wBMcj4ZTD2Zi9nr4bhzkDvAW14S234U2a58G6snQ HWMc4xR3bTKVDmjHBdYWlUxnRlQdOLf1o8SSX26DlT/bkB/baJ5EuESmYzDDFeI9HTkg IA8g== 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=wv4bRiRVjlotB3NJW4BQD8xcTUogsyFuw65oZfNvb1s=; b=JmQqxh8zs5vpLdEbDQ10i5/83Qay1nzedvS0tMhST364injMysqwo/SCP5WciPRLb5 spYi8Gd6ogruIyaXyh/IQdgh2CX7fnlSiDZssygCwzM1KCim+y+s6hTr2GWk4CAWsenK mdUROosOHIvhKDAGasTFiVoH46fLA/meFMXKRlrHxShE7tjdhjWnhyUXxXw+InCmNHMJ +rwfo5Durg467X3bPGwZnJdE0/cpW+kP569r6pkUIoEJNRF5+d0DIy+tv2onYLHVUmMO lbfZFb1B96KTOpobCic+4mkhxEIgtSICV6Ule5IY6bH9dgS3ZkKvVuKJWdJMyHdZBfXe VZLg== X-Gm-Message-State: APjAAAUJxN1lm1VpNPf7nhnkHyFCJXtu9V4h7dAIm36RpdHaDNJpNfNS 3eW+mgr/Yx4u2D8SJF5P0/0= X-Google-Smtp-Source: APXvYqzRen9k8IsaoDFCRgz5uh2Kh75YVlp6HkmpKHkpJQcDv7nSUTkHyUNb9OYwV/fN7pzBgLzz9A== X-Received: by 2002:a1c:f50a:: with SMTP id t10mr508352wmh.86.1558987816422; Mon, 27 May 2019 13:10:16 -0700 (PDT) Received: from localhost.localdomain ([2a01:e0a:1f1:d0f0::4e2b:d7ca]) by smtp.gmail.com with ESMTPSA id s127sm308523wmf.48.2019.05.27.13.10.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 27 May 2019 13:10:15 -0700 (PDT) From: =?UTF-8?q?Cl=C3=A9ment=20P=C3=A9ron?= To: Liam Girdwood , Mark Brown , Rob Herring , Mark Rutland , Maxime Ripard , Chen-Yu Tsai , Jaroslav Kysela , Takashi Iwai , Jagan Teki Cc: 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 3/7] ASoC: sun4i-spdif: Add TX fifo bit flush quirks Date: Mon, 27 May 2019 22:06:23 +0200 Message-Id: <20190527200627.8635-4-peron.clem@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190527200627.8635-1-peron.clem@gmail.com> References: <20190527200627.8635-1-peron.clem@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Allwinner H6 has a different bit to flush the TX FIFO. Add a quirks to prepare introduction of H6 SoC. Signed-off-by: Clément Péron --- sound/soc/sunxi/sun4i-spdif.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/sound/soc/sunxi/sun4i-spdif.c b/sound/soc/sunxi/sun4i-spdif.c index b6c66a62e915..045d0cc4b62a 100644 --- a/sound/soc/sunxi/sun4i-spdif.c +++ b/sound/soc/sunxi/sun4i-spdif.c @@ -166,10 +166,12 @@ * * @reg_dac_tx_data: TX FIFO offset for DMA config. * @has_reset: SoC needs reset deasserted. + * @val_fctl_ftx: TX FIFO flush bitmask. */ struct sun4i_spdif_quirks { unsigned int reg_dac_txdata; bool has_reset; + unsigned int val_fctl_ftx; }; struct sun4i_spdif_dev { @@ -180,16 +182,19 @@ struct sun4i_spdif_dev { struct snd_soc_dai_driver cpu_dai_drv; struct regmap *regmap; struct snd_dmaengine_dai_dma_data dma_params_tx; + const struct sun4i_spdif_quirks *quirks; }; static void sun4i_spdif_configure(struct sun4i_spdif_dev *host) { + const struct sun4i_spdif_quirks *quirks = host->quirks; + /* soft reset SPDIF */ regmap_write(host->regmap, SUN4I_SPDIF_CTL, SUN4I_SPDIF_CTL_RESET); /* flush TX FIFO */ regmap_update_bits(host->regmap, SUN4I_SPDIF_FCTL, - SUN4I_SPDIF_FCTL_FTX, SUN4I_SPDIF_FCTL_FTX); + quirks->val_fctl_ftx, quirks->val_fctl_ftx); /* clear TX counter */ regmap_write(host->regmap, SUN4I_SPDIF_TXCNT, 0); @@ -418,15 +423,18 @@ static struct snd_soc_dai_driver sun4i_spdif_dai = { static const struct sun4i_spdif_quirks sun4i_a10_spdif_quirks = { .reg_dac_txdata = SUN4I_SPDIF_TXFIFO, + .val_fctl_ftx = SUN4I_SPDIF_FCTL_FTX, }; static const struct sun4i_spdif_quirks sun6i_a31_spdif_quirks = { .reg_dac_txdata = SUN4I_SPDIF_TXFIFO, + .val_fctl_ftx = SUN4I_SPDIF_FCTL_FTX, .has_reset = true, }; static const struct sun4i_spdif_quirks sun8i_h3_spdif_quirks = { .reg_dac_txdata = SUN8I_SPDIF_TXFIFO, + .val_fctl_ftx = SUN4I_SPDIF_FCTL_FTX, .has_reset = true, }; @@ -507,6 +515,7 @@ static int sun4i_spdif_probe(struct platform_device *pdev) dev_err(&pdev->dev, "Failed to determine the quirks to use\n"); return -ENODEV; } + host->quirks = quirks; host->regmap = devm_regmap_init_mmio(&pdev->dev, base, &sun4i_spdif_regmap_config); -- 2.20.1