From patchwork Fri Jun 14 19:32:58 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomasz Figa X-Patchwork-Id: 2724231 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 50DA1C0AB1 for ; Fri, 14 Jun 2013 20:35:01 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 74B5C2027A for ; Fri, 14 Jun 2013 20:35:00 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id E77D920279 for ; Fri, 14 Jun 2013 20:34:58 +0000 (UTC) Received: from merlin.infradead.org ([205.233.59.134]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UnZto-00049t-DZ; Fri, 14 Jun 2013 19:43:07 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1UnZo3-0007di-0a; Fri, 14 Jun 2013 19:37:07 +0000 Received: from mailout4.w1.samsung.com ([210.118.77.14]) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1UnZl9-0007JT-RB for linux-arm-kernel@lists.infradead.org; Fri, 14 Jun 2013 19:34:12 +0000 Received: from eucpsbgm2.samsung.com (unknown [203.254.199.245]) by mailout4.w1.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0MOE00E84E2KE880@mailout4.w1.samsung.com> for linux-arm-kernel@lists.infradead.org; Fri, 14 Jun 2013 20:33:28 +0100 (BST) X-AuditID: cbfec7f5-b7f376d000001ec6-53-51bb7008af4d Received: from eusync2.samsung.com ( [203.254.199.212]) by eucpsbgm2.samsung.com (EUCPMTA) with SMTP id CA.3E.07878.8007BB15; Fri, 14 Jun 2013 20:33:28 +0100 (BST) Received: from amdc1227.digital.local ([106.116.147.199]) by eusync2.samsung.com (Oracle Communications Messaging Server 7u4-23.01(7.0.4.23.0) 64bit (built Aug 10 2011)) with ESMTPA id <0MOE00FXFEBEW970@eusync2.samsung.com>; Fri, 14 Jun 2013 20:33:28 +0100 (BST) From: Tomasz Figa To: linux-samsung-soc@vger.kernel.org Subject: [PATCH 22/28] ARM: EXYNOS: Remove mach/regs-gpio.h header Date: Fri, 14 Jun 2013 21:32:58 +0200 Message-id: <1371238384-1504-23-git-send-email-t.figa@samsung.com> X-Mailer: git-send-email 1.8.2.1 In-reply-to: <1371238384-1504-1-git-send-email-t.figa@samsung.com> References: <1371238384-1504-1-git-send-email-t.figa@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFupkluLIzCtJLcpLzFFi42I5/e/4FV2Ogt2BBnMvc1r8nXSM3aJ3wVU2 i7NNb9gtNj2+xmox4/w+Jou1R+6yW5y6/pnN4vCbdlaL9TNes1gcm7GE0YHL4/evSYwed67t YfPYvKTe48qJJlaPvi2rGD0+b5ILYIvisklJzcksSy3St0vgyphxSbfgk1jFh+XdLA2M04W7 GDk5JARMJG7enMkOYYtJXLi3nq2LkYtDSGApo8TnfZfYIZw+Jolpj2YygVSxCahJfG54xAZi iwioSnxuWwBWxCzwkknibuMDsFHCAk4SNy+vYASxWYCKnt/aDRbnBYpvmfuIFWKdgsTx7dvA ajiB4mfXbwEbKiTgKDG9cQnLBEbeBYwMqxhFU0uTC4qT0nON9IoTc4tL89L1kvNzNzFCgu/r Dsalx6wOMQpwMCrx8E5U2x0oxJpYVlyZe4hRgoNZSYT3ripQiDclsbIqtSg/vqg0J7X4ECMT B6dUA6PqBtX4CcZqzN/UOL2unbfYwyMfrFpt8cRlS7dGb9/1hFeBC5PYj2q0lbZwWgp9v70u c8m1JC2dNOYrP+t0MvY326584rFtTbVZ+Qeb8Ft77rDdO+/PE13o/JfL5Ux9hIVwTalaeueq o5fvMpyX/3T8uKRIr+Fa78h300P3S6qaCmz5tyBjnhJLcUaioRZzUXEiAN0wS1AcAgAA X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130614_153408_032557_80051587 X-CRM114-Status: GOOD ( 11.84 ) X-Spam-Score: -7.2 (-------) Cc: Kukjin Kim , Arnd Bergmann , Tomasz Figa , Kyungmin Park , Thomas Abraham , Sylwester Nawrocki , Olof Johansson , linux-arm-kernel@lists.infradead.org, Marek Szyprowski X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.5 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Contents of this header are not used any more and can be safely removed. Signed-off-by: Tomasz Figa Signed-off-by: Kyungmin Park --- arch/arm/mach-exynos/common.c | 1 - arch/arm/mach-exynos/include/mach/regs-gpio.h | 40 --------------------------- arch/arm/mach-exynos/pm.c | 1 - 3 files changed, 42 deletions(-) delete mode 100644 arch/arm/mach-exynos/include/mach/regs-gpio.h diff --git a/arch/arm/mach-exynos/common.c b/arch/arm/mach-exynos/common.c index f81aa22..7b53e4c 100644 --- a/arch/arm/mach-exynos/common.c +++ b/arch/arm/mach-exynos/common.c @@ -40,7 +40,6 @@ #include #include -#include #include #include diff --git a/arch/arm/mach-exynos/include/mach/regs-gpio.h b/arch/arm/mach-exynos/include/mach/regs-gpio.h deleted file mode 100644 index e4b5b60..0000000 --- a/arch/arm/mach-exynos/include/mach/regs-gpio.h +++ /dev/null @@ -1,40 +0,0 @@ -/* linux/arch/arm/mach-exynos4/include/mach/regs-gpio.h - * - * Copyright (c) 2010-2011 Samsung Electronics Co., Ltd. - * http://www.samsung.com - * - * EXYNOS4 - GPIO (including EINT) register definitions - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. -*/ - -#ifndef __ASM_ARCH_REGS_GPIO_H -#define __ASM_ARCH_REGS_GPIO_H __FILE__ - -#include -#include - -#define EINT_REG_NR(x) (EINT_OFFSET(x) >> 3) -#define EINT_CON(b, x) (b + 0xE00 + (EINT_REG_NR(x) * 4)) -#define EINT_FLTCON(b, x) (b + 0xE80 + (EINT_REG_NR(x) * 4)) -#define EINT_MASK(b, x) (b + 0xF00 + (EINT_REG_NR(x) * 4)) -#define EINT_PEND(b, x) (b + 0xF40 + (EINT_REG_NR(x) * 4)) - -#define EINT_OFFSET_BIT(x) (1 << (EINT_OFFSET(x) & 0x7)) - -/* compatibility for plat-s5p/irq-pm.c */ -#define EXYNOS4_EINT40CON (S5P_VA_GPIO2 + 0xE00) -#define S5P_EINT_CON(x) (EXYNOS4_EINT40CON + ((x) * 0x4)) - -#define EXYNOS4_EINT40FLTCON0 (S5P_VA_GPIO2 + 0xE80) -#define S5P_EINT_FLTCON(x) (EXYNOS4_EINT40FLTCON0 + ((x) * 0x4)) - -#define EXYNOS4_EINT40MASK (S5P_VA_GPIO2 + 0xF00) -#define S5P_EINT_MASK(x) (EXYNOS4_EINT40MASK + ((x) * 0x4)) - -#define EXYNOS4_EINT40PEND (S5P_VA_GPIO2 + 0xF40) -#define S5P_EINT_PEND(x) (EXYNOS4_EINT40PEND + ((x) * 0x4)) - -#endif /* __ASM_ARCH_REGS_GPIO_H */ diff --git a/arch/arm/mach-exynos/pm.c b/arch/arm/mach-exynos/pm.c index e3faaa81..41c2069 100644 --- a/arch/arm/mach-exynos/pm.c +++ b/arch/arm/mach-exynos/pm.c @@ -30,7 +30,6 @@ #include #include -#include #include #include #include