From mboxrd@z Thu Jan 1 00:00:00 1970 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 C16B0C433FE for ; Sun, 23 Oct 2022 09:47:26 +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=g+bdlVlLukdTE4JbL8tg1uNrOgkri6OGvDhq3H4VxuU=; b=wD9KYRAdhHNpH8 Inp8wVBHjEjnzEE1+mw9tTILjVC0b9YtCNuVH1fpiHFzT2ydwWVqD/BruVlwSIO+rOYp3hMoYY841 H+mB2Q6PbBZU+aeqFzV6gHBBfLlCSBVwo6NkGO4M3HFVpS1AV8ZsuPZMgueW88bSyxI2D6Obgq4Ue aVkSK1/zZ9yWPeBXe+gYLTXN9oCmhMVWxlS86X4KWRIW6HYM8H2C1cdgm4qWFK4f9705qdo6dD7SR xiZ6wwRnV1Ehgl6te2dNPgNnaoM9g9MQYKUpXx6xeaBFZsuYA/HPQKsoMcWNUoWnGDamHlN4JucdB oPd/QR3hra+kaM6W+3NA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1omXZZ-00EsII-KH; Sun, 23 Oct 2022 09:47:13 +0000 Received: from gloria.sntech.de ([185.11.138.130]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1omXZO-00EsFb-Mh; Sun, 23 Oct 2022 09:47:04 +0000 Received: from ip5b412258.dynamic.kabel-deutschland.de ([91.65.34.88] helo=diego.localnet) by gloria.sntech.de with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1omXZA-0002uP-4D; Sun, 23 Oct 2022 11:46:48 +0200 From: Heiko =?ISO-8859-1?Q?St=FCbner?= To: robh+dt@kernel.org, krzysztof.kozlowski+dt@linaro.org, michael.riesch@wolfvision.net, s.hauer@pengutronix.de, pgwipeout@gmail.com, frattaroli.nicolas@gmail.com, frank-w@public-files.de, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, Shengyu Qu Cc: Shengyu Qu Subject: Re: [RESEND PATCH v3] arm64: dts: rockchip: Add support for RADXA SDIO Wifi/BT M.2 ekey module for rock 3a Date: Sun, 23 Oct 2022 11:46:47 +0200 Message-ID: <6001384.lOV4Wx5bFT@diego> In-Reply-To: References: MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20221023_024702_770915_9BAECCCB X-CRM114-Status: GOOD ( 19.31 ) X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+linux-rockchip=archiver.kernel.org@lists.infradead.org Hi Shengyu Qu, Am Samstag, 22. Oktober 2022, 21:34:12 CEST schrieb Shengyu Qu: > Tested with RADXA A6 module, which uses AP6275S (BCM43752A2) > > Changes in v2: > - Fix SDMMC2 vmmc/vqmmc supply configuration > > Changes in v3: > - Fix UART1 vbat/vddio supply configuration > > Signed-off-by: Shengyu Qu the patch below contains a number of unlerated changes that want to be split into multiple ones. So you want 3 separate patches in total. - add the i2s controller to rk356x.dtso - add the i2s enablement to the rock3a (also please specify where it leads to as in the patch below only enables the i2s2_2ch without anything using it) - add the wifi controller with its nodes, Regards Heiko > --- > .../boot/dts/rockchip/rk3568-rock-3a.dts | 80 +++++++++++++++++++ > arch/arm64/boot/dts/rockchip/rk356x.dtsi | 22 +++++ > 2 files changed, 102 insertions(+) > > diff --git a/arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts b/arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts > index 6b5093a1a6cf..37676e8a258c 100644 > --- a/arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts > +++ b/arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts > @@ -60,6 +60,23 @@ simple-audio-card,codec { > }; > }; > > + sdio_pwrseq: sdio-pwrseq { > + compatible = "mmc-pwrseq-simple"; > + clocks = <&rk809 1>; > + clock-names = "ext_clock"; > + pinctrl-names = "default"; > + pinctrl-0 = <&wifi_enable>; > + post-power-on-delay-ms = <100>; > + power-off-delay-us = <5000000>; > + > + /* On the module itself this is one of these (depending on the actual > + * card populated): > + * - SDIO_RESET_L_WL_REG_ON > + * - PDN (power down when low) > + */ > + reset-gpios = <&gpio3 RK_PD4 GPIO_ACTIVE_LOW>; > + }; > + > vcc12v_dcin: vcc12v-dcin { > compatible = "regulator-fixed"; > regulator-name = "vcc12v_dcin"; > @@ -449,6 +466,11 @@ &i2s1_8ch { > status = "okay"; > }; > > +&i2s2_2ch { > + rockchip,trcm-sync-tx-only; > + status = "okay"; > +}; > + > &mdio1 { > rgmii_phy1: ethernet-phy@0 { > compatible = "ethernet-phy-ieee802.3-c22"; > @@ -492,6 +514,26 @@ vcc5v0_usb_otg_en: vcc5v0_usb_otg_en { > rockchip,pins = <0 RK_PA5 RK_FUNC_GPIO &pcfg_pull_none>; > }; > }; > + > + bt { > + bt_enable: bt_enable { > + rockchip,pins = <4 RK_PB2 RK_FUNC_GPIO &pcfg_pull_none>; > + }; > + > + bt_host_wake: bt_host_wake { > + rockchip,pins = <4 RK_PB4 RK_FUNC_GPIO &pcfg_pull_down>; > + }; > + > + bt_wake: bt_wake { > + rockchip,pins = <4 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>; > + }; > + }; > + > + sdio-pwrseq { > + wifi_enable: wifi_enable { > + rockchip,pins = <3 RK_PD4 RK_FUNC_GPIO &pcfg_pull_none>; > + }; > + }; > }; > > &pmu_io_domains { > @@ -536,12 +578,50 @@ &sdmmc0 { > status = "okay"; > }; > > +&sdmmc2 { > + supports-sdio; > + bus-width = <4>; > + disable-wp; > + cap-sd-highspeed; > + cap-sdio-irq; > + keep-power-in-suspend; > + mmc-pwrseq = <&sdio_pwrseq>; > + non-removable; > + pinctrl-names = "default"; > + pinctrl-0 = <&sdmmc2m0_bus4 &sdmmc2m0_cmd &sdmmc2m0_clk>; > + sd-uhs-sdr104; > + vmmc-supply = <&vcc3v3_sys>; > + vqmmc-supply = <&vcc_1v8>; > + status = "okay"; > +}; > + > &tsadc { > rockchip,hw-tshut-mode = <1>; > rockchip,hw-tshut-polarity = <0>; > status = "okay"; > }; > > +&uart1 { > + pinctrl-names = "default"; > + pinctrl-0 = <&uart1m0_xfer &uart1m0_ctsn &uart1m0_rtsn>; > + uart-has-rtscts; > + status = "okay"; > + > + bluetooth { > + compatible = "brcm,bcm43438-bt"; > + clocks = <&rk809 1>; > + clock-names = "lpo"; > + device-wakeup-gpios = <&gpio4 RK_PB5 GPIO_ACTIVE_HIGH>; > + host-wakeup-gpios = <&gpio4 RK_PB4 GPIO_ACTIVE_HIGH>; > + shutdown-gpios = <&gpio4 RK_PB2 GPIO_ACTIVE_HIGH>; > + pinctrl-names = "default"; > + pinctrl-0 = <&bt_host_wake &bt_wake &bt_enable>; > + vbat-supply = <&vcc3v3_sys>; > + vddio-supply = <&vcc_1v8>; > + /* vddio comes from regulator inside module, use IO voltage instead */ > + }; > +}; > + > &uart2 { > status = "okay"; > }; > diff --git a/arch/arm64/boot/dts/rockchip/rk356x.dtsi b/arch/arm64/boot/dts/rockchip/rk356x.dtsi > index 319981c3e9f7..73df56107db4 100644 > --- a/arch/arm64/boot/dts/rockchip/rk356x.dtsi > +++ b/arch/arm64/boot/dts/rockchip/rk356x.dtsi > @@ -1009,6 +1009,28 @@ &i2s1m0_sdo0 &i2s1m0_sdo1 > status = "disabled"; > }; > > + i2s2_2ch: i2s@fe420000 { > + compatible = "rockchip,rk3568-i2s-tdm"; > + reg = <0x0 0xfe420000 0x0 0x1000>; > + interrupts = ; > + assigned-clocks = <&cru CLK_I2S2_2CH_SRC>; > + assigned-clock-rates = <1188000000>; > + clocks = <&cru MCLK_I2S2_2CH>, <&cru MCLK_I2S2_2CH>, <&cru HCLK_I2S2_2CH>; > + clock-names = "mclk_tx", "mclk_rx", "hclk"; > + dmas = <&dmac1 4>, <&dmac1 5>; > + dma-names = "tx", "rx"; > + resets = <&cru SRST_M_I2S2_2CH>; > + reset-names = "m"; > + rockchip,grf = <&grf>; > + pinctrl-names = "default"; > + pinctrl-0 = <&i2s2m0_sclktx > + &i2s2m0_lrcktx > + &i2s2m0_sdi > + &i2s2m0_sdo>; > + #sound-dai-cells = <0>; > + status = "disabled"; > + }; > + > i2s3_2ch: i2s@fe430000 { > compatible = "rockchip,rk3568-i2s-tdm"; > reg = <0x0 0xfe430000 0x0 0x1000>; > _______________________________________________ Linux-rockchip mailing list Linux-rockchip@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-rockchip