From patchwork Fri Mar 31 08:12:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cristian Ciocaltea X-Patchwork-Id: 77618 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp406111vqo; Fri, 31 Mar 2023 01:30:30 -0700 (PDT) X-Google-Smtp-Source: AKy350Y78iG7hd5S54D18+ud8wtcq1QYgqlaRFgDGKhNog3YPUVa0ly9ympYG9lNZMhUr7KOZkxN X-Received: by 2002:a17:90a:7286:b0:23d:22d7:9ecf with SMTP id e6-20020a17090a728600b0023d22d79ecfmr10086318pjg.7.1680251430654; Fri, 31 Mar 2023 01:30:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680251430; cv=none; d=google.com; s=arc-20160816; b=hWoLshO7diWjMZZwdCggVOj6yXtbULmyOJrmOF+Y5AbUvHJStopZNd6lB5n45erN4V HSm5NIWRPoXevuPmXZboJ32LJc1elyuDhRIX3heCYG2z8ie2rnl+5zcbpwBZRgqz4RXa IVNLt3KnMIW0Ho5JV9mG4gLJvB8scj4/McQ6ep3CPI1ToZrv3wWgz2V8IAHqFabXf+y9 80VqLDceqO2JxhCCXD5Upe5S4jkVg4kmZJX4cyXJE6kKE8+Ub5hANFvFILjWetqWMpBX GnXBEIcL9LPR5WLtFDx/FbFNyMY8Rl/Z6wXdmFJrPBawn9EvB39jw+FuBj4A6QaXsS7E LWTg== 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=kTChUHZytN3QrOQo97jNqLgnEqh/0GBi7yhF2l39WeY=; b=x7WkQOkKrAdGx/MeLDbmrmaYzaLrw6GVg54wsqvzBaeXTsIfEBrt7RtSMciwR03zT+ IyKRxAtjVn0z6cSQrCHPCKBrI/umsXfmlGALX9aaDs1UUN2vkoLwjKGJJdzBpac/e/Df 7yKsbgajFfxabV4vJg0ax5AazqzOr9uJ7Z9amr2ffU74ufL5lit7ZLRLq25G5TlOUj+b 66sIom4BS2SftrRP/z1CtNGs/UgErQqOJ3vaTA6wwZDkwxAVcMEjWqFBCrZQ8tE3O92v Rp9GaIK/sfbqygw7s3lc31f8EdFbT9jAhyteeiPwxdXAoD/u+lfHz6ihtNhPWLP8jo/D jqNA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=KWf9g+Jg; 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=QUARANTINE sp=QUARANTINE dis=NONE) header.from=collabora.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id nn14-20020a17090b38ce00b0023f0955f301si6665837pjb.166.2023.03.31.01.30.18; Fri, 31 Mar 2023 01:30:30 -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=@collabora.com header.s=mail header.b=KWf9g+Jg; 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=QUARANTINE sp=QUARANTINE dis=NONE) header.from=collabora.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231539AbjCaIMp (ORCPT + 99 others); Fri, 31 Mar 2023 04:12:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59694 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231504AbjCaIMm (ORCPT ); Fri, 31 Mar 2023 04:12:42 -0400 Received: from madras.collabora.co.uk (madras.collabora.co.uk [46.235.227.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DB8C626BD; Fri, 31 Mar 2023 01:12:34 -0700 (PDT) Received: from localhost (unknown [188.27.34.213]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: cristicc) by madras.collabora.co.uk (Postfix) with ESMTPSA id 9C9A36603191; Fri, 31 Mar 2023 09:12:33 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1680250353; bh=qfVvQcXAO2HebpYt7+zwdYr5k3ab1Li3DgzzFWiv4VM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=KWf9g+JgheC2xho72MM5Mm4Azpat1L+1T48KYtxwxHrfKU/PhZOz1lDvJIkMVZOuk w7jzDWvJhZyv4xIFv3IA4qmHhxS35+x0uY5fMo2FvcPJ2vjP8/6rcVOCIYVaaQ8xdV Kwc5KiCj76MhrY+29tBy8V3woRgT5TGVmzq0317nKLdY84XKlZVNOdkW9vexfwlgdV V+YrkPmIS1lOJ91h+d7Vsswo8mPl3bcYnM/Hf1kAyzEVJcs2W2hDGh/hxuvuCoXwxX tA3F0iuDmpkK0CbwkeuvWm/VE4u8r19QBNqDFUSdVbLSt9QO2lfKdyP6Pxy/62p3Qr 3rnP2+cuougLw== From: Cristian Ciocaltea To: Rob Herring , Krzysztof Kozlowski , Heiko Stuebner , Nicolas Frattaroli Cc: devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org, kernel@collabora.com Subject: [PATCH v3 1/4] arm64: dts: rockchip: rk3588s: Move assigned-clocks/assigned-clock-rates out of scmi Date: Fri, 31 Mar 2023 11:12:23 +0300 Message-Id: <20230331081226.245881-2-cristian.ciocaltea@collabora.com> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230331081226.245881-1-cristian.ciocaltea@collabora.com> References: <20230331081226.245881-1-cristian.ciocaltea@collabora.com> MIME-Version: 1.0 X-Spam-Status: No, score=-0.2 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,DKIM_VALID_EF,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 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?1761871324197452162?= X-GMAIL-MSGID: =?utf-8?q?1761871324197452162?= Since commit df4fdd0db475 ("dt-bindings: firmware: arm,scmi: Restrict protocol child node properties") the following dtbs_check warning is shown: rk3588-rock-5b.dtb: scmi: protocol@14: Unevaluated properties are not allowed ('assigned-clock-rates', 'assigned-clocks' were unexpected) Since adding the missing properties to Documentation/devicetree/bindings/firmware/arm,scmi.yaml was not an acceptable solution, move them from scmi to cpu nodes. Signed-off-by: Cristian Ciocaltea --- arch/arm64/boot/dts/rockchip/rk3588s.dtsi | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/arm64/boot/dts/rockchip/rk3588s.dtsi b/arch/arm64/boot/dts/rockchip/rk3588s.dtsi index 7840767dfcd8..14615d1df03c 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588s.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588s.dtsi @@ -136,6 +136,8 @@ cpu_b0: cpu@400 { enable-method = "psci"; capacity-dmips-mhz = <1024>; clocks = <&scmi_clk SCMI_CLK_CPUB01>; + assigned-clocks = <&scmi_clk SCMI_CLK_CPUB01>; + assigned-clock-rates = <1200000000>; cpu-idle-states = <&CPU_SLEEP>; i-cache-size = <65536>; i-cache-line-size = <64>; @@ -174,6 +176,8 @@ cpu_b2: cpu@600 { enable-method = "psci"; capacity-dmips-mhz = <1024>; clocks = <&scmi_clk SCMI_CLK_CPUB23>; + assigned-clocks = <&scmi_clk SCMI_CLK_CPUB23>; + assigned-clock-rates = <1200000000>; cpu-idle-states = <&CPU_SLEEP>; i-cache-size = <65536>; i-cache-line-size = <64>; @@ -313,10 +317,6 @@ scmi: scmi { scmi_clk: protocol@14 { reg = <0x14>; - assigned-clocks = <&scmi_clk SCMI_CLK_CPUB01>, - <&scmi_clk SCMI_CLK_CPUB23>; - assigned-clock-rates = <1200000000>, - <1200000000>; #clock-cells = <1>; }; From patchwork Fri Mar 31 08:12:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cristian Ciocaltea X-Patchwork-Id: 77615 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp405180vqo; Fri, 31 Mar 2023 01:28:15 -0700 (PDT) X-Google-Smtp-Source: AKy350agh2XdC4HkhKx/YuXZ1TaSizzfUXvd6T90ycmofpk7Q5QneSywxEapNtOYH3PgELPl8SON X-Received: by 2002:a05:6a00:cd:b0:627:e69c:847c with SMTP id e13-20020a056a0000cd00b00627e69c847cmr23876955pfj.16.1680251295515; Fri, 31 Mar 2023 01:28:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680251295; cv=none; d=google.com; s=arc-20160816; b=RdIDTyRN1g305LPYbu95w44MgAy1TLmu0D0GZIOgqGavA76GKhgObGMGEjyazZY4sO nXPDPhENbPdm5klYSjwSBUZAjD+9mv6adooIZzDi5Z5SAWxxBBYsRE/OzdudpLgz80zC NS6fQolPlbbmbDWPkisdqYlDq9TgxHbqeOOqnhzIsf3EbSS8TYZrCGDwhNZNZOKZj9ym pViiCe3QwAChx8w5ehtNbNGY5nZBFYAI+/o+6hT0U9RKO0RURU5MTbcEHkGBrSXGWMN8 cuQotu6gpr2aMQRH+lRwWyYYB2X2pYS92j6lv3ZCu9A1C1Y4oq4aLiJ8e/dl1VhBEa4a uEOw== 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=cXsl8K69JzalSB2xQA7UvLQESojgeiH/68uvr7z1d5w=; b=toEJLmN/xlnjkkkrcR1sCwab2mkq7AQJ5/O3DFjXwVDxEwZbuUG5GAhtfoqlQlzDkr 6RZ8xjUqQNZbgOKybiPBYIpj5b5KzXJgd5GaVAjBIJY1qjWX9yxR6HOwRcwVdNA/vumD pcYTe/uXXmNLL7Waawp++TdYLUC9JUthF7wOLU775IJcmfStgdefwnE919yLB2VmEiEX 4es6wkp8b9wcDvi15sZJUpllIg9kzYtX1vUY1GdEEHSS8cjEIl+vjrjpGXSjEXAUH/51 pGTBA+TtXCU3hKNBqodEpZaFaqC7PTWOwJebqvww5cZFjC/jP580FLaOnyeNGLZu6+jy leiQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=AqmTaN3I; 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=QUARANTINE sp=QUARANTINE dis=NONE) header.from=collabora.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id s11-20020aa78bcb000000b006275349409bsi1910031pfd.331.2023.03.31.01.28.03; Fri, 31 Mar 2023 01:28:15 -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=@collabora.com header.s=mail header.b=AqmTaN3I; 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=QUARANTINE sp=QUARANTINE dis=NONE) header.from=collabora.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231526AbjCaIMu (ORCPT + 99 others); Fri, 31 Mar 2023 04:12:50 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59908 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231514AbjCaIMo (ORCPT ); Fri, 31 Mar 2023 04:12:44 -0400 Received: from madras.collabora.co.uk (madras.collabora.co.uk [IPv6:2a00:1098:0:82:1000:25:2eeb:e5ab]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 12D371CB95; Fri, 31 Mar 2023 01:12:38 -0700 (PDT) Received: from localhost (unknown [188.27.34.213]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: cristicc) by madras.collabora.co.uk (Postfix) with ESMTPSA id 0B0FB6603192; Fri, 31 Mar 2023 09:12:37 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1680250357; bh=Y7oSt7LHrx9myPMASvNWicWMTibK+y7MUMmEnZAfOWo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=AqmTaN3IUuFYtvlhQTn6yr2mNzuIxBnazGEUz0mrNNVYZgJTCWCubZo/2qdtSRm+6 DgMdY+TYVHrQ6rMB0C4Q0vJSAZmpjPt/nxaqRzBt9JWigliPHWfXzpv9RU5WjuEiOJ +tfjp9gRe9NQSjdSe9wM7Z2jw7wjKIogMrxdxdNnUHv71vQtHf5C97d4CeRoZOcEXA tVExF+AlokoPjzWCpZi0peZ4N8FW2XvciEuBGtO6xZDbWMaT7gmBrZmFwOgEsW3gCu JznXOw+PdlPc87uYvGF36I198N2roNRAbnIHxicSOV37TlqgoFct/ACG82eJKalhO3 ro3aCj/M4fwjw== From: Cristian Ciocaltea To: Rob Herring , Krzysztof Kozlowski , Heiko Stuebner , Nicolas Frattaroli Cc: devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org, kernel@collabora.com Subject: [PATCH v3 2/4] arm64: dts: rockchip: rk3588s: Add I2S nodes Date: Fri, 31 Mar 2023 11:12:24 +0300 Message-Id: <20230331081226.245881-3-cristian.ciocaltea@collabora.com> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230331081226.245881-1-cristian.ciocaltea@collabora.com> References: <20230331081226.245881-1-cristian.ciocaltea@collabora.com> MIME-Version: 1.0 X-Spam-Status: No, score=-0.2 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,DKIM_VALID_EF,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 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?1761871182238263758?= X-GMAIL-MSGID: =?utf-8?q?1761871182238263758?= There are five I2S/PCM/TDM controllers and two I2S/PCM controllers embedded in the RK3588 and RK3588S SoCs. Add the DT nodes corresponding to the above mentioned Rockchip controllers. Also note RK3588 SoC contains four additional I2S/PCM/TDM controllers, which are handled via a separate patch. Signed-off-by: Cristian Ciocaltea --- arch/arm64/boot/dts/rockchip/rk3588s.dtsi | 148 ++++++++++++++++++++++ 1 file changed, 148 insertions(+) diff --git a/arch/arm64/boot/dts/rockchip/rk3588s.dtsi b/arch/arm64/boot/dts/rockchip/rk3588s.dtsi index 14615d1df03c..8d48ac6809f4 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588s.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588s.dtsi @@ -819,6 +819,57 @@ power-domain@RK3588_PD_SDMMC { }; }; + i2s4_8ch: i2s@fddc0000 { + compatible = "rockchip,rk3588-i2s-tdm"; + reg = <0x0 0xfddc0000 0x0 0x1000>; + interrupts = ; + clocks = <&cru MCLK_I2S4_8CH_TX>, <&cru MCLK_I2S4_8CH_TX>, <&cru HCLK_I2S4_8CH>; + clock-names = "mclk_tx", "mclk_rx", "hclk"; + assigned-clocks = <&cru CLK_I2S4_8CH_TX_SRC>; + assigned-clock-parents = <&cru PLL_AUPLL>; + dmas = <&dmac2 0>; + dma-names = "tx"; + power-domains = <&power RK3588_PD_VO0>; + resets = <&cru SRST_M_I2S4_8CH_TX>; + reset-names = "tx-m"; + #sound-dai-cells = <0>; + status = "disabled"; + }; + + i2s5_8ch: i2s@fddf0000 { + compatible = "rockchip,rk3588-i2s-tdm"; + reg = <0x0 0xfddf0000 0x0 0x1000>; + interrupts = ; + clocks = <&cru MCLK_I2S5_8CH_TX>, <&cru MCLK_I2S5_8CH_TX>, <&cru HCLK_I2S5_8CH>; + clock-names = "mclk_tx", "mclk_rx", "hclk"; + assigned-clocks = <&cru CLK_I2S5_8CH_TX_SRC>; + assigned-clock-parents = <&cru PLL_AUPLL>; + dmas = <&dmac2 2>; + dma-names = "tx"; + power-domains = <&power RK3588_PD_VO1>; + resets = <&cru SRST_M_I2S5_8CH_TX>; + reset-names = "tx-m"; + #sound-dai-cells = <0>; + status = "disabled"; + }; + + i2s9_8ch: i2s@fddfc000 { + compatible = "rockchip,rk3588-i2s-tdm"; + reg = <0x0 0xfddfc000 0x0 0x1000>; + interrupts = ; + clocks = <&cru MCLK_I2S9_8CH_RX>, <&cru MCLK_I2S9_8CH_RX>, <&cru HCLK_I2S9_8CH>; + clock-names = "mclk_tx", "mclk_rx", "hclk"; + assigned-clocks = <&cru CLK_I2S9_8CH_RX_SRC>; + assigned-clock-parents = <&cru PLL_AUPLL>; + dmas = <&dmac2 23>; + dma-names = "rx"; + power-domains = <&power RK3588_PD_VO1>; + resets = <&cru SRST_M_I2S9_8CH_RX>; + reset-names = "rx-m"; + #sound-dai-cells = <0>; + status = "disabled"; + }; + qos_gpu_m0: qos@fdf35000 { compatible = "rockchip,rk3588-qos", "syscon"; reg = <0x0 0xfdf35000 0x0 0x20>; @@ -1141,6 +1192,103 @@ sdhci: mmc@fe2e0000 { status = "disabled"; }; + i2s0_8ch: i2s@fe470000 { + compatible = "rockchip,rk3588-i2s-tdm"; + reg = <0x0 0xfe470000 0x0 0x1000>; + interrupts = ; + clocks = <&cru MCLK_I2S0_8CH_TX>, <&cru MCLK_I2S0_8CH_RX>, <&cru HCLK_I2S0_8CH>; + clock-names = "mclk_tx", "mclk_rx", "hclk"; + assigned-clocks = <&cru CLK_I2S0_8CH_TX_SRC>, <&cru CLK_I2S0_8CH_RX_SRC>; + assigned-clock-parents = <&cru PLL_AUPLL>, <&cru PLL_AUPLL>; + dmas = <&dmac0 0>, <&dmac0 1>; + dma-names = "tx", "rx"; + power-domains = <&power RK3588_PD_AUDIO>; + resets = <&cru SRST_M_I2S0_8CH_TX>, <&cru SRST_M_I2S0_8CH_RX>; + reset-names = "tx-m", "rx-m"; + rockchip,trcm-sync-tx-only; + pinctrl-names = "default"; + pinctrl-0 = <&i2s0_lrck + &i2s0_sclk + &i2s0_sdi0 + &i2s0_sdi1 + &i2s0_sdi2 + &i2s0_sdi3 + &i2s0_sdo0 + &i2s0_sdo1 + &i2s0_sdo2 + &i2s0_sdo3>; + #sound-dai-cells = <0>; + status = "disabled"; + }; + + i2s1_8ch: i2s@fe480000 { + compatible = "rockchip,rk3588-i2s-tdm"; + reg = <0x0 0xfe480000 0x0 0x1000>; + interrupts = ; + clocks = <&cru MCLK_I2S1_8CH_TX>, <&cru MCLK_I2S1_8CH_RX>, <&cru HCLK_I2S1_8CH>; + clock-names = "mclk_tx", "mclk_rx", "hclk"; + dmas = <&dmac0 2>, <&dmac0 3>; + dma-names = "tx", "rx"; + resets = <&cru SRST_M_I2S1_8CH_TX>, <&cru SRST_M_I2S1_8CH_RX>; + reset-names = "tx-m", "rx-m"; + rockchip,trcm-sync-tx-only; + pinctrl-names = "default"; + pinctrl-0 = <&i2s1m0_lrck + &i2s1m0_sclk + &i2s1m0_sdi0 + &i2s1m0_sdi1 + &i2s1m0_sdi2 + &i2s1m0_sdi3 + &i2s1m0_sdo0 + &i2s1m0_sdo1 + &i2s1m0_sdo2 + &i2s1m0_sdo3>; + #sound-dai-cells = <0>; + status = "disabled"; + }; + + i2s2_2ch: i2s@fe490000 { + compatible = "rockchip,rk3588-i2s", "rockchip,rk3066-i2s"; + reg = <0x0 0xfe490000 0x0 0x1000>; + interrupts = ; + clocks = <&cru MCLK_I2S2_2CH>, <&cru HCLK_I2S2_2CH>; + clock-names = "i2s_clk", "i2s_hclk"; + assigned-clocks = <&cru CLK_I2S2_2CH_SRC>; + assigned-clock-parents = <&cru PLL_AUPLL>; + dmas = <&dmac1 0>, <&dmac1 1>; + dma-names = "tx", "rx"; + power-domains = <&power RK3588_PD_AUDIO>; + rockchip,trcm-sync-tx-only; + pinctrl-names = "default"; + pinctrl-0 = <&i2s2m1_lrck + &i2s2m1_sclk + &i2s2m1_sdi + &i2s2m1_sdo>; + #sound-dai-cells = <0>; + status = "disabled"; + }; + + i2s3_2ch: i2s@fe4a0000 { + compatible = "rockchip,rk3588-i2s", "rockchip,rk3066-i2s"; + reg = <0x0 0xfe4a0000 0x0 0x1000>; + interrupts = ; + clocks = <&cru MCLK_I2S3_2CH>, <&cru HCLK_I2S3_2CH>; + clock-names = "i2s_clk", "i2s_hclk"; + assigned-clocks = <&cru CLK_I2S3_2CH_SRC>; + assigned-clock-parents = <&cru PLL_AUPLL>; + dmas = <&dmac1 2>, <&dmac1 3>; + dma-names = "tx", "rx"; + power-domains = <&power RK3588_PD_AUDIO>; + rockchip,trcm-sync-tx-only; + pinctrl-names = "default"; + pinctrl-0 = <&i2s3_lrck + &i2s3_sclk + &i2s3_sdi + &i2s3_sdo>; + #sound-dai-cells = <0>; + status = "disabled"; + }; + gic: interrupt-controller@fe600000 { compatible = "arm,gic-v3"; reg = <0x0 0xfe600000 0 0x10000>, /* GICD */ From patchwork Fri Mar 31 08:12:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cristian Ciocaltea X-Patchwork-Id: 77642 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp415248vqo; Fri, 31 Mar 2023 01:54:29 -0700 (PDT) X-Google-Smtp-Source: AKy350YHerxyD88VmtP4kq9Mw3D9XTIfxF34hdYERh/Sp0DbcTuRBmYDeEz/Rwu53rVIV00sVE/l X-Received: by 2002:a17:906:11d6:b0:93b:68a8:a0e0 with SMTP id o22-20020a17090611d600b0093b68a8a0e0mr25279311eja.16.1680252869454; Fri, 31 Mar 2023 01:54:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680252869; cv=none; d=google.com; s=arc-20160816; b=XjRBE4kVIEANHnHlJNm6A5GHCsD6oWj02dh8t8cy9aAsKUDs+/JG60QtSDYRpIlmwG pImlD34agok6yvhjVNikeMYgdWKcb0lVpyeRdapM2k1p3NUODPGODHz7zXX1l9Jt6/VW MZ8cPH/ZLt9euMryVddIjHro1UT7SiB0lwHYY9NPJuq6JCU3xgp6vY6MtfCaffGbpYik Yf2jV8KSEmLFX86Lu9Hr98mrwBFJu7rpFGiXOOiENLrArOqMrFo2VUbtIvewHtKdTHDj KzFJpr9yoom4ibh3s/rR5bupkLbmVi/VHhJxd2wSINHnk3hSAgW+qy3Kd7ljnqg7eLbb /odQ== 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=JirZpLVQowRr9XwnPmjtHEMcE+/kp/DN73T2fU3MBRQ=; b=ElWCTvwxfvjy6nGE+GKa828EfLj6UyGCWjpDZVSWL3VIozi7hRNASV9xru+p+5pOJI kVAajK1PE2iN0pnHLIqcFVl+yBIh67soY+5soaXTLiMc5Y5LbdRDBlEYNuwbnJEimAE2 Vpg8jRTbrAcJm80sWupcT2/Cgcs6Xkix59CfSwICZySmzQzwXzeAsIsrziTpiPNLm4Dt F7QiWE6zpf+5eAdHhl5zkFDLhQvjtenP7FwDoRFE8gfNy9/xYiO3oJ5jk6Xdxbz2RUPt s5hL0w6gY1sRjzJSlMyxZ2Ezchn+WAJPBeXW1kbQaFX4Bd/gg5KMJE13VapllF3P/Tcs c/Xg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=jl6ZovPd; 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=QUARANTINE sp=QUARANTINE dis=NONE) header.from=collabora.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id l10-20020a1709060e0a00b00926e4a8a488si1569758eji.647.2023.03.31.01.54.06; Fri, 31 Mar 2023 01:54:29 -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=@collabora.com header.s=mail header.b=jl6ZovPd; 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=QUARANTINE sp=QUARANTINE dis=NONE) header.from=collabora.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231533AbjCaIMz (ORCPT + 99 others); Fri, 31 Mar 2023 04:12:55 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59880 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231494AbjCaIMs (ORCPT ); Fri, 31 Mar 2023 04:12:48 -0400 Received: from madras.collabora.co.uk (madras.collabora.co.uk [IPv6:2a00:1098:0:82:1000:25:2eeb:e5ab]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A997A1D842; Fri, 31 Mar 2023 01:12:40 -0700 (PDT) Received: from localhost (unknown [188.27.34.213]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: cristicc) by madras.collabora.co.uk (Postfix) with ESMTPSA id 4B94B6603130; Fri, 31 Mar 2023 09:12:39 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1680250359; bh=VEHW/c/2s4Nzddue0SQRQN8yI6FlgApEF6XFoJ9BplU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=jl6ZovPdDx+rPOAQgtUzYm5GbNL4w2nABSX0veFQXNFGpiD39FK0gh8cf6ZGBfc77 lIwcQAzeDvLrfTNHvpbx6+WXzmms3dk79joh1k3SJBbt4/6Ya1EAmkKoB6QGHujXqe v0wbsiTdQh0JthrbN4Df9srL6CFFX4lansfarSkXutfE51RPJhQ7a1L2MfdP6v864o lfqALpPVPaFn/xPldO+zlyJEHBHGA4n7q/ZJFdgpdW5XUZemt4Xbd+6MjTGEYVo+dU UC4cmVW70CAK3HtVOgWzZKhCBznqebfXHjwyFncLCdH+OTQ9C0/HSsxsTRtyEFaH8q XjuvaGsHyKAmQ== From: Cristian Ciocaltea To: Rob Herring , Krzysztof Kozlowski , Heiko Stuebner , Nicolas Frattaroli Cc: devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org, kernel@collabora.com Subject: [PATCH v3 3/4] arm64: dts: rockchip: rk3588: Add I2S nodes Date: Fri, 31 Mar 2023 11:12:25 +0300 Message-Id: <20230331081226.245881-4-cristian.ciocaltea@collabora.com> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230331081226.245881-1-cristian.ciocaltea@collabora.com> References: <20230331081226.245881-1-cristian.ciocaltea@collabora.com> MIME-Version: 1.0 X-Spam-Status: No, score=-0.2 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,DKIM_VALID_EF,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 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?1761872832502925357?= X-GMAIL-MSGID: =?utf-8?q?1761872832502925357?= In addition to the five I2S/PCM/TDM controllers and the two I2S/PCM controllers shared between the RK3588 and RK3588S SoCs, RK3588 provides another group of four I2S/PCM/TDM controllers. Add the DT nodes corresponding to the additional controllers. Signed-off-by: Cristian Ciocaltea --- arch/arm64/boot/dts/rockchip/rk3588.dtsi | 68 ++++++++++++++++++++++++ 1 file changed, 68 insertions(+) diff --git a/arch/arm64/boot/dts/rockchip/rk3588.dtsi b/arch/arm64/boot/dts/rockchip/rk3588.dtsi index d085e57fbc4c..8be75556af8f 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588.dtsi @@ -7,6 +7,74 @@ #include "rk3588-pinctrl.dtsi" / { + i2s8_8ch: i2s@fddc8000 { + compatible = "rockchip,rk3588-i2s-tdm"; + reg = <0x0 0xfddc8000 0x0 0x1000>; + interrupts = ; + clocks = <&cru MCLK_I2S8_8CH_TX>, <&cru MCLK_I2S8_8CH_TX>, <&cru HCLK_I2S8_8CH>; + clock-names = "mclk_tx", "mclk_rx", "hclk"; + assigned-clocks = <&cru CLK_I2S8_8CH_TX_SRC>; + assigned-clock-parents = <&cru PLL_AUPLL>; + dmas = <&dmac2 22>; + dma-names = "tx"; + power-domains = <&power RK3588_PD_VO0>; + resets = <&cru SRST_M_I2S8_8CH_TX>; + reset-names = "tx-m"; + #sound-dai-cells = <0>; + status = "disabled"; + }; + + i2s6_8ch: i2s@fddf4000 { + compatible = "rockchip,rk3588-i2s-tdm"; + reg = <0x0 0xfddf4000 0x0 0x1000>; + interrupts = ; + clocks = <&cru MCLK_I2S6_8CH_TX>, <&cru MCLK_I2S6_8CH_TX>, <&cru HCLK_I2S6_8CH>; + clock-names = "mclk_tx", "mclk_rx", "hclk"; + assigned-clocks = <&cru CLK_I2S6_8CH_TX_SRC>; + assigned-clock-parents = <&cru PLL_AUPLL>; + dmas = <&dmac2 4>; + dma-names = "tx"; + power-domains = <&power RK3588_PD_VO1>; + resets = <&cru SRST_M_I2S6_8CH_TX>; + reset-names = "tx-m"; + #sound-dai-cells = <0>; + status = "disabled"; + }; + + i2s7_8ch: i2s@fddf8000 { + compatible = "rockchip,rk3588-i2s-tdm"; + reg = <0x0 0xfddf8000 0x0 0x1000>; + interrupts = ; + clocks = <&cru MCLK_I2S7_8CH_RX>, <&cru MCLK_I2S7_8CH_RX>, <&cru HCLK_I2S7_8CH>; + clock-names = "mclk_tx", "mclk_rx", "hclk"; + assigned-clocks = <&cru CLK_I2S7_8CH_RX_SRC>; + assigned-clock-parents = <&cru PLL_AUPLL>; + dmas = <&dmac2 21>; + dma-names = "rx"; + power-domains = <&power RK3588_PD_VO1>; + resets = <&cru SRST_M_I2S7_8CH_RX>; + reset-names = "rx-m"; + #sound-dai-cells = <0>; + status = "disabled"; + }; + + i2s10_8ch: i2s@fde00000 { + compatible = "rockchip,rk3588-i2s-tdm"; + reg = <0x0 0xfde00000 0x0 0x1000>; + interrupts = ; + clocks = <&cru MCLK_I2S10_8CH_RX>, <&cru MCLK_I2S10_8CH_RX>, <&cru HCLK_I2S10_8CH>; + clock-names = "mclk_tx", "mclk_rx", "hclk"; + assigned-clocks = <&cru CLK_I2S10_8CH_RX_SRC>; + assigned-clock-parents = <&cru PLL_AUPLL>; + dmas = <&dmac2 24>; + dma-names = "rx"; + power-domains = <&power RK3588_PD_VO1>; + resets = <&cru SRST_M_I2S10_8CH_RX>; + reset-names = "rx-m"; + #sound-dai-cells = <0>; + status = "disabled"; + }; + gmac0: ethernet@fe1b0000 { compatible = "rockchip,rk3588-gmac", "snps,dwmac-4.20a"; reg = <0x0 0xfe1b0000 0x0 0x10000>; From patchwork Fri Mar 31 08:12:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cristian Ciocaltea X-Patchwork-Id: 77619 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp406241vqo; Fri, 31 Mar 2023 01:30:47 -0700 (PDT) X-Google-Smtp-Source: AKy350ZtkiOUZ7iJfqCQQZV5fUKUo8C8urX5slFsekqifZtT0A+YzjLnGgofqlUKd21CMIDw3z2+ X-Received: by 2002:a17:902:f543:b0:1a1:ce5d:5a15 with SMTP id h3-20020a170902f54300b001a1ce5d5a15mr29006763plf.50.1680251446972; Fri, 31 Mar 2023 01:30:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680251446; cv=none; d=google.com; s=arc-20160816; b=WbNR7JcTkNEEFvjVTmL1Oq1ktwsucAkhRq8g4J5ZhsB8WjKLlwkp223Zmy2v6P2dxc QT+D7jXe+2b7rGURF3Aam4Q7DDYN3RKi5MSBDWHrGnuuscdmp0CcJM4GFR7EOV9+tBsd P2BrU7BL0uohDT0mLHA76tr8aF+38hTKNMQAlnP6H/ExYgg5R1JSZxkdqWuujm9eNnXt KAzrQgMjACzocjLLaRovqVmKCroRT//20e3rZ1Rh8zMMqfQFLNOU49YdLmKdqdjzBb0y ehHk+M+z85pn/PO61SudliSePZmzvpcfYnVCC4zB9BQXEp/wpRC5ZL1id5LAppLUmm7/ VqPw== 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=ERHLqYOak3PribhDtDxY6bXVcyH/JJNOSe11G9Wp/FY=; b=eUuYGVDoFU4mv1vI4s2CzO5pYvDoPnNs718XQZeFwsqGHaLI7j5rsncB0pk6SC0eGX FvuALC+PmtlvgtaEf0O2+aKVZOPzknIxPiDCLygyrwu4akmXwoo6keB9b09dN9OA8uG1 8tlb0W0Jw4N12znE2GWdDrwxrZFh+hG2ECfEiQc/CIT9A84jbZA4nZyENI5qso8Bx18N RRUvb3J3PxYf4iq/9qLhXAPnH0KK21bPp3ZSZ0Ekg5NK/i9vHcyoFNt/Fhbmnc2eVN0z VkRnHXfyUmYxQjI7N5AamB63LSs2hzr4P8VxhlwsEl3GqKKQtlBXO3eN/TrPnwata5C0 XF+w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=KRHNEPxX; 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=QUARANTINE sp=QUARANTINE dis=NONE) header.from=collabora.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id x10-20020a17090300ca00b0019aa8d665bdsi1563551plc.71.2023.03.31.01.30.23; Fri, 31 Mar 2023 01:30:46 -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=@collabora.com header.s=mail header.b=KRHNEPxX; 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=QUARANTINE sp=QUARANTINE dis=NONE) header.from=collabora.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231522AbjCaING (ORCPT + 99 others); Fri, 31 Mar 2023 04:13:06 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60440 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231560AbjCaIM4 (ORCPT ); Fri, 31 Mar 2023 04:12:56 -0400 Received: from madras.collabora.co.uk (madras.collabora.co.uk [IPv6:2a00:1098:0:82:1000:25:2eeb:e5ab]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 581551D846; Fri, 31 Mar 2023 01:12:43 -0700 (PDT) Received: from localhost (unknown [188.27.34.213]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: cristicc) by madras.collabora.co.uk (Postfix) with ESMTPSA id EC8286603190; Fri, 31 Mar 2023 09:12:41 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1680250362; bh=kJdtSesynjBrpuEEDEDtpj5X9IcAxkUH0Y/1s8Txv6c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=KRHNEPxXJgDW42ZL6xjOam7Ng8ZJw4lK/reZfB2L5MsVxAu9TC26eSxzVdWgU71K7 mwYRRanAjSsDcDNsPcmin6l5+Aix7vCZt36Kcui37k6UkgiOTbYE6o9GnyGsICcKjw PQMHm1SJxANqY6vzt3Nuyd4r1j8ZvnSbI3DVzsQwSjz7BQ/R2BSdkGBhpCO8TJ1AmP ZjufTnfLbT+Vyi4wxd0MfRdAqSo6SuyjsV5xc4bTiQVvU2FtzNYvr4SLxhGfjpJJf3 XWKbWkOYNmkfVKbGjqXIBthX2QuATSRrorSFBlbGDoGuSzdK6aDWr0ajYIabf9v+Av O43jUxd+W/Y5w== From: Cristian Ciocaltea To: Rob Herring , Krzysztof Kozlowski , Heiko Stuebner , Nicolas Frattaroli Cc: devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org, kernel@collabora.com Subject: [PATCH v3 4/4] arm64: dts: rockchip: rk3588-rock-5b: Add analog audio Date: Fri, 31 Mar 2023 11:12:26 +0300 Message-Id: <20230331081226.245881-5-cristian.ciocaltea@collabora.com> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230331081226.245881-1-cristian.ciocaltea@collabora.com> References: <20230331081226.245881-1-cristian.ciocaltea@collabora.com> MIME-Version: 1.0 X-Spam-Status: No, score=-0.2 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,DKIM_VALID_EF,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 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?1761871341281952479?= X-GMAIL-MSGID: =?utf-8?q?1761871341281952479?= Add the necessary DT nodes for the Rock 5B board to enable the analog audio support provided by the Everest Semi ES8316 codec. Signed-off-by: Cristian Ciocaltea --- .../boot/dts/rockchip/rk3588-rock-5b.dts | 62 +++++++++++++++++++ 1 file changed, 62 insertions(+) diff --git a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts index 95805cb0adfa..a9e12e098d48 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts @@ -2,6 +2,7 @@ /dts-v1/; +#include #include "rk3588.dtsi" / { @@ -17,6 +18,23 @@ chosen { stdout-path = "serial2:1500000n8"; }; + sound { + compatible = "audio-graph-card"; + label = "Analog"; + + widgets = "Microphone", "Mic Jack", + "Headphone", "Headphones"; + + routing = "MIC2", "Mic Jack", + "Headphones", "HPOL", + "Headphones", "HPOR"; + + dais = <&i2s0_8ch_p0>; + hp-det-gpio = <&gpio1 RK_PD5 GPIO_ACTIVE_HIGH>; + pinctrl-names = "default"; + pinctrl-0 = <&hp_detect>; + }; + vcc5v0_sys: vcc5v0-sys-regulator { compatible = "regulator-fixed"; regulator-name = "vcc5v0_sys"; @@ -27,6 +45,50 @@ vcc5v0_sys: vcc5v0-sys-regulator { }; }; +&i2c7 { + status = "okay"; + + es8316: es8316@11 { + compatible = "everest,es8316"; + reg = <0x11>; + clocks = <&cru I2S0_8CH_MCLKOUT>; + clock-names = "mclk"; + #sound-dai-cells = <0>; + + port { + es8316_p0_0: endpoint { + remote-endpoint = <&i2s0_8ch_p0_0>; + }; + }; + }; +}; + +&i2s0_8ch { + pinctrl-names = "default"; + pinctrl-0 = <&i2s0_lrck + &i2s0_mclk + &i2s0_sclk + &i2s0_sdi0 + &i2s0_sdo0>; + status = "okay"; + + i2s0_8ch_p0: port { + i2s0_8ch_p0_0: endpoint { + dai-format = "i2s"; + mclk-fs = <256>; + remote-endpoint = <&es8316_p0_0>; + }; + }; +}; + +&pinctrl { + sound { + hp_detect: hp-detect { + rockchip,pins = <1 RK_PD5 RK_FUNC_GPIO &pcfg_pull_none>; + }; + }; +}; + &sdhci { bus-width = <8>; no-sdio;