summaryrefslogtreecommitdiffstats
path: root/arch/arm/plat-mxc/include/mach/iomux-mx1-mx2.h
diff options
context:
space:
mode:
authorSascha Hauer2008-11-04 16:48:46 +0100
committerSascha Hauer2008-12-16 14:46:14 +0100
commit7bd1822135175354e1662cc890a156f1d89dc211 (patch)
tree91c0278ee0cfb2728bee25ff9fd3ca171d225ab8 /arch/arm/plat-mxc/include/mach/iomux-mx1-mx2.h
parent[ARM] MX27: add i.MX27 SDHC1 and SDHC2 GPIO declarations (diff)
downloadkernel-qcow2-linux-7bd1822135175354e1662cc890a156f1d89dc211.tar.gz
kernel-qcow2-linux-7bd1822135175354e1662cc890a156f1d89dc211.tar.xz
kernel-qcow2-linux-7bd1822135175354e1662cc890a156f1d89dc211.zip
[ARM] MX1/MX2: simplify mxc_gpio_setup_multiple_pins
mxc_gpio_setup_multiple_pins used to take several ALLOC_MODE flags. Most of them are unused, so simplify the function by removing the flags. Also, instead of using a confusing MXC_GPIO_ALLOC_MODE_RELEASE flag in a function having alloc in its name, add a mxc_gpio_release_multiple_pins function. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/plat-mxc/include/mach/iomux-mx1-mx2.h')
-rw-r--r--arch/arm/plat-mxc/include/mach/iomux-mx1-mx2.h9
1 files changed, 2 insertions, 7 deletions
diff --git a/arch/arm/plat-mxc/include/mach/iomux-mx1-mx2.h b/arch/arm/plat-mxc/include/mach/iomux-mx1-mx2.h
index f49d798c5c3c..6c331c939c00 100644
--- a/arch/arm/plat-mxc/include/mach/iomux-mx1-mx2.h
+++ b/arch/arm/plat-mxc/include/mach/iomux-mx1-mx2.h
@@ -21,12 +21,6 @@
#include <linux/io.h>
-#define MXC_GPIO_ALLOC_MODE_NORMAL 0
-#define MXC_GPIO_ALLOC_MODE_NO_ALLOC 1
-#define MXC_GPIO_ALLOC_MODE_TRY_ALLOC 2
-#define MXC_GPIO_ALLOC_MODE_ALLOC_ONLY 4
-#define MXC_GPIO_ALLOC_MODE_RELEASE 8
-
/*
* GPIO Module and I/O Multiplexer
* x = 0..3 for reg_A, reg_B, reg_C, reg_D
@@ -103,7 +97,8 @@
extern void mxc_gpio_mode(int gpio_mode);
extern int mxc_gpio_setup_multiple_pins(const int *pin_list, unsigned count,
- int alloc_mode, const char *label);
+ const char *label);
+extern void mxc_gpio_release_multiple_pins(const int *pin_list, int count);
/*-------------------------------------------------------------------------*/