From nobody Wed Feb 11 10:14:02 2026 Received: from smtp.forwardemail.net (smtp.forwardemail.net [167.172.40.54]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6F08C149DE5 for ; Tue, 21 May 2024 21:11:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=167.172.40.54 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1716325915; cv=none; b=jOiC6MaNS4EIte9y3/zJe/+FqjS7/bi5fpse7VGJl8S68tRwjVfKROg6bxepsWNPxWmjbFyGFUX9bvOOvR8G4Lmzo4FkYlZR91sNaiUP4ActL2R0iEZHX0135VKkgF7hYeeNUlDGA6U1iGICNjDNyyFqMHAs0wJSydoEOiBzLi0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1716325915; c=relaxed/simple; bh=vgUPXlXlmK6yjMF3YOYZke5ISs5p8Y4/YiJ42OIkdKA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=f6UOPuMGCtvj6ayQu3rT5CvPvgiKqF757Ypt1w7nijVga7L47eu2P6Uz+7ZRY3SuesXhgMx8bgMqe7CPyzj0vgAqLHIcnL9YA5GxN+zbVHopMAi84dgaBsxv1rgCTLA6x4x8orx1bMelfQNOUZl7Ey7Cig+9DeiSvVdwK1OXq+k= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=kwiboo.se; spf=pass smtp.mailfrom=fe-bounces.kwiboo.se; dkim=pass (2048-bit key) header.d=kwiboo.se header.i=@kwiboo.se header.b=a2QKBYdf; arc=none smtp.client-ip=167.172.40.54 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=kwiboo.se Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=fe-bounces.kwiboo.se Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kwiboo.se header.i=@kwiboo.se header.b="a2QKBYdf" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kwiboo.se; h=Content-Transfer-Encoding: MIME-Version: References: In-Reply-To: Message-ID: Date: Subject: Cc: To: From; q=dns/txt; s=fe-e1b5cab7be; t=1716325892; bh=e2XmCYKg+DEbJTHFYQfWLLGn67ZCrbca5etc71lmhE0=; b=a2QKBYdf73bmZZFxbhFtjbLuBJKDBig6R3CJ0GyooYRCq7pi9l24NR+ICoNEQ2Z/aLTX5H343 ObHT1orjHzKCipicUScyVQ1J9nlKNw6Bc5LaNSCf9/XsqnRoYn6qMS5ChZK6gCOP83K2KwBOMSg BHc3Tm0JaKuZmvRtI5/sH0hUIPAISkEQg9Iu+DykYNpIUllPofVi+m2r7jE2i995T0/lM0owL2m p61H71yX8ZGejkoJHA4rllkECedTsAHwajM5T4J97syteBuOYCFWK4/IX5SVrsDNYt33oL5OdNl ecTWyiPQf7DztzUL2DyPZgHHcp+fqFZ0lgBH981oKqMg== From: Jonas Karlman To: Heiko Stuebner , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Sjoerd Simons Cc: devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org, Jonas Karlman Subject: [PATCH 13/13] arm64: dts: rockchip: rk3308-rock-pi-s: Update WIFi/BT related nodes Date: Tue, 21 May 2024 21:10:16 +0000 Message-ID: <20240521211029.1236094-14-jonas@kwiboo.se> X-Mailer: git-send-email 2.43.2 In-Reply-To: <20240521211029.1236094-1-jonas@kwiboo.se> References: <20240521211029.1236094-1-jonas@kwiboo.se> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Report-Abuse-To: abuse@forwardemail.net X-Report-Abuse: abuse@forwardemail.net X-Complaints-To: abuse@forwardemail.net X-ForwardEmail-Version: 0.4.40 X-ForwardEmail-Sender: rfc822; jonas@kwiboo.se, smtp.forwardemail.net, 167.172.40.54 X-ForwardEmail-ID: 664d0e018b6b0c828344af8f Content-Type: text/plain; charset="utf-8" Update WiFi SDIO and BT UART related props to better reflect details about the optional onboard RTL8723DS WiFi/BT module. Also correct the compatible used for bluetooth to match the WiFi/BT module used on the board. Fixes: bc3753aed81f ("arm64: dts: rockchip: rock-pi-s add more peripherals") Signed-off-by: Jonas Karlman --- .../boot/dts/rockchip/rk3308-rock-pi-s.dts | 40 +++++++++++++++++-- 1 file changed, 36 insertions(+), 4 deletions(-) diff --git a/arch/arm64/boot/dts/rockchip/rk3308-rock-pi-s.dts b/arch/arm64= /boot/dts/rockchip/rk3308-rock-pi-s.dts index 5c702f00b27f..62d18ca769a1 100644 --- a/arch/arm64/boot/dts/rockchip/rk3308-rock-pi-s.dts +++ b/arch/arm64/boot/dts/rockchip/rk3308-rock-pi-s.dts @@ -17,6 +17,7 @@ aliases { ethernet0 =3D &gmac; mmc0 =3D &emmc; mmc1 =3D &sdmmc; + mmc2 =3D &sdio; }; =20 chosen { @@ -245,6 +246,20 @@ &pinctrl { pinctrl-names =3D "default"; pinctrl-0 =3D <&rtc_32k>; =20 + bluetooth { + bt_reg_on: bt-reg-on { + rockchip,pins =3D <4 RK_PB3 RK_FUNC_GPIO &pcfg_pull_none>; + }; + + bt_wake_host: bt-wake-host { + rockchip,pins =3D <4 RK_PB4 RK_FUNC_GPIO &pcfg_pull_down>; + }; + + host_wake_bt: host-wake-bt { + rockchip,pins =3D <4 RK_PB2 RK_FUNC_GPIO &pcfg_pull_none>; + }; + }; + gmac { mac_rst: mac-rst { rockchip,pins =3D <0 RK_PA7 RK_FUNC_GPIO &pcfg_pull_none>; @@ -294,11 +309,24 @@ &sdio { cap-sd-highspeed; cap-sdio-irq; keep-power-in-suspend; - max-frequency =3D <1000000>; + max-frequency =3D <100000000>; mmc-pwrseq =3D <&sdio_pwrseq>; + no-mmc; + no-sd; non-removable; - sd-uhs-sdr104; + sd-uhs-sdr50; + vmmc-supply =3D <&vcc_io>; + vqmmc-supply =3D <&vcc_1v8>; status =3D "okay"; + + rtl8723ds: wifi@1 { + reg =3D <1>; + interrupt-parent =3D <&gpio0>; + interrupts =3D ; + interrupt-names =3D "host-wake"; + pinctrl-names =3D "default"; + pinctrl-0 =3D <&wifi_host_wake>; + }; }; =20 &sdmmc { @@ -330,12 +358,16 @@ &uart0 { }; =20 &uart4 { + uart-has-rtscts; status =3D "okay"; =20 bluetooth { - compatible =3D "realtek,rtl8723bs-bt"; - device-wake-gpios =3D <&gpio4 RK_PB3 GPIO_ACTIVE_HIGH>; + compatible =3D "realtek,rtl8723ds-bt"; + device-wake-gpios =3D <&gpio4 RK_PB2 GPIO_ACTIVE_HIGH>; + enable-gpios =3D <&gpio4 RK_PB3 GPIO_ACTIVE_HIGH>; host-wake-gpios =3D <&gpio4 RK_PB4 GPIO_ACTIVE_HIGH>; + pinctrl-names =3D "default"; + pinctrl-0 =3D <&bt_reg_on &bt_wake_host &host_wake_bt>; }; }; =20 --=20 2.43.2