From: Tianling Shen Date: Sun, 1 Jun 2025 08:01:52 +0000 (+0800) Subject: uboot-mediatek: update patch for Cudy TR3000-v1 and SNR SNR-CPE-AX2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=53b87d660b11cfb05c5438df75007f0107cd5c97;p=thirdparty%2Fopenwrt.git uboot-mediatek: update patch for Cudy TR3000-v1 and SNR SNR-CPE-AX2 Update the reference to gpio props. Fixes: 2a32d215ba47 ("uboot-mediatek: bump to v2025.04") Signed-off-by: Tianling Shen Link: https://github.com/openwrt/openwrt/pull/18988 Signed-off-by: Hauke Mehrtens --- diff --git a/package/boot/uboot-mediatek/patches/445-add-cudy_tr3000-v1.patch b/package/boot/uboot-mediatek/patches/445-add-cudy_tr3000-v1.patch index d350a5ed027..e7e09261483 100644 --- a/package/boot/uboot-mediatek/patches/445-add-cudy_tr3000-v1.patch +++ b/package/boot/uboot-mediatek/patches/445-add-cudy_tr3000-v1.patch @@ -140,14 +140,14 @@ + button-reset { + label = "reset"; + linux,code = ; -+ gpios = <&gpio 1 GPIO_ACTIVE_LOW>; ++ gpios = <&pio 1 GPIO_ACTIVE_LOW>; + }; + + button-mode { + label = "mode"; + linux,code = ; + linux,input-type = ; -+ gpios = <&gpio 0 GPIO_ACTIVE_HIGH>; ++ gpios = <&pio 0 GPIO_ACTIVE_HIGH>; + debounce-interval = <60>; + }; + }; @@ -157,13 +157,13 @@ + + led_status: led-0 { + label = "red:power"; -+ gpios = <&gpio 11 GPIO_ACTIVE_LOW>; ++ gpios = <&pio 11 GPIO_ACTIVE_LOW>; + default-state = "on"; + }; + + led-1 { + label = "white:status"; -+ gpios = <&gpio 10 GPIO_ACTIVE_LOW>; ++ gpios = <&pio 10 GPIO_ACTIVE_LOW>; + default-state = "off"; + }; + }; @@ -184,7 +184,7 @@ + }; +}; + -+&pinctrl { ++&pio { + spi_flash_pins: spi0-pins-func-1 { + mux { + function = "flash"; diff --git a/package/boot/uboot-mediatek/patches/463-add-snr-snr-cpe-ax2.patch b/package/boot/uboot-mediatek/patches/463-add-snr-snr-cpe-ax2.patch index 5602f46474e..a5f8873775a 100644 --- a/package/boot/uboot-mediatek/patches/463-add-snr-snr-cpe-ax2.patch +++ b/package/boot/uboot-mediatek/patches/463-add-snr-snr-cpe-ax2.patch @@ -143,13 +143,13 @@ + button-0 { + label = "mesh"; + linux,code = ; -+ gpios = <&gpio 0 GPIO_ACTIVE_LOW>; ++ gpios = <&pio 0 GPIO_ACTIVE_LOW>; + }; + + button-1 { + label = "reset"; + linux,code = ; -+ gpios = <&gpio 1 GPIO_ACTIVE_LOW>; ++ gpios = <&pio 1 GPIO_ACTIVE_LOW>; + }; + }; + @@ -158,37 +158,37 @@ + + led-0 { + label = "red:status"; -+ gpios = <&gpio 4 GPIO_ACTIVE_LOW>; ++ gpios = <&pio 4 GPIO_ACTIVE_LOW>; + }; + + led-1 { + label = "red:status_1"; -+ gpios = <&gpio 5 GPIO_ACTIVE_LOW>; ++ gpios = <&pio 5 GPIO_ACTIVE_LOW>; + }; + + led-2 { + label = "blue:wlan_2ghz"; -+ gpios = <&gpio 6 GPIO_ACTIVE_LOW>; ++ gpios = <&pio 6 GPIO_ACTIVE_LOW>; + }; + + led-3 { + label = "blue:wlan_5ghz"; -+ gpios = <&gpio 7 GPIO_ACTIVE_LOW>; ++ gpios = <&pio 7 GPIO_ACTIVE_LOW>; + }; + + led-4 { + label = "blue:status"; -+ gpios = <&gpio 9 GPIO_ACTIVE_LOW>; ++ gpios = <&pio 9 GPIO_ACTIVE_LOW>; + }; + + led-5 { + label = "blue:wan"; -+ gpios = <&gpio 10 GPIO_ACTIVE_LOW>; ++ gpios = <&pio 10 GPIO_ACTIVE_LOW>; + }; + + led-6 { + label = "blue:status_1"; -+ gpios = <&gpio 11 GPIO_ACTIVE_LOW>; ++ gpios = <&pio 11 GPIO_ACTIVE_LOW>; + }; + }; +}; @@ -203,7 +203,7 @@ + mediatek,gmac-id = <0>; + phy-mode = "2500base-x"; + mediatek,switch = "mt7531"; -+ reset-gpios = <&gpio 39 GPIO_ACTIVE_HIGH>; ++ reset-gpios = <&pio 39 GPIO_ACTIVE_HIGH>; + + fixed-link { + speed = <2500>; @@ -211,7 +211,7 @@ + }; +}; + -+&pinctrl { ++&pio { + spi_flash_pins: spi0-pins-func-1 { + mux { + function = "flash";