From 2b2abdbb75fed15332011a3e4bd4764fc433c0bf Mon Sep 17 00:00:00 2001 From: Shiji Yang Date: Wed, 23 Oct 2024 21:56:23 +0800 Subject: [PATCH 1/7] ramips: ralink-gpio: use irqchip helpers to register driver The gpiolib has already introduced a general GPIO irqchip framework to initialize the GPIO irqchip[1]. This patch will make use of it to simplify the legacy Ralink GPIO driver codes. This patch also includes some code readability improvements. [1] 1425052097b5 ("gpio: add IRQ chip helpers in gpiolib") Signed-off-by: Shiji Yang Link: https://github.com/openwrt/openwrt/pull/16764 Signed-off-by: Robert Marko --- target/linux/ramips/mt7620/config-6.6 | 3 +- target/linux/ramips/mt7621/config-6.6 | 1 - target/linux/ramips/mt76x8/config-6.6 | 2 +- ...DT-Add-documentation-for-gpio-ralink.patch | 14 +- ...alink-add-gpio-driver-for-ralink-SoC.patch | 192 +++++++----------- ...support-for-GPIO-as-interrupt-contro.patch | 43 ---- target/linux/ramips/rt288x/config-6.6 | 2 + target/linux/ramips/rt305x/config-6.6 | 3 +- target/linux/ramips/rt3883/config-6.6 | 3 +- 9 files changed, 94 insertions(+), 169 deletions(-) delete mode 100644 target/linux/ramips/patches-6.6/803-gpio-ralink-Add-support-for-GPIO-as-interrupt-contro.patch diff --git a/target/linux/ramips/mt7620/config-6.6 b/target/linux/ramips/mt7620/config-6.6 index 606fc51eef..2c95b9c960 100644 --- a/target/linux/ramips/mt7620/config-6.6 +++ b/target/linux/ramips/mt7620/config-6.6 @@ -54,6 +54,7 @@ CONFIG_EARLY_PRINTK=y CONFIG_ETHERNET_PACKET_MANGLE=y CONFIG_EXCLUSIVE_SYSTEM_RAM=y CONFIG_FIXED_PHY=y +CONFIG_FORCE_NR_CPUS=y CONFIG_FS_IOMAP=y CONFIG_FUNCTION_ALIGNMENT=0 CONFIG_FWNODE_MDIO=y @@ -81,6 +82,7 @@ CONFIG_GENERIC_SCHED_CLOCK=y CONFIG_GENERIC_SMP_IDLE_THREAD=y CONFIG_GENERIC_TIME_VSYSCALL=y CONFIG_GLOB=y +CONFIG_GPIOLIB_IRQCHIP=y CONFIG_GPIO_CDEV=y CONFIG_GPIO_GENERIC=y # CONFIG_GPIO_MT7621 is not set @@ -181,7 +183,6 @@ CONFIG_PINCTRL_MTK_MTMIPS=y CONFIG_PREEMPT_NONE_BUILD=y CONFIG_PTP_1588_CLOCK_OPTIONAL=y CONFIG_RALINK=y -# CONFIG_RALINK_GDMA is not set CONFIG_RALINK_WDT=y CONFIG_RANDSTRUCT_NONE=y CONFIG_RATIONAL=y diff --git a/target/linux/ramips/mt7621/config-6.6 b/target/linux/ramips/mt7621/config-6.6 index 5e10f03ac1..d1ca85aebd 100644 --- a/target/linux/ramips/mt7621/config-6.6 +++ b/target/linux/ramips/mt7621/config-6.6 @@ -92,7 +92,6 @@ CONFIG_GPIOLIB_IRQCHIP=y CONFIG_GPIO_CDEV=y CONFIG_GPIO_GENERIC=y CONFIG_GPIO_MT7621=y -# CONFIG_GPIO_RALINK is not set CONFIG_GPIO_WATCHDOG=y # CONFIG_GPIO_WATCHDOG_ARCH_INITCALL is not set CONFIG_GRO_CELLS=y diff --git a/target/linux/ramips/mt76x8/config-6.6 b/target/linux/ramips/mt76x8/config-6.6 index b9dc8525df..bf57a7a330 100644 --- a/target/linux/ramips/mt76x8/config-6.6 +++ b/target/linux/ramips/mt76x8/config-6.6 @@ -52,6 +52,7 @@ CONFIG_DTC=y CONFIG_EARLY_PRINTK=y CONFIG_EXCLUSIVE_SYSTEM_RAM=y CONFIG_FIXED_PHY=y +CONFIG_FORCE_NR_CPUS=y CONFIG_FS_IOMAP=y CONFIG_FUNCTION_ALIGNMENT=0 CONFIG_FWNODE_MDIO=y @@ -175,7 +176,6 @@ CONFIG_PINCTRL_MTK_MTMIPS=y CONFIG_PREEMPT_NONE_BUILD=y CONFIG_PTP_1588_CLOCK_OPTIONAL=y CONFIG_RALINK=y -# CONFIG_RALINK_GDMA is not set # CONFIG_RALINK_WDT is not set CONFIG_RANDSTRUCT_NONE=y CONFIG_RATIONAL=y diff --git a/target/linux/ramips/patches-6.6/801-DT-Add-documentation-for-gpio-ralink.patch b/target/linux/ramips/patches-6.6/801-DT-Add-documentation-for-gpio-ralink.patch index fdb07f84f7..d4db7c1b4f 100644 --- a/target/linux/ramips/patches-6.6/801-DT-Add-documentation-for-gpio-ralink.patch +++ b/target/linux/ramips/patches-6.6/801-DT-Add-documentation-for-gpio-ralink.patch @@ -1,18 +1,18 @@ From: John Crispin Date: Sun, 28 Jul 2013 19:45:30 +0200 -Subject: [PATCH 1/3] DT: Add documentation for gpio-ralink +Subject: [PATCH 1/2] DT: Add documentation for gpio-ralink Describe gpio-ralink binding. Signed-off-by: John Crispin --- - .../devicetree/bindings/gpio/gpio-ralink.txt | 36 +++++++++++++++++++ - 1 file changed, 36 insertions(+) + .../devicetree/bindings/gpio/gpio-ralink.txt | 42 +++++++++++++++++++ + 1 file changed, 42 insertions(+) create mode 100644 Documentation/devicetree/bindings/gpio/gpio-ralink.txt --- /dev/null +++ b/Documentation/devicetree/bindings/gpio/gpio-ralink.txt -@@ -0,0 +1,36 @@ +@@ -0,0 +1,42 @@ +Ralink SoC GPIO controller bindings + +Required properties: @@ -29,6 +29,9 @@ Signed-off-by: John Crispin +- ralink,register-map : The register layout depends on the GPIO bank and actual + SoC type. Register offsets need to be in this order. + [ INT, EDGE, RENA, FENA, DATA, DIR, POL, SET, RESET, TOGGLE ] ++- interrupt-controller : marks this as an interrupt controller ++- #interrupt-cells : a standard two-cell interrupt flag, see ++ interrupt-controller/interrupts.txt + +Example: + @@ -40,6 +43,9 @@ Signed-off-by: John Crispin + + reg = <0x600 0x34>; + ++ interrupt-controller; ++ #interrupt-cells = <2>; ++ + interrupt-parent = <&intc>; + interrupts = <6>; + diff --git a/target/linux/ramips/patches-6.6/802-GPIO-MIPS-ralink-add-gpio-driver-for-ralink-SoC.patch b/target/linux/ramips/patches-6.6/802-GPIO-MIPS-ralink-add-gpio-driver-for-ralink-SoC.patch index 2930c57f40..23c9ce32d0 100644 --- a/target/linux/ramips/patches-6.6/802-GPIO-MIPS-ralink-add-gpio-driver-for-ralink-SoC.patch +++ b/target/linux/ramips/patches-6.6/802-GPIO-MIPS-ralink-add-gpio-driver-for-ralink-SoC.patch @@ -1,34 +1,35 @@ From: John Crispin Date: Mon, 4 Aug 2014 20:36:29 +0200 -Subject: [PATCH 2/3] GPIO: MIPS: ralink: add gpio driver for ralink SoC +Subject: [PATCH 2/2] GPIO: MIPS: ralink: add gpio driver for ralink SoC Add gpio driver for Ralink SoC. This driver makes the gpio core on RT2880, RT305x, rt3352, rt3662, rt3883, rt5350 and mt7620 work. Signed-off-by: John Crispin --- - drivers/gpio/Kconfig | 7 + + drivers/gpio/Kconfig | 8 ++ drivers/gpio/Makefile | 1 + - drivers/gpio/gpio-ralink.c | 273 +++++++++++++++++++++++++++++++++++++ - 3 files changed, 281 insertions(+) + drivers/gpio/gpio-ralink.c | 230 +++++++++++++++++++++++++++++++++++++ + 3 files changed, 239 insertions(+) create mode 100644 drivers/gpio/gpio-ralink.c --- a/drivers/gpio/Kconfig +++ b/drivers/gpio/Kconfig -@@ -594,6 +594,13 @@ config GPIO_SNPS_CREG - where only several fields in register belong to GPIO lines and - each GPIO line owns a field with different length and on/off value. +@@ -509,6 +509,14 @@ config GPIO_PXA + help + Say yes here to support the PXA GPIO device. +config GPIO_RALINK + bool "Ralink GPIO Support" -+ depends on RALINK ++ depends on SOC_RT288X || SOC_RT305X || SOC_RT3883 || SOC_MT7620 + select GPIO_GENERIC ++ select GPIOLIB_IRQCHIP + help + Say yes here to support the Ralink SoC GPIO device + - config GPIO_SPEAR_SPICS - bool "ST SPEAr13xx SPI Chip Select as GPIO support" - depends on PLAT_SPEAR + config GPIO_RCAR + tristate "Renesas R-Car and RZ/G GPIO support" + depends on ARCH_RENESAS || COMPILE_TEST --- a/drivers/gpio/Makefile +++ b/drivers/gpio/Makefile @@ -130,6 +130,7 @@ obj-$(CONFIG_GPIO_PISOSR) += gpio-pisos @@ -41,7 +42,7 @@ Signed-off-by: John Crispin obj-$(CONFIG_GPIO_RCAR) += gpio-rcar.o --- /dev/null +++ b/drivers/gpio/gpio-ralink.c -@@ -0,0 +1,273 @@ +@@ -0,0 +1,230 @@ +/* + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 as published @@ -51,14 +52,13 @@ Signed-off-by: John Crispin + * Copyright (C) 2013 John Crispin + */ + -+#include -+#include ++#include +#include -+#include -+#include -+#include -+#include +#include ++#include ++#include ++#include ++#include + +enum ralink_gpio_reg { + GPIO_REG_INT = 0, @@ -80,27 +80,12 @@ Signed-off-by: John Crispin + + spinlock_t lock; + void __iomem *membase; -+ struct irq_domain *domain; -+ int irq; ++ int gpio_irq; + + u32 rising; + u32 falling; +}; + -+#define MAP_MAX 4 -+static struct irq_domain *irq_map[MAP_MAX]; -+static int irq_map_count; -+static atomic_t irq_refcount = ATOMIC_INIT(0); -+ -+static inline struct ralink_gpio_chip *to_ralink_gpio(struct gpio_chip *chip) -+{ -+ struct ralink_gpio_chip *rg; -+ -+ rg = container_of(chip, struct ralink_gpio_chip, chip); -+ -+ return rg; -+} -+ +static inline void rt_gpio_w32(struct ralink_gpio_chip *rg, u8 reg, u32 val) +{ + iowrite32(val, rg->membase + rg->regs[reg]); @@ -111,44 +96,31 @@ Signed-off-by: John Crispin + return ioread32(rg->membase + rg->regs[reg]); +} + -+static int ralink_gpio_to_irq(struct gpio_chip *chip, unsigned pin) -+{ -+ struct ralink_gpio_chip *rg = to_ralink_gpio(chip); ++static irqreturn_t ralink_gpio_irq_handler(int irq, void *data) ++{ ++ struct gpio_chip *gc = data; ++ struct ralink_gpio_chip *rg = gpiochip_get_data(gc); ++ irqreturn_t ret = IRQ_NONE; ++ unsigned long pending; ++ int bit; + -+ if (rg->irq < 1) -+ return -1; -+ -+ return irq_create_mapping(rg->domain, pin); -+} -+ -+static void ralink_gpio_irq_handler(struct irq_desc *desc) -+{ -+ int i; -+ -+ for (i = 0; i < irq_map_count; i++) { -+ struct irq_domain *domain = irq_map[i]; -+ struct ralink_gpio_chip *rg; -+ unsigned long pending; -+ int bit; -+ -+ rg = (struct ralink_gpio_chip *) domain->host_data; -+ pending = rt_gpio_r32(rg, GPIO_REG_INT); -+ -+ for_each_set_bit(bit, &pending, rg->chip.ngpio) { -+ u32 map = irq_find_mapping(domain, bit); -+ generic_handle_irq(map); -+ rt_gpio_w32(rg, GPIO_REG_INT, BIT(bit)); -+ } ++ pending = rt_gpio_r32(rg, GPIO_REG_INT); ++ for_each_set_bit(bit, &pending, rg->chip.ngpio) { ++ generic_handle_domain_irq(gc->irq.domain, bit); ++ rt_gpio_w32(rg, GPIO_REG_INT, BIT(bit)); ++ ret |= IRQ_HANDLED; + } ++ ++ return ret; +} + +static void ralink_gpio_irq_unmask(struct irq_data *d) +{ -+ struct ralink_gpio_chip *rg; ++ struct gpio_chip *gc = irq_data_get_irq_chip_data(d); ++ struct ralink_gpio_chip *rg = gpiochip_get_data(gc); + unsigned long flags; + u32 rise, fall; + -+ rg = (struct ralink_gpio_chip *) d->domain->host_data; + rise = rt_gpio_r32(rg, GPIO_REG_RENA); + fall = rt_gpio_r32(rg, GPIO_REG_FENA); + @@ -160,11 +132,11 @@ Signed-off-by: John Crispin + +static void ralink_gpio_irq_mask(struct irq_data *d) +{ -+ struct ralink_gpio_chip *rg; ++ struct gpio_chip *gc = irq_data_get_irq_chip_data(d); ++ struct ralink_gpio_chip *rg = gpiochip_get_data(gc); + unsigned long flags; + u32 rise, fall; + -+ rg = (struct ralink_gpio_chip *) d->domain->host_data; + rise = rt_gpio_r32(rg, GPIO_REG_RENA); + fall = rt_gpio_r32(rg, GPIO_REG_FENA); + @@ -176,11 +148,10 @@ Signed-off-by: John Crispin + +static int ralink_gpio_irq_type(struct irq_data *d, unsigned int type) +{ -+ struct ralink_gpio_chip *rg; ++ struct gpio_chip *gc = irq_data_get_irq_chip_data(d); ++ struct ralink_gpio_chip *rg = gpiochip_get_data(gc); + u32 mask = BIT(d->hwirq); + -+ rg = (struct ralink_gpio_chip *) d->domain->host_data; -+ + if (type == IRQ_TYPE_PROBE) { + if ((rg->rising | rg->falling) & mask) + return 0; @@ -202,55 +173,15 @@ Signed-off-by: John Crispin +} + +static struct irq_chip ralink_gpio_irq_chip = { -+ .name = "GPIO", ++ .name = "gpio-ralink", + .irq_unmask = ralink_gpio_irq_unmask, + .irq_mask = ralink_gpio_irq_mask, + .irq_mask_ack = ralink_gpio_irq_mask, + .irq_set_type = ralink_gpio_irq_type, ++ .flags = IRQCHIP_IMMUTABLE, ++ GPIOCHIP_IRQ_RESOURCE_HELPERS, +}; + -+static int gpio_map(struct irq_domain *d, unsigned int irq, irq_hw_number_t hw) -+{ -+ irq_set_chip_and_handler(irq, &ralink_gpio_irq_chip, handle_level_irq); -+ irq_set_handler_data(irq, d); -+ -+ return 0; -+} -+ -+static const struct irq_domain_ops irq_domain_ops = { -+ .xlate = irq_domain_xlate_onecell, -+ .map = gpio_map, -+}; -+ -+static void ralink_gpio_irq_init(struct device_node *np, -+ struct ralink_gpio_chip *rg) -+{ -+ if (irq_map_count >= MAP_MAX) -+ return; -+ -+ rg->irq = irq_of_parse_and_map(np, 0); -+ if (!rg->irq) -+ return; -+ -+ rg->domain = irq_domain_add_linear(np, rg->chip.ngpio, -+ &irq_domain_ops, rg); -+ if (!rg->domain) { -+ dev_err(rg->chip.parent, "irq_domain_add_linear failed\n"); -+ return; -+ } -+ -+ irq_map[irq_map_count++] = rg->domain; -+ -+ rt_gpio_w32(rg, GPIO_REG_RENA, 0x0); -+ rt_gpio_w32(rg, GPIO_REG_FENA, 0x0); -+ -+ if (!atomic_read(&irq_refcount)) -+ irq_set_chained_handler(rg->irq, ralink_gpio_irq_handler); -+ atomic_inc(&irq_refcount); -+ -+ dev_info(rg->chip.parent, "registering %d irq handlers\n", rg->chip.ngpio); -+} -+ +static int ralink_gpio_probe(struct platform_device *pdev) +{ + struct device *dev = &pdev->dev; @@ -282,14 +213,42 @@ Signed-off-by: John Crispin + NULL, 0); + if (ret) + return dev_err_probe(dev, ret, "bgpio_init() failed\n"); -+ rg->chip.request = gpiochip_generic_request; -+ rg->chip.to_irq = ralink_gpio_to_irq; -+ rg->chip.free = gpiochip_generic_free; + + /* set polarity to low for all lines */ + rt_gpio_w32(rg, GPIO_REG_POL, 0); + -+ ralink_gpio_irq_init(np, rg); ++ rg->gpio_irq = platform_get_irq(pdev, 0); ++ if (rg->gpio_irq < 0) ++ return rg->gpio_irq; ++ ++ if (rg->gpio_irq) { ++ struct gpio_irq_chip *girq; ++ ++ /* ++ * Directly request the irq here instead of passing ++ * a flow-handler because the irq is shared. ++ */ ++ ret = devm_request_irq(dev, rg->gpio_irq, ++ ralink_gpio_irq_handler, IRQF_SHARED, ++ NULL, &rg->chip); ++ if (ret) { ++ dev_err(dev, "Error requesting IRQ %d: %d\n", ++ rg->gpio_irq, ret); ++ return ret; ++ } ++ ++ girq = &rg->chip.irq; ++ gpio_irq_chip_set_chip(girq, &ralink_gpio_irq_chip); ++ /* This will let us handle the parent IRQ in the driver */ ++ girq->parent_handler = NULL; ++ girq->num_parents = 0; ++ girq->parents = NULL; ++ girq->default_type = IRQ_TYPE_NONE; ++ girq->handler = handle_simple_irq; ++ ++ rt_gpio_w32(rg, GPIO_REG_RENA, 0); ++ rt_gpio_w32(rg, GPIO_REG_FENA, 0); ++ } + + return devm_gpiochip_add_data(dev, &rg->chip, rg); +} @@ -303,8 +262,7 @@ Signed-off-by: John Crispin +static struct platform_driver ralink_gpio_driver = { + .probe = ralink_gpio_probe, + .driver = { -+ .name = "rt2880_gpio", -+ .owner = THIS_MODULE, ++ .name = "ralink_gpio", + .of_match_table = ralink_gpio_match, + }, +}; diff --git a/target/linux/ramips/patches-6.6/803-gpio-ralink-Add-support-for-GPIO-as-interrupt-contro.patch b/target/linux/ramips/patches-6.6/803-gpio-ralink-Add-support-for-GPIO-as-interrupt-contro.patch deleted file mode 100644 index 54dadc735d..0000000000 --- a/target/linux/ramips/patches-6.6/803-gpio-ralink-Add-support-for-GPIO-as-interrupt-contro.patch +++ /dev/null @@ -1,43 +0,0 @@ -From: Daniel Santos -Date: Sun, 4 Nov 2018 20:24:32 -0600 -Subject: [PATCH 3/3] gpio-ralink: Add support for GPIO as interrupt-controller - -Signed-off-by: Daniel Santos ---- - Documentation/devicetree/bindings/gpio/gpio-ralink.txt | 6 ++++++ - drivers/gpio/gpio-ralink.c | 2 +- - 2 files changed, 7 insertions(+), 1 deletion(-) - ---- a/Documentation/devicetree/bindings/gpio/gpio-ralink.txt -+++ b/Documentation/devicetree/bindings/gpio/gpio-ralink.txt -@@ -14,6 +14,9 @@ Required properties: - - ralink,register-map : The register layout depends on the GPIO bank and actual - SoC type. Register offsets need to be in this order. - [ INT, EDGE, RENA, FENA, DATA, DIR, POL, SET, RESET, TOGGLE ] -+- interrupt-controller : marks this as an interrupt controller -+- #interrupt-cells : a standard two-cell interrupt flag, see -+ interrupt-controller/interrupts.txt - - Example: - -@@ -25,6 +28,9 @@ Example: - - reg = <0x600 0x34>; - -+ interrupt-controller; -+ #interrupt-cells = <2>; -+ - interrupt-parent = <&intc>; - interrupts = <6>; - ---- a/drivers/gpio/gpio-ralink.c -+++ b/drivers/gpio/gpio-ralink.c -@@ -174,7 +174,7 @@ static int gpio_map(struct irq_domain *d - } - - static const struct irq_domain_ops irq_domain_ops = { -- .xlate = irq_domain_xlate_onecell, -+ .xlate = irq_domain_xlate_twocell, - .map = gpio_map, - }; - diff --git a/target/linux/ramips/rt288x/config-6.6 b/target/linux/ramips/rt288x/config-6.6 index 3a6657fdfe..986bd1ef3e 100644 --- a/target/linux/ramips/rt288x/config-6.6 +++ b/target/linux/ramips/rt288x/config-6.6 @@ -45,6 +45,7 @@ CONFIG_DTC=y CONFIG_EARLY_PRINTK=y CONFIG_EXCLUSIVE_SYSTEM_RAM=y CONFIG_FIXED_PHY=y +CONFIG_FORCE_NR_CPUS=y CONFIG_FS_IOMAP=y CONFIG_FUNCTION_ALIGNMENT=0 CONFIG_FWNODE_MDIO=y @@ -72,6 +73,7 @@ CONFIG_GENERIC_SCHED_CLOCK=y CONFIG_GENERIC_SMP_IDLE_THREAD=y CONFIG_GENERIC_TIME_VSYSCALL=y CONFIG_GLOB=y +CONFIG_GPIOLIB_IRQCHIP=y CONFIG_GPIO_CDEV=y CONFIG_GPIO_GENERIC=y CONFIG_GPIO_RALINK=y diff --git a/target/linux/ramips/rt305x/config-6.6 b/target/linux/ramips/rt305x/config-6.6 index 69070730ad..9b34b94cff 100644 --- a/target/linux/ramips/rt305x/config-6.6 +++ b/target/linux/ramips/rt305x/config-6.6 @@ -48,6 +48,7 @@ CONFIG_DTC=y CONFIG_EARLY_PRINTK=y CONFIG_EXCLUSIVE_SYSTEM_RAM=y CONFIG_FIXED_PHY=y +CONFIG_FORCE_NR_CPUS=y CONFIG_FS_IOMAP=y CONFIG_FUNCTION_ALIGNMENT=0 CONFIG_FWNODE_MDIO=y @@ -75,6 +76,7 @@ CONFIG_GENERIC_SCHED_CLOCK=y CONFIG_GENERIC_SMP_IDLE_THREAD=y CONFIG_GENERIC_TIME_VSYSCALL=y CONFIG_GLOB=y +CONFIG_GPIOLIB_IRQCHIP=y CONFIG_GPIO_CDEV=y CONFIG_GPIO_GENERIC=y CONFIG_GPIO_RALINK=y @@ -160,7 +162,6 @@ CONFIG_PINCTRL_RT305X=y CONFIG_PREEMPT_NONE_BUILD=y CONFIG_PTP_1588_CLOCK_OPTIONAL=y CONFIG_RALINK=y -# CONFIG_RALINK_GDMA is not set # CONFIG_RALINK_ILL_ACC is not set CONFIG_RALINK_WDT=y CONFIG_RANDSTRUCT_NONE=y diff --git a/target/linux/ramips/rt3883/config-6.6 b/target/linux/ramips/rt3883/config-6.6 index 55dd19406e..7b3f6916ac 100644 --- a/target/linux/ramips/rt3883/config-6.6 +++ b/target/linux/ramips/rt3883/config-6.6 @@ -48,6 +48,7 @@ CONFIG_EARLY_PRINTK=y CONFIG_ETHERNET_PACKET_MANGLE=y CONFIG_EXCLUSIVE_SYSTEM_RAM=y CONFIG_FIXED_PHY=y +CONFIG_FORCE_NR_CPUS=y CONFIG_FS_IOMAP=y CONFIG_FUNCTION_ALIGNMENT=0 CONFIG_FWNODE_MDIO=y @@ -75,6 +76,7 @@ CONFIG_GENERIC_SCHED_CLOCK=y CONFIG_GENERIC_SMP_IDLE_THREAD=y CONFIG_GENERIC_TIME_VSYSCALL=y CONFIG_GLOB=y +CONFIG_GPIOLIB_IRQCHIP=y CONFIG_GPIO_CDEV=y CONFIG_GPIO_GENERIC=y CONFIG_GPIO_RALINK=y @@ -160,7 +162,6 @@ CONFIG_PINCTRL_RT3883=y CONFIG_PREEMPT_NONE_BUILD=y CONFIG_PTP_1588_CLOCK_OPTIONAL=y CONFIG_RALINK=y -# CONFIG_RALINK_GDMA is not set CONFIG_RALINK_WDT=y CONFIG_RANDSTRUCT_NONE=y CONFIG_RATIONAL=y From 0d4616b838ab01c267701b3288e55e5a4d649601 Mon Sep 17 00:00:00 2001 From: Shiji Yang Date: Wed, 23 Oct 2024 23:09:57 +0800 Subject: [PATCH 2/7] ramips: dts: add the missing interrupt properties for GPIO nodes The Ralink GPIO driver supports irqchip function. Hence we need to add "interrupt-parent" and "interrupt-controller" properties to make sure it works properly. It is worth noting that all GPIO devices share the same interrupt line. Signed-off-by: Shiji Yang Link: https://github.com/openwrt/openwrt/pull/16764 Signed-off-by: Robert Marko --- target/linux/ramips/dts/mt7620a.dtsi | 8 ++++++++ target/linux/ramips/dts/mt7620n.dtsi | 8 ++++++++ target/linux/ramips/dts/rt2880.dtsi | 15 +++++++++++++++ target/linux/ramips/dts/rt3050.dtsi | 18 +++++++++++++++--- target/linux/ramips/dts/rt3352.dtsi | 18 +++++++++++++++--- target/linux/ramips/dts/rt3883.dtsi | 23 ++++++++++++++++++++--- target/linux/ramips/dts/rt5350.dtsi | 4 ++++ 7 files changed, 85 insertions(+), 9 deletions(-) diff --git a/target/linux/ramips/dts/mt7620a.dtsi b/target/linux/ramips/dts/mt7620a.dtsi index 0e925b4dcc..bcc7f4be3f 100644 --- a/target/linux/ramips/dts/mt7620a.dtsi +++ b/target/linux/ramips/dts/mt7620a.dtsi @@ -140,6 +140,8 @@ interrupt-parent = <&intc>; interrupts = <6>; + interrupt-controller; + #interrupt-cells = <2>; gpio-controller; #gpio-cells = <2>; @@ -156,6 +158,8 @@ interrupt-parent = <&intc>; interrupts = <6>; + interrupt-controller; + #interrupt-cells = <2>; gpio-controller; #gpio-cells = <2>; @@ -174,6 +178,8 @@ interrupt-parent = <&intc>; interrupts = <6>; + interrupt-controller; + #interrupt-cells = <2>; gpio-controller; #gpio-cells = <2>; @@ -192,6 +198,8 @@ interrupt-parent = <&intc>; interrupts = <6>; + interrupt-controller; + #interrupt-cells = <2>; gpio-controller; #gpio-cells = <2>; diff --git a/target/linux/ramips/dts/mt7620n.dtsi b/target/linux/ramips/dts/mt7620n.dtsi index eafa7c16bb..b284119961 100644 --- a/target/linux/ramips/dts/mt7620n.dtsi +++ b/target/linux/ramips/dts/mt7620n.dtsi @@ -95,6 +95,8 @@ interrupt-parent = <&intc>; interrupts = <6>; + interrupt-controller; + #interrupt-cells = <2>; gpio-controller; #gpio-cells = <2>; @@ -111,6 +113,8 @@ interrupt-parent = <&intc>; interrupts = <6>; + interrupt-controller; + #interrupt-cells = <2>; gpio-controller; #gpio-cells = <2>; @@ -129,6 +133,8 @@ interrupt-parent = <&intc>; interrupts = <6>; + interrupt-controller; + #interrupt-cells = <2>; gpio-controller; #gpio-cells = <2>; @@ -147,6 +153,8 @@ interrupt-parent = <&intc>; interrupts = <6>; + interrupt-controller; + #interrupt-cells = <2>; gpio-controller; #gpio-cells = <2>; diff --git a/target/linux/ramips/dts/rt2880.dtsi b/target/linux/ramips/dts/rt2880.dtsi index 15f5eac625..fc289d5779 100644 --- a/target/linux/ramips/dts/rt2880.dtsi +++ b/target/linux/ramips/dts/rt2880.dtsi @@ -87,6 +87,11 @@ gpio-controller; #gpio-cells = <2>; + interrupt-parent = <&intc>; + interrupts = <6>; + interrupt-controller; + #interrupt-cells = <2>; + ngpios = <24>; ralink,register-map = [ 00 04 08 0c 20 24 28 2c @@ -100,6 +105,11 @@ gpio-controller; #gpio-cells = <2>; + interrupt-parent = <&intc>; + interrupts = <6>; + interrupt-controller; + #interrupt-cells = <2>; + ngpios = <16>; ralink,register-map = [ 00 04 08 0c 10 14 18 1c @@ -115,6 +125,11 @@ gpio-controller; #gpio-cells = <2>; + interrupt-parent = <&intc>; + interrupts = <6>; + interrupt-controller; + #interrupt-cells = <2>; + ngpios = <32>; ralink,register-map = [ 00 04 08 0c 10 14 18 1c diff --git a/target/linux/ramips/dts/rt3050.dtsi b/target/linux/ramips/dts/rt3050.dtsi index 886f6b7de1..8a2304f7b9 100644 --- a/target/linux/ramips/dts/rt3050.dtsi +++ b/target/linux/ramips/dts/rt3050.dtsi @@ -111,13 +111,15 @@ gpio-controller; #gpio-cells = <2>; + interrupt-parent = <&intc>; + interrupts = <6>; + interrupt-controller; + #interrupt-cells = <2>; + ngpios = <24>; ralink,register-map = [ 00 04 08 0c 20 24 28 2c 30 34 ]; - - interrupt-parent = <&intc>; - interrupts = <6>; }; gpio1: gpio@638 { @@ -127,6 +129,11 @@ gpio-controller; #gpio-cells = <2>; + interrupt-parent = <&intc>; + interrupts = <6>; + interrupt-controller; + #interrupt-cells = <2>; + ngpios = <16>; ralink,register-map = [ 00 04 08 0c 10 14 18 1c @@ -142,6 +149,11 @@ gpio-controller; #gpio-cells = <2>; + interrupt-parent = <&intc>; + interrupts = <6>; + interrupt-controller; + #interrupt-cells = <2>; + ngpios = <12>; ralink,register-map = [ 00 04 08 0c 10 14 18 1c diff --git a/target/linux/ramips/dts/rt3352.dtsi b/target/linux/ramips/dts/rt3352.dtsi index ceef29259c..6713a04fcc 100644 --- a/target/linux/ramips/dts/rt3352.dtsi +++ b/target/linux/ramips/dts/rt3352.dtsi @@ -112,13 +112,15 @@ gpio-controller; #gpio-cells = <2>; + interrupt-parent = <&intc>; + interrupts = <6>; + interrupt-controller; + #interrupt-cells = <2>; + ngpios = <24>; ralink,register-map = [ 00 04 08 0c 20 24 28 2c 30 34 ]; - - interrupt-parent = <&intc>; - interrupts = <6>; }; gpio1: gpio@638 { @@ -128,6 +130,11 @@ gpio-controller; #gpio-cells = <2>; + interrupt-parent = <&intc>; + interrupts = <6>; + interrupt-controller; + #interrupt-cells = <2>; + ngpios = <16>; ralink,register-map = [ 00 04 08 0c 10 14 18 1c @@ -143,6 +150,11 @@ gpio-controller; #gpio-cells = <2>; + interrupt-parent = <&intc>; + interrupts = <6>; + interrupt-controller; + #interrupt-cells = <2>; + ngpios = <6>; ralink,register-map = [ 00 04 08 0c 10 14 18 1c diff --git a/target/linux/ramips/dts/rt3883.dtsi b/target/linux/ramips/dts/rt3883.dtsi index 30c0916785..509d1c21e8 100644 --- a/target/linux/ramips/dts/rt3883.dtsi +++ b/target/linux/ramips/dts/rt3883.dtsi @@ -109,12 +109,14 @@ compatible = "ralink,rt2880-gpio"; reg = <0x600 0x34>; - interrupt-parent = <&intc>; - interrupts = <6>; - gpio-controller; #gpio-cells = <2>; + interrupt-parent = <&intc>; + interrupts = <6>; + interrupt-controller; + #interrupt-cells = <2>; + ngpios = <24>; ralink,register-map = [ 00 04 08 0c 20 24 28 2c @@ -128,6 +130,11 @@ gpio-controller; #gpio-cells = <2>; + interrupt-parent = <&intc>; + interrupts = <6>; + interrupt-controller; + #interrupt-cells = <2>; + ngpios = <16>; ralink,register-map = [ 00 04 08 0c 10 14 18 1c @@ -143,6 +150,11 @@ gpio-controller; #gpio-cells = <2>; + interrupt-parent = <&intc>; + interrupts = <6>; + interrupt-controller; + #interrupt-cells = <2>; + ngpios = <32>; ralink,register-map = [ 00 04 08 0c 10 14 18 1c @@ -158,6 +170,11 @@ gpio-controller; #gpio-cells = <2>; + interrupt-parent = <&intc>; + interrupts = <6>; + interrupt-controller; + #interrupt-cells = <2>; + ngpios = <24>; ralink,register-map = [ 00 04 08 0c 10 14 18 1c diff --git a/target/linux/ramips/dts/rt5350.dtsi b/target/linux/ramips/dts/rt5350.dtsi index cb6f3ff232..677931ec14 100644 --- a/target/linux/ramips/dts/rt5350.dtsi +++ b/target/linux/ramips/dts/rt5350.dtsi @@ -111,6 +111,8 @@ interrupt-parent = <&intc>; interrupts = <6>; + interrupt-controller; + #interrupt-cells = <2>; gpio-controller; #gpio-cells = <2>; @@ -127,6 +129,8 @@ interrupt-parent = <&intc>; interrupts = <6>; + interrupt-controller; + #interrupt-cells = <2>; gpio-controller; #gpio-cells = <2>; From 7cc53ef09b9b22e5cfa73a900544ef87b5bbbb8a Mon Sep 17 00:00:00 2001 From: Shiji Yang Date: Thu, 24 Oct 2024 00:07:53 +0800 Subject: [PATCH 3/7] ramips: mt76x8: convert Minew G1-C to interrupt-driven gpio-keys All other MT76x8 devices have already been migrated to gpio-keys. Signed-off-by: Shiji Yang Link: https://github.com/openwrt/openwrt/pull/16764 Signed-off-by: Robert Marko --- target/linux/ramips/dts/mt7628an_minew_g1-c.dts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/target/linux/ramips/dts/mt7628an_minew_g1-c.dts b/target/linux/ramips/dts/mt7628an_minew_g1-c.dts index 603bc09fa6..2ee0618a53 100644 --- a/target/linux/ramips/dts/mt7628an_minew_g1-c.dts +++ b/target/linux/ramips/dts/mt7628an_minew_g1-c.dts @@ -17,8 +17,7 @@ }; keys { - compatible = "gpio-keys-polled"; - poll-interval = <20>; + compatible = "gpio-keys"; reset { label = "reset"; From a3819e23bed714917d2f2e24b8be71b635d4207c Mon Sep 17 00:00:00 2001 From: Shiji Yang Date: Thu, 24 Oct 2024 00:08:25 +0800 Subject: [PATCH 4/7] ramips: rt2880: convert devices to interrupt-driven gpio-keys This converts all RT2880 devices to use interrupt based gpio-keys instead of gpio-keys-polled. The poll-interval will be removed. Signed-off-by: Shiji Yang Link: https://github.com/openwrt/openwrt/pull/16764 Signed-off-by: Robert Marko --- target/linux/ramips/dts/rt2880_airlink101_ar670w.dts | 3 +-- target/linux/ramips/dts/rt2880_airlink101_ar725w.dts | 3 +-- target/linux/ramips/dts/rt2880_asus_rt-n15.dts | 3 +-- target/linux/ramips/dts/rt2880_belkin_f5d8235-v1.dts | 3 +-- target/linux/ramips/dts/rt2880_buffalo_wli-tx4-ag300n.dts | 3 +-- target/linux/ramips/dts/rt2880_buffalo_wzr-agl300nh.dts | 3 +-- target/linux/ramips/dts/rt2880_dlink_dap-1522-a1.dts | 3 +-- target/linux/ramips/dts/rt2880_ralink_v11st-fe.dts | 3 +-- 8 files changed, 8 insertions(+), 16 deletions(-) diff --git a/target/linux/ramips/dts/rt2880_airlink101_ar670w.dts b/target/linux/ramips/dts/rt2880_airlink101_ar670w.dts index 7ff3b370b5..a1f5e74d09 100644 --- a/target/linux/ramips/dts/rt2880_airlink101_ar670w.dts +++ b/target/linux/ramips/dts/rt2880_airlink101_ar670w.dts @@ -76,8 +76,7 @@ }; keys { - compatible = "gpio-keys-polled"; - poll-interval = <100>; + compatible = "gpio-keys"; wps { label = "wps"; diff --git a/target/linux/ramips/dts/rt2880_airlink101_ar725w.dts b/target/linux/ramips/dts/rt2880_airlink101_ar725w.dts index 95a4b495eb..056011dbe8 100644 --- a/target/linux/ramips/dts/rt2880_airlink101_ar725w.dts +++ b/target/linux/ramips/dts/rt2880_airlink101_ar725w.dts @@ -87,8 +87,7 @@ }; keys { - compatible = "gpio-keys-polled"; - poll-interval = <100>; + compatible = "gpio-keys"; wps { label = "wps"; diff --git a/target/linux/ramips/dts/rt2880_asus_rt-n15.dts b/target/linux/ramips/dts/rt2880_asus_rt-n15.dts index 3e34f89165..7306c458ff 100644 --- a/target/linux/ramips/dts/rt2880_asus_rt-n15.dts +++ b/target/linux/ramips/dts/rt2880_asus_rt-n15.dts @@ -75,8 +75,7 @@ }; keys { - compatible = "gpio-keys-polled"; - poll-interval = <100>; + compatible = "gpio-keys"; wps { label = "wps"; diff --git a/target/linux/ramips/dts/rt2880_belkin_f5d8235-v1.dts b/target/linux/ramips/dts/rt2880_belkin_f5d8235-v1.dts index 86e4964a99..014dca2c48 100644 --- a/target/linux/ramips/dts/rt2880_belkin_f5d8235-v1.dts +++ b/target/linux/ramips/dts/rt2880_belkin_f5d8235-v1.dts @@ -113,8 +113,7 @@ }; keys { - compatible = "gpio-keys-polled"; - poll-interval = <100>; + compatible = "gpio-keys"; wps { label = "wps"; diff --git a/target/linux/ramips/dts/rt2880_buffalo_wli-tx4-ag300n.dts b/target/linux/ramips/dts/rt2880_buffalo_wli-tx4-ag300n.dts index b89e086584..203023f186 100644 --- a/target/linux/ramips/dts/rt2880_buffalo_wli-tx4-ag300n.dts +++ b/target/linux/ramips/dts/rt2880_buffalo_wli-tx4-ag300n.dts @@ -69,8 +69,7 @@ }; keys { - compatible = "gpio-keys-polled"; - poll-interval = <100>; + compatible = "gpio-keys"; wps { label = "wps"; diff --git a/target/linux/ramips/dts/rt2880_buffalo_wzr-agl300nh.dts b/target/linux/ramips/dts/rt2880_buffalo_wzr-agl300nh.dts index e86486dce6..dee4c6b981 100644 --- a/target/linux/ramips/dts/rt2880_buffalo_wzr-agl300nh.dts +++ b/target/linux/ramips/dts/rt2880_buffalo_wzr-agl300nh.dts @@ -74,8 +74,7 @@ }; keys { - compatible = "gpio-keys-polled"; - poll-interval = <100>; + compatible = "gpio-keys"; wps { label = "wps"; diff --git a/target/linux/ramips/dts/rt2880_dlink_dap-1522-a1.dts b/target/linux/ramips/dts/rt2880_dlink_dap-1522-a1.dts index 3fdbdf681e..05f6edce2a 100644 --- a/target/linux/ramips/dts/rt2880_dlink_dap-1522-a1.dts +++ b/target/linux/ramips/dts/rt2880_dlink_dap-1522-a1.dts @@ -67,8 +67,7 @@ }; keys { - compatible = "gpio-keys-polled"; - poll-interval = <100>; + compatible = "gpio-keys"; reset { label = "reset"; diff --git a/target/linux/ramips/dts/rt2880_ralink_v11st-fe.dts b/target/linux/ramips/dts/rt2880_ralink_v11st-fe.dts index 695db15a55..d93479e07e 100644 --- a/target/linux/ramips/dts/rt2880_ralink_v11st-fe.dts +++ b/target/linux/ramips/dts/rt2880_ralink_v11st-fe.dts @@ -62,8 +62,7 @@ }; keys { - compatible = "gpio-keys-polled"; - poll-interval = <100>; + compatible = "gpio-keys"; wps { label = "wps"; From 0bcb64041af1a37231df1fc2742da52600ea704f Mon Sep 17 00:00:00 2001 From: Shiji Yang Date: Thu, 24 Oct 2024 00:09:19 +0800 Subject: [PATCH 5/7] ramips: rt305x: convert devices to interrupt-driven gpio-keys This converts all RT305x and RT5350 devices to use interrupt based gpio-keys instead of gpio-keys-polled. The poll-interval will be removed. Signed-off-by: Shiji Yang Link: https://github.com/openwrt/openwrt/pull/16764 Signed-off-by: Robert Marko --- target/linux/ramips/dts/rt3050_allnet_all0256n.dtsi | 3 +-- target/linux/ramips/dts/rt3050_alphanetworks_asl26555.dtsi | 3 +-- target/linux/ramips/dts/rt3050_asus_rt-g32-b1.dts | 3 +-- target/linux/ramips/dts/rt3050_asus_rt-n10-plus.dts | 3 +-- target/linux/ramips/dts/rt3050_asus_wl-330n.dts | 3 +-- target/linux/ramips/dts/rt3050_asus_wl-330n3g.dts | 3 +-- target/linux/ramips/dts/rt3050_dlink_dcs-930.dts | 3 +-- target/linux/ramips/dts/rt3050_dlink_dir-300-b1.dts | 3 +-- target/linux/ramips/dts/rt3050_dlink_dir-600-b1.dts | 3 +-- target/linux/ramips/dts/rt3050_dlink_dir-615-d.dts | 3 +-- target/linux/ramips/dts/rt3050_dlink_dir-620-a1.dts | 3 +-- target/linux/ramips/dts/rt3050_edimax_3g-6200n.dts | 3 +-- target/linux/ramips/dts/rt3050_edimax_3g-6200nl.dts | 3 +-- target/linux/ramips/dts/rt3050_huawei_d105.dts | 3 +-- target/linux/ramips/dts/rt3050_jcg_jhr-n805r.dts | 3 +-- target/linux/ramips/dts/rt3050_netcore_nw718.dts | 3 +-- target/linux/ramips/dts/rt3050_sparklan_wcr-150gn.dts | 3 +-- target/linux/ramips/dts/rt3050_teltonika_rut5xx.dts | 3 +-- target/linux/ramips/dts/rt3050_tenda_w150m.dts | 3 +-- target/linux/ramips/dts/rt3050_trendnet_tew-638apb-v2.dts | 3 +-- target/linux/ramips/dts/rt3052_accton_wr6202.dts | 3 +-- target/linux/ramips/dts/rt3052_alfa-network_w502u.dts | 3 +-- target/linux/ramips/dts/rt3052_argus_atp-52b.dts | 3 +-- target/linux/ramips/dts/rt3052_asiarf_awapn2403.dts | 3 +-- target/linux/ramips/dts/rt3052_asus_rt-n13u.dts | 3 +-- target/linux/ramips/dts/rt3052_aximcom_mr-102n.dts | 3 +-- target/linux/ramips/dts/rt3052_aztech_hw550-3g.dts | 3 +-- target/linux/ramips/dts/rt3052_buffalo_whr-g300n.dts | 3 +-- target/linux/ramips/dts/rt3052_dlink_dap-1350.dts | 3 +-- target/linux/ramips/dts/rt3052_engenius_esr-9753.dts | 3 +-- target/linux/ramips/dts/rt3052_fon_fonera-20n.dts | 3 +-- target/linux/ramips/dts/rt3052_hauppauge_broadway.dts | 3 +-- target/linux/ramips/dts/rt3052_huawei_hg255d.dts | 3 +-- target/linux/ramips/dts/rt3052_jcg_jhr-n825r.dts | 3 +-- target/linux/ramips/dts/rt3052_jcg_jhr-n926r.dts | 3 +-- target/linux/ramips/dts/rt3052_mofinetwork_mofi3500-3gn.dts | 3 +-- target/linux/ramips/dts/rt3052_netgear_wnce2001.dts | 3 +-- target/linux/ramips/dts/rt3052_nexaira_bc2.dts | 3 +-- target/linux/ramips/dts/rt3052_omnima_miniembwifi.dts | 3 +-- target/linux/ramips/dts/rt3052_petatel_psr-680w.dts | 3 +-- target/linux/ramips/dts/rt3052_planex_mzk-w300nh2.dts | 3 +-- target/linux/ramips/dts/rt3052_poray_ip2202.dts | 3 +-- target/linux/ramips/dts/rt3052_prolink_pwh2004.dts | 3 +-- target/linux/ramips/dts/rt3052_ralink_v22rw-2x2.dts | 3 +-- target/linux/ramips/dts/rt3052_sitecom_wl-351.dts | 3 +-- target/linux/ramips/dts/rt3052_skyline_sl-r7205.dts | 3 +-- target/linux/ramips/dts/rt3052_tenda_3g300m.dts | 3 +-- target/linux/ramips/dts/rt3052_tenda_w306r-v2.dts | 3 +-- target/linux/ramips/dts/rt3052_unbranded_wr512-3gn.dtsi | 3 +-- target/linux/ramips/dts/rt3052_unbranded_xdx-rn502j.dts | 3 +-- target/linux/ramips/dts/rt3052_upvel_ur-326n4g.dts | 3 +-- target/linux/ramips/dts/rt3052_upvel_ur-336un.dts | 3 +-- target/linux/ramips/dts/rt3052_zyxel_keenetic.dts | 3 +-- target/linux/ramips/dts/rt3052_zyxel_nbg-419n.dts | 3 +-- target/linux/ramips/dts/rt3352_dlink_dir-615-h1.dts | 3 +-- target/linux/ramips/dts/rt3352_dlink_dir-620-d1.dts | 3 +-- target/linux/ramips/dts/rt3352_zte_mf283plus.dts | 3 +-- target/linux/ramips/dts/rt3352_zyxel_nbg-419n-v2.dts | 3 +-- target/linux/ramips/dts/rt5350_7links_px-4885.dtsi | 3 +-- target/linux/ramips/dts/rt5350_airlive_air3gii.dts | 3 +-- target/linux/ramips/dts/rt5350_asiarf_awm002-evb.dtsi | 3 +-- target/linux/ramips/dts/rt5350_belkin_f7c027.dts | 3 +-- target/linux/ramips/dts/rt5350_dlink_dcs-930l-b1.dts | 3 +-- target/linux/ramips/dts/rt5350_dlink_dir-300-b7.dts | 3 +-- target/linux/ramips/dts/rt5350_dlink_dir-320-b1.dts | 3 +-- target/linux/ramips/dts/rt5350_dlink_dir-610-a1.dts | 3 +-- target/linux/ramips/dts/rt5350_dlink_dwr-512-b.dts | 3 +-- target/linux/ramips/dts/rt5350_hame_mpr-a1.dts | 3 +-- target/linux/ramips/dts/rt5350_hame_mpr-a2.dts | 3 +-- target/linux/ramips/dts/rt5350_hilink_hlk-rm04.dts | 3 +-- target/linux/ramips/dts/rt5350_hootoo_ht-tm02.dts | 3 +-- target/linux/ramips/dts/rt5350_intenso_memory2move.dts | 3 +-- target/linux/ramips/dts/rt5350_nexx_wt1520.dtsi | 3 +-- target/linux/ramips/dts/rt5350_omnima_miniembplug.dts | 3 +-- target/linux/ramips/dts/rt5350_planex_mzk-dp150n.dts | 3 +-- target/linux/ramips/dts/rt5350_poray_m3.dts | 3 +-- target/linux/ramips/dts/rt5350_poray_m4.dtsi | 3 +-- target/linux/ramips/dts/rt5350_poray_x5.dts | 3 +-- target/linux/ramips/dts/rt5350_poray_x8.dts | 3 +-- target/linux/ramips/dts/rt5350_tenda_3g150b.dts | 3 +-- target/linux/ramips/dts/rt5350_trendnet_tew-714tru.dts | 3 +-- target/linux/ramips/dts/rt5350_unbranded_a5-v11.dts | 3 +-- target/linux/ramips/dts/rt5350_wiznet_wizfi630a.dts | 3 +-- target/linux/ramips/dts/rt5350_zorlik_zl5900v2.dts | 3 +-- target/linux/ramips/dts/rt5350_zyxel_keenetic-start.dts | 3 +-- 85 files changed, 85 insertions(+), 170 deletions(-) diff --git a/target/linux/ramips/dts/rt3050_allnet_all0256n.dtsi b/target/linux/ramips/dts/rt3050_allnet_all0256n.dtsi index 3be20dd2f4..1183cade6a 100644 --- a/target/linux/ramips/dts/rt3050_allnet_all0256n.dtsi +++ b/target/linux/ramips/dts/rt3050_allnet_all0256n.dtsi @@ -26,8 +26,7 @@ }; keys { - compatible = "gpio-keys-polled"; - poll-interval = <20>; + compatible = "gpio-keys"; reset { label = "reset"; diff --git a/target/linux/ramips/dts/rt3050_alphanetworks_asl26555.dtsi b/target/linux/ramips/dts/rt3050_alphanetworks_asl26555.dtsi index 74e3edd4ed..a987ee49b6 100644 --- a/target/linux/ramips/dts/rt3050_alphanetworks_asl26555.dtsi +++ b/target/linux/ramips/dts/rt3050_alphanetworks_asl26555.dtsi @@ -15,8 +15,7 @@ }; keys { - compatible = "gpio-keys-polled"; - poll-interval = <20>; + compatible = "gpio-keys"; reset { label = "reset"; diff --git a/target/linux/ramips/dts/rt3050_asus_rt-g32-b1.dts b/target/linux/ramips/dts/rt3050_asus_rt-g32-b1.dts index 5d980ebf8a..22138a47c3 100644 --- a/target/linux/ramips/dts/rt3050_asus_rt-g32-b1.dts +++ b/target/linux/ramips/dts/rt3050_asus_rt-g32-b1.dts @@ -8,8 +8,7 @@ model = "Asus RT-G32 B1"; keys { - compatible = "gpio-keys-polled"; - poll-interval = <20>; + compatible = "gpio-keys"; reset { label = "reset"; diff --git a/target/linux/ramips/dts/rt3050_asus_rt-n10-plus.dts b/target/linux/ramips/dts/rt3050_asus_rt-n10-plus.dts index 85414a284e..96f82a17a6 100644 --- a/target/linux/ramips/dts/rt3050_asus_rt-n10-plus.dts +++ b/target/linux/ramips/dts/rt3050_asus_rt-n10-plus.dts @@ -77,8 +77,7 @@ }; keys { - compatible = "gpio-keys-polled"; - poll-interval = <20>; + compatible = "gpio-keys"; reset { label = "reset"; diff --git a/target/linux/ramips/dts/rt3050_asus_wl-330n.dts b/target/linux/ramips/dts/rt3050_asus_wl-330n.dts index e9349f6a39..1263f588a0 100644 --- a/target/linux/ramips/dts/rt3050_asus_wl-330n.dts +++ b/target/linux/ramips/dts/rt3050_asus_wl-330n.dts @@ -31,8 +31,7 @@ }; keys { - compatible = "gpio-keys-polled"; - poll-interval = <20>; + compatible = "gpio-keys"; reset { label = "reset"; diff --git a/target/linux/ramips/dts/rt3050_asus_wl-330n3g.dts b/target/linux/ramips/dts/rt3050_asus_wl-330n3g.dts index eb47913fb2..6461e709eb 100644 --- a/target/linux/ramips/dts/rt3050_asus_wl-330n3g.dts +++ b/target/linux/ramips/dts/rt3050_asus_wl-330n3g.dts @@ -36,8 +36,7 @@ }; keys { - compatible = "gpio-keys-polled"; - poll-interval = <20>; + compatible = "gpio-keys"; reset { label = "reset"; diff --git a/target/linux/ramips/dts/rt3050_dlink_dcs-930.dts b/target/linux/ramips/dts/rt3050_dlink_dcs-930.dts index 32ecbb47b8..eb1c052665 100644 --- a/target/linux/ramips/dts/rt3050_dlink_dcs-930.dts +++ b/target/linux/ramips/dts/rt3050_dlink_dcs-930.dts @@ -88,8 +88,7 @@ }; keys { - compatible = "gpio-keys-polled"; - poll-interval = <20>; + compatible = "gpio-keys"; wps { label = "wps"; diff --git a/target/linux/ramips/dts/rt3050_dlink_dir-300-b1.dts b/target/linux/ramips/dts/rt3050_dlink_dir-300-b1.dts index 47264478b2..c538afe676 100644 --- a/target/linux/ramips/dts/rt3050_dlink_dir-300-b1.dts +++ b/target/linux/ramips/dts/rt3050_dlink_dir-300-b1.dts @@ -67,8 +67,7 @@ }; keys { - compatible = "gpio-keys-polled"; - poll-interval = <20>; + compatible = "gpio-keys"; reset { label = "reset"; diff --git a/target/linux/ramips/dts/rt3050_dlink_dir-600-b1.dts b/target/linux/ramips/dts/rt3050_dlink_dir-600-b1.dts index 13badc7139..ce7f182aa5 100644 --- a/target/linux/ramips/dts/rt3050_dlink_dir-600-b1.dts +++ b/target/linux/ramips/dts/rt3050_dlink_dir-600-b1.dts @@ -67,8 +67,7 @@ }; keys { - compatible = "gpio-keys-polled"; - poll-interval = <20>; + compatible = "gpio-keys"; reset { label = "reset"; diff --git a/target/linux/ramips/dts/rt3050_dlink_dir-615-d.dts b/target/linux/ramips/dts/rt3050_dlink_dir-615-d.dts index 4df6d44219..92cd28b784 100644 --- a/target/linux/ramips/dts/rt3050_dlink_dir-615-d.dts +++ b/target/linux/ramips/dts/rt3050_dlink_dir-615-d.dts @@ -64,8 +64,7 @@ }; keys { - compatible = "gpio-keys-polled"; - poll-interval = <20>; + compatible = "gpio-keys"; reset { label = "reset"; diff --git a/target/linux/ramips/dts/rt3050_dlink_dir-620-a1.dts b/target/linux/ramips/dts/rt3050_dlink_dir-620-a1.dts index f159580972..13e5d640a8 100644 --- a/target/linux/ramips/dts/rt3050_dlink_dir-620-a1.dts +++ b/target/linux/ramips/dts/rt3050_dlink_dir-620-a1.dts @@ -67,8 +67,7 @@ }; keys { - compatible = "gpio-keys-polled"; - poll-interval = <20>; + compatible = "gpio-keys"; reset { label = "reset"; diff --git a/target/linux/ramips/dts/rt3050_edimax_3g-6200n.dts b/target/linux/ramips/dts/rt3050_edimax_3g-6200n.dts index 128f84de1f..56ef8b7e6d 100644 --- a/target/linux/ramips/dts/rt3050_edimax_3g-6200n.dts +++ b/target/linux/ramips/dts/rt3050_edimax_3g-6200n.dts @@ -99,8 +99,7 @@ }; keys { - compatible = "gpio-keys-polled"; - poll-interval = <20>; + compatible = "gpio-keys"; reset { label = "reset"; diff --git a/target/linux/ramips/dts/rt3050_edimax_3g-6200nl.dts b/target/linux/ramips/dts/rt3050_edimax_3g-6200nl.dts index 5277f9b523..448c18ccd5 100644 --- a/target/linux/ramips/dts/rt3050_edimax_3g-6200nl.dts +++ b/target/linux/ramips/dts/rt3050_edimax_3g-6200nl.dts @@ -91,8 +91,7 @@ }; keys { - compatible = "gpio-keys-polled"; - poll-interval = <20>; + compatible = "gpio-keys"; reset { label = "reset"; diff --git a/target/linux/ramips/dts/rt3050_huawei_d105.dts b/target/linux/ramips/dts/rt3050_huawei_d105.dts index 6a26e0d513..948cf84a79 100644 --- a/target/linux/ramips/dts/rt3050_huawei_d105.dts +++ b/target/linux/ramips/dts/rt3050_huawei_d105.dts @@ -85,8 +85,7 @@ }; keys { - compatible = "gpio-keys-polled"; - poll-interval = <20>; + compatible = "gpio-keys"; reset { label = "reset"; diff --git a/target/linux/ramips/dts/rt3050_jcg_jhr-n805r.dts b/target/linux/ramips/dts/rt3050_jcg_jhr-n805r.dts index 3c54a38f28..96adde07ed 100644 --- a/target/linux/ramips/dts/rt3050_jcg_jhr-n805r.dts +++ b/target/linux/ramips/dts/rt3050_jcg_jhr-n805r.dts @@ -24,8 +24,7 @@ }; keys { - compatible = "gpio-keys-polled"; - poll-interval = <20>; + compatible = "gpio-keys"; reset { label = "reset"; diff --git a/target/linux/ramips/dts/rt3050_netcore_nw718.dts b/target/linux/ramips/dts/rt3050_netcore_nw718.dts index 83b79d5e77..3af5f62e0a 100644 --- a/target/linux/ramips/dts/rt3050_netcore_nw718.dts +++ b/target/linux/ramips/dts/rt3050_netcore_nw718.dts @@ -40,8 +40,7 @@ }; keys { - compatible = "gpio-keys-polled"; - poll-interval = <20>; + compatible = "gpio-keys"; reset { label = "reset"; diff --git a/target/linux/ramips/dts/rt3050_sparklan_wcr-150gn.dts b/target/linux/ramips/dts/rt3050_sparklan_wcr-150gn.dts index 4b4c5e18ee..5428f791cf 100644 --- a/target/linux/ramips/dts/rt3050_sparklan_wcr-150gn.dts +++ b/target/linux/ramips/dts/rt3050_sparklan_wcr-150gn.dts @@ -84,8 +84,7 @@ }; keys { - compatible = "gpio-keys-polled"; - poll-interval = <20>; + compatible = "gpio-keys"; wps { label = "wps"; diff --git a/target/linux/ramips/dts/rt3050_teltonika_rut5xx.dts b/target/linux/ramips/dts/rt3050_teltonika_rut5xx.dts index 691e5d621d..2f7e195554 100644 --- a/target/linux/ramips/dts/rt3050_teltonika_rut5xx.dts +++ b/target/linux/ramips/dts/rt3050_teltonika_rut5xx.dts @@ -26,8 +26,7 @@ }; keys { - compatible = "gpio-keys-polled"; - poll-interval = <20>; + compatible = "gpio-keys"; reset { label = "reset"; diff --git a/target/linux/ramips/dts/rt3050_tenda_w150m.dts b/target/linux/ramips/dts/rt3050_tenda_w150m.dts index f76661b500..8ebfb4f1a0 100644 --- a/target/linux/ramips/dts/rt3050_tenda_w150m.dts +++ b/target/linux/ramips/dts/rt3050_tenda_w150m.dts @@ -100,8 +100,7 @@ }; keys { - compatible = "gpio-keys-polled"; - poll-interval = <20>; + compatible = "gpio-keys"; reset { label = "reset"; diff --git a/target/linux/ramips/dts/rt3050_trendnet_tew-638apb-v2.dts b/target/linux/ramips/dts/rt3050_trendnet_tew-638apb-v2.dts index 990c3eb4ce..9f72ddd7c1 100644 --- a/target/linux/ramips/dts/rt3050_trendnet_tew-638apb-v2.dts +++ b/target/linux/ramips/dts/rt3050_trendnet_tew-638apb-v2.dts @@ -67,8 +67,7 @@ }; keys { - compatible = "gpio-keys-polled"; - poll-interval = <20>; + compatible = "gpio-keys"; reset { label = "reset"; diff --git a/target/linux/ramips/dts/rt3052_accton_wr6202.dts b/target/linux/ramips/dts/rt3052_accton_wr6202.dts index f3a31ad6ca..685f596177 100644 --- a/target/linux/ramips/dts/rt3052_accton_wr6202.dts +++ b/target/linux/ramips/dts/rt3052_accton_wr6202.dts @@ -28,8 +28,7 @@ }; keys { - compatible = "gpio-keys-polled"; - poll-interval = <20>; + compatible = "gpio-keys"; reset { label = "reset"; diff --git a/target/linux/ramips/dts/rt3052_alfa-network_w502u.dts b/target/linux/ramips/dts/rt3052_alfa-network_w502u.dts index 609fd9b2f4..71493faa55 100644 --- a/target/linux/ramips/dts/rt3052_alfa-network_w502u.dts +++ b/target/linux/ramips/dts/rt3052_alfa-network_w502u.dts @@ -89,8 +89,7 @@ }; keys { - compatible = "gpio-keys-polled"; - poll-interval = <20>; + compatible = "gpio-keys"; reset { label = "reset"; diff --git a/target/linux/ramips/dts/rt3052_argus_atp-52b.dts b/target/linux/ramips/dts/rt3052_argus_atp-52b.dts index 5cee0dfcfd..01ca2a1c72 100644 --- a/target/linux/ramips/dts/rt3052_argus_atp-52b.dts +++ b/target/linux/ramips/dts/rt3052_argus_atp-52b.dts @@ -78,8 +78,7 @@ }; keys { - compatible = "gpio-keys-polled"; - poll-interval = <20>; + compatible = "gpio-keys"; wps { label = "wps"; diff --git a/target/linux/ramips/dts/rt3052_asiarf_awapn2403.dts b/target/linux/ramips/dts/rt3052_asiarf_awapn2403.dts index ec794b8eab..107cbf1804 100644 --- a/target/linux/ramips/dts/rt3052_asiarf_awapn2403.dts +++ b/target/linux/ramips/dts/rt3052_asiarf_awapn2403.dts @@ -26,8 +26,7 @@ }; keys { - compatible = "gpio-keys-polled"; - poll-interval = <20>; + compatible = "gpio-keys"; reset { label = "reset"; diff --git a/target/linux/ramips/dts/rt3052_asus_rt-n13u.dts b/target/linux/ramips/dts/rt3052_asus_rt-n13u.dts index 4f0d9e6207..bcd05e3f19 100644 --- a/target/linux/ramips/dts/rt3052_asus_rt-n13u.dts +++ b/target/linux/ramips/dts/rt3052_asus_rt-n13u.dts @@ -82,8 +82,7 @@ }; keys { - compatible = "gpio-keys-polled"; - poll-interval = <10>; + compatible = "gpio-keys"; reset { label = "reset"; diff --git a/target/linux/ramips/dts/rt3052_aximcom_mr-102n.dts b/target/linux/ramips/dts/rt3052_aximcom_mr-102n.dts index f0d4122517..60164724bd 100644 --- a/target/linux/ramips/dts/rt3052_aximcom_mr-102n.dts +++ b/target/linux/ramips/dts/rt3052_aximcom_mr-102n.dts @@ -101,8 +101,7 @@ }; keys { - compatible = "gpio-keys-polled"; - poll-interval = <20>; + compatible = "gpio-keys"; reset { label = "reset"; diff --git a/target/linux/ramips/dts/rt3052_aztech_hw550-3g.dts b/target/linux/ramips/dts/rt3052_aztech_hw550-3g.dts index 8f9a62bba2..b75ecb0495 100644 --- a/target/linux/ramips/dts/rt3052_aztech_hw550-3g.dts +++ b/target/linux/ramips/dts/rt3052_aztech_hw550-3g.dts @@ -96,8 +96,7 @@ }; keys { - compatible = "gpio-keys-polled"; - poll-interval = <20>; + compatible = "gpio-keys"; reset { label = "reset"; diff --git a/target/linux/ramips/dts/rt3052_buffalo_whr-g300n.dts b/target/linux/ramips/dts/rt3052_buffalo_whr-g300n.dts index c7d4b62695..811db0b1c1 100644 --- a/target/linux/ramips/dts/rt3052_buffalo_whr-g300n.dts +++ b/target/linux/ramips/dts/rt3052_buffalo_whr-g300n.dts @@ -90,8 +90,7 @@ }; keys { - compatible = "gpio-keys-polled"; - poll-interval = <20>; + compatible = "gpio-keys"; reset { label = "reset"; diff --git a/target/linux/ramips/dts/rt3052_dlink_dap-1350.dts b/target/linux/ramips/dts/rt3052_dlink_dap-1350.dts index 581da5acbb..b4c2adbe03 100644 --- a/target/linux/ramips/dts/rt3052_dlink_dap-1350.dts +++ b/target/linux/ramips/dts/rt3052_dlink_dap-1350.dts @@ -99,8 +99,7 @@ }; keys { - compatible = "gpio-keys-polled"; - poll-interval = <20>; + compatible = "gpio-keys"; reset { label = "reset"; diff --git a/target/linux/ramips/dts/rt3052_engenius_esr-9753.dts b/target/linux/ramips/dts/rt3052_engenius_esr-9753.dts index 8f040bf893..653b3d5590 100644 --- a/target/linux/ramips/dts/rt3052_engenius_esr-9753.dts +++ b/target/linux/ramips/dts/rt3052_engenius_esr-9753.dts @@ -83,8 +83,7 @@ }; keys { - compatible = "gpio-keys-polled"; - poll-interval = <20>; + compatible = "gpio-keys"; reset { label = "reset"; diff --git a/target/linux/ramips/dts/rt3052_fon_fonera-20n.dts b/target/linux/ramips/dts/rt3052_fon_fonera-20n.dts index 8f612fbc1c..7b7546a997 100644 --- a/target/linux/ramips/dts/rt3052_fon_fonera-20n.dts +++ b/target/linux/ramips/dts/rt3052_fon_fonera-20n.dts @@ -90,8 +90,7 @@ }; keys { - compatible = "gpio-keys-polled"; - poll-interval = <20>; + compatible = "gpio-keys"; reset { label = "reset"; diff --git a/target/linux/ramips/dts/rt3052_hauppauge_broadway.dts b/target/linux/ramips/dts/rt3052_hauppauge_broadway.dts index 698d8fbc1e..da80010526 100644 --- a/target/linux/ramips/dts/rt3052_hauppauge_broadway.dts +++ b/target/linux/ramips/dts/rt3052_hauppauge_broadway.dts @@ -75,8 +75,7 @@ }; keys { - compatible = "gpio-keys-polled"; - poll-interval = <20>; + compatible = "gpio-keys"; factory { label = "Factory Reset button"; diff --git a/target/linux/ramips/dts/rt3052_huawei_hg255d.dts b/target/linux/ramips/dts/rt3052_huawei_hg255d.dts index 7150a7f41a..0aac571ee2 100644 --- a/target/linux/ramips/dts/rt3052_huawei_hg255d.dts +++ b/target/linux/ramips/dts/rt3052_huawei_hg255d.dts @@ -113,8 +113,7 @@ }; keys { - compatible = "gpio-keys-polled"; - poll-interval = <10>; + compatible = "gpio-keys"; reset { label = "reset"; diff --git a/target/linux/ramips/dts/rt3052_jcg_jhr-n825r.dts b/target/linux/ramips/dts/rt3052_jcg_jhr-n825r.dts index 75af528d30..2e73c4c8cb 100644 --- a/target/linux/ramips/dts/rt3052_jcg_jhr-n825r.dts +++ b/target/linux/ramips/dts/rt3052_jcg_jhr-n825r.dts @@ -76,8 +76,7 @@ }; keys { - compatible = "gpio-keys-polled"; - poll-interval = <20>; + compatible = "gpio-keys"; reset_wps { label = "reset_wps"; gpios = <&gpio0 10 GPIO_ACTIVE_LOW>; diff --git a/target/linux/ramips/dts/rt3052_jcg_jhr-n926r.dts b/target/linux/ramips/dts/rt3052_jcg_jhr-n926r.dts index 8b50244e18..04605017d3 100644 --- a/target/linux/ramips/dts/rt3052_jcg_jhr-n926r.dts +++ b/target/linux/ramips/dts/rt3052_jcg_jhr-n926r.dts @@ -117,8 +117,7 @@ }; keys { - compatible = "gpio-keys-polled"; - poll-interval = <20>; + compatible = "gpio-keys"; reset_wps { label = "reset_wps"; diff --git a/target/linux/ramips/dts/rt3052_mofinetwork_mofi3500-3gn.dts b/target/linux/ramips/dts/rt3052_mofinetwork_mofi3500-3gn.dts index 7e958c3a07..58c62ac5a7 100644 --- a/target/linux/ramips/dts/rt3052_mofinetwork_mofi3500-3gn.dts +++ b/target/linux/ramips/dts/rt3052_mofinetwork_mofi3500-3gn.dts @@ -92,8 +92,7 @@ }; keys { - compatible = "gpio-keys-polled"; - poll-interval = <20>; + compatible = "gpio-keys"; reset { label = "reset"; diff --git a/target/linux/ramips/dts/rt3052_netgear_wnce2001.dts b/target/linux/ramips/dts/rt3052_netgear_wnce2001.dts index 5406e1e263..dd49842001 100644 --- a/target/linux/ramips/dts/rt3052_netgear_wnce2001.dts +++ b/target/linux/ramips/dts/rt3052_netgear_wnce2001.dts @@ -48,8 +48,7 @@ }; keys { - compatible = "gpio-keys-polled"; - poll-interval = <20>; + compatible = "gpio-keys"; reset { label = "reset"; diff --git a/target/linux/ramips/dts/rt3052_nexaira_bc2.dts b/target/linux/ramips/dts/rt3052_nexaira_bc2.dts index e92ce3261d..ae6ab4d764 100644 --- a/target/linux/ramips/dts/rt3052_nexaira_bc2.dts +++ b/target/linux/ramips/dts/rt3052_nexaira_bc2.dts @@ -72,8 +72,7 @@ }; keys { - compatible = "gpio-keys-polled"; - poll-interval = <20>; + compatible = "gpio-keys"; reset { label = "reset"; diff --git a/target/linux/ramips/dts/rt3052_omnima_miniembwifi.dts b/target/linux/ramips/dts/rt3052_omnima_miniembwifi.dts index 8aed9e947f..41985ee3cb 100644 --- a/target/linux/ramips/dts/rt3052_omnima_miniembwifi.dts +++ b/target/linux/ramips/dts/rt3052_omnima_miniembwifi.dts @@ -32,8 +32,7 @@ }; keys { - compatible = "gpio-keys-polled"; - poll-interval = <20>; + compatible = "gpio-keys"; reset { label = "reset"; diff --git a/target/linux/ramips/dts/rt3052_petatel_psr-680w.dts b/target/linux/ramips/dts/rt3052_petatel_psr-680w.dts index de2d9450ee..cde7d7b17f 100644 --- a/target/linux/ramips/dts/rt3052_petatel_psr-680w.dts +++ b/target/linux/ramips/dts/rt3052_petatel_psr-680w.dts @@ -81,8 +81,7 @@ }; keys { - compatible = "gpio-keys-polled"; - poll-interval = <20>; + compatible = "gpio-keys"; reset { label = "reset"; diff --git a/target/linux/ramips/dts/rt3052_planex_mzk-w300nh2.dts b/target/linux/ramips/dts/rt3052_planex_mzk-w300nh2.dts index 88e2480f41..b7aa08ea74 100644 --- a/target/linux/ramips/dts/rt3052_planex_mzk-w300nh2.dts +++ b/target/linux/ramips/dts/rt3052_planex_mzk-w300nh2.dts @@ -95,8 +95,7 @@ }; keys { - compatible = "gpio-keys-polled"; - poll-interval = <20>; + compatible = "gpio-keys"; wps { label = "wps"; diff --git a/target/linux/ramips/dts/rt3052_poray_ip2202.dts b/target/linux/ramips/dts/rt3052_poray_ip2202.dts index e9273d6570..77ac4e187d 100644 --- a/target/linux/ramips/dts/rt3052_poray_ip2202.dts +++ b/target/linux/ramips/dts/rt3052_poray_ip2202.dts @@ -76,8 +76,7 @@ }; keys { - compatible = "gpio-keys-polled"; - poll-interval = <20>; + compatible = "gpio-keys"; reset { label = "reset"; diff --git a/target/linux/ramips/dts/rt3052_prolink_pwh2004.dts b/target/linux/ramips/dts/rt3052_prolink_pwh2004.dts index bb213c9f80..5faf41cfc8 100644 --- a/target/linux/ramips/dts/rt3052_prolink_pwh2004.dts +++ b/target/linux/ramips/dts/rt3052_prolink_pwh2004.dts @@ -78,8 +78,7 @@ }; keys { - compatible = "gpio-keys-polled"; - poll-interval = <20>; + compatible = "gpio-keys"; wps { label = "wps"; diff --git a/target/linux/ramips/dts/rt3052_ralink_v22rw-2x2.dts b/target/linux/ramips/dts/rt3052_ralink_v22rw-2x2.dts index 179e738d4f..1fc7124455 100644 --- a/target/linux/ramips/dts/rt3052_ralink_v22rw-2x2.dts +++ b/target/linux/ramips/dts/rt3052_ralink_v22rw-2x2.dts @@ -78,8 +78,7 @@ }; keys { - compatible = "gpio-keys-polled"; - poll-interval = <20>; + compatible = "gpio-keys"; reset { label = "reset"; diff --git a/target/linux/ramips/dts/rt3052_sitecom_wl-351.dts b/target/linux/ramips/dts/rt3052_sitecom_wl-351.dts index f4dd878782..d1d68f6a5c 100644 --- a/target/linux/ramips/dts/rt3052_sitecom_wl-351.dts +++ b/target/linux/ramips/dts/rt3052_sitecom_wl-351.dts @@ -87,8 +87,7 @@ }; keys { - compatible = "gpio-keys-polled"; - poll-interval = <20>; + compatible = "gpio-keys"; reset { label = "reset"; diff --git a/target/linux/ramips/dts/rt3052_skyline_sl-r7205.dts b/target/linux/ramips/dts/rt3052_skyline_sl-r7205.dts index 2a1c576fe5..e55850bc28 100644 --- a/target/linux/ramips/dts/rt3052_skyline_sl-r7205.dts +++ b/target/linux/ramips/dts/rt3052_skyline_sl-r7205.dts @@ -75,8 +75,7 @@ }; keys { - compatible = "gpio-keys-polled"; - poll-interval = <20>; + compatible = "gpio-keys"; reset { label = "reset"; diff --git a/target/linux/ramips/dts/rt3052_tenda_3g300m.dts b/target/linux/ramips/dts/rt3052_tenda_3g300m.dts index 8620d4a1ad..a37d2a4ac6 100644 --- a/target/linux/ramips/dts/rt3052_tenda_3g300m.dts +++ b/target/linux/ramips/dts/rt3052_tenda_3g300m.dts @@ -51,8 +51,7 @@ }; keys { - compatible = "gpio-keys-polled"; - poll-interval = <20>; + compatible = "gpio-keys"; reset { label = "reset"; diff --git a/target/linux/ramips/dts/rt3052_tenda_w306r-v2.dts b/target/linux/ramips/dts/rt3052_tenda_w306r-v2.dts index ddeaa94fc5..7e5ffc61e0 100644 --- a/target/linux/ramips/dts/rt3052_tenda_w306r-v2.dts +++ b/target/linux/ramips/dts/rt3052_tenda_w306r-v2.dts @@ -82,8 +82,7 @@ }; keys { - compatible = "gpio-keys-polled"; - poll-interval = <20>; + compatible = "gpio-keys"; reset { label = "RESET/WPS"; diff --git a/target/linux/ramips/dts/rt3052_unbranded_wr512-3gn.dtsi b/target/linux/ramips/dts/rt3052_unbranded_wr512-3gn.dtsi index c18112fc01..4e1560728a 100644 --- a/target/linux/ramips/dts/rt3052_unbranded_wr512-3gn.dtsi +++ b/target/linux/ramips/dts/rt3052_unbranded_wr512-3gn.dtsi @@ -45,8 +45,7 @@ }; keys { - compatible = "gpio-keys-polled"; - poll-interval = <20>; + compatible = "gpio-keys"; reset_wps { label = "reset_wps"; diff --git a/target/linux/ramips/dts/rt3052_unbranded_xdx-rn502j.dts b/target/linux/ramips/dts/rt3052_unbranded_xdx-rn502j.dts index af140fee1f..074dd8cec9 100644 --- a/target/linux/ramips/dts/rt3052_unbranded_xdx-rn502j.dts +++ b/target/linux/ramips/dts/rt3052_unbranded_xdx-rn502j.dts @@ -82,8 +82,7 @@ }; keys { - compatible = "gpio-keys-polled"; - poll-interval = <20>; + compatible = "gpio-keys"; reset { label = "reset"; diff --git a/target/linux/ramips/dts/rt3052_upvel_ur-326n4g.dts b/target/linux/ramips/dts/rt3052_upvel_ur-326n4g.dts index e22b946b08..0118f02143 100644 --- a/target/linux/ramips/dts/rt3052_upvel_ur-326n4g.dts +++ b/target/linux/ramips/dts/rt3052_upvel_ur-326n4g.dts @@ -97,8 +97,7 @@ }; keys { - compatible = "gpio-keys-polled"; - poll-interval = <20>; + compatible = "gpio-keys"; reset_wps { label = "reset_wps"; diff --git a/target/linux/ramips/dts/rt3052_upvel_ur-336un.dts b/target/linux/ramips/dts/rt3052_upvel_ur-336un.dts index 4a7dc5511c..58cc069c7e 100644 --- a/target/linux/ramips/dts/rt3052_upvel_ur-336un.dts +++ b/target/linux/ramips/dts/rt3052_upvel_ur-336un.dts @@ -97,8 +97,7 @@ }; keys { - compatible = "gpio-keys-polled"; - poll-interval = <20>; + compatible = "gpio-keys"; reset_wps { label = "reset_wps"; diff --git a/target/linux/ramips/dts/rt3052_zyxel_keenetic.dts b/target/linux/ramips/dts/rt3052_zyxel_keenetic.dts index c7285150d9..454f865da7 100644 --- a/target/linux/ramips/dts/rt3052_zyxel_keenetic.dts +++ b/target/linux/ramips/dts/rt3052_zyxel_keenetic.dts @@ -91,8 +91,7 @@ }; keys { - compatible = "gpio-keys-polled"; - poll-interval = <20>; + compatible = "gpio-keys"; reset { label = "reset"; diff --git a/target/linux/ramips/dts/rt3052_zyxel_nbg-419n.dts b/target/linux/ramips/dts/rt3052_zyxel_nbg-419n.dts index fc6cd21f3c..0c0add3a09 100644 --- a/target/linux/ramips/dts/rt3052_zyxel_nbg-419n.dts +++ b/target/linux/ramips/dts/rt3052_zyxel_nbg-419n.dts @@ -83,8 +83,7 @@ }; keys { - compatible = "gpio-keys-polled"; - poll-interval = <20>; + compatible = "gpio-keys"; reset { label = "reset"; diff --git a/target/linux/ramips/dts/rt3352_dlink_dir-615-h1.dts b/target/linux/ramips/dts/rt3352_dlink_dir-615-h1.dts index 8ed29c8dee..ef142ba6c5 100644 --- a/target/linux/ramips/dts/rt3352_dlink_dir-615-h1.dts +++ b/target/linux/ramips/dts/rt3352_dlink_dir-615-h1.dts @@ -52,8 +52,7 @@ }; keys { - compatible = "gpio-keys-polled"; - poll-interval = <20>; + compatible = "gpio-keys"; reset { label = "reset"; diff --git a/target/linux/ramips/dts/rt3352_dlink_dir-620-d1.dts b/target/linux/ramips/dts/rt3352_dlink_dir-620-d1.dts index bd897a0d1a..3ee0ed9401 100644 --- a/target/linux/ramips/dts/rt3352_dlink_dir-620-d1.dts +++ b/target/linux/ramips/dts/rt3352_dlink_dir-620-d1.dts @@ -31,8 +31,7 @@ }; keys { - compatible = "gpio-keys-polled"; - poll-interval = <20>; + compatible = "gpio-keys"; reset_wps { label = "reset_wps"; diff --git a/target/linux/ramips/dts/rt3352_zte_mf283plus.dts b/target/linux/ramips/dts/rt3352_zte_mf283plus.dts index 1d0b14608a..d35cf43095 100644 --- a/target/linux/ramips/dts/rt3352_zte_mf283plus.dts +++ b/target/linux/ramips/dts/rt3352_zte_mf283plus.dts @@ -41,8 +41,7 @@ }; keys { - compatible = "gpio-keys-polled"; - poll-interval = <20>; + compatible = "gpio-keys"; reset { label = "reset"; diff --git a/target/linux/ramips/dts/rt3352_zyxel_nbg-419n-v2.dts b/target/linux/ramips/dts/rt3352_zyxel_nbg-419n-v2.dts index ce776d4603..5bb019bf07 100644 --- a/target/linux/ramips/dts/rt3352_zyxel_nbg-419n-v2.dts +++ b/target/linux/ramips/dts/rt3352_zyxel_nbg-419n-v2.dts @@ -40,8 +40,7 @@ }; keys { - compatible = "gpio-keys-polled"; - poll-interval = <20>; + compatible = "gpio-keys"; reset { label = "reset"; gpios = <&gpio0 10 GPIO_ACTIVE_LOW>; diff --git a/target/linux/ramips/dts/rt5350_7links_px-4885.dtsi b/target/linux/ramips/dts/rt5350_7links_px-4885.dtsi index ba330112e1..c0a209f809 100644 --- a/target/linux/ramips/dts/rt5350_7links_px-4885.dtsi +++ b/target/linux/ramips/dts/rt5350_7links_px-4885.dtsi @@ -14,8 +14,7 @@ }; keys { - compatible = "gpio-keys-polled"; - poll-interval = <20>; + compatible = "gpio-keys"; reset { label = "reset"; diff --git a/target/linux/ramips/dts/rt5350_airlive_air3gii.dts b/target/linux/ramips/dts/rt5350_airlive_air3gii.dts index 5c64ef30e6..2f6a350561 100644 --- a/target/linux/ramips/dts/rt5350_airlive_air3gii.dts +++ b/target/linux/ramips/dts/rt5350_airlive_air3gii.dts @@ -26,8 +26,7 @@ }; keys { - compatible = "gpio-keys-polled"; - poll-interval = <20>; + compatible = "gpio-keys"; wps { label = "wps"; diff --git a/target/linux/ramips/dts/rt5350_asiarf_awm002-evb.dtsi b/target/linux/ramips/dts/rt5350_asiarf_awm002-evb.dtsi index eb5e25fa6e..abe60ddd6e 100644 --- a/target/linux/ramips/dts/rt5350_asiarf_awm002-evb.dtsi +++ b/target/linux/ramips/dts/rt5350_asiarf_awm002-evb.dtsi @@ -30,8 +30,7 @@ }; keys { - compatible = "gpio-keys-polled"; - poll-interval = <20>; + compatible = "gpio-keys"; reset_wps { label = "reset_wps"; diff --git a/target/linux/ramips/dts/rt5350_belkin_f7c027.dts b/target/linux/ramips/dts/rt5350_belkin_f7c027.dts index 30eb833dd7..f8b0881e2a 100644 --- a/target/linux/ramips/dts/rt5350_belkin_f7c027.dts +++ b/target/linux/ramips/dts/rt5350_belkin_f7c027.dts @@ -43,8 +43,7 @@ }; keys { - compatible = "gpio-keys-polled"; - poll-interval = <20>; + compatible = "gpio-keys"; top { label = "restore"; diff --git a/target/linux/ramips/dts/rt5350_dlink_dcs-930l-b1.dts b/target/linux/ramips/dts/rt5350_dlink_dcs-930l-b1.dts index 254b8353a8..9abbbccc87 100644 --- a/target/linux/ramips/dts/rt5350_dlink_dcs-930l-b1.dts +++ b/target/linux/ramips/dts/rt5350_dlink_dcs-930l-b1.dts @@ -32,8 +32,7 @@ }; keys { - compatible = "gpio-keys-polled"; - poll-interval = <20>; + compatible = "gpio-keys"; reset { label = "reset"; diff --git a/target/linux/ramips/dts/rt5350_dlink_dir-300-b7.dts b/target/linux/ramips/dts/rt5350_dlink_dir-300-b7.dts index 80740c5ae9..18c3cbdb14 100644 --- a/target/linux/ramips/dts/rt5350_dlink_dir-300-b7.dts +++ b/target/linux/ramips/dts/rt5350_dlink_dir-300-b7.dts @@ -32,8 +32,7 @@ }; keys { - compatible = "gpio-keys-polled"; - poll-interval = <20>; + compatible = "gpio-keys"; reset { label = "reset"; diff --git a/target/linux/ramips/dts/rt5350_dlink_dir-320-b1.dts b/target/linux/ramips/dts/rt5350_dlink_dir-320-b1.dts index 71ea2256c4..4e6feab497 100644 --- a/target/linux/ramips/dts/rt5350_dlink_dir-320-b1.dts +++ b/target/linux/ramips/dts/rt5350_dlink_dir-320-b1.dts @@ -38,8 +38,7 @@ }; keys { - compatible = "gpio-keys-polled"; - poll-interval = <20>; + compatible = "gpio-keys"; reset { label = "reset"; diff --git a/target/linux/ramips/dts/rt5350_dlink_dir-610-a1.dts b/target/linux/ramips/dts/rt5350_dlink_dir-610-a1.dts index 9a352d0ea5..b11816870c 100644 --- a/target/linux/ramips/dts/rt5350_dlink_dir-610-a1.dts +++ b/target/linux/ramips/dts/rt5350_dlink_dir-610-a1.dts @@ -32,8 +32,7 @@ }; keys { - compatible = "gpio-keys-polled"; - poll-interval = <20>; + compatible = "gpio-keys"; reset { label = "reset"; diff --git a/target/linux/ramips/dts/rt5350_dlink_dwr-512-b.dts b/target/linux/ramips/dts/rt5350_dlink_dwr-512-b.dts index 56efcde9f5..0e3c4b9e35 100644 --- a/target/linux/ramips/dts/rt5350_dlink_dwr-512-b.dts +++ b/target/linux/ramips/dts/rt5350_dlink_dwr-512-b.dts @@ -16,8 +16,7 @@ }; keys { - compatible = "gpio-keys-polled"; - poll-interval = <20>; + compatible = "gpio-keys"; wps { label = "wps"; diff --git a/target/linux/ramips/dts/rt5350_hame_mpr-a1.dts b/target/linux/ramips/dts/rt5350_hame_mpr-a1.dts index a463bace6f..ab46851207 100644 --- a/target/linux/ramips/dts/rt5350_hame_mpr-a1.dts +++ b/target/linux/ramips/dts/rt5350_hame_mpr-a1.dts @@ -31,8 +31,7 @@ }; keys { - compatible = "gpio-keys-polled"; - poll-interval = <20>; + compatible = "gpio-keys"; wps { label = "reset"; diff --git a/target/linux/ramips/dts/rt5350_hame_mpr-a2.dts b/target/linux/ramips/dts/rt5350_hame_mpr-a2.dts index 557443a4c0..be33d39f7e 100644 --- a/target/linux/ramips/dts/rt5350_hame_mpr-a2.dts +++ b/target/linux/ramips/dts/rt5350_hame_mpr-a2.dts @@ -31,8 +31,7 @@ }; keys { - compatible = "gpio-keys-polled"; - poll-interval = <20>; + compatible = "gpio-keys"; wps { label = "reset"; diff --git a/target/linux/ramips/dts/rt5350_hilink_hlk-rm04.dts b/target/linux/ramips/dts/rt5350_hilink_hlk-rm04.dts index 6d7b1f0892..111e3e7e77 100644 --- a/target/linux/ramips/dts/rt5350_hilink_hlk-rm04.dts +++ b/target/linux/ramips/dts/rt5350_hilink_hlk-rm04.dts @@ -31,8 +31,7 @@ }; keys { - compatible = "gpio-keys-polled"; - poll-interval = <20>; + compatible = "gpio-keys"; reset { label = "reset"; gpios = <&gpio0 0 GPIO_ACTIVE_LOW>; diff --git a/target/linux/ramips/dts/rt5350_hootoo_ht-tm02.dts b/target/linux/ramips/dts/rt5350_hootoo_ht-tm02.dts index 7d189338b7..d65a8d8e92 100644 --- a/target/linux/ramips/dts/rt5350_hootoo_ht-tm02.dts +++ b/target/linux/ramips/dts/rt5350_hootoo_ht-tm02.dts @@ -32,8 +32,7 @@ }; keys { - compatible = "gpio-keys-polled"; - poll-interval = <20>; + compatible = "gpio-keys"; reset { label = "reset"; diff --git a/target/linux/ramips/dts/rt5350_intenso_memory2move.dts b/target/linux/ramips/dts/rt5350_intenso_memory2move.dts index 68807159d8..5fe14669af 100644 --- a/target/linux/ramips/dts/rt5350_intenso_memory2move.dts +++ b/target/linux/ramips/dts/rt5350_intenso_memory2move.dts @@ -35,8 +35,7 @@ }; keys { - compatible = "gpio-keys-polled"; - poll-interval = <20>; + compatible = "gpio-keys"; power { label = "power"; diff --git a/target/linux/ramips/dts/rt5350_nexx_wt1520.dtsi b/target/linux/ramips/dts/rt5350_nexx_wt1520.dtsi index 4dbb324def..9c552c3450 100644 --- a/target/linux/ramips/dts/rt5350_nexx_wt1520.dtsi +++ b/target/linux/ramips/dts/rt5350_nexx_wt1520.dtsi @@ -7,8 +7,7 @@ compatible = "nexx,wt1520", "ralink,rt5350-soc"; keys { - compatible = "gpio-keys-polled"; - poll-interval = <20>; + compatible = "gpio-keys"; reset { label = "reset"; diff --git a/target/linux/ramips/dts/rt5350_omnima_miniembplug.dts b/target/linux/ramips/dts/rt5350_omnima_miniembplug.dts index 2c09c12d79..10924bda95 100644 --- a/target/linux/ramips/dts/rt5350_omnima_miniembplug.dts +++ b/target/linux/ramips/dts/rt5350_omnima_miniembplug.dts @@ -26,8 +26,7 @@ }; keys { - compatible = "gpio-keys-polled"; - poll-interval = <20>; + compatible = "gpio-keys"; wps { label = "wps"; diff --git a/target/linux/ramips/dts/rt5350_planex_mzk-dp150n.dts b/target/linux/ramips/dts/rt5350_planex_mzk-dp150n.dts index f6059f0645..5407c68122 100644 --- a/target/linux/ramips/dts/rt5350_planex_mzk-dp150n.dts +++ b/target/linux/ramips/dts/rt5350_planex_mzk-dp150n.dts @@ -26,8 +26,7 @@ }; keys { - compatible = "gpio-keys-polled"; - poll-interval = <20>; + compatible = "gpio-keys"; reset { label = "reset"; diff --git a/target/linux/ramips/dts/rt5350_poray_m3.dts b/target/linux/ramips/dts/rt5350_poray_m3.dts index 489f218456..92af77e54b 100644 --- a/target/linux/ramips/dts/rt5350_poray_m3.dts +++ b/target/linux/ramips/dts/rt5350_poray_m3.dts @@ -26,8 +26,7 @@ }; keys { - compatible = "gpio-keys-polled"; - poll-interval = <20>; + compatible = "gpio-keys"; reset { label = "reset"; diff --git a/target/linux/ramips/dts/rt5350_poray_m4.dtsi b/target/linux/ramips/dts/rt5350_poray_m4.dtsi index 74ce523566..3ae8e3c818 100644 --- a/target/linux/ramips/dts/rt5350_poray_m4.dtsi +++ b/target/linux/ramips/dts/rt5350_poray_m4.dtsi @@ -25,8 +25,7 @@ }; keys { - compatible = "gpio-keys-polled"; - poll-interval = <20>; + compatible = "gpio-keys"; reset { label = "reset"; diff --git a/target/linux/ramips/dts/rt5350_poray_x5.dts b/target/linux/ramips/dts/rt5350_poray_x5.dts index ac88c73364..33321624c2 100644 --- a/target/linux/ramips/dts/rt5350_poray_x5.dts +++ b/target/linux/ramips/dts/rt5350_poray_x5.dts @@ -41,8 +41,7 @@ }; keys { - compatible = "gpio-keys-polled"; - poll-interval = <20>; + compatible = "gpio-keys"; bat { label = "bat"; diff --git a/target/linux/ramips/dts/rt5350_poray_x8.dts b/target/linux/ramips/dts/rt5350_poray_x8.dts index 7930716dcf..a398228b36 100644 --- a/target/linux/ramips/dts/rt5350_poray_x8.dts +++ b/target/linux/ramips/dts/rt5350_poray_x8.dts @@ -26,8 +26,7 @@ }; keys { - compatible = "gpio-keys-polled"; - poll-interval = <20>; + compatible = "gpio-keys"; reset { label = "reset"; diff --git a/target/linux/ramips/dts/rt5350_tenda_3g150b.dts b/target/linux/ramips/dts/rt5350_tenda_3g150b.dts index 407a18e761..64ba5b41d2 100644 --- a/target/linux/ramips/dts/rt5350_tenda_3g150b.dts +++ b/target/linux/ramips/dts/rt5350_tenda_3g150b.dts @@ -31,8 +31,7 @@ }; keys { - compatible = "gpio-keys-polled"; - poll-interval = <20>; + compatible = "gpio-keys"; reset { label = "reset"; diff --git a/target/linux/ramips/dts/rt5350_trendnet_tew-714tru.dts b/target/linux/ramips/dts/rt5350_trendnet_tew-714tru.dts index 44612945a3..2a930c3e95 100644 --- a/target/linux/ramips/dts/rt5350_trendnet_tew-714tru.dts +++ b/target/linux/ramips/dts/rt5350_trendnet_tew-714tru.dts @@ -26,8 +26,7 @@ }; keys { - compatible = "gpio-keys-polled"; - poll-interval = <20>; + compatible = "gpio-keys"; reset { label = "reset"; diff --git a/target/linux/ramips/dts/rt5350_unbranded_a5-v11.dts b/target/linux/ramips/dts/rt5350_unbranded_a5-v11.dts index c8b361842b..e4ae17bbbf 100644 --- a/target/linux/ramips/dts/rt5350_unbranded_a5-v11.dts +++ b/target/linux/ramips/dts/rt5350_unbranded_a5-v11.dts @@ -32,8 +32,7 @@ }; keys { - compatible = "gpio-keys-polled"; - poll-interval = <20>; + compatible = "gpio-keys"; reset { label = "reset"; diff --git a/target/linux/ramips/dts/rt5350_wiznet_wizfi630a.dts b/target/linux/ramips/dts/rt5350_wiznet_wizfi630a.dts index 2aff7445e8..600fb2814b 100644 --- a/target/linux/ramips/dts/rt5350_wiznet_wizfi630a.dts +++ b/target/linux/ramips/dts/rt5350_wiznet_wizfi630a.dts @@ -43,8 +43,7 @@ }; keys { - compatible = "gpio-keys-polled"; - poll-interval = <20>; + compatible = "gpio-keys"; reset { label = "reset"; diff --git a/target/linux/ramips/dts/rt5350_zorlik_zl5900v2.dts b/target/linux/ramips/dts/rt5350_zorlik_zl5900v2.dts index 488a4887b9..3f35940528 100644 --- a/target/linux/ramips/dts/rt5350_zorlik_zl5900v2.dts +++ b/target/linux/ramips/dts/rt5350_zorlik_zl5900v2.dts @@ -32,8 +32,7 @@ }; keys { - compatible = "gpio-keys-polled"; - poll-interval = <20>; + compatible = "gpio-keys"; reset { label = "reset"; diff --git a/target/linux/ramips/dts/rt5350_zyxel_keenetic-start.dts b/target/linux/ramips/dts/rt5350_zyxel_keenetic-start.dts index 459350fade..68b34dc45a 100644 --- a/target/linux/ramips/dts/rt5350_zyxel_keenetic-start.dts +++ b/target/linux/ramips/dts/rt5350_zyxel_keenetic-start.dts @@ -34,8 +34,7 @@ }; keys { - compatible = "gpio-keys-polled"; - poll-interval = <20>; + compatible = "gpio-keys"; reset { label = "reset"; From d7ed4c77b526a1b9e2b914b817a6816dffe11484 Mon Sep 17 00:00:00 2001 From: Shiji Yang Date: Thu, 24 Oct 2024 00:09:36 +0800 Subject: [PATCH 6/7] ramips: rt3883: convert devices to interrupt-driven gpio-keys This converts all RT3662 and RT3883 devices to use interrupt based gpio-keys instead of gpio-keys-polled. The poll-interval will be removed. Signed-off-by: Shiji Yang Link: https://github.com/openwrt/openwrt/pull/16764 Signed-off-by: Robert Marko --- target/linux/ramips/dts/rt3662_asus_rt-n56u.dts | 3 +-- target/linux/ramips/dts/rt3662_dlink_dir-645.dts | 3 +-- target/linux/ramips/dts/rt3662_edimax_br-6475nd.dts | 3 +-- target/linux/ramips/dts/rt3662_engenius_esr600h.dts | 3 +-- target/linux/ramips/dts/rt3662_omnima_hpm.dts | 3 +-- target/linux/ramips/dts/rt3883_belkin_f9k1109v1.dts | 3 +-- target/linux/ramips/dts/rt3883_sitecom_wlr-6000.dts | 3 +-- target/linux/ramips/dts/rt3883_trendnet_tew-691gr.dts | 3 +-- target/linux/ramips/dts/rt3883_trendnet_tew-692gr.dts | 3 +-- 9 files changed, 9 insertions(+), 18 deletions(-) diff --git a/target/linux/ramips/dts/rt3662_asus_rt-n56u.dts b/target/linux/ramips/dts/rt3662_asus_rt-n56u.dts index c381aa3e03..825190c315 100644 --- a/target/linux/ramips/dts/rt3662_asus_rt-n56u.dts +++ b/target/linux/ramips/dts/rt3662_asus_rt-n56u.dts @@ -77,8 +77,7 @@ }; keys { - compatible = "gpio-keys-polled"; - poll-interval = <100>; + compatible = "gpio-keys"; reset { label = "reset"; diff --git a/target/linux/ramips/dts/rt3662_dlink_dir-645.dts b/target/linux/ramips/dts/rt3662_dlink_dir-645.dts index 8cfa48e195..7597b7d867 100644 --- a/target/linux/ramips/dts/rt3662_dlink_dir-645.dts +++ b/target/linux/ramips/dts/rt3662_dlink_dir-645.dts @@ -23,8 +23,7 @@ }; keys { - compatible = "gpio-keys-polled"; - poll-interval = <100>; + compatible = "gpio-keys"; reset { label = "reset"; diff --git a/target/linux/ramips/dts/rt3662_edimax_br-6475nd.dts b/target/linux/ramips/dts/rt3662_edimax_br-6475nd.dts index fbc795b24f..832891f44e 100644 --- a/target/linux/ramips/dts/rt3662_edimax_br-6475nd.dts +++ b/target/linux/ramips/dts/rt3662_edimax_br-6475nd.dts @@ -17,8 +17,7 @@ }; keys { - compatible = "gpio-keys-polled"; - poll-interval = <100>; + compatible = "gpio-keys"; reset { label = "reset"; diff --git a/target/linux/ramips/dts/rt3662_engenius_esr600h.dts b/target/linux/ramips/dts/rt3662_engenius_esr600h.dts index b539d2d4a7..f7a7ba8a0e 100644 --- a/target/linux/ramips/dts/rt3662_engenius_esr600h.dts +++ b/target/linux/ramips/dts/rt3662_engenius_esr600h.dts @@ -35,8 +35,7 @@ }; keys { - compatible = "gpio-keys-polled"; - poll-interval = <100>; + compatible = "gpio-keys"; reset-wps { label = "reset-wps"; diff --git a/target/linux/ramips/dts/rt3662_omnima_hpm.dts b/target/linux/ramips/dts/rt3662_omnima_hpm.dts index 82d79dedb4..a6d5e4e8b3 100644 --- a/target/linux/ramips/dts/rt3662_omnima_hpm.dts +++ b/target/linux/ramips/dts/rt3662_omnima_hpm.dts @@ -20,8 +20,7 @@ }; keys { - compatible = "gpio-keys-polled"; - poll-interval = <100>; + compatible = "gpio-keys"; reset { label = "reset"; diff --git a/target/linux/ramips/dts/rt3883_belkin_f9k1109v1.dts b/target/linux/ramips/dts/rt3883_belkin_f9k1109v1.dts index 5547ec0f48..db1a536d2c 100644 --- a/target/linux/ramips/dts/rt3883_belkin_f9k1109v1.dts +++ b/target/linux/ramips/dts/rt3883_belkin_f9k1109v1.dts @@ -58,8 +58,7 @@ }; keys { - compatible = "gpio-keys-polled"; - poll-interval = <100>; + compatible = "gpio-keys"; reset { label = "reset"; diff --git a/target/linux/ramips/dts/rt3883_sitecom_wlr-6000.dts b/target/linux/ramips/dts/rt3883_sitecom_wlr-6000.dts index 94a47b8735..5f2fea28d3 100644 --- a/target/linux/ramips/dts/rt3883_sitecom_wlr-6000.dts +++ b/target/linux/ramips/dts/rt3883_sitecom_wlr-6000.dts @@ -16,8 +16,7 @@ }; keys { - compatible = "gpio-keys-polled"; - poll-interval = <20>; + compatible = "gpio-keys"; reset { label = "reset"; diff --git a/target/linux/ramips/dts/rt3883_trendnet_tew-691gr.dts b/target/linux/ramips/dts/rt3883_trendnet_tew-691gr.dts index d9ad78ba2b..3863021a4b 100644 --- a/target/linux/ramips/dts/rt3883_trendnet_tew-691gr.dts +++ b/target/linux/ramips/dts/rt3883_trendnet_tew-691gr.dts @@ -68,8 +68,7 @@ }; keys { - compatible = "gpio-keys-polled"; - poll-interval = <100>; + compatible = "gpio-keys"; reset { label = "reset"; diff --git a/target/linux/ramips/dts/rt3883_trendnet_tew-692gr.dts b/target/linux/ramips/dts/rt3883_trendnet_tew-692gr.dts index c6a817aafc..6bb01b8c6c 100644 --- a/target/linux/ramips/dts/rt3883_trendnet_tew-692gr.dts +++ b/target/linux/ramips/dts/rt3883_trendnet_tew-692gr.dts @@ -68,8 +68,7 @@ }; keys { - compatible = "gpio-keys-polled"; - poll-interval = <100>; + compatible = "gpio-keys"; reset { label = "reset"; From 1dc86af3565c833cea32040bf23d085124c4c464 Mon Sep 17 00:00:00 2001 From: Andreas Gnau Date: Fri, 25 Oct 2024 18:49:48 +0200 Subject: [PATCH 7/7] airoha: Clarify subtarget compatibility Clarify compatibility of the two subtargets with different SoCs to reduce confusion. The added SoC names only differ in small details such as features enabled (PoN vs DSL for example). Signed-off-by: Andreas Gnau Link: https://github.com/openwrt/openwrt/pull/16785 Signed-off-by: Christian Marangi --- target/linux/airoha/an7581/target.mk | 2 +- target/linux/airoha/en7523/target.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/target/linux/airoha/an7581/target.mk b/target/linux/airoha/an7581/target.mk index 1c0e8d02f6..6d0c4e2cb5 100644 --- a/target/linux/airoha/an7581/target.mk +++ b/target/linux/airoha/an7581/target.mk @@ -1,6 +1,6 @@ ARCH:=aarch64 SUBTARGET:=an7581 -BOARDNAME:=AN7581 +BOARDNAME:=AN7581 / AN7566 / AN7551 CPU_TYPE:=cortex-a53 KERNELNAME:=Image dtbs FEATURES+=pwm source-only diff --git a/target/linux/airoha/en7523/target.mk b/target/linux/airoha/en7523/target.mk index eec7bb41ca..607077e5c8 100644 --- a/target/linux/airoha/en7523/target.mk +++ b/target/linux/airoha/en7523/target.mk @@ -1,6 +1,6 @@ ARCH:=arm SUBTARGET:=en7523 -BOARDNAME:=EN7523 +BOARDNAME:=EN7523 / EN7529 / EN7562 CPU_TYPE:=cortex-a7 KERNELNAME:=Image dtbs -FEATURES+=source-only \ No newline at end of file +FEATURES+=source-only