diff options
author | Rafał Miłecki <zajec5@gmail.com> | 2014-09-21 14:45:13 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2014-09-26 17:06:52 -0400 |
commit | 1abf676974be2d1c4acd156adf00beb1d25e2fed (patch) | |
tree | 5f4dc855f1111f4c1fed34e701a6e1cf71b4ea65 /drivers/bcma | |
parent | 8084bb0369b9924ecc775ce1c7050bc75ca016f3 (diff) |
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>
Diffstat (limited to 'drivers/bcma')
-rw-r--r-- | drivers/bcma/driver_gpio.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/bcma/driver_gpio.c b/drivers/bcma/driver_gpio.c index aec9f850b4a8..8ea497c73506 100644 --- a/drivers/bcma/driver_gpio.c +++ b/drivers/bcma/driver_gpio.c | |||
@@ -76,7 +76,7 @@ static void bcma_gpio_free(struct gpio_chip *chip, unsigned gpio) | |||
76 | bcma_chipco_gpio_pullup(cc, 1 << gpio, 0); | 76 | bcma_chipco_gpio_pullup(cc, 1 << gpio, 0); |
77 | } | 77 | } |
78 | 78 | ||
79 | #if IS_BUILTIN(CONFIG_BCMA_HOST_SOC) | 79 | #if IS_BUILTIN(CONFIG_BCM47XX) |
80 | static int bcma_gpio_to_irq(struct gpio_chip *chip, unsigned gpio) | 80 | static int bcma_gpio_to_irq(struct gpio_chip *chip, unsigned gpio) |
81 | { | 81 | { |
82 | struct bcma_drv_cc *cc = bcma_gpio_get_cc(chip); | 82 | struct bcma_drv_cc *cc = bcma_gpio_get_cc(chip); |
@@ -215,7 +215,7 @@ int bcma_gpio_init(struct bcma_drv_cc *cc) | |||
215 | chip->set = bcma_gpio_set_value; | 215 | chip->set = bcma_gpio_set_value; |
216 | chip->direction_input = bcma_gpio_direction_input; | 216 | chip->direction_input = bcma_gpio_direction_input; |
217 | chip->direction_output = bcma_gpio_direction_output; | 217 | chip->direction_output = bcma_gpio_direction_output; |
218 | #if IS_BUILTIN(CONFIG_BCMA_HOST_SOC) | 218 | #if IS_BUILTIN(CONFIG_BCM47XX) |
219 | chip->to_irq = bcma_gpio_to_irq; | 219 | chip->to_irq = bcma_gpio_to_irq; |
220 | #endif | 220 | #endif |
221 | switch (cc->core->bus->chipinfo.id) { | 221 | switch (cc->core->bus->chipinfo.id) { |