From patchwork Tue Aug 30 11:00:56 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Russell King (Oracle)" X-Patchwork-Id: 9305211 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id DF4B060756 for ; Tue, 30 Aug 2016 11:05:36 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CF2C128B83 for ; Tue, 30 Aug 2016 11:05:36 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C328328B8C; Tue, 30 Aug 2016 11:05:36 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 2224928B83 for ; Tue, 30 Aug 2016 11:05:34 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.85_2 #1 (Red Hat Linux)) id 1begpS-0000Wt-G1; Tue, 30 Aug 2016 11:03:42 +0000 Received: from pandora.armlinux.org.uk ([2001:4d48:ad52:3201:214:fdff:fe10:1be6]) by bombadil.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1begnA-00074g-6e for linux-arm-kernel@lists.infradead.org; Tue, 30 Aug 2016 11:01:24 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=armlinux.org.uk; s=pandora-2014; h=Date:Sender:Message-Id:Content-Type:Content-Transfer-Encoding:MIME-Version:Subject:To:From:References:In-Reply-To; bh=MfwkJz+FlcIfLvWogKDDShHGZWQh8i9412ftUnA6kOY=; b=I6SL4PFh5kdBdESdlMrz9MThGhNC509WkqkkxmS02gSfKgj1Hbf9P5KGw05Ri6vi4jOKkeU5rc47WowuJyeTv/g27GdSBTxx98KPeN3qgbUGdNDQSHmhZKTLD9Apa+DdCariOrhal6cyTotOulBJQZjyPwxoUwJah4yEx/VR01Q=; Received: from e0022681537dd.dyn.armlinux.org.uk ([fd8f:7570:feb6:1:222:68ff:fe15:37dd]:35946 helo=rmk-PC.armlinux.org.uk) by pandora.armlinux.org.uk with esmtpsa (TLSv1:AES128-SHA:128) (Exim 4.82_1-5b7a7c0-XX) (envelope-from ) id 1begmn-0004ZY-BC for linux-arm-kernel@lists.infradead.org; Tue, 30 Aug 2016 12:00:57 +0100 Received: from rmk by rmk-PC.armlinux.org.uk with local (Exim 4.82_1-5b7a7c0-XX) (envelope-from ) id 1begmm-0007Ik-EQ for linux-arm-kernel@lists.infradead.org; Tue, 30 Aug 2016 12:00:56 +0100 In-Reply-To: <20160830105950.GA15580@n2100.armlinux.org.uk> References: <20160830105950.GA15580@n2100.armlinux.org.uk> From: Russell King To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 7/8] ARM: sa1100/neponset: remove neponset_ncr_* GPIO interfaces and header MIME-Version: 1.0 Content-Disposition: inline Message-Id: Date: Tue, 30 Aug 2016 12:00:56 +0100 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160830_040120_690075_EE3ABFB0 X-CRM114-Status: GOOD ( 13.61 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Remove the legacy neponset_ncr_*() interfaces and definitions, which leaves the header empty apart from the header and footer. Remove the header as well. Signed-off-by: Russell King --- arch/arm/mach-sa1100/include/mach/neponset.h | 30 ---------------------------- arch/arm/mach-sa1100/neponset.c | 14 +------------ 2 files changed, 1 insertion(+), 43 deletions(-) delete mode 100644 arch/arm/mach-sa1100/include/mach/neponset.h diff --git a/arch/arm/mach-sa1100/include/mach/neponset.h b/arch/arm/mach-sa1100/include/mach/neponset.h deleted file mode 100644 index 5516a52a329d..000000000000 --- a/arch/arm/mach-sa1100/include/mach/neponset.h +++ /dev/null @@ -1,30 +0,0 @@ -/* - * arch/arm/mach-sa1100/include/mach/neponset.h - * - * Created 2000/06/05 by Nicolas Pitre - * - * This file contains the hardware specific definitions for Assabet - * Only include this file from SA1100-specific files. - * - * 2000/05/23 John Dorsey - * Definitions for Neponset added. - */ -#ifndef __ASM_ARCH_NEPONSET_H -#define __ASM_ARCH_NEPONSET_H - -/* - * Neponset definitions: - */ -#define NCR_GP01_OFF (1<<0) -#define NCR_TP_PWR_EN (1<<1) -#define NCR_MS_PWR_EN (1<<2) -#define NCR_ENET_OSC_EN (1<<3) -#define NCR_SPI_KB_WK_UP (1<<4) -#define NCR_A0VPP (1<<5) -#define NCR_A1VPP (1<<6) - -void neponset_ncr_frob(unsigned int, unsigned int); -#define neponset_ncr_set(v) neponset_ncr_frob(0, v) -#define neponset_ncr_clear(v) neponset_ncr_frob(v, 0) - -#endif diff --git a/arch/arm/mach-sa1100/neponset.c b/arch/arm/mach-sa1100/neponset.c index 700659cadebb..b3c2266b2302 100644 --- a/arch/arm/mach-sa1100/neponset.c +++ b/arch/arm/mach-sa1100/neponset.c @@ -25,7 +25,6 @@ #include #include -#include #include #define NEP_IRQ_SMC91X 0 @@ -48,6 +47,7 @@ #define IRR_USAR (1 << 1) #define IRR_SA1111 (1 << 2) +#define NCR_GP01_OFF BIT(0) #define NCR_NGPIO 7 #define MDM_CTL0_NGPIO 4 #define MDM_CTL1_NGPIO 6 @@ -124,18 +124,6 @@ static struct gpiod_lookup_table neponset_pcmcia_table = { static struct neponset_drvdata *nep; -void neponset_ncr_frob(unsigned int mask, unsigned int val) -{ - struct neponset_drvdata *n = nep; - unsigned long m = mask, v = val; - - if (nep) - n->gpio[0]->set_multiple(n->gpio[0], &m, &v); - else - WARN(1, "nep unset\n"); -} -EXPORT_SYMBOL(neponset_ncr_frob); - /* * Install handler for Neponset IRQ. Note that we have to loop here * since the ETHERNET and USAR IRQs are level based, and we need to