From patchwork Tue Sep 24 12:24:38 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 20554 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-vb0-f69.google.com (mail-vb0-f69.google.com [209.85.212.69]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id C826B25E03 for ; Tue, 24 Sep 2013 12:24:48 +0000 (UTC) Received: by mail-vb0-f69.google.com with SMTP id e13sf4450135vbg.8 for ; Tue, 24 Sep 2013 05:24:48 -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:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-unsubscribe; bh=DMFUlmQnCD6j5Mm3Ewb+sq4UJ+/Lz/iOTOSWbFSD0R0=; b=jjvB1HM0iDMZww8uzH9Hg6OoSjJTiiqdE9zhUVDbQuBVfISQMP4c9bJu6c+4tg3wLs Oj6bq58l5Fe9dV/wqBa9a7iZHaSoLFaYusTslCKcxO14IJ1qAjm6o4kdz0/8BNtDS/dE ZcOqbxUXmzxc4XZ91Kfvq6nIhrar940ZiJrjrIRnEoZERwi0vgMmlKdPzpRnRFBqaCIV ZqXlGuDg+cuDz/JLBhZQNk4O99D3f8qSBe+NI8mmletmUEsR6ba2CAcjOzrADXbkhDai syVcTFeqy3N4GlXDxz8yzKOtqomDcEmkv3xeIK4gvRlYG4vhMDMqfsEtXJklp4Fpjh/G +FDQ== X-Gm-Message-State: ALoCoQnEB6eI5Y0mNeQtTZbXzZs6ScAt7W9Dw7jKoYlOKtnZAMwlwckd/SgEG9ZEGGMBKI1QF7el X-Received: by 10.224.5.5 with SMTP id 5mr12805288qat.4.1380025488166; Tue, 24 Sep 2013 05:24:48 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.121.164 with SMTP id ll4ls91653qeb.17.gmail; Tue, 24 Sep 2013 05:24:48 -0700 (PDT) X-Received: by 10.52.118.73 with SMTP id kk9mr22843148vdb.13.1380025488058; Tue, 24 Sep 2013 05:24:48 -0700 (PDT) Received: from mail-vc0-f178.google.com (mail-vc0-f178.google.com [209.85.220.178]) by mx.google.com with ESMTPS id i15si8361636vep.54.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 24 Sep 2013 05:24:48 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.220.178 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.220.178; Received: by mail-vc0-f178.google.com with SMTP id ha12so3361780vcb.9 for ; Tue, 24 Sep 2013 05:24:48 -0700 (PDT) X-Received: by 10.52.230.102 with SMTP id sx6mr22939572vdc.15.1380025487956; Tue, 24 Sep 2013 05:24:47 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.220.174.196 with SMTP id u4csp239462vcz; Tue, 24 Sep 2013 05:24:47 -0700 (PDT) X-Received: by 10.14.212.72 with SMTP id x48mr1893406eeo.73.1380025486901; Tue, 24 Sep 2013 05:24:46 -0700 (PDT) Received: from mail-ea0-f177.google.com (mail-ea0-f177.google.com [209.85.215.177]) by mx.google.com with ESMTPS id z8si26843473eee.83.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 24 Sep 2013 05:24:46 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.215.177 is neither permitted nor denied by best guess record for domain of linus.walleij@linaro.org) client-ip=209.85.215.177; Received: by mail-ea0-f177.google.com with SMTP id f15so2432247eak.36 for ; Tue, 24 Sep 2013 05:24:46 -0700 (PDT) X-Received: by 10.14.5.3 with SMTP id 3mr12780131eek.49.1380025486240; Tue, 24 Sep 2013 05:24:46 -0700 (PDT) Received: from localhost.localdomain ([85.235.11.236]) by mx.google.com with ESMTPSA id n48sm52787921eeg.17.1969.12.31.16.00.00 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Tue, 24 Sep 2013 05:24:45 -0700 (PDT) From: Linus Walleij To: linux-gpio@vger.kernel.org, Russell King Cc: Alexandre Courbot , linux-arm-kernel@lists.infradead.org, Linus Walleij , Kristoffer Ericson Subject: [PATCH v2] ARM: sa1100: remove complex GPIO interface Date: Tue, 24 Sep 2013 14:24:38 +0200 Message-Id: <1380025478-24831-1-git-send-email-linus.walleij@linaro.org> X-Mailer: git-send-email 1.8.3.1 X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: linus.walleij@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.220.178 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , The SA1100 was implementing its own variants of gpio_get_value() and gpio_set_value() and only selectively falling back to gpiolib for extended (EGPIO) handling. However the driver in gpio/gpio-sa1100.c already handles the same functionality for these lines, yet remain unused. The only upside would be things like a timing-critical hotpath on bit-banged GPIO, but that kind of things does not seem to happen on these GPIOs, so it is not worth having the extra complexity. Tested with some buttons on the Compaq iPAQ H3630. Cc: Russell King Cc: Kristoffer Ericson Signed-off-by: Linus Walleij --- ChangeLog v1->v2: - #include instead of . --- arch/arm/Kconfig | 1 - arch/arm/mach-sa1100/include/mach/gpio.h | 55 ------------------------------- arch/arm/mach-sa1100/include/mach/h3xxx.h | 2 ++ drivers/gpio/gpio-sa1100.c | 2 +- 4 files changed, 3 insertions(+), 57 deletions(-) delete mode 100644 arch/arm/mach-sa1100/include/mach/gpio.h diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 3f7714d..74bf29f 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -692,7 +692,6 @@ config ARCH_SA1100 select GENERIC_CLOCKEVENTS select HAVE_IDE select ISA - select NEED_MACH_GPIO_H select NEED_MACH_MEMORY_H select SPARSE_IRQ help diff --git a/arch/arm/mach-sa1100/include/mach/gpio.h b/arch/arm/mach-sa1100/include/mach/gpio.h deleted file mode 100644 index 6a9eecf..0000000 --- a/arch/arm/mach-sa1100/include/mach/gpio.h +++ /dev/null @@ -1,55 +0,0 @@ -/* - * arch/arm/mach-sa1100/include/mach/gpio.h - * - * SA1100 GPIO wrappers for arch-neutral GPIO calls - * - * Written by Philipp Zabel - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - */ - -#ifndef __ASM_ARCH_SA1100_GPIO_H -#define __ASM_ARCH_SA1100_GPIO_H - -#include -#include -#include -#include - -#define __ARM_GPIOLIB_COMPLEX - -static inline int gpio_get_value(unsigned gpio) -{ - if (__builtin_constant_p(gpio) && (gpio <= GPIO_MAX)) - return GPLR & GPIO_GPIO(gpio); - else - return __gpio_get_value(gpio); -} - -static inline void gpio_set_value(unsigned gpio, int value) -{ - if (__builtin_constant_p(gpio) && (gpio <= GPIO_MAX)) - if (value) - GPSR = GPIO_GPIO(gpio); - else - GPCR = GPIO_GPIO(gpio); - else - __gpio_set_value(gpio, value); -} - -#define gpio_cansleep __gpio_cansleep - -#endif diff --git a/arch/arm/mach-sa1100/include/mach/h3xxx.h b/arch/arm/mach-sa1100/include/mach/h3xxx.h index 7d9df16..c810620 100644 --- a/arch/arm/mach-sa1100/include/mach/h3xxx.h +++ b/arch/arm/mach-sa1100/include/mach/h3xxx.h @@ -13,6 +13,8 @@ #ifndef _INCLUDE_H3XXX_H_ #define _INCLUDE_H3XXX_H_ +#include "hardware.h" /* Gives GPIO_MAX */ + /* Physical memory regions corresponding to chip selects */ #define H3600_EGPIO_PHYS (SA1100_CS5_PHYS + 0x01000000) #define H3600_BANK_2_PHYS SA1100_CS2_PHYS diff --git a/drivers/gpio/gpio-sa1100.c b/drivers/gpio/gpio-sa1100.c index 8ea3b33..a90be34 100644 --- a/drivers/gpio/gpio-sa1100.c +++ b/drivers/gpio/gpio-sa1100.c @@ -10,7 +10,7 @@ #include #include #include - +#include #include #include