From 564a6442f2c0906bc462a0ecbd70c9405b11f771 Mon Sep 17 00:00:00 2001 From: Jonas Jelonek Date: Fri, 27 Feb 2026 20:27:14 +0000 Subject: [PATCH] ath79: replace gpio-cascade on Buffalo WZR-HP-G300NH The GPIO cascade driver is a downstream-only driver and the Buffalo WZR-HP-G300NH is its only user for now. Recently, a similar and independently developed driver 'gpio-line-mux `which serves the same purpose was accepted upstream and backported here. Use that instead the downstream driver. Signed-off-by: Jonas Jelonek Link: https://github.com/openwrt/openwrt/pull/22206 Signed-off-by: Robert Marko --- .../ath79/dts/ar9132_buffalo_wzr-hp-g300nh.dtsi | 16 +++++++++------- target/linux/ath79/image/generic.mk | 2 +- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/target/linux/ath79/dts/ar9132_buffalo_wzr-hp-g300nh.dtsi b/target/linux/ath79/dts/ar9132_buffalo_wzr-hp-g300nh.dtsi index c3108e2123..981173c0cd 100644 --- a/target/linux/ath79/dts/ar9132_buffalo_wzr-hp-g300nh.dtsi +++ b/target/linux/ath79/dts/ar9132_buffalo_wzr-hp-g300nh.dtsi @@ -24,25 +24,27 @@ }; gpio2: key-mux1 { - compatible = "gpio-cascade"; + compatible = "gpio-line-mux"; mux-controls = <&mux>; gpio-controller; #gpio-cells = <2>; // GPIOs used by this node, the mux pin - upstream-gpios = <&gpio 12 GPIO_ACTIVE_HIGH>; /* 1y */ + muxed-gpios = <&gpio 12 GPIO_ACTIVE_HIGH>; /* 1y */ + gpio-line-mux-states = <0>, <1>, <2>, <3>; }; gpio3: key-mux2 { - compatible = "gpio-cascade"; + compatible = "gpio-line-mux"; mux-controls = <&mux>; gpio-controller; #gpio-cells = <2>; // GPIOs used by this node, the mux pin - upstream-gpios = <&gpio 14 GPIO_ACTIVE_HIGH>; /* 2y */ + muxed-gpios = <&gpio 14 GPIO_ACTIVE_HIGH>; /* 2y */ + gpio-line-mux-states = <1>, <2>, <3>; }; keys { @@ -80,21 +82,21 @@ usb { label = "usb"; linux,code = ; - gpios = <&gpio3 1 GPIO_ACTIVE_LOW>; + gpios = <&gpio3 0 GPIO_ACTIVE_LOW>; debounce-interval = <60>; }; router_auto { label = "router_auto"; linux,code = ; - gpios = <&gpio3 2 GPIO_ACTIVE_HIGH>; + gpios = <&gpio3 1 GPIO_ACTIVE_HIGH>; debounce-interval = <60>; }; movie_on { label = "movie_on"; linux,code = ; - gpios = <&gpio3 3 GPIO_ACTIVE_HIGH>; + gpios = <&gpio3 2 GPIO_ACTIVE_HIGH>; debounce-interval = <60>; }; }; diff --git a/target/linux/ath79/image/generic.mk b/target/linux/ath79/image/generic.mk index 794d199187..7f43fde57f 100644 --- a/target/linux/ath79/image/generic.mk +++ b/target/linux/ath79/image/generic.mk @@ -687,7 +687,7 @@ define Device/buffalo_wzr-hp-g300nh SOC := ar9132 BUFFALO_PRODUCT := WZR-HP-G300NH BUFFALO_HWVER := 1 - DEVICE_PACKAGES := kmod-gpio-cascade kmod-mux-gpio kmod-usb2 kmod-usb-ledtrig-usbport + DEVICE_PACKAGES := kmod-gpio-line-mux kmod-mux-gpio kmod-usb2 kmod-usb-ledtrig-usbport BLOCKSIZE := 128k IMAGE_SIZE := 32128k SUPPORTED_DEVICES += wzr-hp-g300nh