kernel: update kernel 4.4 to 4.4.53
[openwrt/staging/mkresin.git] / target / linux / brcm47xx / patches-4.4 / 901-Revert-bcma-switch-GPIO-portions-to-use-GPIOLIB_IRQC.patch
index 585d56aedfa21582bd720e3a36585a4d69b28e2c..57799ee08280af48b190960e9ef16925c6eadcab 100644 (file)
@@ -20,7 +20,7 @@ Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
 
 --- a/drivers/bcma/Kconfig
 +++ b/drivers/bcma/Kconfig
-@@ -94,7 +94,7 @@ config BCMA_DRIVER_GMAC_CMN
+@@ -106,7 +106,7 @@ config BCMA_DRIVER_GMAC_CMN
  config BCMA_DRIVER_GPIO
        bool "BCMA GPIO driver"
        depends on BCMA && GPIOLIB
@@ -193,8 +193,8 @@ 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;
+       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;
@@ -223,7 +223,7 @@ Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
  }
 --- a/include/linux/bcma/bcma_driver_chipcommon.h
 +++ b/include/linux/bcma/bcma_driver_chipcommon.h
-@@ -640,6 +640,7 @@ struct bcma_drv_cc {
+@@ -646,6 +646,7 @@ struct bcma_drv_cc {
        spinlock_t gpio_lock;
  #ifdef CONFIG_BCMA_DRIVER_GPIO
        struct gpio_chip gpio;