From patchwork Thu Nov 25 14:40:50 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Olivier Moysan X-Patchwork-Id: 12693673 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (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 4CCB2C433F5 for ; Thu, 25 Nov 2021 14:47:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:CC:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=giYnwuqTBZxFCs9jsAMWme91ZRdfiLJ2Gb+d94QGeXw=; b=ladx3rxMtTMNg0 P87+Dg+N9UeS4m3yUvqZ711kv/QXYQO7WHltrFbWcTZKHcQdNpi3IJOATm56KxzVCw/+SKnz3NJx6 G5+Bciy0Ko4lChLrcpk9KCLcSb2Iabs0Tr4PVIY+V0krtYhhyAVboPK7eqSqXvNLMzrNyPGI/eMTM UM555g5u1d1+XFpiJTRiDjDESUeSok9MU7E8YsllUKxgLLBrTPNs91PbL+tEyi1nAybCGAixwLcOR 7T63uWObtzYo5moHqlNpI6xadwW6STAyXjs5EirX+3+YYC9r0ssEq7qkc3V0Zvq6apHQ3ggdKD9pq 15+nDYfQs6H87P2NeC4A==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mqFzY-007rp7-D0; Thu, 25 Nov 2021 14:44:52 +0000 Received: from mx08-00178001.pphosted.com ([91.207.212.93] helo=mx07-00178001.pphosted.com) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mqFzI-007rln-LE for linux-arm-kernel@lists.infradead.org; Thu, 25 Nov 2021 14:44:39 +0000 Received: from pps.filterd (m0046661.ppops.net [127.0.0.1]) by mx07-00178001.pphosted.com (8.16.1.2/8.16.1.2) with ESMTP id 1APCgxw7016072; Thu, 25 Nov 2021 15:44:22 +0100 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foss.st.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-type; s=selector1; bh=EXTlbQS8eDv4A0IJqxUFLPpP6bGa9jNKsKWAyWcl8Xw=; b=LUOZXEUP4DM6Rn7Z7PNeZUKLQX3x8RETUkuM77zFszn0nt9J8ODqDQ6LzAxepwC8bel+ 0+RS/NXNT2gONZl8iypAq6Lh+TAnjf2WClsLPc6uX4Ee9wAly/FDiTCdS0DuqoerMVub GIB0FaRRw7Tvk7IEHBgZadc2lOKExr4w3OTH1ln3hirYsZf5TJqhnd4MWljh9xLKayBV FVYeu9cdhcNLhvLKA0k7BhMxXv4bGoEZCJ6DGWYZfOeSFeUfj0g87rOLlDjtHUrhcQHn 4PM7GLNCPpoY2HfFpaG1P5bmUzYMvoxUAAXEJ7+wBs/2m93AaAJebusSa5fMzH7M8V8g WQ== Received: from beta.dmz-eu.st.com (beta.dmz-eu.st.com [164.129.1.35]) by mx07-00178001.pphosted.com (PPS) with ESMTPS id 3cjar3gq2x-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 25 Nov 2021 15:44:22 +0100 Received: from euls16034.sgp.st.com (euls16034.sgp.st.com [10.75.44.20]) by beta.dmz-eu.st.com (STMicroelectronics) with ESMTP id 6B395100034; Thu, 25 Nov 2021 15:44:21 +0100 (CET) Received: from Webmail-eu.st.com (sfhdag2node2.st.com [10.75.127.5]) by euls16034.sgp.st.com (STMicroelectronics) with ESMTP id 61CF8237D98; Thu, 25 Nov 2021 15:44:21 +0100 (CET) Received: from localhost (10.75.127.51) by SFHDAG2NODE2.st.com (10.75.127.5) with Microsoft SMTP Server (TLS) id 15.0.1497.26; Thu, 25 Nov 2021 15:44:20 +0100 From: Olivier Moysan To: Alexandre Torgue , Liam Girdwood , Mark Brown , Maxime Coquelin , Olivier Moysan , "Rob Herring" , , , CC: , , , , , , Olivier Moysan Subject: [PATCH v2 1/4] ASoC: dt-bindings: stm32: i2s: add audio-graph-card port Date: Thu, 25 Nov 2021 15:40:50 +0100 Message-ID: <20211125144053.774-2-olivier.moysan@foss.st.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20211125144053.774-1-olivier.moysan@foss.st.com> References: <20211125144053.774-1-olivier.moysan@foss.st.com> MIME-Version: 1.0 X-Originating-IP: [10.75.127.51] X-ClientProxiedBy: SFHDAG2NODE3.st.com (10.75.127.6) To SFHDAG2NODE2.st.com (10.75.127.5) X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.790,Hydra:6.0.425,FMLib:17.0.607.475 definitions=2021-11-25_06,2021-11-25_01,2020-04-07_01 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211125_064437_028764_EAEE775C X-CRM114-Status: GOOD ( 14.06 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org The STM2 I2S DAI can be connected via the audio-graph-card. Add port entry into the bindings. Signed-off-by: Olivier Moysan --- Documentation/devicetree/bindings/sound/st,stm32-i2s.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Documentation/devicetree/bindings/sound/st,stm32-i2s.yaml b/Documentation/devicetree/bindings/sound/st,stm32-i2s.yaml index 6feb5a09c184..64b70ac539f8 100644 --- a/Documentation/devicetree/bindings/sound/st,stm32-i2s.yaml +++ b/Documentation/devicetree/bindings/sound/st,stm32-i2s.yaml @@ -58,6 +58,11 @@ properties: description: Configure the I2S device as MCLK clock provider. const: 0 +patternProperties: + '^port@[0-9]': + $ref: audio-graph-port.yaml# + unevaluatedProperties: false + required: - compatible - "#sound-dai-cells" From patchwork Thu Nov 25 14:40:51 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Olivier Moysan X-Patchwork-Id: 12693670 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (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 A2675C433F5 for ; Thu, 25 Nov 2021 14:46:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:CC:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=C5PDJo3nub5sC03LI2Z2cPpROVxSyNfFZmdNZtBgb2c=; b=Jyc3BxFEcbiuk7 8WLQKtIAAfRfMGBSzT5EBEj0GrKHQRquAxLAnH2VxpqK2O+gUahOwRU3fYTapWGUgsl75tNgIXt/+ g9aKLKJe/WtVqcejU+gFRdXlvmwFNrzJalWJiSDypsKeOPl0ssjOAeGefa0mHJReLFU7C6UJdmIrE YXmZXg1bxQcS4fMsXC/ukuy6eVhyHYeZCXBBeNENyAhXynVuDvIypZi7zNhBYLgC8a8796BHJp4rR agj63IrsPiBRV2TDQPM9BPh7RvBAlBfd+lhMtHPbu7x8yaZ+RBpRY57J6wtB4QV235Lhe0pKurS7x Srb+2ZWxpE/1rxxSrS/w==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mqFzj-007rqx-Qv; Thu, 25 Nov 2021 14:45:04 +0000 Received: from mx07-00178001.pphosted.com ([185.132.182.106]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mqFzI-007rlU-Ka for linux-arm-kernel@lists.infradead.org; Thu, 25 Nov 2021 14:44:40 +0000 Received: from pps.filterd (m0046668.ppops.net [127.0.0.1]) by mx07-00178001.pphosted.com (8.16.1.2/8.16.1.2) with ESMTP id 1AP9OCMP002618; Thu, 25 Nov 2021 15:44:22 +0100 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foss.st.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-type; s=selector1; bh=8TcwlTK97rQnX8N3x7FHRcKkfLTqnGhIJuDXv5FUVZ8=; b=Uk6l0ezKrfl9hNDCNgbbup2DhSsUP3mFmeyjs4nnoiw7sEISxDV+5yMrJbXy7d0Uk9TO wKpeM6MHGLMkbWWIMKOHsJxp+/cErXhceXd0UkVVrQmz8mCOKveDPpBB+uwyRerc6OQ8 xUASM40h6LrYEHGZT0y3l0kG4YYRocJb6JmOaZCE7OKZD53dIrKcUEPx5mbFoA0RxESO ND2yWgia0QKkuKH0Sid84kYUXRrfYNrq9GYBE7xjDNil6di2hcDnCoErIuihRIH/TqA3 HNM97ddr7G/N63O4Lr8Oii4Ly67npCEE64VIaybu0GxcQm0D3e4T+aEVaRHFG7uNpDHB ew== Received: from beta.dmz-eu.st.com (beta.dmz-eu.st.com [164.129.1.35]) by mx07-00178001.pphosted.com (PPS) with ESMTPS id 3cj3cykuvv-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 25 Nov 2021 15:44:22 +0100 Received: from euls16034.sgp.st.com (euls16034.sgp.st.com [10.75.44.20]) by beta.dmz-eu.st.com (STMicroelectronics) with ESMTP id 4537A100038; Thu, 25 Nov 2021 15:44:22 +0100 (CET) Received: from Webmail-eu.st.com (sfhdag2node2.st.com [10.75.127.5]) by euls16034.sgp.st.com (STMicroelectronics) with ESMTP id 3D788237D97; Thu, 25 Nov 2021 15:44:22 +0100 (CET) Received: from localhost (10.75.127.49) by SFHDAG2NODE2.st.com (10.75.127.5) with Microsoft SMTP Server (TLS) id 15.0.1497.26; Thu, 25 Nov 2021 15:44:21 +0100 From: Olivier Moysan To: Alexandre Torgue , Liam Girdwood , Mark Brown , Maxime Coquelin , Olivier Moysan , "Rob Herring" , , , CC: , , , , , , Olivier Moysan Subject: [PATCH v2 2/4] ASoC: dt-bindings: stm32: i2s: allow additional properties. Date: Thu, 25 Nov 2021 15:40:51 +0100 Message-ID: <20211125144053.774-3-olivier.moysan@foss.st.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20211125144053.774-1-olivier.moysan@foss.st.com> References: <20211125144053.774-1-olivier.moysan@foss.st.com> MIME-Version: 1.0 X-Originating-IP: [10.75.127.49] X-ClientProxiedBy: SFHDAG2NODE1.st.com (10.75.127.4) To SFHDAG2NODE2.st.com (10.75.127.5) X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.790,Hydra:6.0.425,FMLib:17.0.607.475 definitions=2021-11-25_06,2021-11-25_01,2020-04-07_01 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211125_064437_028603_462506B4 X-CRM114-Status: GOOD ( 17.42 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org The STM32 SPI peripheral supports both SPI and I2S protocols. In the SoC device tree the node describes the peripheral as an SPI peripheral by default. This default configuration can be overwritten in board device tree to use the IP as an I2S peripheral. In this case the address-cells and size-cells properties from SoC DT SPI node should not be checked against STM32 I2S bindings. Set additionalProperties to "true" to allow these extra properties. Signed-off-by: Olivier Moysan --- Documentation/devicetree/bindings/sound/st,stm32-i2s.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/devicetree/bindings/sound/st,stm32-i2s.yaml b/Documentation/devicetree/bindings/sound/st,stm32-i2s.yaml index 64b70ac539f8..33ba15363c0f 100644 --- a/Documentation/devicetree/bindings/sound/st,stm32-i2s.yaml +++ b/Documentation/devicetree/bindings/sound/st,stm32-i2s.yaml @@ -73,7 +73,7 @@ required: - dmas - dma-names -additionalProperties: false +additionalProperties: true examples: - | From patchwork Thu Nov 25 14:40:52 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Olivier Moysan X-Patchwork-Id: 12693674 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (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 EDB37C433EF for ; Thu, 25 Nov 2021 14:47:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:CC:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=mNw7coiZ0lRbxJL9xFrMKi7y6zbVZu6L6x8wG1bOhWI=; b=UqC1f0br38pIoM nF3+wxHtj3NdkjTvwDSMj8+uImuGJhW3jfI1y2MzDAjaX1yd2UuXfQs2kwAIXWhMkMexsLO4XkN3b Xz4xNQxsTkn1SvgaoMjQh5zjasky5j95y79NhffPP8LZZMn4hV5grlUt63iqdF7Ums7ZnXTcG8N44 BJSn6UZPavWOjnerv/0lIeDbpBTEuA4BgwJsF9Nln+cC3fcZiAKtZ9hQzS5nFjMjOlgouEa0eKpyg qU40g/y6WEgr5DP2AgPGEOjUBDkWhC3huAcMn4yUZPGtAr0XxuxWgPOpQoCdzVVRaqvxnhu5N+JI7 XorzlsahmLW9LgYs+KSw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mqG08-007rwn-Ky; Thu, 25 Nov 2021 14:45:28 +0000 Received: from mx08-00178001.pphosted.com ([91.207.212.93] helo=mx07-00178001.pphosted.com) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mqFzI-007rlN-3i for linux-arm-kernel@lists.infradead.org; Thu, 25 Nov 2021 14:44:40 +0000 Received: from pps.filterd (m0046661.ppops.net [127.0.0.1]) by mx07-00178001.pphosted.com (8.16.1.2/8.16.1.2) with ESMTP id 1APCh3ZM016506; Thu, 25 Nov 2021 15:44:23 +0100 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foss.st.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-type; s=selector1; bh=0Sc7MpkQ4w7bhIf6WOu/6TD/ofcTkd3wIkQ/r5c2lng=; b=1qcEXKxHypV6r7CBf8ng3nCny6zbqXnJwlbpcw+hCGSCBDGP53Eb1J9eBx13sqEiG5G2 7FE45z90NqRJ3SgzjhwMk43xn9egrF0kRZ2AulEq1HJo6GIJsVaUv6LlvT/oWAaBuR0O rjLqH8MsqVz2Tpt9Fu8Efctz3wndt8DcsUFXoSutpdwBFImyjpH/abHU2jbHW5WF/C8G HjkJwHwhf3wnIhkTSXG9pTUJglXbTU48+SnJQxUDXYVgozoY/cvyKsW9atCLO+d93xaV JHDH9xLHCc46SFLQxHnMSUQhrTxI6vBOBTKA5uL32jURf92I4xfSVhBWlzsJBIxe5Z3G ug== Received: from beta.dmz-eu.st.com (beta.dmz-eu.st.com [164.129.1.35]) by mx07-00178001.pphosted.com (PPS) with ESMTPS id 3cjar3gq35-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 25 Nov 2021 15:44:23 +0100 Received: from euls16034.sgp.st.com (euls16034.sgp.st.com [10.75.44.20]) by beta.dmz-eu.st.com (STMicroelectronics) with ESMTP id 0FEBA10002A; Thu, 25 Nov 2021 15:44:23 +0100 (CET) Received: from Webmail-eu.st.com (sfhdag2node2.st.com [10.75.127.5]) by euls16034.sgp.st.com (STMicroelectronics) with ESMTP id 081E7237D97; Thu, 25 Nov 2021 15:44:23 +0100 (CET) Received: from localhost (10.75.127.49) by SFHDAG2NODE2.st.com (10.75.127.5) with Microsoft SMTP Server (TLS) id 15.0.1497.26; Thu, 25 Nov 2021 15:44:22 +0100 From: Olivier Moysan To: Alexandre Torgue , Liam Girdwood , Mark Brown , Maxime Coquelin , Olivier Moysan , "Rob Herring" , , , CC: , , , , , , Olivier Moysan Subject: [PATCH v2 3/4] ASoC: dt-bindings: stm32: i2s: update example Date: Thu, 25 Nov 2021 15:40:52 +0100 Message-ID: <20211125144053.774-4-olivier.moysan@foss.st.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20211125144053.774-1-olivier.moysan@foss.st.com> References: <20211125144053.774-1-olivier.moysan@foss.st.com> MIME-Version: 1.0 X-Originating-IP: [10.75.127.49] X-ClientProxiedBy: SFHDAG2NODE1.st.com (10.75.127.4) To SFHDAG2NODE2.st.com (10.75.127.5) X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.790,Hydra:6.0.425,FMLib:17.0.607.475 definitions=2021-11-25_06,2021-11-25_01,2020-04-07_01 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211125_064437_172333_E2A99AB1 X-CRM114-Status: GOOD ( 17.06 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Some STM32 SPI peripheral instances support I2S for audio. SPI and I2S features were initially described through two separated nodes in the SoC Device Tree. In the next SoC Device Trees a single node is used to describe SPI peripheral, leading to a change in node name for I2S. Change example in STM32 DT binding example to match this change. Signed-off-by: Olivier Moysan --- Documentation/devicetree/bindings/sound/st,stm32-i2s.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/devicetree/bindings/sound/st,stm32-i2s.yaml b/Documentation/devicetree/bindings/sound/st,stm32-i2s.yaml index 33ba15363c0f..591f9c941f54 100644 --- a/Documentation/devicetree/bindings/sound/st,stm32-i2s.yaml +++ b/Documentation/devicetree/bindings/sound/st,stm32-i2s.yaml @@ -79,7 +79,7 @@ examples: - | #include #include - i2s2: audio-controller@4000b000 { + spi2s2: spi@4000b000 { compatible = "st,stm32h7-i2s"; #sound-dai-cells = <0>; reg = <0x4000b000 0x400>; From patchwork Thu Nov 25 14:40:53 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Olivier Moysan X-Patchwork-Id: 12693671 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (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 5B8BFC433FE for ; Thu, 25 Nov 2021 14:46:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:CC:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=kiMRoUwCvusBG4UGloyFoLEnXCZlh7ud6k1zHXyzENc=; b=Ux3PkCNCZQUja+ Ms5g4xY+TQ6M07i2Znx5HSDyCSw4/Ori+QPkmp97b62LfvzCLQGwh+czUxC20lB8aQ/F8RVAGxaON 26BDQmfcf+CZ8ziMx3yJRcNAXSsB/djxozFsH+IFOEhj9DzT2yF3Fb6oRSKMxohETDB6iMYdQSt8S 9D8bimpCZUoTSVBV+ColTwyK6HUQv6VEW6tZOToHoZzT5cmrk5kmnZyxb+ay42Q7sGAJAHm5KCN65 cMubg5aMkQS7r/u8x9fl5bYGkZqo3bFLblBlA9rbhnckYvQHkkQ2h9gnkZQBxF9zBwNwGyUPQJLPi 2pq8NCR4eQVm++dJ9FIQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mqFzN-007rna-Ej; Thu, 25 Nov 2021 14:44:41 +0000 Received: from mx07-00178001.pphosted.com ([185.132.182.106]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mqFzH-007rlO-Ay for linux-arm-kernel@lists.infradead.org; Thu, 25 Nov 2021 14:44:38 +0000 Received: from pps.filterd (m0046668.ppops.net [127.0.0.1]) by mx07-00178001.pphosted.com (8.16.1.2/8.16.1.2) with ESMTP id 1AP9GKsm002630; Thu, 25 Nov 2021 15:44:24 +0100 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foss.st.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-type; s=selector1; bh=m7uWqW34ebKJsCiE75+OnmMwbr1EosFegGv/Ik9D7jY=; b=5xYyGq4B/xztIvQqdrQ3sLWmyg0UdaMjQF7+K9YbSdC2Ev8wANUuRTWqJ6teVF8IPqjy Xk3FBwoVhCV1pqaOZ+b4LRPABOXk9j4LWENukOsCXLRsZS9Etd4OpN3gyJ9JqiCbzd1s wNqsrloCmaN/38EnpZ58Wi2G888xIO6aUoFAGczP92Sv7G7JHwVcxHhifut7SnJ2fg6g TqHEThKaoQhuDk34W6BYg3kZHIB5XSIIYhSSuma1NY/Dtrnd7w2s0wfu3IxEF3o8lVgz 4oX5z8Bvmuo8oMDzaKISM3VTqlncqRlDLs4s7lSqid6BkP/f03u8fwVroBSgBpa9bGFa iQ== Received: from beta.dmz-eu.st.com (beta.dmz-eu.st.com [164.129.1.35]) by mx07-00178001.pphosted.com (PPS) with ESMTPS id 3cj3cykuw0-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 25 Nov 2021 15:44:24 +0100 Received: from euls16034.sgp.st.com (euls16034.sgp.st.com [10.75.44.20]) by beta.dmz-eu.st.com (STMicroelectronics) with ESMTP id EBE04100034; Thu, 25 Nov 2021 15:44:23 +0100 (CET) Received: from Webmail-eu.st.com (sfhdag2node2.st.com [10.75.127.5]) by euls16034.sgp.st.com (STMicroelectronics) with ESMTP id E1030237D97; Thu, 25 Nov 2021 15:44:23 +0100 (CET) Received: from localhost (10.75.127.51) by SFHDAG2NODE2.st.com (10.75.127.5) with Microsoft SMTP Server (TLS) id 15.0.1497.26; Thu, 25 Nov 2021 15:44:23 +0100 From: Olivier Moysan To: Alexandre Torgue , Liam Girdwood , Mark Brown , Maxime Coquelin , Olivier Moysan , "Rob Herring" , , , CC: , , , , , , Olivier Moysan Subject: [PATCH v2 4/4] ARM: dts: stm32: merge spi and i2s nodes Date: Thu, 25 Nov 2021 15:40:53 +0100 Message-ID: <20211125144053.774-5-olivier.moysan@foss.st.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20211125144053.774-1-olivier.moysan@foss.st.com> References: <20211125144053.774-1-olivier.moysan@foss.st.com> MIME-Version: 1.0 X-Originating-IP: [10.75.127.51] X-ClientProxiedBy: SFHDAG1NODE2.st.com (10.75.127.2) To SFHDAG2NODE2.st.com (10.75.127.5) X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.790,Hydra:6.0.425,FMLib:17.0.607.475 definitions=2021-11-25_06,2021-11-25_01,2020-04-07_01 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211125_064436_253530_4CB4AE63 X-CRM114-Status: GOOD ( 19.01 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org When a SPI instance offers I2S feature, two nodes are defined in SoC device tree to support both SPI and I2S. Merge SPI node and I2S nodes into a single node, to avoid hardware description duplication and compilation warnings. spi2sx label is used to identify the SPI instances which are supporting I2S feature. Rename nodes, to match new labels of SPI/I2S nodes in the SoC device tree on following boards: - STMP32MP15xx-DKx - STMP32MP157C-EV1 - STMP32MP15xx-dhcor-avenger96 - STMP32MP15xx-dhcom-drc02 In DT check utility, the spi2s2 node is identified as an spi node. The check_spi_bus_reg() function issues a warning "missing or empty reg property" if reg property is not defined in child nodes. Add reg property to STM32 I2S port node on STM32MP15XX-DK board to match this requirement and add related unit-address in node name. Signed-off-by: Olivier Moysan --- arch/arm/boot/dts/stm32mp151.dtsi | 39 ++----------------- arch/arm/boot/dts/stm32mp157c-ev1.dts | 2 +- .../arm/boot/dts/stm32mp15xx-dhcom-drc02.dtsi | 2 +- .../boot/dts/stm32mp15xx-dhcor-avenger96.dtsi | 2 +- arch/arm/boot/dts/stm32mp15xx-dkx.dtsi | 7 +++- 5 files changed, 11 insertions(+), 41 deletions(-) diff --git a/arch/arm/boot/dts/stm32mp151.dtsi b/arch/arm/boot/dts/stm32mp151.dtsi index f693a7d24247..61226821ff8c 100644 --- a/arch/arm/boot/dts/stm32mp151.dtsi +++ b/arch/arm/boot/dts/stm32mp151.dtsi @@ -386,7 +386,7 @@ }; }; - spi2: spi@4000b000 { + spi2s2: spi@4000b000 { #address-cells = <1>; #size-cells = <0>; compatible = "st,stm32h7-spi"; @@ -400,18 +400,7 @@ status = "disabled"; }; - i2s2: audio-controller@4000b000 { - compatible = "st,stm32h7-i2s"; - #sound-dai-cells = <0>; - reg = <0x4000b000 0x400>; - interrupts = ; - dmas = <&dmamux1 39 0x400 0x01>, - <&dmamux1 40 0x400 0x01>; - dma-names = "rx", "tx"; - status = "disabled"; - }; - - spi3: spi@4000c000 { + spi2s3: spi@4000c000 { #address-cells = <1>; #size-cells = <0>; compatible = "st,stm32h7-spi"; @@ -425,17 +414,6 @@ status = "disabled"; }; - i2s3: audio-controller@4000c000 { - compatible = "st,stm32h7-i2s"; - #sound-dai-cells = <0>; - reg = <0x4000c000 0x400>; - interrupts = ; - dmas = <&dmamux1 61 0x400 0x01>, - <&dmamux1 62 0x400 0x01>; - dma-names = "rx", "tx"; - status = "disabled"; - }; - spdifrx: audio-controller@4000d000 { compatible = "st,stm32h7-spdifrx"; #sound-dai-cells = <0>; @@ -681,7 +659,7 @@ status = "disabled"; }; - spi1: spi@44004000 { + spi2s1: spi@44004000 { #address-cells = <1>; #size-cells = <0>; compatible = "st,stm32h7-spi"; @@ -695,17 +673,6 @@ status = "disabled"; }; - i2s1: audio-controller@44004000 { - compatible = "st,stm32h7-i2s"; - #sound-dai-cells = <0>; - reg = <0x44004000 0x400>; - interrupts = ; - dmas = <&dmamux1 37 0x400 0x01>, - <&dmamux1 38 0x400 0x01>; - dma-names = "rx", "tx"; - status = "disabled"; - }; - spi4: spi@44005000 { #address-cells = <1>; #size-cells = <0>; diff --git a/arch/arm/boot/dts/stm32mp157c-ev1.dts b/arch/arm/boot/dts/stm32mp157c-ev1.dts index 5c5b1ddf7bfd..c836b4a1dbe2 100644 --- a/arch/arm/boot/dts/stm32mp157c-ev1.dts +++ b/arch/arm/boot/dts/stm32mp157c-ev1.dts @@ -293,7 +293,7 @@ status = "disabled"; }; -&spi1 { +&spi2s1 { pinctrl-names = "default"; pinctrl-0 = <&spi1_pins_a>; status = "disabled"; diff --git a/arch/arm/boot/dts/stm32mp15xx-dhcom-drc02.dtsi b/arch/arm/boot/dts/stm32mp15xx-dhcom-drc02.dtsi index 4b10b013ffd5..29f18382d962 100644 --- a/arch/arm/boot/dts/stm32mp15xx-dhcom-drc02.dtsi +++ b/arch/arm/boot/dts/stm32mp15xx-dhcom-drc02.dtsi @@ -114,7 +114,7 @@ disable-wp; }; -&spi1 { +&spi2s1 { pinctrl-names = "default"; pinctrl-0 = <&spi1_pins_a>; cs-gpios = <&gpioz 3 0>; diff --git a/arch/arm/boot/dts/stm32mp15xx-dhcor-avenger96.dtsi b/arch/arm/boot/dts/stm32mp15xx-dhcor-avenger96.dtsi index 6885948f3024..0dce9b118318 100644 --- a/arch/arm/boot/dts/stm32mp15xx-dhcor-avenger96.dtsi +++ b/arch/arm/boot/dts/stm32mp15xx-dhcor-avenger96.dtsi @@ -362,7 +362,7 @@ }; }; -&spi2 { +&spi2s2 { pinctrl-names = "default"; pinctrl-0 = <&spi2_pins_a>; cs-gpios = <&gpioi 0 0>; diff --git a/arch/arm/boot/dts/stm32mp15xx-dkx.dtsi b/arch/arm/boot/dts/stm32mp15xx-dkx.dtsi index 48beed0f1f30..4c362af95736 100644 --- a/arch/arm/boot/dts/stm32mp15xx-dkx.dtsi +++ b/arch/arm/boot/dts/stm32mp15xx-dkx.dtsi @@ -427,7 +427,9 @@ status = "disabled"; }; -&i2s2 { +&spi2s2 { + compatible = "st,stm32h7-i2s"; + #sound-dai-cells = <0>; clocks = <&rcc SPI2>, <&rcc SPI2_K>, <&rcc PLL3_Q>, <&rcc PLL3_R>; clock-names = "pclk", "i2sclk", "x8k", "x11k"; pinctrl-names = "default", "sleep"; @@ -435,7 +437,8 @@ pinctrl-1 = <&i2s2_sleep_pins_a>; status = "okay"; - i2s2_port: port { + i2s2_port: port@0 { + reg = <0>; i2s2_endpoint: endpoint { remote-endpoint = <&sii9022_tx_endpoint>; format = "i2s";