From 533d45a9cd3eec72ff6de5cf6d11e85d3746965a Mon Sep 17 00:00:00 2001
From: Austin Lane <vidplace7@gmail.com>
Date: Mon, 6 Apr 2026 13:52:38 -0400
Subject: [PATCH] luckfox-lyra-zero-w: Default to onboard wifi antenna, add
 overlay for ipex.

Currently the luckfox-lyra-zero-w defaults to using the ipex connector for wifi (not the onboard antenna). This has lead to user confusion.

Use a gpio hog to set the antenna selection pin HIGH at boot, selecting the onboard by default. Add an overlay for switching to the ipex connector.
---
 arch/arm/boot/dts/overlay/Makefile            |  1 +
 .../boot/dts/overlay/README.rockchip-overlays |  4 ++++
 ...kchip-luckfox-lyra-zero-w-ipex-antenna.dts | 23 +++++++++++++++++++
 .../dts/rk3506b-luckfox-lyra-zero-w-sd.dts    | 15 ++++++++++++
 4 files changed, 43 insertions(+)
 create mode 100644 arch/arm/boot/dts/overlay/rockchip-luckfox-lyra-zero-w-ipex-antenna.dts

diff --git a/arch/arm/boot/dts/overlay/Makefile b/arch/arm/boot/dts/overlay/Makefile
index 792845071b05c..8308fac2c8443 100644
--- a/arch/arm/boot/dts/overlay/Makefile
+++ b/arch/arm/boot/dts/overlay/Makefile
@@ -8,6 +8,7 @@ dtbo-$(CONFIG_ARCH_ROCKCHIP) += \
 	rockchip-luckfox-lyra-plus-spi0-1cs-spidev.dtbo \
 	rockchip-luckfox-lyra-plus-spi0-2cs-spidev.dtbo \
 	rockchip-luckfox-lyra-ultra-w-spi0-1cs-spidev.dtbo \
+	rockchip-luckfox-lyra-zero-w-ipex-antenna.dtbo \
 	rockchip-luckfox-lyra-zero-w-spi0-1cs-spidev.dtbo \
 	rockchip-luckfox-lyra-zero-w-spi0-2cs-spidev.dtbo \
 	rockchip-luckfox-lyra-zero-w-spi1-1cs-spidev.dtbo \
diff --git a/arch/arm/boot/dts/overlay/README.rockchip-overlays b/arch/arm/boot/dts/overlay/README.rockchip-overlays
index 67ebcdd491474..024ae9474e61f 100644
--- a/arch/arm/boot/dts/overlay/README.rockchip-overlays
+++ b/arch/arm/boot/dts/overlay/README.rockchip-overlays
@@ -28,6 +28,7 @@ for Luckfox Lyra Ultra W:
 - spi0-1cs-spidev
 
 for Luckfox Lyra Zero W:
+- ipex-antenna
 - spi0-1cs-spidev
 - spi0-2cs-spidev
 - spi1-1cs-spidev
@@ -73,6 +74,9 @@ Retains pin-compatibility with Luckfox Pico Plus.
 Enables SPI0 spidev on luckfox-lyra-ultra-w with one chipselect.
 Retains pin-compatibility with Luckfox Pico Ultra.
 
+### luckfox-lyra-zero-w-ipex-antenna
+Switches wifi/bluetooth from the onboard antenna to the external IPEX connector.
+
 ### luckfox-lyra-zero-w-spi0-1cs-spidev
 Enables SPI0 spidev on luckfox-lyra-zero-w with one chipselect.
 Compatible with Raspberry Pi 'spi0-1cs' hats.
diff --git a/arch/arm/boot/dts/overlay/rockchip-luckfox-lyra-zero-w-ipex-antenna.dts b/arch/arm/boot/dts/overlay/rockchip-luckfox-lyra-zero-w-ipex-antenna.dts
new file mode 100644
index 0000000000000..34b05c1debb42
--- /dev/null
+++ b/arch/arm/boot/dts/overlay/rockchip-luckfox-lyra-zero-w-ipex-antenna.dts
@@ -0,0 +1,23 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
+ * Switch wifi/bluetooth antenna from onboard to external IPEX connector
+ * on Luckfox Lyra Zero W.
+ */
+
+/dts-v1/;
+/plugin/;
+
+/ {
+	metadata {
+		title = "Enable IPEX antenna on luckfox-lyra-zero-w";
+		compatible = "rockchip,rk3506b-lyra-zero";
+		category = "misc";
+		description = "Switch wifi/bluetooth from onboard antenna to external IPEX connector (GPIO1_C7 low).";
+	};
+};
+
+&gpio1 {
+	ant-sel-hog {
+		output-low;
+	};
+};
diff --git a/arch/arm/boot/dts/rk3506b-luckfox-lyra-zero-w-sd.dts b/arch/arm/boot/dts/rk3506b-luckfox-lyra-zero-w-sd.dts
index d49be9146d4bf..719b4b2cc34ad 100644
--- a/arch/arm/boot/dts/rk3506b-luckfox-lyra-zero-w-sd.dts
+++ b/arch/arm/boot/dts/rk3506b-luckfox-lyra-zero-w-sd.dts
@@ -99,6 +99,21 @@
 	status = "okay";
 };
 
+/**********gpio**********/
+&gpio1 {
+	/*
+	 * Antenna selection GPIO
+	 * output-high = Onboard antenna selected
+	 * output-low = External (ipex) antenna selected
+	 */
+	ant-sel-hog {
+		gpio-hog;
+		gpios = <RK_PC7 GPIO_ACTIVE_HIGH>;
+		output-high;
+		line-name = "ant-sel";
+	};
+};
+
 /**********pinctrl**********/
 &pinctrl {
 	lcd {