[openwrt/openwrt] Revert "apm821xx: rename pciex to pcie"

[LEDE Commits]

robimarko pushed a commit to openwrt/openwrt.git, branch main:
https://git.openwrt.org/3b450b23fe0fe9ce7eb65cd41239a1ad070803b1

commit 3b450b23fe0fe9ce7eb65cd41239a1ad070803b1
Author: Edward Chow <equu at openmail.cc>
AuthorDate: Mon Feb 9 10:54:35 2026 +0800

    Revert "apm821xx: rename pciex to pcie"
    
    This reverts commit 66a7e04e9e10247978c301a679428cbfc001e6ea.
    
    Doing so makes the u-boot unable to find the node for this pcie
    controller and disable it on mx60, resulting boot failure, as reported
    in https://github.com/openwrt/openwrt/issues/21649 .
    
    If we keep on treating mx60 and mx60w the same target, we might have
    to endure the warning which 66a7e04 wants to eliminate.
    
    Signed-off-by: Edward Chow <equu at openmail.cc>
    Link: https://github.com/openwrt/openwrt/pull/21941
    Signed-off-by: Robert Marko <robert.marko at sartura.hr>
---
 .../etc/hotplug.d/ieee80211/05-wifi-migrate        | 47 ----------------------
 target/linux/apm821xx/dts/apm82181.dtsi            |  3 +-
 2 files changed, 2 insertions(+), 48 deletions(-)

diff --git a/target/linux/apm821xx/base-files/etc/hotplug.d/ieee80211/05-wifi-migrate b/target/linux/apm821xx/base-files/etc/hotplug.d/ieee80211/05-wifi-migrate
deleted file mode 100644
index 0496092084..0000000000
--- a/target/linux/apm821xx/base-files/etc/hotplug.d/ieee80211/05-wifi-migrate
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/bin/sh
-
-# This must run before 10-wifi-detect
-
-[ "${ACTION}" = "add" ] || return
-
-. /lib/functions.sh
-. /lib/functions/system.sh
-
-do_migrate_radio()
-{
-	local config="$1"
-
-	config_get from "$config" path
-
-	to=${from/pciex\//pcie\/}
-
-	# Checks if kernel version is less than 6.12.0, if it is and the path is
-	# using the new format, then path should be migrated to the old format.
-	[ "$(get_linux_version)" -lt "612000" ] && to=${from/pcie\//pciex\/}
-
-	[ "$from" = "$to" ] && return
-
-	uci set "wireless.${config}.path=${to}"
-	WIRELESS_CHANGED=true
-
-	logger -t wifi-migrate "Updated path of wireless.${config} from '${from}' to '${to}'"
-}
-
-migrate_radio()
-{
-	config_load wireless
-
-	config_foreach do_migrate_radio wifi-device
-}
-
-WIRELESS_CHANGED=false
-
-case "$(board_name)" in
-*)
-	migrate_radio
-	;;
-esac
-
-$WIRELESS_CHANGED && uci commit wireless
-
-exit 0
diff --git a/target/linux/apm821xx/dts/apm82181.dtsi b/target/linux/apm821xx/dts/apm82181.dtsi
index 5b7d907311..71dea7ae20 100644
--- a/target/linux/apm821xx/dts/apm82181.dtsi
+++ b/target/linux/apm821xx/dts/apm82181.dtsi
@@ -418,7 +418,8 @@
 			#size-cells = <0>;
 		};
 
-		PCIE0: pcie at d00000000 {
+		/* u-boot of meraki mx60 match the node name to disable it. Please keep. */
+		PCIE0: pciex at d00000000 {
 			device_type = "pci"; /* see ppc4xx_pci_find_bridge */
 			#interrupt-cells = <1>;
 			#size-cells = <2>;