From patchwork Fri Jul 1 19:22:56 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Conor Dooley X-Patchwork-Id: 12903665 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 E5D92C43334 for ; Fri, 1 Jul 2022 19:24:51 +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=NiUJ8393QCuO72BFig/eXkOPnmpALSlHu/ohMic183Y=; b=GrEpUnU1s4FaOW 1RnabwYNalQJmN6hBOgonqjHwYTbDcZZmdPoBOVhhAk5yOq4FDPh8DvaDINsrQglMbn5/bROTHnNO PE6YhTrrR9kKj0CsCn3J7yxEB5qdaNktLiJWcJllaG0ROO2SB5ephRi+NJ5inKxPNk5kmrraxNTIh gYD0v4J/Vivb/asCPT5u/U8w4Ga4+zm+Y3trw9dK3Jrq7oORcSLjSuT1fSvmC3+T3VfHQ5b4Jm93D M9GfBrVWMjO6deEeIP3STxgHxDAh2BjH9j0y0Q9FXfUNJCLjmaV9r6qmdyAylYx3PmaEgxZBvJPcL ktL79In2hY/dML/bik9w==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1o7MFu-006Xul-DE; Fri, 01 Jul 2022 19:24:42 +0000 Received: from ams.source.kernel.org ([145.40.68.75]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1o7MFq-006XqB-NR for linux-riscv@lists.infradead.org; Fri, 01 Jul 2022 19:24:40 +0000 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 560ECB831A8; Fri, 1 Jul 2022 19:24:37 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4A077C341D0; Fri, 1 Jul 2022 19:24:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1656703475; bh=4Dw8o4Ni+/DIiNaSaTnUmrQEB08oB1ZRamr7MN1V+tQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=pMhXY41NKw9L9gf7dOedkxHWG7+XTyZ2beNaUFCb9eRP1cTFNQJ2a8889bkSxASUv grB2HZL6+SGKndT4SXJHqdPEJ9LIQF/cNti2iBngLDBnwMsDJhjjRV9TxqnJD0D5S3 WXgT+MtiZxqXDLAAryj09i2+TMFiHYW3Tfh31LxTTsJBLEv9/t6hZDg/7vrIUfbsS9 pb51wJDldYwXbsChbZVZGBhAYuQWZnoCD1e7clOCXicJ0YC4GnWR29LTDoAsj7g6mv GZMs4ITv8bjDFpkyKQUIg5Kqlze4aSU1L3MkxaNqv0/gcQzPeRtGzyFEQ+4k+//1eo w7KoJB0k0h/cg== From: Conor Dooley To: David Airlie , Daniel Vetter , Rob Herring , Krzysztof Kozlowski , Thierry Reding , Sam Ravnborg , Eugeniy Paltsev , Vinod Koul , Liam Girdwood , Mark Brown , Serge Semin , Daniel Lezcano , Palmer Dabbelt , Palmer Dabbelt Cc: Paul Walmsley , Albert Ou , Conor Dooley , Masahiro Yamada , Damien Le Moal , Geert Uytterhoeven , Niklas Cassel , Dillon Min , Jose Abreu , dri-devel@lists.freedesktop.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, dmaengine@vger.kernel.org, alsa-devel@alsa-project.org, linux-riscv@lists.infradead.org Subject: [PATCH v4 10/14] riscv: dts: canaan: use custom compatible for k210 i2s Date: Fri, 1 Jul 2022 20:22:56 +0100 Message-Id: <20220701192300.2293643-11-conor@kernel.org> X-Mailer: git-send-email 2.37.0 In-Reply-To: <20220701192300.2293643-1-conor@kernel.org> References: <20220701192300.2293643-1-conor@kernel.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220701_122438_975518_F4AB6EE5 X-CRM114-Status: GOOD ( 12.07 ) X-BeenThere: linux-riscv@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-riscv" Errors-To: linux-riscv-bounces+linux-riscv=archiver.kernel.org@lists.infradead.org From: Conor Dooley The devicetrees using the Canaan k210 all have a sound-dai-cells value of 1, whereas the standard binding example for the DesignWare i2s and other use cases suggest 0. Use a k210 specific compatible which supports this difference. Signed-off-by: Conor Dooley --- arch/riscv/boot/dts/canaan/k210.dtsi | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/riscv/boot/dts/canaan/k210.dtsi b/arch/riscv/boot/dts/canaan/k210.dtsi index 72f70128d751..900dc629a945 100644 --- a/arch/riscv/boot/dts/canaan/k210.dtsi +++ b/arch/riscv/boot/dts/canaan/k210.dtsi @@ -251,7 +251,7 @@ spi2: spi@50240000 { }; i2s0: i2s@50250000 { - compatible = "snps,designware-i2s"; + compatible = "canaan,k210-i2s", "snps,designware-i2s"; reg = <0x50250000 0x200>; interrupts = <5>; clocks = <&sysclk K210_CLK_I2S0>; @@ -260,7 +260,7 @@ i2s0: i2s@50250000 { }; i2s1: i2s@50260000 { - compatible = "snps,designware-i2s"; + compatible = "canaan,k210-i2s", "snps,designware-i2s"; reg = <0x50260000 0x200>; interrupts = <6>; clocks = <&sysclk K210_CLK_I2S1>; @@ -269,7 +269,7 @@ i2s1: i2s@50260000 { }; i2s2: i2s@50270000 { - compatible = "snps,designware-i2s"; + compatible = "canaan,k210-i2s", "snps,designware-i2s"; reg = <0x50270000 0x200>; interrupts = <7>; clocks = <&sysclk K210_CLK_I2S2>;