devicetree.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH V2 0/4] Indiedroid Nova Devicetree Updates
@ 2025-11-18 22:30 Chris Morgan
  2025-11-18 22:30 ` [PATCH V2 1/4] arm64: dts: rockchip: Add clk32k_in for Indiedroid Nova Chris Morgan
                   ` (4 more replies)
  0 siblings, 5 replies; 6+ messages in thread
From: Chris Morgan @ 2025-11-18 22:30 UTC (permalink / raw)
  To: linux-rockchip
  Cc: devicetree, sebastian.reichel, heiko, conor+dt, krzk+dt, robh,
	Chris Morgan

From: Chris Morgan <macromorgan@hotmail.com>

This series fixes up a few remaining issues with the devicetree for the
Indiedroid Nova. Namely it adds or updates a few pinctrl definitions,
it removes a few workarounds that no longer appear to be necessary for
eMMC and bluetooth, it adds support for the NPU, and it sets the device
type as embedded.

Changes since V1:
 - The device type addition, NPU enablement, HS400 enablement, and DMA
   fixes for bluetooth were accepted as a subset and have been removed
   from this series.
 - The individual changes from the pinctrl fixes have been broken out
   into a series of separate patches.

Chris Morgan (4):
  arm64: dts: rockchip: Add clk32k_in for Indiedroid Nova
  arm64: dts: rockchip: Define regulator for pcie2x1l2
  arm64: dts: rockchip: Correct pinctrl for pcie for Indiedroid Nova
  arm64: dts: rockchip: Add host wake pin for wifi on Indiedroid Nova

 .../dts/rockchip/rk3588s-indiedroid-nova.dts  | 43 ++++++++++++-------
 1 file changed, 28 insertions(+), 15 deletions(-)

-- 
2.43.0


^ permalink raw reply	[flat|nested] 6+ messages in thread

* [PATCH V2 1/4] arm64: dts: rockchip: Add clk32k_in for Indiedroid Nova
  2025-11-18 22:30 [PATCH V2 0/4] Indiedroid Nova Devicetree Updates Chris Morgan
@ 2025-11-18 22:30 ` Chris Morgan
  2025-11-18 22:30 ` [PATCH V2 2/4] arm64: dts: rockchip: Define regulator for pcie2x1l2 Chris Morgan
                   ` (3 subsequent siblings)
  4 siblings, 0 replies; 6+ messages in thread
From: Chris Morgan @ 2025-11-18 22:30 UTC (permalink / raw)
  To: linux-rockchip
  Cc: devicetree, sebastian.reichel, heiko, conor+dt, krzk+dt, robh,
	Chris Morgan

From: Chris Morgan <macromorgan@hotmail.com>

The clk32k_in pin of the SoC is connected to the real time clock
according to the schematics. Set the pin definition on the real
time clock to reflect this.

Signed-off-by: Chris Morgan <macromorgan@hotmail.com>
---
 arch/arm64/boot/dts/rockchip/rk3588s-indiedroid-nova.dts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-indiedroid-nova.dts b/arch/arm64/boot/dts/rockchip/rk3588s-indiedroid-nova.dts
index 769f4a7adf0a..d1cef48bcce5 100644
--- a/arch/arm64/boot/dts/rockchip/rk3588s-indiedroid-nova.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3588s-indiedroid-nova.dts
@@ -430,7 +430,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;
 	};
-- 
2.43.0


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [PATCH V2 2/4] arm64: dts: rockchip: Define regulator for pcie2x1l2
  2025-11-18 22:30 [PATCH V2 0/4] Indiedroid Nova Devicetree Updates Chris Morgan
  2025-11-18 22:30 ` [PATCH V2 1/4] arm64: dts: rockchip: Add clk32k_in for Indiedroid Nova Chris Morgan
@ 2025-11-18 22:30 ` Chris Morgan
  2025-11-18 22:30 ` [PATCH V2 3/4] arm64: dts: rockchip: Correct pinctrl for pcie for Indiedroid Nova Chris Morgan
                   ` (2 subsequent siblings)
  4 siblings, 0 replies; 6+ messages in thread
From: Chris Morgan @ 2025-11-18 22:30 UTC (permalink / raw)
  To: linux-rockchip
  Cc: devicetree, sebastian.reichel, heiko, conor+dt, krzk+dt, robh,
	Chris Morgan

From: Chris Morgan <macromorgan@hotmail.com>

Add the correct regulator defined per the schematics to the PCIE
interface for the Indiedroid Nova.

Signed-off-by: Chris Morgan <macromorgan@hotmail.com>
---
 arch/arm64/boot/dts/rockchip/rk3588s-indiedroid-nova.dts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-indiedroid-nova.dts b/arch/arm64/boot/dts/rockchip/rk3588s-indiedroid-nova.dts
index d1cef48bcce5..1562d02e85d6 100644
--- a/arch/arm64/boot/dts/rockchip/rk3588s-indiedroid-nova.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3588s-indiedroid-nova.dts
@@ -485,6 +485,7 @@ &i2s5_8ch {
 &pcie2x1l2 {
 	pinctrl-0 = <&rtl8111_perstb>;
 	pinctrl-names = "default";
+	vpcie3v3-supply = <&vcc_3v3_s3>;
 	status = "okay";
 };
 
-- 
2.43.0


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [PATCH V2 3/4] arm64: dts: rockchip: Correct pinctrl for pcie for Indiedroid Nova
  2025-11-18 22:30 [PATCH V2 0/4] Indiedroid Nova Devicetree Updates Chris Morgan
  2025-11-18 22:30 ` [PATCH V2 1/4] arm64: dts: rockchip: Add clk32k_in for Indiedroid Nova Chris Morgan
  2025-11-18 22:30 ` [PATCH V2 2/4] arm64: dts: rockchip: Define regulator for pcie2x1l2 Chris Morgan
@ 2025-11-18 22:30 ` Chris Morgan
  2025-11-18 22:30 ` [PATCH V2 4/4] arm64: dts: rockchip: Add host wake pin for wifi on " Chris Morgan
  2025-11-20 22:23 ` [PATCH V2 0/4] Indiedroid Nova Devicetree Updates Heiko Stuebner
  4 siblings, 0 replies; 6+ messages in thread
From: Chris Morgan @ 2025-11-18 22:30 UTC (permalink / raw)
  To: linux-rockchip
  Cc: devicetree, sebastian.reichel, heiko, conor+dt, krzk+dt, robh,
	Chris Morgan

From: Chris Morgan <macromorgan@hotmail.com>

Correct the pin definitions of the PCIE controller on the Indiedroid
Nova according to the schematics. Since GPIO3 D1 is already defined
as a reset pin in the rk3588-base-pinctrl.dtsi file we do not need
a custom definition anymore.

Signed-off-by: Chris Morgan <macromorgan@hotmail.com>
---
 .../boot/dts/rockchip/rk3588s-indiedroid-nova.dts      | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-indiedroid-nova.dts b/arch/arm64/boot/dts/rockchip/rk3588s-indiedroid-nova.dts
index 1562d02e85d6..7233e290d0cf 100644
--- a/arch/arm64/boot/dts/rockchip/rk3588s-indiedroid-nova.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3588s-indiedroid-nova.dts
@@ -483,8 +483,10 @@ &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";
 };
@@ -515,12 +517,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 {
-- 
2.43.0


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [PATCH V2 4/4] arm64: dts: rockchip: Add host wake pin for wifi on Indiedroid Nova
  2025-11-18 22:30 [PATCH V2 0/4] Indiedroid Nova Devicetree Updates Chris Morgan
                   ` (2 preceding siblings ...)
  2025-11-18 22:30 ` [PATCH V2 3/4] arm64: dts: rockchip: Correct pinctrl for pcie for Indiedroid Nova Chris Morgan
@ 2025-11-18 22:30 ` Chris Morgan
  2025-11-20 22:23 ` [PATCH V2 0/4] Indiedroid Nova Devicetree Updates Heiko Stuebner
  4 siblings, 0 replies; 6+ messages in thread
From: Chris Morgan @ 2025-11-18 22:30 UTC (permalink / raw)
  To: linux-rockchip
  Cc: devicetree, sebastian.reichel, heiko, conor+dt, krzk+dt, robh,
	Chris Morgan

From: Chris Morgan <macromorgan@hotmail.com>

Add the pin definition for the host wake interrupt on the Indiedroid
Nova. This necessitates adding a node for the wifi controller to
properly define the interrupt. Additionally, we can consolidate both
pinctrl definitions under a wifi node to note their common functionality.

Signed-off-by: Chris Morgan <macromorgan@hotmail.com>
---
 .../dts/rockchip/rk3588s-indiedroid-nova.dts  | 30 ++++++++++++++-----
 1 file changed, 23 insertions(+), 7 deletions(-)

diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-indiedroid-nova.dts b/arch/arm64/boot/dts/rockchip/rk3588s-indiedroid-nova.dts
index 7233e290d0cf..174d299cc6bb 100644
--- a/arch/arm64/boot/dts/rockchip/rk3588s-indiedroid-nova.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3588s-indiedroid-nova.dts
@@ -525,13 +525,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 =
@@ -543,6 +536,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>;
+		};
+	};
 };
 
 &rknn_core_0 {
@@ -593,6 +598,7 @@ &sdhci {
 };
 
 &sdio {
+	#address-cells = <1>;
 	bus-width = <4>;
 	cap-sd-highspeed;
 	cap-sdio-irq;
@@ -604,9 +610,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


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* Re: [PATCH V2 0/4] Indiedroid Nova Devicetree Updates
  2025-11-18 22:30 [PATCH V2 0/4] Indiedroid Nova Devicetree Updates Chris Morgan
                   ` (3 preceding siblings ...)
  2025-11-18 22:30 ` [PATCH V2 4/4] arm64: dts: rockchip: Add host wake pin for wifi on " Chris Morgan
@ 2025-11-20 22:23 ` Heiko Stuebner
  4 siblings, 0 replies; 6+ messages in thread
From: Heiko Stuebner @ 2025-11-20 22:23 UTC (permalink / raw)
  To: linux-rockchip, Chris Morgan
  Cc: Heiko Stuebner, devicetree, sebastian.reichel, conor+dt, krzk+dt,
	robh, Chris Morgan


On Tue, 18 Nov 2025 16:30:44 -0600, Chris Morgan wrote:
> This series fixes up a few remaining issues with the devicetree for the
> Indiedroid Nova. Namely it adds or updates a few pinctrl definitions,
> it removes a few workarounds that no longer appear to be necessary for
> eMMC and bluetooth, it adds support for the NPU, and it sets the device
> type as embedded.
> 
> Changes since V1:
>  - The device type addition, NPU enablement, HS400 enablement, and DMA
>    fixes for bluetooth were accepted as a subset and have been removed
>    from this series.
>  - The individual changes from the pinctrl fixes have been broken out
>    into a series of separate patches.
> 
> [...]

Applied, thanks!

[1/4] arm64: dts: rockchip: Add clk32k_in for Indiedroid Nova
      commit: e28f44013dc4ec820bdb7182d5a2188550bc07fd
[2/4] arm64: dts: rockchip: Define regulator for pcie2x1l2
      commit: 835c909e8576919437227f6ac1d4e4769016137f
[3/4] arm64: dts: rockchip: Correct pinctrl for pcie for Indiedroid Nova
      commit: 6f563ebf0b21e661f6a663ea55ae00544192a213
[4/4] arm64: dts: rockchip: Add host wake pin for wifi on Indiedroid Nova
      commit: 932feac9d8c591a6c5d3824765f71e2cd87f33e8

Best regards,
-- 
Heiko Stuebner <heiko@sntech.de>

^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2025-11-20 22:23 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-11-18 22:30 [PATCH V2 0/4] Indiedroid Nova Devicetree Updates Chris Morgan
2025-11-18 22:30 ` [PATCH V2 1/4] arm64: dts: rockchip: Add clk32k_in for Indiedroid Nova Chris Morgan
2025-11-18 22:30 ` [PATCH V2 2/4] arm64: dts: rockchip: Define regulator for pcie2x1l2 Chris Morgan
2025-11-18 22:30 ` [PATCH V2 3/4] arm64: dts: rockchip: Correct pinctrl for pcie for Indiedroid Nova Chris Morgan
2025-11-18 22:30 ` [PATCH V2 4/4] arm64: dts: rockchip: Add host wake pin for wifi on " Chris Morgan
2025-11-20 22:23 ` [PATCH V2 0/4] Indiedroid Nova Devicetree Updates Heiko Stuebner

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).