diff options
Diffstat (limited to 'target/linux/brcm47xx')
3 files changed, 6 insertions, 44 deletions
diff --git a/target/linux/brcm47xx/patches-4.4/030-MIPS-BCM47XX-Add-Luxul-devices-to-the-database.patch b/target/linux/brcm47xx/patches-4.4/030-MIPS-BCM47XX-Add-Luxul-devices-to-the-database.patch index 402d9360f4..49ba623733 100644 --- a/target/linux/brcm47xx/patches-4.4/030-MIPS-BCM47XX-Add-Luxul-devices-to-the-database.patch +++ b/target/linux/brcm47xx/patches-4.4/030-MIPS-BCM47XX-Add-Luxul-devices-to-the-database.patch @@ -43,7 +43,7 @@ Signed-off-by: Ralf Baechle <ralf@linux-mips.org> {{BCM47XX_BOARD_NETGEAR_WGR614V9, "Netgear WGR614 V9"}, "U12H094T00_NETGEAR"}, --- a/arch/mips/bcm47xx/buttons.c +++ b/arch/mips/bcm47xx/buttons.c -@@ -302,6 +302,51 @@ bcm47xx_buttons_linksys_wrtsl54gs[] __in +@@ -308,6 +308,51 @@ bcm47xx_buttons_linksys_wrtsl54gs[] __in /* Luxul */ static const struct gpio_keys_button @@ -95,7 +95,7 @@ Signed-off-by: Ralf Baechle <ralf@linux-mips.org> bcm47xx_buttons_luxul_xwr_1750_v1[] = { BCM47XX_GPIO_KEY(14, BTN_TASK), }; -@@ -561,6 +606,33 @@ int __init bcm47xx_buttons_register(void +@@ -567,6 +612,33 @@ int __init bcm47xx_buttons_register(void err = bcm47xx_copy_bdata(bcm47xx_buttons_linksys_wrtsl54gs); break; diff --git a/target/linux/brcm47xx/patches-4.4/130-MIPS-bcm47xx-Fix-button-inversion-for-Asus-WL-500W.patch b/target/linux/brcm47xx/patches-4.4/130-MIPS-bcm47xx-Fix-button-inversion-for-Asus-WL-500W.patch deleted file mode 100644 index 7d671cf183..0000000000 --- a/target/linux/brcm47xx/patches-4.4/130-MIPS-bcm47xx-Fix-button-inversion-for-Asus-WL-500W.patch +++ /dev/null @@ -1,38 +0,0 @@ -From: Mirko Parthey <mirko.parthey@web.de> -Subject: [PATCH] MIPS: bcm47xx: Fix button inversion for Asus WL-500W - -The Asus WL-500W buttons are active high, -but the software treats them as active low. -Fix the inverted logic. - -Signed-off-by: Mirko Parthey <mirko.parthey@web.de> ---- - arch/mips/bcm47xx/buttons.c | 10 ++++++++-- - 1 file changed, 8 insertions(+), 2 deletions(-) - ---- a/arch/mips/bcm47xx/buttons.c -+++ b/arch/mips/bcm47xx/buttons.c -@@ -17,6 +17,12 @@ - .active_low = 1, \ - } - -+#define BCM47XX_GPIO_KEY_H(_gpio, _code) \ -+ { \ -+ .code = _code, \ -+ .gpio = _gpio, \ -+ } -+ - /* Asus */ - - static const struct gpio_keys_button -@@ -79,8 +85,8 @@ bcm47xx_buttons_asus_wl500gpv2[] __initc - - static const struct gpio_keys_button - bcm47xx_buttons_asus_wl500w[] __initconst = { -- BCM47XX_GPIO_KEY(6, KEY_RESTART), -- BCM47XX_GPIO_KEY(7, KEY_WPS_BUTTON), -+ BCM47XX_GPIO_KEY_H(6, KEY_RESTART), -+ BCM47XX_GPIO_KEY_H(7, KEY_WPS_BUTTON), - }; - - static const struct gpio_keys_button diff --git a/target/linux/brcm47xx/patches-4.4/901-Revert-bcma-switch-GPIO-portions-to-use-GPIOLIB_IRQC.patch b/target/linux/brcm47xx/patches-4.4/901-Revert-bcma-switch-GPIO-portions-to-use-GPIOLIB_IRQC.patch index 4968c1bbac..57799ee082 100644 --- a/target/linux/brcm47xx/patches-4.4/901-Revert-bcma-switch-GPIO-portions-to-use-GPIOLIB_IRQC.patch +++ b/target/linux/brcm47xx/patches-4.4/901-Revert-bcma-switch-GPIO-portions-to-use-GPIOLIB_IRQC.patch @@ -193,9 +193,9 @@ Signed-off-by: Rafał Miłecki <zajec5@gmail.com> + chip->to_irq = bcma_gpio_to_irq; +#endif #if IS_BUILTIN(CONFIG_OF) - if (cc->core->bus->hosttype == BCMA_HOSTTYPE_SOC) - chip->of_node = cc->core->dev.of_node; -@@ -217,13 +249,13 @@ int bcma_gpio_init(struct bcma_drv_cc *c + chip->of_node = cc->core->dev.of_node; + #endif +@@ -216,13 +248,13 @@ int bcma_gpio_init(struct bcma_drv_cc *c else chip->base = -1; @@ -212,7 +212,7 @@ Signed-off-by: Rafał Miłecki <zajec5@gmail.com> return err; } -@@ -232,7 +264,7 @@ int bcma_gpio_init(struct bcma_drv_cc *c +@@ -231,7 +263,7 @@ int bcma_gpio_init(struct bcma_drv_cc *c int bcma_gpio_unregister(struct bcma_drv_cc *cc) { |