From patchwork Wed Jun 4 13:33:55 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 31359 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ie0-f197.google.com (mail-ie0-f197.google.com [209.85.223.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 38BDE203AC for ; Wed, 4 Jun 2014 13:34:24 +0000 (UTC) Received: by mail-ie0-f197.google.com with SMTP id rd18sf42753497iec.4 for ; Wed, 04 Jun 2014 06:34:23 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe; bh=lorGUd/0xa0PptHstJzMtKfaAbM8CaysD7CGoWArvqM=; b=atFk2YNDiZhtOTg7s5uTTU5esKC63rSZDFnPvtlQJWABNGzwAp8S+695+JJnCYBA/O gpHTKphZuybKzSdRbWZvH3l7ilqL/pKgeV2Wpot0ZzZXpOd1DbyocVfkcZNYR48dy2qc Og1fx0bwIgf8zrNxAEvuF2mhyoBPzlxnl0gpVzFog+o48Afu+z4YPKw14mFFt4LPPYIW 3MQx9OHyOhELarj4D2x0KJEauftSifgIRJGqFd59mFRomYoKrViotmT56RtoaEg3jGm6 JuQuCQXWqLE52g/rzRZtNQEogwRHFBD15k8Q3H3DsFYzvJ5zXVe9Nn2yzi9YWsSTRszQ QXbg== X-Gm-Message-State: ALoCoQlZ0OY6UiKPDoQdOF0bJm+I891+OIr7zBUc2C+YZLnnimezgeGdfBuxWC+1Y4XT91wXjNT1 X-Received: by 10.182.24.104 with SMTP id t8mr22246735obf.34.1401888863535; Wed, 04 Jun 2014 06:34:23 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.34.46 with SMTP id k43ls3172226qgk.58.gmail; Wed, 04 Jun 2014 06:34:23 -0700 (PDT) X-Received: by 10.58.185.165 with SMTP id fd5mr14059456vec.41.1401888863418; Wed, 04 Jun 2014 06:34:23 -0700 (PDT) Received: from mail-ve0-f176.google.com (mail-ve0-f176.google.com [209.85.128.176]) by mx.google.com with ESMTPS id fu13si1569233vdb.105.2014.06.04.06.34.23 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 04 Jun 2014 06:34:23 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.128.176 as permitted sender) client-ip=209.85.128.176; Received: by mail-ve0-f176.google.com with SMTP id jz11so8659094veb.7 for ; Wed, 04 Jun 2014 06:34:23 -0700 (PDT) X-Received: by 10.53.8.162 with SMTP id dl2mr26615546vdd.24.1401888863318; Wed, 04 Jun 2014 06:34:23 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.221.54.6 with SMTP id vs6csp45713vcb; Wed, 4 Jun 2014 06:34:22 -0700 (PDT) X-Received: by 10.60.56.8 with SMTP id w8mr21933088oep.74.1401888862733; Wed, 04 Jun 2014 06:34:22 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id r2si4589188oew.72.2014.06.04.06.34.22; Wed, 04 Jun 2014 06:34:22 -0700 (PDT) Received-SPF: none (google.com: linux-gpio-owner@vger.kernel.org does not designate permitted sender hosts) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753258AbaFDNeW (ORCPT + 1 other); Wed, 4 Jun 2014 09:34:22 -0400 Received: from mail-we0-f174.google.com ([74.125.82.174]:37011 "EHLO mail-we0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752977AbaFDNeV (ORCPT ); Wed, 4 Jun 2014 09:34:21 -0400 Received: by mail-we0-f174.google.com with SMTP id k48so8658321wev.33 for ; Wed, 04 Jun 2014 06:34:20 -0700 (PDT) X-Received: by 10.194.21.103 with SMTP id u7mr10197968wje.14.1401888859935; Wed, 04 Jun 2014 06:34:19 -0700 (PDT) Received: from localhost.localdomain ([85.235.11.236]) by mx.google.com with ESMTPSA id ba9sm48315938wib.24.2014.06.04.06.34.18 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 04 Jun 2014 06:34:19 -0700 (PDT) From: Linus Walleij To: linux-gpio@vger.kernel.org, linux-arm-kernel@lists.infradead.org Cc: Alexandre Courbot , Linus Walleij Subject: [PATCH 1/4] ARM: s5p: cut the custom ARCH_NR_GPIOS definition Date: Wed, 4 Jun 2014 15:33:55 +0200 Message-Id: <1401888838-3126-2-git-send-email-linus.walleij@linaro.org> X-Mailer: git-send-email 1.9.3 In-Reply-To: <1401888838-3126-1-git-send-email-linus.walleij@linaro.org> References: <1401888838-3126-1-git-send-email-linus.walleij@linaro.org> Sender: linux-gpio-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-gpio@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: linus.walleij@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.128.176 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , The number of GPIOs defined for the different S5P platforms using the tricky #define macros are actually as follows: S5P64x0: 180 GPIOs S5PC100: 115 GPIOs S5PV210: 252 GPIOs The include file will automatically bump us to 256 GPIOs which is a nice default value that happens to encompass all the S5P platform requirements under its roof. Cut ARCH_NR_GPIOS and the custom spacing macro for extra GPIOs that is not used anywhere in the kernel. Signed-off-by: Linus Walleij --- arch/arm/mach-s5p64x0/include/mach/gpio.h | 4 ---- arch/arm/mach-s5pc100/include/mach/gpio.h | 3 --- arch/arm/mach-s5pv210/include/mach/gpio.h | 4 ---- arch/arm/plat-samsung/Kconfig | 16 ---------------- 4 files changed, 27 deletions(-) diff --git a/arch/arm/mach-s5p64x0/include/mach/gpio.h b/arch/arm/mach-s5p64x0/include/mach/gpio.h index 06cd3c9b16ac..cbd325e14477 100644 --- a/arch/arm/mach-s5p64x0/include/mach/gpio.h +++ b/arch/arm/mach-s5p64x0/include/mach/gpio.h @@ -125,8 +125,4 @@ enum s5p6450_gpio_number { #define S3C_GPIO_END S5P64X0_GPIO_END -/* define the number of gpios we need to the one after the last GPIO range */ - -#define ARCH_NR_GPIOS (S5P64X0_GPIO_END + CONFIG_SAMSUNG_GPIO_EXTRA) - #endif /* __ASM_ARCH_GPIO_H */ diff --git a/arch/arm/mach-s5pc100/include/mach/gpio.h b/arch/arm/mach-s5pc100/include/mach/gpio.h index 5e1a924b595f..291c57504bab 100644 --- a/arch/arm/mach-s5pc100/include/mach/gpio.h +++ b/arch/arm/mach-s5pc100/include/mach/gpio.h @@ -138,7 +138,4 @@ enum s5p_gpio_number { /* It used the end of the S5PC100 gpios */ #define S3C_GPIO_END S5PC100_GPIO_END -/* define the number of gpios we need to the one after the MP04() range */ -#define ARCH_NR_GPIOS (S5PC100_GPIO_END + 1) - #endif /* __ASM_ARCH_GPIO_H */ diff --git a/arch/arm/mach-s5pv210/include/mach/gpio.h b/arch/arm/mach-s5pv210/include/mach/gpio.h index 6c8b903c02e4..e6f80d57c38e 100644 --- a/arch/arm/mach-s5pv210/include/mach/gpio.h +++ b/arch/arm/mach-s5pv210/include/mach/gpio.h @@ -133,8 +133,4 @@ enum s5p_gpio_number { #define S5PV210_GPIO_END (S5PV210_MP05(S5PV210_GPIO_MP05_NR) + 1) #define S3C_GPIO_END S5PV210_GPIO_END -/* define the number of gpios we need to the one after the MP05() range */ -#define ARCH_NR_GPIOS (S5PV210_MP05(S5PV210_GPIO_MP05_NR) + \ - CONFIG_SAMSUNG_GPIO_EXTRA + 1) - #endif /* __ASM_ARCH_GPIO_H */ diff --git a/arch/arm/plat-samsung/Kconfig b/arch/arm/plat-samsung/Kconfig index 243dfcb2ca0e..68824e617a21 100644 --- a/arch/arm/plat-samsung/Kconfig +++ b/arch/arm/plat-samsung/Kconfig @@ -120,22 +120,6 @@ config S5P_GPIO_DRVSTR Internal configuration to get and set correct GPIO driver strength helper -config SAMSUNG_GPIO_EXTRA - int "Number of additional GPIO pins" - default 128 if SAMSUNG_GPIO_EXTRA128 - default 64 if SAMSUNG_GPIO_EXTRA64 - default 0 - help - Use additional GPIO space in addition to the GPIO's the SOC - provides. This allows expanding the GPIO space for use with - GPIO expanders. - -config SAMSUNG_GPIO_EXTRA64 - bool - -config SAMSUNG_GPIO_EXTRA128 - bool - config S3C_GPIO_SPACE int "Space between gpio banks" default 0