浏览代码

bcma: gpio: use ChipCommon GPIO IRQ on BCM47XX arch only

GPIOs can be also used on bcm53xx, however this arch requires different
implementation of IRQ support. It uses different IRQ number (117) and
different masks & acking.

Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Rafał Miłecki 11 年之前
父节点
当前提交
1abf676974
共有 1 个文件被更改,包括 2 次插入2 次删除
  1. 2 2
      drivers/bcma/driver_gpio.c

+ 2 - 2
drivers/bcma/driver_gpio.c

@@ -76,7 +76,7 @@ static void bcma_gpio_free(struct gpio_chip *chip, unsigned gpio)
 	bcma_chipco_gpio_pullup(cc, 1 << gpio, 0);
 	bcma_chipco_gpio_pullup(cc, 1 << gpio, 0);
 }
 }
 
 
-#if IS_BUILTIN(CONFIG_BCMA_HOST_SOC)
+#if IS_BUILTIN(CONFIG_BCM47XX)
 static int bcma_gpio_to_irq(struct gpio_chip *chip, unsigned gpio)
 static int bcma_gpio_to_irq(struct gpio_chip *chip, unsigned gpio)
 {
 {
 	struct bcma_drv_cc *cc = bcma_gpio_get_cc(chip);
 	struct bcma_drv_cc *cc = bcma_gpio_get_cc(chip);
@@ -215,7 +215,7 @@ int bcma_gpio_init(struct bcma_drv_cc *cc)
 	chip->set		= bcma_gpio_set_value;
 	chip->set		= bcma_gpio_set_value;
 	chip->direction_input	= bcma_gpio_direction_input;
 	chip->direction_input	= bcma_gpio_direction_input;
 	chip->direction_output	= bcma_gpio_direction_output;
 	chip->direction_output	= bcma_gpio_direction_output;
-#if IS_BUILTIN(CONFIG_BCMA_HOST_SOC)
+#if IS_BUILTIN(CONFIG_BCM47XX)
 	chip->to_irq		= bcma_gpio_to_irq;
 	chip->to_irq		= bcma_gpio_to_irq;
 #endif
 #endif
 	switch (cc->core->bus->chipinfo.id) {
 	switch (cc->core->bus->chipinfo.id) {