diff options
| author | Dinh Nguyen <Dinh.Nguyen@freescale.com> | 2011-02-15 15:41:14 -0600 |
|---|---|---|
| committer | Dinh Nguyen <Dinh.Nguyen@freescale.com> | 2011-02-16 13:33:12 -0600 |
| commit | 97fc45810719f30baeac94786d129fbb7dc44f44 (patch) | |
| tree | 8177174949a1abc40cd62d32f63784a3b9d2baa2 /arch/arm/plat-mxc | |
| parent | 4f1a6d4571abce13a0300a8f17b528b6fc306b01 (diff) | |
ENGR00139377 Iomux clean-up, remove unnecessary defines.
Remove IOMUX_TO_IRQ_V3, because the call gpio_to_irq in
mach/gpio.h does the same thing. Also the iomux_config
enum is not used anywhere.
Signed-off-by: Dinh Nguyen <Dinh.Nguyen@freescale.com>
Diffstat (limited to 'arch/arm/plat-mxc')
| -rw-r--r-- | arch/arm/plat-mxc/include/mach/iomux-mx50.h | 21 | ||||
| -rw-r--r-- | arch/arm/plat-mxc/include/mach/iomux-mx51.h | 2 | ||||
| -rw-r--r-- | arch/arm/plat-mxc/include/mach/iomux-mx53.h | 18 |
3 files changed, 1 insertions, 40 deletions
diff --git a/arch/arm/plat-mxc/include/mach/iomux-mx50.h b/arch/arm/plat-mxc/include/mach/iomux-mx50.h index fd4a2e2f4ecc..d92fd16493b6 100644 --- a/arch/arm/plat-mxc/include/mach/iomux-mx50.h +++ b/arch/arm/plat-mxc/include/mach/iomux-mx50.h @@ -21,26 +21,7 @@ #include <mach/iomux-v3.h> -/* - * various IOMUX alternate output functions (1-7) - */ -typedef enum iomux_config { - IOMUX_CONFIG_ALT0, - IOMUX_CONFIG_ALT1, - IOMUX_CONFIG_ALT2, - IOMUX_CONFIG_ALT3, - IOMUX_CONFIG_ALT4, - IOMUX_CONFIG_ALT5, - IOMUX_CONFIG_ALT6, - IOMUX_CONFIG_ALT7, - IOMUX_CONFIG_GPIO, /* added to help user use GPIO mode */ - IOMUX_CONFIG_SION = 0x1 << 4, /* LOOPBACK:MUX SION bit */ -} iomux_pin_cfg_t; - -#define NON_MUX_I 0x3FF -#define NON_PAD_I 0x7FF - -#define IOMUX_TO_IRQ_V3(pin) (MXC_GPIO_IRQ_START + pin) +#define NON_MUX_I 0 #define MX50_ELCDIF_PAD_CTRL (PAD_CTL_PKE | \ PAD_CTL_DSE_HIGH) diff --git a/arch/arm/plat-mxc/include/mach/iomux-mx51.h b/arch/arm/plat-mxc/include/mach/iomux-mx51.h index 8f77976ce7cc..5b3cc08dbbc0 100644 --- a/arch/arm/plat-mxc/include/mach/iomux-mx51.h +++ b/arch/arm/plat-mxc/include/mach/iomux-mx51.h @@ -15,8 +15,6 @@ #include <mach/iomux-v3.h> -#define IOMUX_TO_IRQ_V3(pin) (MXC_GPIO_IRQ_START + pin) - /* Pad control groupings */ #define MX51_UART_PAD_CTRL (PAD_CTL_PKE | PAD_CTL_PUE | PAD_CTL_DSE_HIGH | \ PAD_CTL_HYS | PAD_CTL_SRE_FAST) diff --git a/arch/arm/plat-mxc/include/mach/iomux-mx53.h b/arch/arm/plat-mxc/include/mach/iomux-mx53.h index 11a5aa2f3963..5581a2ac21b8 100644 --- a/arch/arm/plat-mxc/include/mach/iomux-mx53.h +++ b/arch/arm/plat-mxc/include/mach/iomux-mx53.h @@ -21,24 +21,6 @@ #include <mach/iomux-v3.h> -/* - * various IOMUX alternate output functions (1-7) - */ -typedef enum iomux_config { - IOMUX_CONFIG_ALT0, - IOMUX_CONFIG_ALT1, - IOMUX_CONFIG_ALT2, - IOMUX_CONFIG_ALT3, - IOMUX_CONFIG_ALT4, - IOMUX_CONFIG_ALT5, - IOMUX_CONFIG_ALT6, - IOMUX_CONFIG_ALT7, - IOMUX_CONFIG_GPIO, /* added to help user use GPIO mode */ - IOMUX_CONFIG_SION = 0x1 << 4, /* LOOPBACK:MUX SION bit */ -} iomux_pin_cfg_t; - -#define IOMUX_TO_IRQ_V3(pin) (MXC_GPIO_IRQ_START + pin) - #define NON_PAD_I 0 #define MX53_UART_PAD_CTRL (PAD_CTL_PKE | PAD_CTL_PUE | PAD_CTL_DSE_HIGH | \ |