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: 10732 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp982828wru; Tue, 25 Oct 2022 05:44:53 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4/llOhPWXeXsGNLJ7HvZT9FVzePx3eoB1I5qeRC/2Cr2uj/wEt/9zsWaQdttkj6ZZajuM/ X-Received: by 2002:a17:907:6d84:b0:78d:f2b0:14c8 with SMTP id sb4-20020a1709076d8400b0078df2b014c8mr31319284ejc.749.1666701893384; Tue, 25 Oct 2022 05:44:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666701893; cv=none; d=google.com; s=arc-20160816; b=KRYWuU0PLxBZ82ml2417X3kuSnBi1xcixuAYKvHOCdi9ALbT5uGtbxlALaSZ02lzVQ kO3eZaYGHLUNqS1CZ4BnIvtDstsf+8ojqOQ/3no/nHXGJKSfYxG5tf1kWknGin2LPvnf 93WPwDi6dlOqzhuyjH3fysg9qXJzeeVpc4OCP25fcZQUolUF+8caxvkjFqs9i1QYVYaT NFrioTh2DJXwvjIrpscBKUB4yAtfLrdKUeC+rQX6mmvs/HJYH5wBYsBtCrxeLO1+fVGS nHu/hL6rDOrhg8qbUJ0uOPIp2m02nsCZwkIgn4qURaNbxXubv9P/vKkjMxi1qHASfm2J 4FlA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=ElsXKifGPu+xWV5kp4Q++GnbWWKLpxXO2HTLVtO10F0=; b=H3zM9sUJEYBEbmUJu9rtHyGlZ5+86QISVqcP94Mr4iRzvrlsEOHTKCpqCo7c/1/LOy meNKb3EVWgDhaq8EH7xt75KjxHdvX7KehC42FofU2b4klzRVm2kxP+oQkSNIbzfeEl2F R3gAz41RiI6o3hUPSzC0JGbBOGZ9IiVnuHr0ZnLpSYrtVNdg0kas5m2FHrs/k4+/Vz1b CgEbE9/k2TAK41EMKmTNqkl50mkP3P10JwQsPvJr0nOjo7wcyIlg71dKT+IkZdV7L8CK hciU6BW4sbTCseGvUSZsMhjUqa6h5QAccR4RigAYA6/ukrvIOmssNMaD8NfUpUsftcPB N14g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=HHau6xvD; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id c20-20020aa7c994000000b00461af57d736si2424496edt.278.2022.10.25.05.44.29; Tue, 25 Oct 2022 05:44:53 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=HHau6xvD; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232026AbiJYMmB (ORCPT + 99 others); Tue, 25 Oct 2022 08:42:01 -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-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 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747663604351229484?= X-GMAIL-MSGID: =?utf-8?q?1747663604351229484?= 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: 10733 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp982839wru; Tue, 25 Oct 2022 05:44:55 -0700 (PDT) X-Google-Smtp-Source: AMsMyM554AjAWeAwDw29/Iwncn8w57gajp4UgI2Lb2Uq3bMiGS4Xoa94q3oIQ6+i/h2S3sQBHRgn X-Received: by 2002:a05:6402:518d:b0:45d:d319:2a88 with SMTP id q13-20020a056402518d00b0045dd3192a88mr34663435edd.35.1666701895073; Tue, 25 Oct 2022 05:44:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666701895; cv=none; d=google.com; s=arc-20160816; b=jxoBCJDTt4K/VQNkFtIKSfAYKTwGj2Fbg7HB+DVwMzDX4Qy6bLbZiTMa6TITypfPuL YSN/xyvuaWKzXkNPujNoE01ud5VmmQRjkVBerhZbjMCycd7i8Qf/TvFJkWHnmcfpfIiP Rknns1+xsO/mdCkyS59deIu3xOlwzDL8/plMCu3ybDJZCusciE6FhzSAnfHcqFbPtAfi Ww84CYyefFuiaCVA4UuiLQqbhBkfk6rFgb2UiRFbB5l/TeTC6NvcaQqsHoI3kY+1/NkI i1gn04fP+aKedFePV9J+PA2TX2NI087otnDsrUnNNk0gM0RmAJXqHnMNQzxn8uNytU58 Erjg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=vIKotX5ooYCDPVEKi3IZCfl55eak5yxZs56MABYXuTk=; b=lT4AaSK1BAEaWBEknvHiEN4KZfp2sXDiHZrdXTsx08xQXh/CYBXkJxwxEadyF3d80K EKZYTbQrE7KiJ/sFylUFUp1IV9SIHYy2WCxUvLG0uiKRxk+gFN2VIfcu+IMckVGPD5Bq EVkPBCGvNrgSbBxqDo+20E62TWu5tjVORDGfyWBMwrDmkmhS7l6nAUHKG2yyEjCRi1rK t687nEenQfICXrWPWThsthx5r8YwDuCxYaYpTd91rXownlH1auDMDEFNxx4bPKclg3JS b8XGaTtz4d+kJwyVSlbf/ZPOLE1RcOIp1JHmT/ljG0WtWBtyBwMblFCytSVRXfQRQzD/ SAWA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=WM9o7GxT; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id qo14-20020a170907874e00b007aa5e6c4b5asi2688428ejc.128.2022.10.25.05.44.30; Tue, 25 Oct 2022 05:44:55 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=WM9o7GxT; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232060AbiJYMmE (ORCPT + 99 others); Tue, 25 Oct 2022 08:42:04 -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-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 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747663606319243221?= X-GMAIL-MSGID: =?utf-8?q?1747663606319243221?= 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: 10742 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp983814wru; Tue, 25 Oct 2022 05:47:03 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5A2H6iJNP/PfubnOJAehKS3tCNKYfT4tyqyyfP01/WAArjHWCe1OMZUE2bPhqHqC9HqbCZ X-Received: by 2002:a17:906:5a6b:b0:7a0:b42d:f17a with SMTP id my43-20020a1709065a6b00b007a0b42df17amr15215855ejc.130.1666702023526; Tue, 25 Oct 2022 05:47:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666702023; cv=none; d=google.com; s=arc-20160816; b=FMlYggqLUUFgehztCchLbUIPPOUq0DFki3WeIQ8dk5BD1yHWMJ16eOTec+pvOQD2jT KS5dzxbpQNOIVuQkEpyoWn6FLB4sisWpuP1oMcihEuQDNS9xbLft7P4Te6NBNGZpia3h /Ln9ss5y5Pd8IqcmZv/zN8QV1gH80c/SS92Dv33+zI+Fx4vjwhEOKb53e77Qli3woHa3 tYeBdudTBtQGBnqfMOMkm2V/g58YL3x2kCnb9F8CRzpf4l8DiyFD9gboudwqD5U3F67K Ue3tv7nmHZt1Z6ycYDYT0i0WhMvGaEoNLga+TgwgyZriRvIkoAg4IKIJx7hB6H3l+3/k jnuA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=4Ic2JEDn8iIKh6kokfWzyIvyt1AwKkoMppVSCI5C57s=; b=YM5u1MzM9WU7SREDK2G0oV18eHLuZ9+fQf+9dPxhzLwmjD0Ylkzx2693WREeV4Q1rC SS3SGJVvveLl9i0u5KiuYJCbmNsUglu+PwDuMUL0x1FhtfJzhhiCarczhcdkzzv9uAkS 0AeABX91kwoEdxNOhAs5RqVXCuRsCycwrvBQUQreeyO4Ve7ajTP4uOjMsyeFDiydgdf3 2Cz1OSPAZ0lemmusuEJVDSsVu1CEo2hUVJJevoeoyDYo+X2cU1mw0lktPO+Aa+0fD2im 6s3D+BRuFWzuR+DWCseUG46Bj2jZ2+oBXvC7/lNsvetANAEVEr+kFCgsN41WFdiN/EYs xPJw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=p7sLxOhF; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id f30-20020a50d55e000000b00456eaa4fb1fsi1496766edj.223.2022.10.25.05.46.39; Tue, 25 Oct 2022 05:47:03 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=p7sLxOhF; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232072AbiJYMmH (ORCPT + 99 others); Tue, 25 Oct 2022 08:42:07 -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-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 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747663741153957963?= X-GMAIL-MSGID: =?utf-8?q?1747663741153957963?= 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: 10734 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp982898wru; Tue, 25 Oct 2022 05:45:03 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4zbOCkCcnDbjf9B52KUwnjV2dITqVPg+5m3SBxxjslNoiBoKEZbQCj8ofn61U2qTpAW00u X-Received: by 2002:a17:907:980e:b0:78d:b6d5:661e with SMTP id ji14-20020a170907980e00b0078db6d5661emr32420680ejc.46.1666701903399; Tue, 25 Oct 2022 05:45:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666701903; cv=none; d=google.com; s=arc-20160816; b=WmY/IJQSSL6X+7KCgt7Ptt0AbMxJXMBe2wAcOeu/9aHSfSaPJzX18BkWt2tLPvveo+ LNmImzyjWgE8vqkG+vXLs7a8aZGG51oleSr2ATUfkNjTKRs/A2DrOBpcjm4fxkJMNIct SaaNwZA8ZoLStYMp6aWwehUDmY5jLOooquPnN09qCgJRK6PTABAmTiFuI2zCl81gELgD 2ol9SRSwosiyuUbilKGXB+iOz4mct01Z/1kbouGpozrHfNZQ2COv7KSrdlR+XU1QRHS8 CM9nZfB/WI5zihR9UXqCTfZmDcU7gPKiYwCtgl3Rkapa7fZUw+xhboYsk+wA9A4Ws6DC o4FA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=KZM0T9VAIhDH8MlN6WTNKMHChs2UsyWeC4jS+W4xqgE=; b=FpVX/gabj9GGAE/Efj0bEA1bTKVCo2H/wB9BjrZ5VtGalVFQD17SKVrd+br1LUVGa+ qlbt0xgcN9Axc0/6euGOY+r6QZ7mr9t4FNbKspseWfO/hlckyio0eszNQswg/OPzwwOw BVziTkByoe1lCudtApwYx9KwMM9B4tuDdwChcpXCk6BZ8W3kimBQGsZwgC451IdF7LkR T3bJpE8jppQpNhlv9Tm4vcXMXws++3R+D/XJHJTbfch216NRb9jnPkOnxYZ71b6Py/KI LHAqrSy8KZ76O2RB8pOpcX8YiAHm2odwVg5bU2ChMksLbyxarUZw+3zjdl9FsNcHWVL/ 1jsA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b="KKMGuE4/"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id ht22-20020a170907609600b00783ac0b4d32si3096591ejc.941.2022.10.25.05.44.39; Tue, 25 Oct 2022 05:45:03 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b="KKMGuE4/"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232135AbiJYMmR (ORCPT + 99 others); Tue, 25 Oct 2022 08:42:17 -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-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 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747663615180113308?= X-GMAIL-MSGID: =?utf-8?q?1747663615180113308?= 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);