From 3b450b23fe0fe9ce7eb65cd41239a1ad070803b1 Mon Sep 17 00:00:00 2001 From: Edward Chow Date: Mon, 9 Feb 2026 10:54:35 +0800 Subject: [PATCH] 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 Link: https://github.com/openwrt/openwrt/pull/21941 Signed-off-by: Robert Marko --- .../etc/hotplug.d/ieee80211/05-wifi-migrate | 47 ------------------- target/linux/apm821xx/dts/apm82181.dtsi | 3 +- 2 files changed, 2 insertions(+), 48 deletions(-) delete mode 100644 target/linux/apm821xx/base-files/etc/hotplug.d/ieee80211/05-wifi-migrate 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 04960920845..00000000000 --- 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 5b7d9073115..71dea7ae208 100644 --- a/target/linux/apm821xx/dts/apm82181.dtsi +++ b/target/linux/apm821xx/dts/apm82181.dtsi @@ -418,7 +418,8 @@ #size-cells = <0>; }; - PCIE0: pcie@d00000000 { + /* u-boot of meraki mx60 match the node name to disable it. Please keep. */ + PCIE0: pciex@d00000000 { device_type = "pci"; /* see ppc4xx_pci_find_bridge */ #interrupt-cells = <1>; #size-cells = <2>; -- 2.47.3