From patchwork Fri Sep 1 18:57:24 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thierry Reding X-Patchwork-Id: 808969 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-tegra-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="PKXkEI80"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3xkT9B05MJz9sPt for ; Sat, 2 Sep 2017 05:01:01 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752475AbdIAS5u (ORCPT ); Fri, 1 Sep 2017 14:57:50 -0400 Received: from mail-wm0-f65.google.com ([74.125.82.65]:35951 "EHLO mail-wm0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752437AbdIAS5s (ORCPT ); Fri, 1 Sep 2017 14:57:48 -0400 Received: by mail-wm0-f65.google.com with SMTP id p17so957300wmd.3; Fri, 01 Sep 2017 11:57:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=h56Jd1dDpBcvBeA7zpFoAUMTBV/z2MRsxs1xX0Cxu8A=; b=PKXkEI80M/erJyoX2glO1hQ4Hc9F4qBZL2hN5LZ546wfefX80cSFGRvUYdQS49OByr 7jc65WKbmBmM6drBKVbj2jVD+wvYNm34j5wKSMWO4mEDD/eL1NlhW+Q9QkrKZ0ZPT1UD uS4XN9BPOngFcJVTWiZb16viFwfCZDGgHkpVcfhIbL3T13GOQaaX2u0EfFrAABjZWUsn gpbgEowYvcRfuNh8mQNrgHVSUJefvZF6pNybe8Ao4EQ4SnCe4uONX3yvM8VxVcFV/4UB Ob1FbnZG1lbjNCTPr7SRiYBFc/fI0Mi56bWAqAi+HTWBZcZC600gIkhFEWewxCIEVx94 6MRw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=h56Jd1dDpBcvBeA7zpFoAUMTBV/z2MRsxs1xX0Cxu8A=; b=lO9d+mcNhLhlBurHtfBi4l+1VqmRmfRHvJayLkTnPVLiDNGsWG+pJDTVUqfInZCE6a 2dARkmE6UY4hpBQnsspHv6QZ1GPA0af5l5UxpjPWOO4ZXO7UxDrEkhZjg69Vkiyue2Ai x841lPReZM7uSnK0ABZMjkO/ploGQ7NYnqcr4oKX1nKDrVdtWGmiwQFBNNPtS8LHiw4E Eg4sR0Q5xC2sZkQZU6OpdGk5VKCug2xDxDIIKuS5rjnZ1/h7FuHtgnRKkFDLHAqIE4IC /iut7k8WDyw/Q/gHeCAsOhZNyW+csApJwj1qF4HqjzjH5RyjWpRqaiSWM+VpOCEbeOBK 5R/g== X-Gm-Message-State: AHPjjUg537lW1EOi2/RJU0DAS8dKwPAIbjQ4kBGW29cmScVv7xxZ/3/w O/QE5IDXb7hzcw== X-Google-Smtp-Source: ADKCNb7KUruPwo9rDjI8MfvB7qxQq5nBS1kbjzO8UiyHwaHve3njlKsIv/HZPZp3EHRiDSGRQ2lu8w== X-Received: by 10.28.136.140 with SMTP id k134mr1144885wmd.97.1504292265173; Fri, 01 Sep 2017 11:57:45 -0700 (PDT) Received: from localhost (p200300E41BD6D60076D02BFFFE273F51.dip0.t-ipconnect.de. [2003:e4:1bd6:d600:76d0:2bff:fe27:3f51]) by smtp.gmail.com with ESMTPSA id 66sm386419wmn.17.2017.09.01.11.57.43 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 01 Sep 2017 11:57:44 -0700 (PDT) From: Thierry Reding To: Linus Walleij Cc: Jonathan Hunter , linux-gpio@vger.kernel.org, linux-tegra@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 04/16] gpio: Move irq_base to struct gpio_irq_chip Date: Fri, 1 Sep 2017 20:57:24 +0200 Message-Id: <20170901185736.28051-5-thierry.reding@gmail.com> X-Mailer: git-send-email 2.13.3 In-Reply-To: <20170901185736.28051-1-thierry.reding@gmail.com> References: <20170901185736.28051-1-thierry.reding@gmail.com> Sender: linux-tegra-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-tegra@vger.kernel.org From: Thierry Reding In order to consolidate the multiple ways to associate an IRQ chip with a GPIO chip, move more fields into the new struct gpio_irq_chip. Signed-off-by: Thierry Reding --- drivers/gpio/gpiolib.c | 2 +- drivers/pinctrl/mvebu/pinctrl-armada-37xx.c | 2 +- include/linux/gpio/driver.h | 10 ++++++++-- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c index d8ea8a292978..e5ad28978d5c 100644 --- a/drivers/gpio/gpiolib.c +++ b/drivers/gpio/gpiolib.c @@ -1781,7 +1781,7 @@ static int gpiochip_add_irqchip(struct gpio_chip *gpiochip) ops = &gpiochip_domain_ops; gpiochip->irq.domain = irq_domain_add_simple(np, gpiochip->ngpio, - gpiochip->irq_base, + gpiochip->irq.first, ops, gpiochip); if (!gpiochip->irq.domain) return -EINVAL; diff --git a/drivers/pinctrl/mvebu/pinctrl-armada-37xx.c b/drivers/pinctrl/mvebu/pinctrl-armada-37xx.c index e66ff18ee362..8df8a4998f48 100644 --- a/drivers/pinctrl/mvebu/pinctrl-armada-37xx.c +++ b/drivers/pinctrl/mvebu/pinctrl-armada-37xx.c @@ -681,7 +681,7 @@ static int armada_37xx_irqchip_register(struct platform_device *pdev, * the chained irq with all of them. */ for (i = 0; i < nrirqs; i++) { - struct irq_data *d = irq_get_irq_data(gc->irq_base + i); + struct irq_data *d = irq_get_irq_data(gc->irq.first + i); /* * The mask field is a "precomputed bitmask for diff --git a/include/linux/gpio/driver.h b/include/linux/gpio/driver.h index 031037bb8670..9389406df0b1 100644 --- a/include/linux/gpio/driver.h +++ b/include/linux/gpio/driver.h @@ -47,6 +47,14 @@ struct gpio_irq_chip { const struct irq_domain_ops *domain_ops; /** + * @first: + * + * If not dynamically assigned, the base (first) IRQ to allocate GPIO + * chip IRQs from (deprecated). + */ + unsigned int first; + + /** * @parent_handler: * * The interrupt handler for the GPIO chip's parent interrupts, may be @@ -152,7 +160,6 @@ static inline struct gpio_irq_chip *to_gpio_irq_chip(struct irq_chip *chip) * safely. * @bgpio_dir: shadowed direction register for generic GPIO to clear/set * direction safely. - * @irq_base: first linux IRQ number assigned to GPIO IRQ chip (deprecated) * @irq_handler: the irq handler to use (often a predefined irq core function) * for GPIO IRQs, provided by GPIO driver * @irq_default_type: default IRQ triggering type applied during GPIO driver @@ -232,7 +239,6 @@ struct gpio_chip { * With CONFIG_GPIOLIB_IRQCHIP we get an irqchip inside the gpiolib * to handle IRQs for most practical cases. */ - unsigned int irq_base; irq_flow_handler_t irq_handler; unsigned int irq_default_type; unsigned int irq_chained_parent;