diff options
author | Russell King <rmk+kernel@armlinux.org.uk> | 2016-08-31 08:49:55 +0100 |
---|---|---|
committer | Russell King (Oracle) <rmk+kernel@armlinux.org.uk> | 2022-04-02 11:11:38 +0100 |
commit | 525d0eb0b3e584d308cf3272ddb4158f9a55e77c (patch) | |
tree | 73268f637790149d03d6c01e9161185b3a4555d5 /arch | |
parent | 7c8758954ad3050f25837464a9fcfc420b975762 (diff) |
ARM: sa1100/neponset: remove neponset_ncr_* interfaces and header
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 <rmk+kernel@armlinux.org.uk>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/mach-sa1100/include/mach/neponset.h | 31 | ||||
-rw-r--r-- | arch/arm/mach-sa1100/neponset.c | 14 |
2 files changed, 1 insertions, 44 deletions
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 18411cfdfe8e..000000000000 --- a/arch/arm/mach-sa1100/include/mach/neponset.h +++ /dev/null @@ -1,31 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -/* - * arch/arm/mach-sa1100/include/mach/neponset.h - * - * Created 2000/06/05 by Nicolas Pitre <nico@fluxnic.net> - * - * This file contains the hardware specific definitions for Assabet - * Only include this file from SA1100-specific files. - * - * 2000/05/23 John Dorsey <john+@cs.cmu.edu> - * 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 2b2fff442ba7..9d2ae7febca3 100644 --- a/arch/arm/mach-sa1100/neponset.c +++ b/arch/arm/mach-sa1100/neponset.c @@ -27,7 +27,6 @@ #include <mach/hardware.h> #include <mach/assabet.h> -#include <mach/neponset.h> #include <mach/irqs.h> #define NEP_IRQ_SMC91X 0 @@ -50,6 +49,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 @@ -126,18 +126,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 |