From: Chris Morgan <macroalpha82@gmail.com>
To: linux-rockchip@lists.infradead.org
Cc: devicetree@vger.kernel.org, sebastian.reichel@collabora.com,
damon.ding@rock-chips.com, jbx6244@gmail.com, heiko@sntech.de,
conor+dt@kernel.org, krzk+dt@kernel.org, robh@kernel.org,
Chris Morgan <macromorgan@hotmail.com>
Subject: [PATCH 2/5] arm64: dts: rockchip: Add Additional pinctrl defs for Indiedroid Nova
Date: Wed, 5 Nov 2025 14:57:05 -0600 [thread overview]
Message-ID: <20251105205708.732125-3-macroalpha82@gmail.com> (raw)
In-Reply-To: <20251105205708.732125-1-macroalpha82@gmail.com>
From: Chris Morgan <macromorgan@hotmail.com>
Define the pinctrl nodes for the WiFi interrupts, correct the pinctrl
for the ethernet according to the schematic, and add the clk32k_in
control for the RTC. Add the correct regulator mapping for the PCIE
too.
Signed-off-by: Chris Morgan <macromorgan@hotmail.com>
---
.../dts/rockchip/rk3588s-indiedroid-nova.dts | 43 ++++++++++++-------
1 file changed, 28 insertions(+), 15 deletions(-)
diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-indiedroid-nova.dts b/arch/arm64/boot/dts/rockchip/rk3588s-indiedroid-nova.dts
index debab7732b71..f40782b6c7db 100644
--- a/arch/arm64/boot/dts/rockchip/rk3588s-indiedroid-nova.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3588s-indiedroid-nova.dts
@@ -406,7 +406,7 @@ rtc_hym8563: rtc@51 {
clock-output-names = "hym8563";
interrupt-parent = <&gpio0>;
interrupts = <RK_PB0 IRQ_TYPE_LEVEL_LOW>;
- pinctrl-0 = <&hym8563_int>;
+ pinctrl-0 = <&hym8563_int>, <&clk32k_in>;
pinctrl-names = "default";
wakeup-source;
};
@@ -459,8 +459,11 @@ &i2s5_8ch {
};
&pcie2x1l2 {
- pinctrl-0 = <&rtl8111_perstb>;
+ pinctrl-0 = <&pcie20x1m0_perstn>, <&pcie20x1m0_clkreqn>,
+ <&pcie20x1m0_waken>;
pinctrl-names = "default";
+ reset-gpios = <&gpio3 RK_PD1 GPIO_ACTIVE_HIGH>;
+ vpcie3v3-supply = <&vcc_3v3_s3>;
status = "okay";
};
@@ -486,12 +489,6 @@ bt_wake_host: bt-wake-host {
};
};
- ethernet-pins {
- rtl8111_perstb: rtl8111-perstb {
- rockchip,pins = <3 RK_PD1 RK_FUNC_GPIO &pcfg_pull_up>;
- };
- };
-
hym8563 {
hym8563_int: hym8563-int {
@@ -500,13 +497,6 @@ hym8563_int: hym8563-int {
};
};
- sdio-pwrseq {
- wifi_enable_h: wifi-enable-h {
- rockchip,pins =
- <0 RK_PC7 RK_FUNC_GPIO &pcfg_pull_none>;
- };
- };
-
usb-typec {
usbc0_int: usbc0-int {
rockchip,pins =
@@ -518,6 +508,18 @@ typec5v_pwren: typec5v-pwren {
<4 RK_PA5 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
+
+ wifi {
+ wifi_enable_h: wifi-enable-h {
+ rockchip,pins =
+ <0 RK_PC7 RK_FUNC_GPIO &pcfg_pull_none>;
+ };
+
+ wifi_host_wake_irq: wifi-host-wake-irq {
+ rockchip,pins =
+ <0 RK_PA0 RK_FUNC_GPIO &pcfg_pull_down>;
+ };
+ };
};
&saradc {
@@ -538,6 +540,7 @@ &sdhci {
};
&sdio {
+ #address-cells = <1>;
bus-width = <4>;
cap-sd-highspeed;
cap-sdio-irq;
@@ -549,9 +552,19 @@ &sdio {
no-sd;
non-removable;
sd-uhs-sdr104;
+ #size-cells = <0>;
vmmc-supply = <&vcc_3v3_s3>;
vqmmc-supply = <&vcc_1v8_s3>;
status = "okay";
+
+ sdio_wifi: wifi@1 {
+ reg = <1>;
+ interrupt-parent = <&gpio0>;
+ interrupts = <RK_PA0 IRQ_TYPE_LEVEL_LOW>;
+ interrupt-names = "host-wake";
+ pinctrl-0 = <&wifi_host_wake_irq>;
+ pinctrl-names = "default";
+ };
};
&sdmmc {
--
2.43.0
next prev parent reply other threads:[~2025-11-05 20:59 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-11-05 20:57 [PATCH 0/5] Indiedroid Nova Devicetree Updates Chris Morgan
2025-11-05 20:57 ` [PATCH 1/5] arm64: dts: rockchip: Add device type for Indiedroid Nova Chris Morgan
2025-11-05 20:57 ` Chris Morgan [this message]
2025-11-06 19:45 ` [PATCH 2/5] arm64: dts: rockchip: Add Additional pinctrl defs " Heiko Stuebner
2025-11-06 23:45 ` Chris Morgan
2025-11-05 20:57 ` [PATCH 3/5] arm64: dts: rockchip: enable NPU on " Chris Morgan
2025-11-05 20:57 ` [PATCH 4/5] arm64: dts: rockchip: Enable HS400 for " Chris Morgan
2025-11-05 23:18 ` Heiko Stuebner
2025-11-06 1:06 ` Chris Morgan
2025-11-05 20:57 ` [PATCH 5/5] arm64: dts: rockchip: Fix DMA for Indiedroid Nova Bluetooth Chris Morgan
2025-11-06 22:58 ` (subset) [PATCH 0/5] Indiedroid Nova Devicetree Updates Heiko Stuebner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20251105205708.732125-3-macroalpha82@gmail.com \
--to=macroalpha82@gmail.com \
--cc=conor+dt@kernel.org \
--cc=damon.ding@rock-chips.com \
--cc=devicetree@vger.kernel.org \
--cc=heiko@sntech.de \
--cc=jbx6244@gmail.com \
--cc=krzk+dt@kernel.org \
--cc=linux-rockchip@lists.infradead.org \
--cc=macromorgan@hotmail.com \
--cc=robh@kernel.org \
--cc=sebastian.reichel@collabora.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).