ath79: use gpio-cascade for Buffalo WZR-HP-G300NH

Switch to a generic GPIO cascade driver.

Signed-off-by: Mauri Sandberg <maukka@ext.kapsi.fi>
Signed-off-by: Petr Štetiar <ynezz@true.cz> [missing commit description]
This commit is contained in:
Mauri Sandberg 2022-02-06 01:07:10 +02:00 committed by Petr Štetiar
parent 2f50d65161
commit b99aee5080
2 changed files with 32 additions and 11 deletions

View file

@ -17,16 +17,37 @@
clock-frequency = <40000000>; clock-frequency = <40000000>;
}; };
gpio2: gpio-extender { /* There is a GPIO driven NXP 74HC153 dual 4-way multiplexer on board
compatible = "nxp,74hc153-gpio"; * used for buttons that are on top of the the device.
*/
mux: mux-controller {
compatible = "gpio-mux";
#mux-control-cells = <0>;
mux-gpios = <&gpio 9 GPIO_ACTIVE_HIGH>, /* s0 */
<&gpio 11 GPIO_ACTIVE_HIGH>; /* s1 */
};
gpio2: key-mux1 {
compatible = "gpio-cascade";
mux-controls = <&mux>;
gpio-controller; gpio-controller;
#gpio-cells = <2>; #gpio-cells = <2>;
// GPIOs used by this node // GPIOs used by this node, the mux pin
gpio-s0 = <&gpio 9 GPIO_ACTIVE_HIGH>; upstream-gpios = <&gpio 12 GPIO_ACTIVE_HIGH>; /* 1y */
gpio-s1 = <&gpio 11 GPIO_ACTIVE_HIGH>; };
gpio-1y = <&gpio 12 GPIO_ACTIVE_HIGH>;
gpio-2y = <&gpio 14 GPIO_ACTIVE_HIGH>; gpio3: key-mux2 {
compatible = "gpio-cascade";
mux-controls = <&mux>;
gpio-controller;
#gpio-cells = <2>;
// GPIOs used by this node, the mux pin
upstream-gpios = <&gpio 14 GPIO_ACTIVE_HIGH>; /* 2y */
}; };
keys { keys {
@ -64,21 +85,21 @@
usb { usb {
label = "usb"; label = "usb";
linux,code = <BTN_2>; linux,code = <BTN_2>;
gpios = <&gpio2 5 GPIO_ACTIVE_LOW>; gpios = <&gpio3 1 GPIO_ACTIVE_LOW>;
debounce-interval = <60>; debounce-interval = <60>;
}; };
router_auto { router_auto {
label = "router_auto"; label = "router_auto";
linux,code = <BTN_6>; linux,code = <BTN_6>;
gpios = <&gpio2 6 GPIO_ACTIVE_HIGH>; gpios = <&gpio3 2 GPIO_ACTIVE_HIGH>;
debounce-interval = <60>; debounce-interval = <60>;
}; };
movie_on { movie_on {
label = "movie_on"; label = "movie_on";
linux,code = <BTN_4>; linux,code = <BTN_4>;
gpios = <&gpio2 7 GPIO_ACTIVE_HIGH>; gpios = <&gpio3 3 GPIO_ACTIVE_HIGH>;
debounce-interval = <60>; debounce-interval = <60>;
}; };
}; };

View file

@ -496,7 +496,7 @@ define Device/buffalo_wzr-hp-g300nh
SOC := ar9132 SOC := ar9132
BUFFALO_PRODUCT := WZR-HP-G300NH BUFFALO_PRODUCT := WZR-HP-G300NH
BUFFALO_HWVER := 1 BUFFALO_HWVER := 1
DEVICE_PACKAGES := kmod-usb2 kmod-usb-ledtrig-usbport kmod-gpio-nxp-74hc153 DEVICE_PACKAGES := kmod-gpio-cascade kmod-mux-gpio kmod-usb2 kmod-usb-ledtrig-usbport
BLOCKSIZE := 128k BLOCKSIZE := 128k
IMAGE_SIZE := 32128k IMAGE_SIZE := 32128k
SUPPORTED_DEVICES += wzr-hp-g300nh SUPPORTED_DEVICES += wzr-hp-g300nh