From nobody Wed Apr 8 10:03:43 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id F0BCDC04A95 for ; Tue, 25 Oct 2022 12:42:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231693AbiJYMmC (ORCPT ); Tue, 25 Oct 2022 08:42:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39102 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231992AbiJYMl6 (ORCPT ); Tue, 25 Oct 2022 08:41:58 -0400 Received: from mail-wr1-x434.google.com (mail-wr1-x434.google.com [IPv6:2a00:1450:4864:20::434]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4CDD918540E; Tue, 25 Oct 2022 05:41:57 -0700 (PDT) Received: by mail-wr1-x434.google.com with SMTP id a14so17830207wru.5; 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=wpsVCRE0OwBnPEdKSp8O8pXje7hP4mL3L1NfJgCRbhqz6np5k6+HYXOSAUFRCA+ikE UIMtQgsdpDCSBbWMT4aa/SaVJx/YmBmaFXMP5/tweRrH4nlwJJIv2x/Pa7omp3B6p1rH 1o94PMiKVpjQ7TTakR9GFAyZIWyvG8Pptu6dHfo7G7rox6lFYpOs8NsbXgLOpbPa2P6p uCPz9HZ+eAtXC9G7/agPknjtl0PkJcQ8HCaXRXF8s6tgaWeFaCFa1JD+51Vf3zHgsZ7q NFBZIHv+HFvf9kViJPHR5YhMQRDcuKL6ovB7luTuF19vrzB5dr7GFJQ7QcyJlmF9SpXl ZQMQ== X-Gm-Message-State: ACrzQf0876CZyvxSPg3OkkjGXGTW0IARBSnHarB3di3cGNDAZKPFj3xC FnA4ILR+U/wyKiXPuYmS/No= 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 Cc: linux-rockchip@lists.infradead.org, alsa-devel@alsa-project.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org 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 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" 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" =20 additionalProperties: false --=20 2.38.1 From nobody Wed Apr 8 10:03:43 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 93856C04A95 for ; Tue, 25 Oct 2022 12:42:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232014AbiJYMmF (ORCPT ); Tue, 25 Oct 2022 08:42:05 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39154 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232020AbiJYMmA (ORCPT ); Tue, 25 Oct 2022 08:42:00 -0400 Received: from mail-wr1-x42d.google.com (mail-wr1-x42d.google.com [IPv6:2a00:1450:4864:20::42d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id ED2AC18B77D for ; Tue, 25 Oct 2022 05:41:59 -0700 (PDT) Received: by mail-wr1-x42d.google.com with SMTP id v1so20607519wrt.11 for ; Tue, 25 Oct 2022 05:41:59 -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=6qj9rJIXJ7b+lQWimHK/GawpftOSgMQokzV7UtlVP6GSCHDJIF3TuML/3IvDUekmBm qU+Rol7a1zoEp3BR9sGn7ywqzjmQ4iB/NAQ7BS40m2QPU9ruxg68Qu9aE8KEJCh4u3Ln Vva3iXXLDHgNAhrpObZ1wVsk/Y2ApWjG3Fvv+JYNzxu5wMoLHk57UmuQE/lQl2wCO0zG mqkHrx9BSEWEuQHKiWfWWwa19zQelUpg6hoER9L23FkoBtr0PLDurVWf5rA8NhYnrlxL EILnjL1EyVOqlXXusSK2g1PLW6HSwygBg/EInz8Etu3wUi/vmduPVENjd/8u86DIx2A5 rgyg== X-Gm-Message-State: ACrzQf3ibcjm5cO1brHFnWeZHJ3uDemzXHdr/vZob+xYIzwQHtehfnt7 dO+7hm+hX0ThuupQtLsZsKY= 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 Cc: linux-rockchip@lists.infradead.org, alsa-devel@alsa-project.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org 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 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" 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/roc= kchip_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_su= bstream *substream, if (!i2s_tdm->io_multiplex) return 0; =20 + 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 =3D=3D SNDRV_PCM_STREAM_CAPTURE) { struct snd_pcm_str *playback_str =3D &substream->pcm->streams[SNDRV_PCM_STREAM_PLAYBACK]; @@ -1222,6 +1228,12 @@ static int common_soc_init(struct device *dev, u32 a= ddr) if (trcm =3D=3D TRCM_TXRX) return 0; =20 + 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 =3D 0; i < i2s_tdm->soc_data->config_count; i++) { if (addr !=3D configs[i].addr) continue; @@ -1568,10 +1580,6 @@ static int rockchip_i2s_tdm_probe(struct platform_de= vice *pdev) return ret; =20 i2s_tdm->grf =3D 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 =3D devm_reset_control_get_optional_exclusive(&pdev->de= v, "tx-m"); if (IS_ERR(i2s_tdm->tx_reset)) { --=20 2.38.1 From nobody Wed Apr 8 10:03:43 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id C1FADECDFA1 for ; Tue, 25 Oct 2022 12:42:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232080AbiJYMmI (ORCPT ); Tue, 25 Oct 2022 08:42:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39220 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232038AbiJYMmD (ORCPT ); Tue, 25 Oct 2022 08:42:03 -0400 Received: from mail-wr1-x432.google.com (mail-wr1-x432.google.com [IPv6:2a00:1450:4864:20::432]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 400C118B494; Tue, 25 Oct 2022 05:42:02 -0700 (PDT) Received: by mail-wr1-x432.google.com with SMTP id g12so7830152wrs.10; 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=gcayYFe6fsCxvAm+oDVmS6Nz7b8wQhHVXGk7Xzc+nxKjmZnTfwnAWsHJkwEgH6+dG3 /PxBIw91D9Te2c2M9RV+K5LbU9MCEIN7A1fl3MQMJxzfWyRGth01/PTY9pz5xRPZEgxh b8FsCzkJ0VnwWPO1TaS1rrsZ5T5vpqj9NGjUDaXm0wMWGL+B+vQZUVQeQuDppM1+Zf9c 8XgONU9Xk0DYOEBeFX49JyQwoWAC4mk9CPa63p/+n7Gd5to7aM0Y94xLDYPokMaIzrIB tRmI83jj9b39Sh/gl4WyRF8STaQvIVHP4Bwy+nvpVTg5TzhEBUkOo0IBMdTMxjbQRuuD 2GGw== X-Gm-Message-State: ACrzQf0H0uRBiY1/7q1ym0QrwnurOCCg233j8rwoK2xR7t2q7hE7Jxny KXJyw379txh8X0ZgkMaKglk= 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 Cc: linux-rockchip@lists.infradead.org, alsa-devel@alsa-project.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org 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 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" 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 =20 reg: --=20 2.38.1 From nobody Wed Apr 8 10:03:43 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 90FE0C38A2D for ; Tue, 25 Oct 2022 12:42:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232086AbiJYMmS (ORCPT ); Tue, 25 Oct 2022 08:42:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39322 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230008AbiJYMmF (ORCPT ); Tue, 25 Oct 2022 08:42:05 -0400 Received: from mail-wr1-x433.google.com (mail-wr1-x433.google.com [IPv6:2a00:1450:4864:20::433]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C61B518BE26 for ; Tue, 25 Oct 2022 05:42:04 -0700 (PDT) Received: by mail-wr1-x433.google.com with SMTP id bp11so20074960wrb.9 for ; Tue, 25 Oct 2022 05:42:04 -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=Ep1/vpeBinjC3Wd5sNB2cVsw7CMSLczNyL3KftZ5qEc+CysB8SLuanmB3mpHs22Ibc bTrAfG5wmBN5dx+ZfjmujgcbpvIzDvbwnjRjwmrPqXu+0C6ano0El7Al2FB9iEz19IjR tEJlnYbXeSGsHbV7sX0yRiSVDi6ory/6XD3ze8AX/1CJeKJGRWtqbziqf4s9v9DZScWr MgmJJx2ubWLkOV6ZvdbDNPbvIefAm9D65sGQ5Q3neiIQFGOHWrHntHelub07NNSYZcxt ObY5MqZIDI5FHK8ay/daH280ryYtKGTThCyTzqW9lGYDaKa17Q+tpwtorY28+L6OLEjx L/og== X-Gm-Message-State: ACrzQf09xc+Dfet7tmunRyf4N/OvhExoU7dr/6TfGx5lSQPcPklZPtHi r23TaJzoER1jZW0eSURdCAE= 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 Cc: linux-rockchip@lists.infradead.org, alsa-devel@alsa-project.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org 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 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" This adds support for the RK3588 SoC to the I2S/TDM driver. --- 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/roc= kchip_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_mat= ch[] =3D { { .compatible =3D "rockchip,rk1808-i2s-tdm", .data =3D &rk1808_i2s_soc_da= ta }, { .compatible =3D "rockchip,rk3308-i2s-tdm", .data =3D &rk3308_i2s_soc_da= ta }, { .compatible =3D "rockchip,rk3568-i2s-tdm", .data =3D &rk3568_i2s_soc_da= ta }, + { .compatible =3D "rockchip,rk3588-i2s-tdm" }, { .compatible =3D "rockchip,rv1126-i2s-tdm", .data =3D &rv1126_i2s_soc_da= ta }, {}, }; @@ -1556,7 +1557,7 @@ static int rockchip_i2s_tdm_probe(struct platform_dev= ice *pdev) i2s_tdm->dev =3D &pdev->dev; =20 of_id =3D of_match_device(rockchip_i2s_tdm_match, &pdev->dev); - if (!of_id || !of_id->data) + if (!of_id) return -EINVAL; =20 spin_lock_init(&i2s_tdm->lock); --=20 2.38.1