From bd83592fc489cf5cd2bebe735e97abda43de23f0 Mon Sep 17 00:00:00 2001 From: Christian Lamparter Date: Sun, 26 May 2019 16:36:10 +0200 Subject: apm821xx: wndr4700: interrupt-driven gpio-keys This patch fixes the active_low setting and converts all of the physical keys on the wndr4700 to utilize the interrupt-driven gpio-keys driver over the polled version. The sdcard-insertion hack has been removed since the block-subsystem will now be polling the device instead. Signed-off-by: Christian Lamparter --- target/linux/apm821xx/dts/netgear-wndr4700.dts | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) (limited to 'target/linux/apm821xx/dts/netgear-wndr4700.dts') diff --git a/target/linux/apm821xx/dts/netgear-wndr4700.dts b/target/linux/apm821xx/dts/netgear-wndr4700.dts index 0f1e97a921..24d5c33f90 100644 --- a/target/linux/apm821xx/dts/netgear-wndr4700.dts +++ b/target/linux/apm821xx/dts/netgear-wndr4700.dts @@ -307,23 +307,21 @@ }; &POB0 { + keys { - compatible = "gpio-keys-polled"; - #interrupt-cells = <2>; - autorepeat; - poll-interval = <60>; /* 3 * 20 = 60ms */ + compatible = "gpio-keys"; reset { label = "Reset button"; + gpios = <&GPIO0 15 GPIO_ACTIVE_LOW>; linux,code = ; - gpios = <&GPIO0 15 GPIO_ACTIVE_HIGH>; interrupt-parent = <&UIC1>; interrupts = <0x14 IRQ_TYPE_EDGE_FALLING>; }; backup_hd { label = "Backup HD button"; - gpios = <&GPIO0 19 GPIO_ACTIVE_HIGH>; + gpios = <&GPIO0 19 GPIO_ACTIVE_LOW>; linux,code = ; interrupt-parent = <&UIC1>; interrupts = <0x1e IRQ_TYPE_EDGE_FALLING>; @@ -331,7 +329,7 @@ rfkill { label = "RFKILL button"; - gpios = <&GPIO0 20 GPIO_ACTIVE_HIGH>; + gpios = <&GPIO0 20 GPIO_ACTIVE_LOW>; linux,code = ; interrupt-parent = <&UIC1>; interrupts = <0x1f IRQ_TYPE_EDGE_FALLING>; @@ -339,17 +337,11 @@ wps { label = "WPS button"; - gpios = <&GPIO0 23 GPIO_ACTIVE_HIGH>; + gpios = <&GPIO0 23 GPIO_ACTIVE_LOW>; linux,code = ; interrupt-parent = <&UIC2>; interrupts = <0x19 IRQ_TYPE_EDGE_FALLING>; }; - - sdcard { - label = "SDCard inserted"; - gpios = <&GPIO0 7 GPIO_ACTIVE_LOW>; - linux,code = ; - }; }; leds { -- cgit v1.2.3