From mboxrd@z Thu Jan 1 00:00:00 1970 From: justinpopo6@gmail.com Subject: [PATCH] gpio: brcmstb: allow 0 width GPIO banks Date: Tue, 14 Aug 2018 16:31:57 -0700 Message-ID: <1534289517-1805-1-git-send-email-justinpopo6@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=m.gmane.org@lists.infradead.org To: linux-gpio@vger.kernel.org Cc: f.fainelli@gmail.com, linus.walleij@linaro.org, linux-kernel@vger.kernel.org, bcm-kernel-feedback-list@broadcom.com, Justin Chen , gregory.0xf0@gmail.com, computersforpeace@gmail.com, linux-arm-kernel@lists.infradead.org List-Id: linux-gpio@vger.kernel.org From: Justin Chen 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 banks and GPIO information from the dev_info print. This information is misleading since the incremented banks and gpio_base do not reflect the actual GPIOs that got initialized. We leave this information out since it is already printed with dev_dbg. Signed-off-by: Justin Chen --- drivers/gpio/gpio-brcmstb.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/drivers/gpio/gpio-brcmstb.c b/drivers/gpio/gpio-brcmstb.c index 16c7f9f..8658910 100644 --- a/drivers/gpio/gpio-brcmstb.c +++ b/drivers/gpio/gpio-brcmstb.c @@ -664,6 +664,18 @@ static int brcmstb_gpio_probe(struct platform_device *pdev) struct brcmstb_gpio_bank *bank; struct gpio_chip *gc; + /* + * If bank_width is 0, then there is an empty bank in the + * register block. Special handling for this case. + */ + if (bank_width == 0) { + dev_dbg(dev, "Width 0 found: Empty bank @ %d\n", + num_banks); + num_banks++; + gpio_base += MAX_GPIO_PER_BANK; + continue; + } + bank = devm_kzalloc(dev, sizeof(*bank), GFP_KERNEL); if (!bank) { err = -ENOMEM; @@ -740,8 +752,7 @@ static int brcmstb_gpio_probe(struct platform_device *pdev) goto fail; } - dev_info(dev, "Registered %d banks (GPIO(s): %d-%d)\n", - num_banks, priv->gpio_base, gpio_base - 1); + dev_info(dev, "Brcmstb GPIO registered\n"); if (priv->parent_wake_irq && need_wakeup_event) pm_wakeup_event(dev, 0); -- 2.7.4