forked from mirror/openwrt
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 <jelonek.jonas@gmail.com> Link: https://github.com/openwrt/openwrt/pull/22206 Signed-off-by: Robert Marko <robimarko@gmail.com>
This commit is contained in:
parent
d50b296727
commit
564a6442f2
2 changed files with 10 additions and 8 deletions
|
|
@ -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 = <BTN_2>;
|
||||
gpios = <&gpio3 1 GPIO_ACTIVE_LOW>;
|
||||
gpios = <&gpio3 0 GPIO_ACTIVE_LOW>;
|
||||
debounce-interval = <60>;
|
||||
};
|
||||
|
||||
router_auto {
|
||||
label = "router_auto";
|
||||
linux,code = <BTN_6>;
|
||||
gpios = <&gpio3 2 GPIO_ACTIVE_HIGH>;
|
||||
gpios = <&gpio3 1 GPIO_ACTIVE_HIGH>;
|
||||
debounce-interval = <60>;
|
||||
};
|
||||
|
||||
movie_on {
|
||||
label = "movie_on";
|
||||
linux,code = <BTN_4>;
|
||||
gpios = <&gpio3 3 GPIO_ACTIVE_HIGH>;
|
||||
gpios = <&gpio3 2 GPIO_ACTIVE_HIGH>;
|
||||
debounce-interval = <60>;
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue