From patchwork Mon Mar 12 15:57:48 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Code Kipper X-Patchwork-Id: 10276675 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 1F859602BD for ; Mon, 12 Mar 2018 16:00:14 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DC59F28D26 for ; Mon, 12 Mar 2018 16:00:13 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C1A7F28C72; Mon, 12 Mar 2018 16:00:13 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, DKIM_VALID, FREEMAIL_FROM autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 906EE28D31 for ; Mon, 12 Mar 2018 16:00:11 +0000 (UTC) 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:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id: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=gz7QqMtAdRV2Df0We47CAPCJIvwdZXjfC1mPmA/eOdg=; b=LbhviP9jo1/yxXEXsU4ujTsJ+u YQkVj6Mmlx6oZd3o/UArl6e6xjzeCfDvbZb2UlOEo50uAjw4brf1qEkdATbyd12rO8P0r51b3iR82 Aqm0KST+eu9pwE6i5r+h+EnHJ3bhIqfhqli0G+kL8Xot/Gp87CSTWjeae3OiCWDPZYO+2SFW0I3FG LHfRmivncv/lyOmaBVnrH1j+9jGXSsdG0gNzsuLWj3Ynz11nssBqK2BSaKyFkhZQvWWndYNoTfjrV xUClx01wWQIuqtzkLokdg/90ZUiV2HeUYC0SL8bl64PndN0eCR+eVzaTqu1e8Ce5QdM93FgINWvrR Za0aFq/w==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.89 #1 (Red Hat Linux)) id 1evPri-0005WI-Qd; Mon, 12 Mar 2018 15:59:58 +0000 Received: from mail-lf0-x244.google.com ([2a00:1450:4010:c07::244]) by bombadil.infradead.org with esmtps (Exim 4.89 #1 (Red Hat Linux)) id 1evPpx-0004NK-Q4 for linux-arm-kernel@lists.infradead.org; Mon, 12 Mar 2018 15:58:11 +0000 Received: by mail-lf0-x244.google.com with SMTP id y19-v6so24022436lfd.4 for ; Mon, 12 Mar 2018 08:57:59 -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; bh=pgeXwfhAK0kPQgXzdl/aAv+JOkNJjqdRYB5Ai7pGkQs=; b=f/GhpHDjOWR+b6bU2+aXG8sPsybxcsON7Mcc3G/FKpvOMljVmZcaoyZV3RDeDPcePJ ZTFgiQPKIx9dQWesQdkPwZE5tCgGGzdPq9xM2hWYoKeNukN1SxU12VpW/NjNNMn7P57l Fv1Vda+Hq5cbtgmt1ROgHSj6Jd0Uelz6DZrMKLjZR47RU3P4niQi/eXkvfNw1UzSjW5p vEqhRH08iKONJdRE0nvyVT3Sq6HE3IYDk0+M5GzYe+J8sIOnkECw7+EnDvT1X2Gu5INU G+9DUPGHzjIRiu0JrVRywFyI4ueZGETff1Iy5NyJVcJsvUWbofleVuZu2+45oU+wkZix yN4w== 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; bh=pgeXwfhAK0kPQgXzdl/aAv+JOkNJjqdRYB5Ai7pGkQs=; b=KYEa6OatkI+i+f+gfz7gg0SOnnxrjbsKwrsVtftkIZJWl6By9z4NMG3UMw89P9rn1V DJO85J/pTuPchRm9kWd09InLQZSMcBrPSHbC2Isdevy/+iai0mvyhL00rY6i+4EfuUSD FHVjtqEPQjSmTpikbageQD4dkJLY8ZTkJo8+DzOiM2noqghMUiZrBqdxBkj/9ZqeOkCl BKNUlnPUYvSXca/alWO4vxgy3Y0F55IXz3bowa0DIM8A8lConazLhusHnryYpBEU197F IWyr5Hvf7LohrpX0XcF9PDc15wgc0cy5eU3U/rCWifqAgeRPtJcCmJbWg2Vu9FVHRbq5 DxoQ== X-Gm-Message-State: AElRT7G/AVIM/SwoZAFs6a9m9bS5MC4teMzvCD+SBf5FgxgjdJ3oVadj 5NvJI2LSzZxU5VLwhLyP3Xg= X-Google-Smtp-Source: AG47ELudKO3tSVBPwXD49P63zNRbRx4HbK1xYdkuTKhiteGQQNthDoqTNL+kHBG1Be/OtMDs/lcPvQ== X-Received: by 2002:a19:1508:: with SMTP id l8-v6mr5761351lfi.139.1520870277550; Mon, 12 Mar 2018 08:57:57 -0700 (PDT) Received: from localhost.localdomain (c83-253-254-90.bredband.comhem.se. [83.253.254.90]) by smtp.gmail.com with ESMTPSA id h11-v6sm1833448lfd.88.2018.03.12.08.57.56 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 12 Mar 2018 08:57:56 -0700 (PDT) From: codekipper@gmail.com To: maxime.ripard@free-electrons.com, wens@csie.org, linux-sunxi@googlegroups.com Subject: [PATCH v2 1/6] ASoC: sun4i-i2s: Add slot width override Date: Mon, 12 Mar 2018 16:57:48 +0100 Message-Id: <20180312155753.9478-2-codekipper@gmail.com> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180312155753.9478-1-codekipper@gmail.com> References: <20180312155753.9478-1-codekipper@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180312_085809_958802_760FAFE5 X-CRM114-Status: GOOD ( 14.64 ) 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: alsa-devel@alsa-project.org, Marcus Cooper , lgirdwood@gmail.com, linux-kernel@vger.kernel.org, be17068@iperbole.bo.it, broonie@kernel.org, linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP From: Marcus Cooper Some codecs require a different amount of a bit clocks per frame than what is calculated by using the sample width. Use a slot width override property to provide this mechanism. Signed-off-by: Marcus Cooper --- Documentation/devicetree/bindings/sound/sun4i-i2s.txt | 5 +++++ sound/soc/sunxi/sun4i-i2s.c | 15 ++++++++++++--- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/Documentation/devicetree/bindings/sound/sun4i-i2s.txt b/Documentation/devicetree/bindings/sound/sun4i-i2s.txt index b9d50d6cdef3..48addef65b8f 100644 --- a/Documentation/devicetree/bindings/sound/sun4i-i2s.txt +++ b/Documentation/devicetree/bindings/sound/sun4i-i2s.txt @@ -28,6 +28,11 @@ Required properties for the following compatibles: - "allwinner,sun8i-h3-i2s" - resets: phandle to the reset line for this codec +Optional properties: +- allwinner,slot-width-override:if this property is present then the dai is + configured to extend the slot width to the + value specified. Min 8, Max 32. + Example: i2s0: i2s@1c22400 { diff --git a/sound/soc/sunxi/sun4i-i2s.c b/sound/soc/sunxi/sun4i-i2s.c index a4aa931ebfae..873054a6c3be 100644 --- a/sound/soc/sunxi/sun4i-i2s.c +++ b/sound/soc/sunxi/sun4i-i2s.c @@ -193,6 +193,8 @@ struct sun4i_i2s { struct regmap_field *field_rxchansel; const struct sun4i_i2s_quirks *variant; + + unsigned int slot_width; }; struct sun4i_i2s_clk_div { @@ -344,7 +346,7 @@ static int sun4i_i2s_set_clk_rate(struct snd_soc_dai *dai, if (i2s->variant->has_fmt_set_lrck_period) regmap_update_bits(i2s->regmap, SUN4I_I2S_FMT0_REG, SUN8I_I2S_FMT0_LRCK_PERIOD_MASK, - SUN8I_I2S_FMT0_LRCK_PERIOD(32)); + SUN8I_I2S_FMT0_LRCK_PERIOD(word_size)); return 0; } @@ -418,7 +420,8 @@ static int sun4i_i2s_hw_params(struct snd_pcm_substream *substream, sr + i2s->variant->fmt_offset); return sun4i_i2s_set_clk_rate(dai, params_rate(params), - params_width(params)); + i2s->slot_width ? + i2s->slot_width : params_width(params)); } static int sun4i_i2s_set_fmt(struct snd_soc_dai *dai, unsigned int fmt) @@ -1029,7 +1032,7 @@ static int sun4i_i2s_probe(struct platform_device *pdev) struct sun4i_i2s *i2s; struct resource *res; void __iomem *regs; - int irq, ret; + int irq, ret, val; i2s = devm_kzalloc(&pdev->dev, sizeof(*i2s), GFP_KERNEL); if (!i2s) @@ -1096,6 +1099,12 @@ static int sun4i_i2s_probe(struct platform_device *pdev) i2s->capture_dma_data.addr = res->start + SUN4I_I2S_FIFO_RX_REG; i2s->capture_dma_data.maxburst = 8; + if (!of_property_read_u32(pdev->dev.of_node, + "allwinner,slot-width-override", &val)) { + if (val >= 8 && val <= 32) + i2s->slot_width = val; + } + pm_runtime_enable(&pdev->dev); if (!pm_runtime_enabled(&pdev->dev)) { ret = sun4i_i2s_runtime_resume(&pdev->dev);