From patchwork Tue Nov 14 13:58:29 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 837863 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-gpio-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="aKqvQvB0"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3ybpy20sw6z9s7C for ; Wed, 15 Nov 2017 00:58:34 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754830AbdKNN6c (ORCPT ); Tue, 14 Nov 2017 08:58:32 -0500 Received: from mail-io0-f195.google.com ([209.85.223.195]:53900 "EHLO mail-io0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752887AbdKNN6a (ORCPT ); Tue, 14 Nov 2017 08:58:30 -0500 Received: by mail-io0-f195.google.com with SMTP id 189so24421499iow.10 for ; Tue, 14 Nov 2017 05:58:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=mime-version:from:date:message-id:subject:to:cc; bh=TuxTCyFHQgQDEKOkKrF34kJo5T3u4kLkbsVN2AEShZg=; b=aKqvQvB0dD//X3dfpcbbLzDt5XeDoiWj2Z5tw60wxNO/6jf+YE72zWD5U+5S0CBJT4 C5GMH8pS7BWdW269zzsczCU77tvN2KAqQ1v0NIF/vaKkucrHMcCU+F4kUH1lD6C4fTKY 6zimqhOgJEiaAVxyPGjKMJEBlANtZUaPCGR/0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to:cc; bh=TuxTCyFHQgQDEKOkKrF34kJo5T3u4kLkbsVN2AEShZg=; b=c8yDZNMw607qr6DGx4GwqQASIZ/WCmhgql9FJklodGLxuYyUCZRiFUth6I9sbkX3VV u0JYrrmPcGUz6xf7PlLGm4ZXX8KmixB9mnE+tCmWUfv0+KkWK+Mn/1dFzapQkjSXp2BE KCxXx5AiombWSGUVWYkooc8iTAMV90OIKR2wkiv+s9k7LhSa0qIo/JYxuVJhk8PLBvIo WA8Pu8576WSNzhOUvRsW1j6JrXLy1cBAsH/kXBsQeYKQJr1UDn2TSmjfuq6CuUnOgJmY t8DwMMiSRsqphECs3Xf2HhDZsqUfJNlUG4q0cFN6evGPbmefhzZknEIxbM6Ccn+XbmPq PpzA== X-Gm-Message-State: AJaThX5lHZR2D8sRvEojjHoy+LyPHlKJRe94ojRppOgUirOS6MRNsGfv 4iiF6fiMBjewTvfhEv1DKQ6kjSH/BVXF2YwTI6UP85Jjl2c= X-Google-Smtp-Source: AGs4zMaYUeu1BbM6F+oui3x+FNlG/Mw6GxZEUOwgEJCp7vPznX5kAFxEIjYorUFYkf0EOICoHxt9j4Toshdwtqw0e0Q= X-Received: by 10.107.164.225 with SMTP id d94mr10773290ioj.175.1510667910019; Tue, 14 Nov 2017 05:58:30 -0800 (PST) MIME-Version: 1.0 Received: by 10.79.29.76 with HTTP; Tue, 14 Nov 2017 05:58:29 -0800 (PST) From: Linus Walleij Date: Tue, 14 Nov 2017 14:58:29 +0100 Message-ID: Subject: [GIT PULL] GPIO bulk changes for the v4.15 kernel cycle To: Linus Torvalds Cc: "thierry.reding@gmail.com" , Lukas Wunner , linux-kernel , linux-gpio@vger.kernel.org, Stephen Rothwell Sender: linux-gpio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-gpio@vger.kernel.org Hi Linus, here is the bulk of GPIO changes for the v4.15 kernel cycle. Conflicts ahoy! There will be a conflict in drivers/pinctrl/bcm/pinctrl-bcm2835.c. This one is a bit silly really, as Thierry developed the patches on top of linux-next where his patches applied cleanly and then I applied them on my v4.14-rc1-based tree and solved the conflict. So since the conflicty thing was already upstream, maybe I should have just merged in another -rc... Anyway it looks like this: ++<<<<<<< HEAD + generic_handle_irq(irq_linear_revmap(pc->gpio_chip.irqdomain, ++======= + /* FIXME: no clue why the code looks up the type here */ + type = pc->irq_type[gpio]; + + generic_handle_irq(irq_linear_revmap(pc->gpio_chip.irq.domain, ++>>>>>>> 24f0966c3e3f52a96e888504d60810d9df5b2d42 The end result should simply be: no comment, delete the type = business, and keep that oneline: generic_handle_irq(irq_linear_revmap(pc->gpio_chip.irq.domain, Then Stepgen R reports a build-time conflict with changes from the IRQchip core from the tip tree, requireing the following fixup patch: From: Stephen Rothwell Date: Thu, 2 Nov 2017 16:10:46 +1100 Subject: [PATCH] gpio: uniphier: merge fix for "Update irq_domain_ops.activate() signature" Signed-off-by: Stephen Rothwell --- drivers/gpio/gpio-uniphier.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) static void uniphier_gpio_irq_domain_deactivate(struct irq_domain *domain, diff --git a/drivers/gpio/gpio-uniphier.c b/drivers/gpio/gpio-uniphier.c index d62cea4ed6b7..d0069202ade3 100644 --- a/drivers/gpio/gpio-uniphier.c +++ b/drivers/gpio/gpio-uniphier.c @@ -300,13 +300,15 @@ static int uniphier_gpio_irq_domain_alloc(struct irq_domain *domain, return irq_domain_alloc_irqs_parent(domain, virq, 1, &parent_fwspec); } -static void uniphier_gpio_irq_domain_activate(struct irq_domain *domain, - struct irq_data *data) +static int uniphier_gpio_irq_domain_activate(struct irq_domain *domain, + struct irq_data *data, + bool early) { struct uniphier_gpio_priv *priv = domain->host_data; struct gpio_chip *chip = &priv->chip; gpiochip_lock_as_irq(chip, data->hwirq + UNIPHIER_GPIO_IRQ_OFFSET); + return 0; }