Skip to content

Commit bfba223

Browse files
Ryceancurrylinusw
authored andcommitted
gpio: brcmstb: allow 0 width GPIO banks
Sometimes we have empty banks within the GPIO block. This commit allows proper handling of 0 width GPIO banks. We handle 0 width GPIO banks by incrementing the bank and number of GPIOs, but not initializing them. This will mean a call into the non-existent GPIOs will return an error. Also remove "GPIO registered" dev print. This information is misleading since the incremented banks and gpio_base do not reflect the actual GPIOs that get initialized. We leave this information out since it is already printed with dev_dbg. Signed-off-by: Justin Chen <[email protected]> Acked-by: Florian Fainelli <[email protected]> Signed-off-by: Linus Walleij <[email protected]>
1 parent 36f3f19 commit bfba223

File tree

1 file changed

+12
-3
lines changed

1 file changed

+12
-3
lines changed

drivers/gpio/gpio-brcmstb.c

+12-3
Original file line numberDiff line numberDiff line change
@@ -664,6 +664,18 @@ static int brcmstb_gpio_probe(struct platform_device *pdev)
664664
struct brcmstb_gpio_bank *bank;
665665
struct gpio_chip *gc;
666666

667+
/*
668+
* If bank_width is 0, then there is an empty bank in the
669+
* register block. Special handling for this case.
670+
*/
671+
if (bank_width == 0) {
672+
dev_dbg(dev, "Width 0 found: Empty bank @ %d\n",
673+
num_banks);
674+
num_banks++;
675+
gpio_base += MAX_GPIO_PER_BANK;
676+
continue;
677+
}
678+
667679
bank = devm_kzalloc(dev, sizeof(*bank), GFP_KERNEL);
668680
if (!bank) {
669681
err = -ENOMEM;
@@ -740,9 +752,6 @@ static int brcmstb_gpio_probe(struct platform_device *pdev)
740752
goto fail;
741753
}
742754

743-
dev_info(dev, "Registered %d banks (GPIO(s): %d-%d)\n",
744-
num_banks, priv->gpio_base, gpio_base - 1);
745-
746755
if (priv->parent_wake_irq && need_wakeup_event)
747756
pm_wakeup_event(dev, 0);
748757

0 commit comments

Comments
 (0)