From patchwork Tue Oct 25 12:41:29 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Frattaroli X-Patchwork-Id: 13019162 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id AD579C38A2D for ; Tue, 25 Oct 2022 12:43:24 +0000 (UTC) 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 86D28533A; Tue, 25 Oct 2022 14:42:32 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 86D28533A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1666701802; bh=AlJdfI6AqBKdahVAhBLf5jp/i/JMNDalJrBK/WPvBlg=; h=From:To:Subject:Date:In-Reply-To:References:Cc:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=R8JY9NAaCvZGmw8K1AatQ8yKtPFvwv8d2EhwuHoTUoI+J4XwY/nQkbK9Cz5w79+T/ aMxM1/TIN0V9Opi2xSm5oaPp9k3+uy/GTNbnVJAIVYLy9rnF2SGwdzJq++4wu6WlJv oppjMWDdUaeG3GhXkcJm+Y5VANa0oQESt4b66950= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id BD35AF80558; Tue, 25 Oct 2022 14:42:05 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 47A05F804AC; Tue, 25 Oct 2022 14:42:04 +0200 (CEST) Received: from mail-wr1-x432.google.com (mail-wr1-x432.google.com [IPv6:2a00:1450:4864:20::432]) (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 A0E39F804AC for ; Tue, 25 Oct 2022 14:41:57 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz A0E39F804AC Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="HHau6xvD" Received: by mail-wr1-x432.google.com with SMTP id k8so11960811wrh.1 for ; Tue, 25 Oct 2022 05:41:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ElsXKifGPu+xWV5kp4Q++GnbWWKLpxXO2HTLVtO10F0=; b=HHau6xvD/rOVqNP6ObIxSLZ9tnj+QB3yZIBup+RJEu6HUeGApKsCbQg71GXp4WHpP1 HeFb1s2MCV1T3pQc9zhYMbzja1i/iUogcuOd4ki2KtMh2nACc5tX5fxsuYV2uywXyQU8 fIE4FU9pD8162SSETLavaz6p0DxVFO59t8uPJtGqLWgoimkuzYOK7U9Ss123dNaQ8Aaa 35EVE8YbSiUjK9/tNd9xNViE4PEoZ2LA3d4nf/7vC7A/V8RNXS3Rc3gdP4z1gm0NEhee CqhgL3zs7MNbwytp/PiGRGhyRkWPmqRe9hHZotjX0JR0+3nikKGZ1CeLe+/gYnQdnZVW ISDA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ElsXKifGPu+xWV5kp4Q++GnbWWKLpxXO2HTLVtO10F0=; b=1L5FWxQ9ISIB31eQMZ2BqBY5FsYQpaY1zoXAON78sfzGZjm881vFeHyyRbsKTg8YsM Wc+eBnhnW+YJXl7ql38eqzNrmGwgKxnxB7Kto0Nar5OL3BxW0w8arRbvJ3TDCsmHtEM+ vtE0HDsvC8vviEO0N5BwEHTRXK66zcsj6GST6K1HlW4y7V5apncjd5oTsscXi1xztSOu eAmtPYGXnQf+5kmOTwJBqH5k/REv5ew8uKMwKAOlWQ3cRLasuZstqtUUv6oaxZ8OH/u3 ERc2ihKI4y3nZuU7ZKsFq4QK7xShhe1r52mdbaZuTaFM29h2rlrdzZZg7A4nUQxcQeT9 ShHw== X-Gm-Message-State: ACrzQf3yt0KH+hmU5CYTCOEbY067ih2rAaPV00A2xeGNl8rEBikCDSwP QLHu0EaRxTqd4zLe86kSlYwRWYm3jDM= X-Google-Smtp-Source: AMsMyM4kI+X+FZY7+WMg564s3kMyQmXgsKWXajfJpp1On9XiNlJ/mym/OBtcbcEgIGxZXcTFg4DEdw== X-Received: by 2002:a7b:c048:0:b0:3b4:fb26:f0f3 with SMTP id u8-20020a7bc048000000b003b4fb26f0f3mr48434995wmc.115.1666701715943; Tue, 25 Oct 2022 05:41:55 -0700 (PDT) Received: from localhost.localdomain (84-72-105-84.dclient.hispeed.ch. [84.72.105.84]) by smtp.gmail.com with ESMTPSA id ay19-20020a05600c1e1300b003a1980d55c4sm11250664wmb.47.2022.10.25.05.41.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Oct 2022 05:41:55 -0700 (PDT) From: Nicolas Frattaroli To: Nicolas Frattaroli , Liam Girdwood , Mark Brown , Rob Herring , Krzysztof Kozlowski , Heiko Stuebner Subject: [PATCH 1/4] ASoC: dt-bindings: rockchip: i2s-tdm: Make grf property optional Date: Tue, 25 Oct 2022 14:41:29 +0200 Message-Id: <20221025124132.399729-2-frattaroli.nicolas@gmail.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221025124132.399729-1-frattaroli.nicolas@gmail.com> References: <20221025124132.399729-1-frattaroli.nicolas@gmail.com> MIME-Version: 1.0 Cc: linux-rockchip@lists.infradead.org, alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.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" Turns out most things don't require the GRF, so making the property optional is the obvious move. Signed-off-by: Nicolas Frattaroli Acked-by: Krzysztof Kozlowski --- Documentation/devicetree/bindings/sound/rockchip,i2s-tdm.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/Documentation/devicetree/bindings/sound/rockchip,i2s-tdm.yaml b/Documentation/devicetree/bindings/sound/rockchip,i2s-tdm.yaml index 6a7c004bef17..8646cdc692d7 100644 --- a/Documentation/devicetree/bindings/sound/rockchip,i2s-tdm.yaml +++ b/Documentation/devicetree/bindings/sound/rockchip,i2s-tdm.yaml @@ -135,7 +135,6 @@ required: - clock-names - resets - reset-names - - rockchip,grf - "#sound-dai-cells" additionalProperties: false From patchwork Tue Oct 25 12:41:30 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Frattaroli X-Patchwork-Id: 13019161 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id A7CA3C04A95 for ; Tue, 25 Oct 2022 12:43:19 +0000 (UTC) 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 79B8C531D; Tue, 25 Oct 2022 14:42:27 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 79B8C531D DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1666701797; bh=sC4nUwLK2yJWWZ6C5v8RzhiRLlscbT+TcPymjBavAN4=; h=From:To:Subject:Date:In-Reply-To:References:Cc:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=smTxv8htf9AnnkX9VZO8qd/dePrmpueCN6bsQHv+3EU+Q0mjWInQc9H63yFgfq0/A +Q16QpCvyFfmU/BdI/hfbRFYaQBkOlLEOxqblD9D8Af/8Y1cqpjX2rwZiN6khtWfX4 7+veobmEbSK8mmM9VPZCiVKNTb4Nh+16ywoBIm7c= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 4A58CF80240; Tue, 25 Oct 2022 14:42:04 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id CE528F80553; Tue, 25 Oct 2022 14:42:02 +0200 (CEST) Received: from mail-wr1-x42d.google.com (mail-wr1-x42d.google.com [IPv6:2a00:1450:4864:20::42d]) (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 48C63F80240 for ; Tue, 25 Oct 2022 14:42:00 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 48C63F80240 Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="WM9o7GxT" Received: by mail-wr1-x42d.google.com with SMTP id z14so7106178wrn.7 for ; Tue, 25 Oct 2022 05:42:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=vIKotX5ooYCDPVEKi3IZCfl55eak5yxZs56MABYXuTk=; b=WM9o7GxTlXLmPNHjXk2Fn1+OVVEmRPipyhgvnOuYvoqTrzNOxH1gBm7FQLhnAG3AtX E3FkjRghlQQoSWLyK5i95gFBdGiD9sShrvBlg2LkIKJ3Cuqeq0jNFbOOklfwvpGCDxTN qrIKz6Z9rEuahjhhtdWP8D7OWZS24e8w0tcIW128tcn5KbQzDeZ8AS87BAAWjRMtArDX 16Ti6CdwDxDcsTO6H4+NpzzskolLqwR4Vdu68xIorqXov7Q91Crf10M+VjbCxIeq07Hk b3WsaG5U3lrbesOzUDIHnhQnL/+mJdsruiBxaOxpiRDJfbqLTgdYMcIi3taTmS8SJxkn wPcA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=vIKotX5ooYCDPVEKi3IZCfl55eak5yxZs56MABYXuTk=; b=6GbMpO/WQKW/BWSptiXYBLdqiEiNR0L6V0NrzpxCgqsLINtTeJEL10+iosRGqZ2VZ1 +HaidJa3HNgV4m5NcrqLg4lR4ekfl2DEZ68xhHQVl94WbWQQs6rzuyoPNzQk1Od2gqm3 xV2vuDFFOsMIl/AFi/ic8XEU1UKCTOOHaGgzqggCaz/MlfsVVRjnGz7iATQsEjY6lFcd vQcSHvyRRP2MTLljQuj9iiUe9f3Rl68VrOb8jUvFWfQMbCRFNgkbNsZy0FVMLxHqmkUj 4Im3Uif+AymloBVxwDd/xlffYGyXLndyeKW/7WDFPXQt/OGq4WIRka0SYVAqj2MmJ2GA cSCQ== X-Gm-Message-State: ACrzQf2prjv5bLVdfmPz5YvoXXosV18gg9iwI+JSgIrtZ9uwa2r//AAg 4pxT3UkjjgLv9GpiXX/iQMs= X-Google-Smtp-Source: AMsMyM60B8oxsFHLS4Cs0RPNNh1I7NmYcXnq2aWXeGunVPT5z/H92YLK84eclOwVh4IjAMrLrTtXCw== X-Received: by 2002:a1c:4454:0:b0:3cf:4792:d3ad with SMTP id r81-20020a1c4454000000b003cf4792d3admr886197wma.5.1666701718486; Tue, 25 Oct 2022 05:41:58 -0700 (PDT) Received: from localhost.localdomain (84-72-105-84.dclient.hispeed.ch. [84.72.105.84]) by smtp.gmail.com with ESMTPSA id ay19-20020a05600c1e1300b003a1980d55c4sm11250664wmb.47.2022.10.25.05.41.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Oct 2022 05:41:58 -0700 (PDT) From: Nicolas Frattaroli To: Nicolas Frattaroli , Liam Girdwood , Mark Brown , Jaroslav Kysela , Takashi Iwai , Heiko Stuebner Subject: [PATCH 2/4] ASoC: rockchip: i2s_tdm: Make the grf property optional Date: Tue, 25 Oct 2022 14:41:30 +0200 Message-Id: <20221025124132.399729-3-frattaroli.nicolas@gmail.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221025124132.399729-1-frattaroli.nicolas@gmail.com> References: <20221025124132.399729-1-frattaroli.nicolas@gmail.com> MIME-Version: 1.0 Cc: linux-rockchip@lists.infradead.org, alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org, 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" Only IO Multiplex and two TRCM modes need access to the GRF, so making it a hard requirement is not a wise idea, as it complicates support for newer SoCs which do not do these things. Signed-off-by: Nicolas Frattaroli --- sound/soc/rockchip/rockchip_i2s_tdm.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/sound/soc/rockchip/rockchip_i2s_tdm.c b/sound/soc/rockchip/rockchip_i2s_tdm.c index 2550bd2a5e78..917f17107891 100644 --- a/sound/soc/rockchip/rockchip_i2s_tdm.c +++ b/sound/soc/rockchip/rockchip_i2s_tdm.c @@ -756,6 +756,12 @@ static int rockchip_i2s_io_multiplex(struct snd_pcm_substream *substream, if (!i2s_tdm->io_multiplex) return 0; + if (IS_ERR_OR_NULL(i2s_tdm->grf)) { + dev_err(i2s_tdm->dev, + "io multiplex not supported for this device\n"); + return -EINVAL; + } + if (substream->stream == SNDRV_PCM_STREAM_CAPTURE) { struct snd_pcm_str *playback_str = &substream->pcm->streams[SNDRV_PCM_STREAM_PLAYBACK]; @@ -1222,6 +1228,12 @@ static int common_soc_init(struct device *dev, u32 addr) if (trcm == TRCM_TXRX) return 0; + if (IS_ERR_OR_NULL(i2s_tdm->grf)) { + dev_err(i2s_tdm->dev, + "no grf present but non-txrx TRCM specified\n"); + return -EINVAL; + } + for (i = 0; i < i2s_tdm->soc_data->config_count; i++) { if (addr != configs[i].addr) continue; @@ -1568,10 +1580,6 @@ static int rockchip_i2s_tdm_probe(struct platform_device *pdev) return ret; i2s_tdm->grf = syscon_regmap_lookup_by_phandle(node, "rockchip,grf"); - if (IS_ERR(i2s_tdm->grf)) - return dev_err_probe(i2s_tdm->dev, PTR_ERR(i2s_tdm->grf), - "Error in rockchip,grf\n"); - i2s_tdm->tx_reset = devm_reset_control_get_optional_exclusive(&pdev->dev, "tx-m"); if (IS_ERR(i2s_tdm->tx_reset)) { From patchwork Tue Oct 25 12:41:31 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Frattaroli X-Patchwork-Id: 13019164 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id C7421C38A2D for ; Tue, 25 Oct 2022 12:43:58 +0000 (UTC) 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 EA5A45314; Tue, 25 Oct 2022 14:43:06 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz EA5A45314 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1666701837; bh=wPZY9l0+jlBdtipx3EDsjoTgmvDjjxj9XrB+JG4g/rs=; h=From:To:Subject:Date:In-Reply-To:References:Cc:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=EcwGFfm0z1/r8YObN1z6JI8s7WCwHUMIkycyQB/aaYtK85fEujs2BdQwDCWsooJrj gL2McZblSjPcHIJoY3Sa83Z6k/1ZOq5WMrAE6PuyVHWy0VbwSteR13GOBjZnt85eXf yG/wgFp+qe+pUKcyDz2y4vzv5tbVRQz88yje3+4M= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id E2C92F80567; Tue, 25 Oct 2022 14:42:09 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id A89CDF80559; Tue, 25 Oct 2022 14:42:08 +0200 (CEST) Received: from mail-wr1-x42d.google.com (mail-wr1-x42d.google.com [IPv6:2a00:1450:4864:20::42d]) (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 CB1F9F80559 for ; Tue, 25 Oct 2022 14:42:02 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz CB1F9F80559 Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="p7sLxOhF" Received: by mail-wr1-x42d.google.com with SMTP id l14so13382737wrw.2 for ; Tue, 25 Oct 2022 05:42:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=4Ic2JEDn8iIKh6kokfWzyIvyt1AwKkoMppVSCI5C57s=; b=p7sLxOhF7+RJa8UpoEmVVGga9/XxYJpHt9VYi4nB27HDInsNdVKl7A7Y7xodOhf69i cH4p45wrXBpH/+j58uHRVEPx6mxh/2gQckDVhrgiGCsUh2ynjtz/IBUS9xWyK2fYpC97 ds2Ro5NO2Ho8uNlbpqNj6GO2mpGF4KKPfRwhoSf+FnqBq9kw4hpbqz5kplGxdOap8pvc nkTIEyN5cbLojENWjdgwwecAr4ejh7T8CkVx6Cc6JRqgtS7O5SoOxMymWmJexfOrWeoK Zm82tzz/g9IR2WW1Wkt62/F8UDLk7lV/5fp9xSUxnVSXRy6hoTpp6OcmSUn8vhSmBfHS 3CSg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=4Ic2JEDn8iIKh6kokfWzyIvyt1AwKkoMppVSCI5C57s=; b=5/759/gNNEK3TDguW2+tVLGEar40U5HG3iWsMM+4Gw8RZVtWUvFw6y+l4lc4nvhfz/ 5F51H1DZgh25+JmGs3qxnoW0XM6WIzwJNMSbSjxAwcwtwTnEbErPqvIPFzY/sM50YDoa vtOMfUXbBb2JxAf2szh0moA036ZvnbqOnhC4aYZSPTSqTZRSp2RZOE+JFgnkMsSb8HXn E601FcOIC/JwROme1MMxEdnciRke0bOyZ/A+5g5WM95D+Yx4fMaSM19py0Mp+izrVjOi zws5Xw6wDuiikejI3fbOUloztLGnxt8w7Iu9nUo688B70/KiOtuAq8flDUviz2VKr5gJ DUBg== X-Gm-Message-State: ACrzQf37sAXNaPH87BH6OW9DdbsQDJG0eBINAtUnV+nGZ5Fdn/giYQZA 3jgZh/OILJHj7t7gq4LSsYk= X-Google-Smtp-Source: AMsMyM4PfHc5iZZPnvgw3lB96B0iv3Tf8sL+cm4ldHaMrUPmjOZBcBtMm3ogjXQBRx7LsZBd9zG5SA== X-Received: by 2002:a05:600c:1c1e:b0:3c6:fa3c:32a9 with SMTP id j30-20020a05600c1c1e00b003c6fa3c32a9mr15113010wms.203.1666701720859; Tue, 25 Oct 2022 05:42:00 -0700 (PDT) Received: from localhost.localdomain (84-72-105-84.dclient.hispeed.ch. [84.72.105.84]) by smtp.gmail.com with ESMTPSA id ay19-20020a05600c1e1300b003a1980d55c4sm11250664wmb.47.2022.10.25.05.41.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Oct 2022 05:42:00 -0700 (PDT) From: Nicolas Frattaroli To: Nicolas Frattaroli , Liam Girdwood , Mark Brown , Rob Herring , Krzysztof Kozlowski , Heiko Stuebner Subject: [PATCH 3/4] ASoC: dt-bindings: rockchip: i2s-tdm: Add RK3588 compatible Date: Tue, 25 Oct 2022 14:41:31 +0200 Message-Id: <20221025124132.399729-4-frattaroli.nicolas@gmail.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221025124132.399729-1-frattaroli.nicolas@gmail.com> References: <20221025124132.399729-1-frattaroli.nicolas@gmail.com> MIME-Version: 1.0 Cc: linux-rockchip@lists.infradead.org, alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.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" This adds the compatible string for the RK3588 SoC. Signed-off-by: Nicolas Frattaroli Acked-by: Krzysztof Kozlowski --- Documentation/devicetree/bindings/sound/rockchip,i2s-tdm.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/Documentation/devicetree/bindings/sound/rockchip,i2s-tdm.yaml b/Documentation/devicetree/bindings/sound/rockchip,i2s-tdm.yaml index 8646cdc692d7..0503f4f3fb1a 100644 --- a/Documentation/devicetree/bindings/sound/rockchip,i2s-tdm.yaml +++ b/Documentation/devicetree/bindings/sound/rockchip,i2s-tdm.yaml @@ -21,6 +21,7 @@ properties: - rockchip,rk1808-i2s-tdm - rockchip,rk3308-i2s-tdm - rockchip,rk3568-i2s-tdm + - rockchip,rk3588-i2s-tdm - rockchip,rv1126-i2s-tdm reg: From patchwork Tue Oct 25 12:41:32 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Frattaroli X-Patchwork-Id: 13019163 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 33BD3C38A2D for ; Tue, 25 Oct 2022 12:43:40 +0000 (UTC) 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 40E225312; Tue, 25 Oct 2022 14:42:48 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 40E225312 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1666701818; bh=2Q8TDh32BX9UJNQr/ncPOw2u8NHCVodCWabBOfRM2x4=; h=From:To:Subject:Date:In-Reply-To:References:Cc:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=IjEmQBYOIYloKQBSWs+0ZR3BzJrGpr+pINUE5HLYHEYOQ4Mg0Bun+Y04D9QH2GdFO wtIfWVXxUQcekHfxqBzVSE8rGhs+m1Kt0Ssw/2quWa6biK6UtG09aeKPJEOvsP055C jfT5uxKW6kdeDn1IINs0KhfKfTDSOFkrHbOm0AGQ= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 7171BF8055A; Tue, 25 Oct 2022 14:42:08 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id F0780F80557; Tue, 25 Oct 2022 14:42:06 +0200 (CEST) Received: from mail-wr1-x432.google.com (mail-wr1-x432.google.com [IPv6:2a00:1450:4864:20::432]) (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 8BEA2F80557 for ; Tue, 25 Oct 2022 14:42:03 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 8BEA2F80557 Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="KKMGuE4/" Received: by mail-wr1-x432.google.com with SMTP id k8so11961624wrh.1 for ; Tue, 25 Oct 2022 05:42:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=KZM0T9VAIhDH8MlN6WTNKMHChs2UsyWeC4jS+W4xqgE=; b=KKMGuE4/SZ26vZUsXFESU9bVBmQJ/U9oz2QjLdmDj6petr7Z0fUlZubuhdLhvEHci5 NKRFIbeUyziptVGfh3p/uVfPCIQyrHUuKO5Qlc2RR/bNaUvRQHI6pnNX9R4FEBl6PjYD 6mWRvQQIfpy7O/C5VnXdugs6rY/7p+VQPqmphCuqAVwJpcPGG5PqRqrPO5Zhh1yeaNJy 9wnklj2raQkZPW+/B0fbHfSxoPtdzucnF3Fn58vb2YsvsXViLeErmNpBsxvYCy25J9Ur glBOkXDAOSNthoVwGPXzCa5jRxghjJ4x7toQbOtgT1kjjHVrzNMFVACINvHPlyhT1NOJ JevQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=KZM0T9VAIhDH8MlN6WTNKMHChs2UsyWeC4jS+W4xqgE=; b=2axym02puvZY0ZbLErgBsXnowQhIK31aoxW/TfE7mFLTncevak+/b2jOv7GWA2Ngzy EudZTEsv9pOup7W/9q1EwLjH4XaL23h948rcvMnlnU+CFt/jaoarr+TOAJd+vbD4nIYX 29WtbI3GZ+76GjRy6WC544r7yKsR1Kx5X3IrTThPdrl7mReDGzIjMTRXgoCb/yO386Cp f2oR4hPzBIEOXSWD3iLNP1kdV3ZcQcXZTshjkqhji9Z3bR3aWynFhhoOoGTPoLbDUYLw luKuL8nzoX9eowyZLIzlBpvfSxICyicbdusgHrf4jVfEVx76vSn9fllHNctqrjwZifRO W/Eg== X-Gm-Message-State: ACrzQf0jjyBGxVRq6DClh885o0fZvuSb4XgJ/a0N7dhHaijDDRpIzoVl JfQRaoqSI4dvgPTfFJ7Hct6EtSdHGPM= X-Google-Smtp-Source: AMsMyM7qGiPSr6jS0SrVQrVe6ZNaIcaZ3Pzpjqm4tGdeQk37enhjvFMn62fA5LjFriOIMhSj/XcqVA== X-Received: by 2002:a1c:ed0b:0:b0:3c1:d16e:a827 with SMTP id l11-20020a1ced0b000000b003c1d16ea827mr25702572wmh.127.1666701723192; Tue, 25 Oct 2022 05:42:03 -0700 (PDT) Received: from localhost.localdomain (84-72-105-84.dclient.hispeed.ch. [84.72.105.84]) by smtp.gmail.com with ESMTPSA id ay19-20020a05600c1e1300b003a1980d55c4sm11250664wmb.47.2022.10.25.05.42.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Oct 2022 05:42:02 -0700 (PDT) From: Nicolas Frattaroli To: Nicolas Frattaroli , Liam Girdwood , Mark Brown , Jaroslav Kysela , Takashi Iwai , Heiko Stuebner Subject: [PATCH 4/4] ASoC: rockchip: i2s_tdm: Add support for RK3588 Date: Tue, 25 Oct 2022 14:41:32 +0200 Message-Id: <20221025124132.399729-5-frattaroli.nicolas@gmail.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221025124132.399729-1-frattaroli.nicolas@gmail.com> References: <20221025124132.399729-1-frattaroli.nicolas@gmail.com> MIME-Version: 1.0 Cc: linux-rockchip@lists.infradead.org, alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org, 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" This adds support for the RK3588 SoC to the I2S/TDM driver. Signed-off-by: Nicolas Frattaroli --- sound/soc/rockchip/rockchip_i2s_tdm.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sound/soc/rockchip/rockchip_i2s_tdm.c b/sound/soc/rockchip/rockchip_i2s_tdm.c index 917f17107891..08b90ec5cc80 100644 --- a/sound/soc/rockchip/rockchip_i2s_tdm.c +++ b/sound/soc/rockchip/rockchip_i2s_tdm.c @@ -1318,6 +1318,7 @@ static const struct of_device_id rockchip_i2s_tdm_match[] = { { .compatible = "rockchip,rk1808-i2s-tdm", .data = &rk1808_i2s_soc_data }, { .compatible = "rockchip,rk3308-i2s-tdm", .data = &rk3308_i2s_soc_data }, { .compatible = "rockchip,rk3568-i2s-tdm", .data = &rk3568_i2s_soc_data }, + { .compatible = "rockchip,rk3588-i2s-tdm" }, { .compatible = "rockchip,rv1126-i2s-tdm", .data = &rv1126_i2s_soc_data }, {}, }; @@ -1556,7 +1557,7 @@ static int rockchip_i2s_tdm_probe(struct platform_device *pdev) i2s_tdm->dev = &pdev->dev; of_id = of_match_device(rockchip_i2s_tdm_match, &pdev->dev); - if (!of_id || !of_id->data) + if (!of_id) return -EINVAL; spin_lock_init(&i2s_tdm->lock);