From patchwork Fri Nov 25 10:09:23 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 84096 Delivered-To: patch@linaro.org Received: by 10.182.1.168 with SMTP id 8csp51702obn; Fri, 25 Nov 2016 02:09:56 -0800 (PST) X-Received: by 10.84.178.195 with SMTP id z61mr15918210plb.176.1480068596629; Fri, 25 Nov 2016 02:09:56 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id e6si15360056plj.245.2016.11.25.02.09.56; Fri, 25 Nov 2016 02:09:56 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-gpio-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org; spf=pass (google.com: best guess record for domain of linux-gpio-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-gpio-owner@vger.kernel.org; dmarc=fail (p=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753021AbcKYKJz (ORCPT + 4 others); Fri, 25 Nov 2016 05:09:55 -0500 Received: from mail-lf0-f52.google.com ([209.85.215.52]:34307 "EHLO mail-lf0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752993AbcKYKJy (ORCPT ); Fri, 25 Nov 2016 05:09:54 -0500 Received: by mail-lf0-f52.google.com with SMTP id o141so46855743lff.1 for ; Fri, 25 Nov 2016 02:09:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=+XaT9E71NC7u5lpGrP9VGr4jPqiduYXIsFV1aHJim2Q=; b=iSR7Eesaa2QHucSJ8KP8hvOY3cPXbZG0P8FALDtFde7C0wlpTmWH1ExaA5Q0GJQTTK GOgzv3sYB3+DNgHB7kGy96JfSZg+s5odbr62lRy5wq0vVs8B2lvshE0PfHK6qR66Sy7l GP0MLexn8fGnqLXqrtXs7PbiX4fP7yFFWEkEI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=+XaT9E71NC7u5lpGrP9VGr4jPqiduYXIsFV1aHJim2Q=; b=Lt9Jj57SoGl/0pf1k5h1NQmpOmq1fS+1jNSZxaGFt/hy8zCxMLv8y2Zl1zuHFc1Zga Zt0eG3ZG8qZ3v5XPnS73urdbVZcLVvIbwJrDDunDXWIIY6ot8UnHB03QbWmcHYhmabxK DI4oIOBIzBAfZqxsZ+DpfxexkTQ4o2Ww+fyL9VddHf2IEVhXP3ix7FrczzPHKQ2iqNza 3vYzDRJxb5CE2CQKW6Cp3+4YSHysW1Jum5HQu3gleNxxGvVzqPuvWMpCnd6bb7lcieLq N+294i7DmoEg5X55iAb2Ta1dFnVl/r8fprrpgpyB+T7U22YcVpDuA0IQC8UUpiQOUw1A duYg== X-Gm-Message-State: AKaTC00Ig/j8R5gA/CXoX4yr7AEeoctdtX2zlbCd/GTvsWUa6s1dP1qrUcaxS4I4diR/zwSC X-Received: by 10.25.198.16 with SMTP id w16mr2897390lff.44.1480068592322; Fri, 25 Nov 2016 02:09:52 -0800 (PST) Received: from linuslaptop.ideon.se ([85.235.10.227]) by smtp.gmail.com with ESMTPSA id c78sm5088022lfc.39.2016.11.25.02.09.51 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 25 Nov 2016 02:09:51 -0800 (PST) From: Linus Walleij To: linux-gpio@vger.kernel.org, Alexandre Courbot , linux-arm-kernel@lists.infradead.org, Baruch Siach Cc: Sudeep Holla , Haojian Zhuang , Linus Walleij , arm@vger.kernel.org, Russell King Subject: [PATCH 4/5] gpio: pl061: move platform data into driver Date: Fri, 25 Nov 2016 11:09:23 +0100 Message-Id: <1480068564-9447-4-git-send-email-linus.walleij@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1480068564-9447-1-git-send-email-linus.walleij@linaro.org> References: <1480068564-9447-1-git-send-email-linus.walleij@linaro.org> Sender: linux-gpio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-gpio@vger.kernel.org No boardfile defines any PL061 platform data anymore: the Integrator IM/PD-1 includes the file but is not making use of the struct. Let's delete the include and all references, then move the platform data into the driver for later consolidation into the driver state container. The only resource defined by the IM/PD-1 is the IRQ which is passed through the AMBA PrimeCell bus abstraction struct amba_device. Cc: arm@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org Cc: Russell King Signed-off-by: Linus Walleij --- ARM SoC folks/Russell: I don't think this is any controversial move, please ACK this if you're OK with it. --- arch/arm/mach-integrator/impd1.c | 1 - drivers/gpio/gpio-pl061.c | 14 +++++++++++++- include/linux/amba/pl061.h | 16 ---------------- 3 files changed, 13 insertions(+), 18 deletions(-) delete mode 100644 include/linux/amba/pl061.h -- 2.7.4 -- To unsubscribe from this list: send the line "unsubscribe linux-gpio" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/arch/arm/mach-integrator/impd1.c b/arch/arm/mach-integrator/impd1.c index ed9a01484030..a109f6482413 100644 --- a/arch/arm/mach-integrator/impd1.c +++ b/arch/arm/mach-integrator/impd1.c @@ -21,7 +21,6 @@ #include #include #include -#include #include #include #include diff --git a/drivers/gpio/gpio-pl061.c b/drivers/gpio/gpio-pl061.c index 47f397236417..cbcc631181e0 100644 --- a/drivers/gpio/gpio-pl061.c +++ b/drivers/gpio/gpio-pl061.c @@ -23,7 +23,6 @@ #include #include #include -#include #include #include #include @@ -39,6 +38,19 @@ #define PL061_GPIO_NR 8 +struct pl061_platform_data { + /* number of the first GPIO */ + unsigned gpio_base; + + /* number of the first IRQ. + * If the IRQ functionality in not desired this must be set to 0. + */ + unsigned irq_base; + + u8 directions; /* startup directions, 1: out, 0: in */ + u8 values; /* startup values */ +}; + #ifdef CONFIG_PM struct pl061_context_save_regs { u8 gpio_data; diff --git a/include/linux/amba/pl061.h b/include/linux/amba/pl061.h deleted file mode 100644 index fb83c0453489..000000000000 --- a/include/linux/amba/pl061.h +++ /dev/null @@ -1,16 +0,0 @@ -#include - -/* platform data for the PL061 GPIO driver */ - -struct pl061_platform_data { - /* number of the first GPIO */ - unsigned gpio_base; - - /* number of the first IRQ. - * If the IRQ functionality in not desired this must be set to 0. - */ - unsigned irq_base; - - u8 directions; /* startup directions, 1: out, 0: in */ - u8 values; /* startup values */ -};