From patchwork Thu Sep 28 03:41:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: ChiYuan Huang X-Patchwork-Id: 145725 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:cae8:0:b0:403:3b70:6f57 with SMTP id r8csp3052236vqu; Wed, 27 Sep 2023 20:45:46 -0700 (PDT) X-Google-Smtp-Source: AGHT+IG0oCcpmbqSlmiU/QigNh0ZKrakEsinuoGwEICuzJJb6XBJNdFfQjZXl0GUDc+fsEo+K4fy X-Received: by 2002:a05:6808:616:b0:3a7:8e6:c946 with SMTP id y22-20020a056808061600b003a708e6c946mr65788oih.41.1695872746275; Wed, 27 Sep 2023 20:45:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695872746; cv=none; d=google.com; s=arc-20160816; b=yx8eFiFHiOCRoFQikJll/mxDrkt7Ve/tVx56kXtAo0twY7PVVWbCiBEpGwaZRspbnb +2MEGfT1xzISFoUzBdAEYdrAxV0kAuqCcUYQJbaavZciaz0E6GXpYV0y7NDj8JoAICBB n8T3EpKA9LvPHaSqzryQheyjhqolSalQPzviatLBgrRcURbU4GGSZHuYW5VausA7TIpp ZwmwPkMsHpwyuDL1kAXhJxPuCy0cQPZOvRvmHA6rBsevrCIhaGHw0UJBGMFpCWEWh/+X VcPP+A0rK8GEJaoZgRm5iXSfgzOCRZVDLKEaJqu/Z2WA5da2OSpPSciuVB4gexO6zWVw A6aA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from; bh=Yjz91Ab3M8EdbTwQo6QqFh/rLcz6IdsjssRHzggdX5c=; fh=Rg+VGHUwN+YZEBnPqM0EVvdwDznNa3EeNKvPuWgLPF0=; b=XY8npx8BVzJP+ts6WQtzDijKVVB6B54W1LAVpCLaswEiOlzx9k3olJHtI8QxoCGOxJ 0F6c5HM8qztNigY0W77kdbntkJU48hs/NHDjiXGxL2uvx+AsAI4my6m5GbNg/nPgfE7D hu6dKq/x8Oy9T127wEXNsipkwwvnqj0G3j/YkKdpy1R8Ue/lmyTPvJ80jeQdXUYHOfiH xFMpWjPEDKG97UiMl/aMBgKmAx7HZnCaJuIsqTVRcIw5If/O2fWhntmKQQMVEBWPV/c8 HuYEjFXyHdEs7XnV4GxfM9HOiJudxRuoF6iIzBRDksE6FWDdpS+yEq9/YeURv6I4Y2EL v4HQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from agentk.vger.email (agentk.vger.email. [23.128.96.32]) by mx.google.com with ESMTPS id y35-20020a056a00182300b00690f191430csi18499332pfa.56.2023.09.27.20.45.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Sep 2023 20:45:46 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) client-ip=23.128.96.32; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by agentk.vger.email (Postfix) with ESMTP id 4F19B8135622; Wed, 27 Sep 2023 20:41:52 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at agentk.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230140AbjI1Dln (ORCPT + 20 others); Wed, 27 Sep 2023 23:41:43 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43122 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229987AbjI1Dll (ORCPT ); Wed, 27 Sep 2023 23:41:41 -0400 Received: from mg.richtek.com (mg.richtek.com [220.130.44.152]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id ECADC11F; Wed, 27 Sep 2023 20:41:37 -0700 (PDT) X-MailGates: (SIP:2,PASS,NONE)(compute_score:DELIVER,40,3) Received: from 192.168.10.46 by mg.richtek.com with MailGates ESMTPS Server V6.0(1978106:0:AUTH_RELAY) (envelope-from ) (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256/256); Thu, 28 Sep 2023 11:41:10 +0800 (CST) Received: from ex3.rt.l (192.168.10.46) by ex3.rt.l (192.168.10.46) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.25; Thu, 28 Sep 2023 11:41:09 +0800 Received: from linuxcarl2.richtek.com (192.168.10.154) by ex3.rt.l (192.168.10.45) with Microsoft SMTP Server id 15.2.1118.25 via Frontend Transport; Thu, 28 Sep 2023 11:41:09 +0800 From: To: Mark Brown , Krzysztof Kozlowski CC: Conor Dooley , Rob Herring , Liam Girdwood , Jaroslav Kysela , Takashi Iwai , ChiYuan Huang , Allen Lin , , , Subject: [PATCH 1/2] ASoC: dt-bindings: rtq9128: Add TDM input source slect property Date: Thu, 28 Sep 2023 11:41:07 +0800 Message-ID: <1695872468-24433-2-git-send-email-cy_huang@richtek.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1695872468-24433-1-git-send-email-cy_huang@richtek.com> References: <1695872468-24433-1-git-send-email-cy_huang@richtek.com> MIME-Version: 1.0 X-Spam-Status: No, score=-0.8 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on agentk.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (agentk.vger.email [0.0.0.0]); Wed, 27 Sep 2023 20:41:55 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1778251460790386134 X-GMAIL-MSGID: 1778251460790386134 From: ChiYuan Huang Create a boolean property to select TDM input source coms from 'DATA2'. Signed-off-by: ChiYuan Huang --- .../devicetree/bindings/sound/richtek,rtq9128.yaml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Documentation/devicetree/bindings/sound/richtek,rtq9128.yaml b/Documentation/devicetree/bindings/sound/richtek,rtq9128.yaml index d117f08fff30..d54686a19ab7 100644 --- a/Documentation/devicetree/bindings/sound/richtek,rtq9128.yaml +++ b/Documentation/devicetree/bindings/sound/richtek,rtq9128.yaml @@ -28,6 +28,13 @@ properties: enable-gpios: maxItems: 1 + richtek,tdm-input-data2-select: + type: boolean + description: + By default, if TDM mode is used, TDM data input will select 'DATA1' pin + as the data source. This option will configure TDM data input source from + 'DATA1' to 'DATA2' pin. + '#sound-dai-cells': const: 0 From patchwork Thu Sep 28 03:41:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: ChiYuan Huang X-Patchwork-Id: 145723 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:cae8:0:b0:403:3b70:6f57 with SMTP id r8csp3051338vqu; Wed, 27 Sep 2023 20:42:43 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFF2FyTxOTHuByErz6+519UOk0qsU1q+4LQHzcc6qL15hH5Z/SG6HY1tC6EBFGuwwh4fJHc X-Received: by 2002:a17:902:7048:b0:1c5:9d28:b2bb with SMTP id h8-20020a170902704800b001c59d28b2bbmr52922plt.33.1695872563252; Wed, 27 Sep 2023 20:42:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695872563; cv=none; d=google.com; s=arc-20160816; b=nY1K5xpD0A8fuEwUWLxA/cxzfBEL+RZJol7DZ3gyrB+AwhVkrj2c16tVEAyuNG5BuL j0b/qHdQ2L5bcTGjDyCFiCf5TNQnKUmLATH35zbFKfZK5fRyFF75cIzLdF1MoZXbSDPT MZhOYIUEKZ2ldUKIE2Htcps+V1K095wkzlv58a+mH89mhVZvoqqE4ufVy1atk8us6dJ6 G8cVufa3S7iRuytdhG1e6n1r/2YCLkiyyZOIiU7zD+vGOewXawWYD0Qycw7Nyei0RwNG dxsKK49p5V523XnA1QWYjHpVss+QpHSYeN+bc6DLSmkPUWbZHXvvmj2fC0yKdEL0MZLG QMdQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from; bh=Qb7IYOITp/fazeQts5rnDbdxZ1BId+poNibxKincG80=; fh=Rg+VGHUwN+YZEBnPqM0EVvdwDznNa3EeNKvPuWgLPF0=; b=Hja7+vs90ZW+C0ZvkYiCR4uq6KhzPc3HVOXiHqOn7LUM7GD8B21zUGRWuG28ZBjFpX m19ewJOSBGkH1VOCBkEJaAxyoncwht/j2doIWr7MQn9a2h10r2PhvbkGOdoXYmthcz6b G8Yhgg+o1uVfb1ooWGIzfOIBklYlP4I1Fkc/9tzrbryfabwSf88fUVrKYrofo8G0PSSf 9lyI48MQlge1h7EflbBULnC6A1R36C4R/afvkPjr6jbELrE2Dh5qgTOPEAXQE6Y4+f8n jUcAHGeu8A/9c8H9RxZkOCf2GfrIOgiQBstp40lL1SBRi9dEbNtfCG4jnRjVaMfZKPgS 2RGg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from groat.vger.email (groat.vger.email. [23.128.96.35]) by mx.google.com with ESMTPS id k9-20020a170902c40900b001c60c552a66si12696196plk.302.2023.09.27.20.42.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Sep 2023 20:42:43 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 as permitted sender) client-ip=23.128.96.35; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by groat.vger.email (Postfix) with ESMTP id 37BA2832DA4D; Wed, 27 Sep 2023 20:42:06 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at groat.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230142AbjI1Dlr (ORCPT + 20 others); Wed, 27 Sep 2023 23:41:47 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43106 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229445AbjI1Dll (ORCPT ); Wed, 27 Sep 2023 23:41:41 -0400 Received: from mg.richtek.com (mg.richtek.com [220.130.44.152]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id EBDB110A; Wed, 27 Sep 2023 20:41:37 -0700 (PDT) X-MailGates: (SIP:2,PASS,NONE)(compute_score:DELIVER,40,3) Received: from 192.168.10.46 by mg.richtek.com with MailGates ESMTPS Server V6.0(1978095:0:AUTH_RELAY) (envelope-from ) (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256/256); Thu, 28 Sep 2023 11:41:10 +0800 (CST) Received: from ex3.rt.l (192.168.10.46) by ex3.rt.l (192.168.10.46) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.25; Thu, 28 Sep 2023 11:41:10 +0800 Received: from linuxcarl2.richtek.com (192.168.10.154) by ex3.rt.l (192.168.10.45) with Microsoft SMTP Server id 15.2.1118.25 via Frontend Transport; Thu, 28 Sep 2023 11:41:10 +0800 From: To: Mark Brown , Krzysztof Kozlowski CC: Conor Dooley , Rob Herring , Liam Girdwood , Jaroslav Kysela , Takashi Iwai , ChiYuan Huang , Allen Lin , , , Subject: [PATCH 2/2] ASoC: codecs: rtq9128: Add TDM input source select Date: Thu, 28 Sep 2023 11:41:08 +0800 Message-ID: <1695872468-24433-3-git-send-email-cy_huang@richtek.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1695872468-24433-1-git-send-email-cy_huang@richtek.com> References: <1695872468-24433-1-git-send-email-cy_huang@richtek.com> MIME-Version: 1.0 X-Spam-Status: No, score=-0.8 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on groat.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (groat.vger.email [0.0.0.0]); Wed, 27 Sep 2023 20:42:06 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1778251269208521317 X-GMAIL-MSGID: 1778251269208521317 From: ChiYuan Huang Pase the property to decide the TDM input source comes from 'DATA1' or 'DATA2 pin. Signed-off-by: ChiYuan Huang --- sound/soc/codecs/rtq9128.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/sound/soc/codecs/rtq9128.c b/sound/soc/codecs/rtq9128.c index 926b79ed8078..371d622c6214 100644 --- a/sound/soc/codecs/rtq9128.c +++ b/sound/soc/codecs/rtq9128.c @@ -14,6 +14,7 @@ #include #include #include +#include #include #include #include @@ -41,6 +42,7 @@ #define RTQ9128_CHSTAT_VAL_MASK GENMASK(1, 0) #define RTQ9128_DOLEN_MASK GENMASK(7, 6) +#define RTQ9128_TDMSRCIN_MASK GENMASK(5, 4) #define RTQ9128_AUDBIT_MASK GENMASK(5, 4) #define RTQ9128_AUDFMT_MASK GENMASK(3, 0) #define RTQ9128_MSMUTE_MASK BIT(0) @@ -59,6 +61,7 @@ struct rtq9128_data { struct gpio_desc *enable; int tdm_slots; int tdm_slot_width; + bool tdm_input_data2_select; }; struct rtq9128_init_reg { @@ -484,7 +487,7 @@ static int rtq9128_dai_set_tdm_slot(struct snd_soc_dai *dai, unsigned int tx_mas struct rtq9128_data *data = snd_soc_dai_get_drvdata(dai); struct snd_soc_component *comp = dai->component; struct device *dev = dai->dev; - unsigned int mask, start_loc; + unsigned int mask, start_loc, srcin_select; int i, frame_length, ret; dev_dbg(dev, "%s: slot %d slot_width %d, tx/rx mask 0x%x 0x%x\n", __func__, slots, @@ -530,6 +533,14 @@ static int rtq9128_dai_set_tdm_slot(struct snd_soc_dai *dai, unsigned int tx_mas } } + srcin_select = data->tdm_input_data2_select ? RTQ9128_TDMSRCIN_MASK : 0; + ret = snd_soc_component_update_bits(comp, RTQ9128_REG_SDO_SEL, RTQ9128_TDMSRCIN_MASK, + srcin_select); + if (ret < 0) { + dev_err(dev, "Failed to configure TDM source input select\n"); + return ret; + } + data->tdm_slots = slots; data->tdm_slot_width = slot_width; @@ -672,6 +683,9 @@ static int rtq9128_probe(struct i2c_client *i2c) else if (data->enable) usleep_range(10000, 11000); + data->tdm_input_data2_select = device_property_read_bool(dev, + "richtek,tdm-input-data2-select"); + i2c_set_clientdata(i2c, data); /*