38 lines
1.3 KiB
Diff
38 lines
1.3 KiB
Diff
|
From dfe45880e4ac50ebaa57e5f8a52b69e7e74cb7ca Mon Sep 17 00:00:00 2001
|
||
|
|
From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com>
|
||
|
|
Date: Sun, 21 Sep 2014 20:40:32 +0200
|
||
|
|
Subject: [PATCH] bcma: gpio: use ChipCommon GPIO IRQ on BCM47XX arch only
|
||
|
|
MIME-Version: 1.0
|
||
|
|
Content-Type: text/plain; charset=UTF-8
|
||
|
|
Content-Transfer-Encoding: 8bit
|
||
|
|
|
||
|
|
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>
|
||
|
|
---
|
||
|
|
drivers/bcma/driver_gpio.c | 4 ++--
|
||
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
--- a/drivers/bcma/driver_gpio.c
|
||
|
|
+++ b/drivers/bcma/driver_gpio.c
|
||
|
|
@@ -76,7 +76,7 @@ static void bcma_gpio_free(struct gpio_c
|
||
|
|
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)
|
||
|
|
{
|
||
|
|
struct bcma_drv_cc *cc = bcma_gpio_get_cc(chip);
|
||
|
|
@@ -215,7 +215,7 @@ int bcma_gpio_init(struct bcma_drv_cc *c
|
||
|
|
chip->set = bcma_gpio_set_value;
|
||
|
|
chip->direction_input = bcma_gpio_direction_input;
|
||
|
|
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;
|
||
|
|
#endif
|
||
|
|
switch (cc->core->bus->chipinfo.id) {
|