FEX-Emu/linux
1
0
Fork 0
mirror of https://github.com/FEX-Emu/linux.git synced 2024-12-14 21:01:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ARM: 7043/1: mach-ixp2000: rename GPIO header

Browse Source 
The ixp2000 abuses the <mach/gpio.h> namespace by not implementing
any generic GPIO nor gpiolib functions in it - just custom GPIO.
Rename the header to <mach/gpio-ixp2000.h> for clarity.

Cc: Lennert Buytenhek <kernel@wantstofly.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
This commit is contained in:
Linus Walleij 2011-08-22 08:44:18 +01:00 committed by Russell King
parent 257af9f972
commit 87f911a38d
4 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/mach-ixp2000/core.c
View File

@ -39,6 +39,8 @@
#include <asm/mach/time.h> #include <asm/mach/time.h>
#include <asm/mach/irq.h> #include <asm/mach/irq.h>
#include <mach/gpio-ixp2000.h>
static DEFINE_SPINLOCK(ixp2000_slowport_lock); static DEFINE_SPINLOCK(ixp2000_slowport_lock);
static unsigned long ixp2000_slowport_irq_flags; static unsigned long ixp2000_slowport_irq_flags;

4
arch/arm/mach-ixp2000/include/mach/gpio.h → arch/arm/mach-ixp2000/include/mach/gpio-ixp2000.h
View File

@ -3,7 +3,7 @@
* *
* Copyright (C) 2002 Intel Corporation. * Copyright (C) 2002 Intel Corporation.
* *
* This program is free software, you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation. * published by the Free Software Foundation.
*/ */
@ -11,7 +11,7 @@
/* /*
* IXP2000 GPIO in/out, edge/level detection for IRQs: * IXP2000 GPIO in/out, edge/level detection for IRQs:
* IRQs are generated on Falling-edge, Rising-Edge, Level-low, Level-High * IRQs are generated on Falling-edge, Rising-Edge, Level-low, Level-High
* or both Falling-edge and Rising-edge. * or both Falling-edge and Rising-edge.
* This must be called *before* the corresponding IRQ is registerd. * This must be called *before* the corresponding IRQ is registerd.
* Use this instead of directly setting the GPIO registers. * Use this instead of directly setting the GPIO registers.
* GPIOs may also be used as GPIOs (e.g. for emulating i2c/smb) * GPIOs may also be used as GPIOs (e.g. for emulating i2c/smb)

1
arch/arm/mach-ixp2000/ixdp2x00.c
View File

@ -41,6 +41,7 @@
#include <asm/mach/flash.h> #include <asm/mach/flash.h>
#include <asm/mach/arch.h> #include <asm/mach/arch.h>
#include <mach/gpio-ixp2000.h>
/************************************************************************* /*************************************************************************
* IXDP2x00 IRQ Initialization * IXDP2x00 IRQ Initialization

2
drivers/i2c/busses/i2c-ixp2000.c
View File

@ -35,7 +35,7 @@
#include <linux/slab.h> #include <linux/slab.h>
#include <mach/hardware.h> /* Pick up IXP2000-specific bits */ #include <mach/hardware.h> /* Pick up IXP2000-specific bits */
#include <asm/gpio.h> #include <mach/gpio-ixp2000.h>
static inline int ixp2000_scl_pin(void *data) static inline int ixp2000_scl_pin(void *data)
{ {