[PATCH v4 5/8] arm: mxc: move IOMUX_CONFIG_XXXX definitions to iomux-v3.h

[richard.zhao@freescale.com (Richard Zhao)]

Hello Sascha,

On Thu, Dec 30, 2010 at 07:25:04PM +0800, Richard Zhao wrote:
> IOMUX_CONFIG_GPIO is not for iomux-v3. It's for old freescale
> iomux routines. Remove it.
> 
> Signed-off-by: Richard Zhao <richard.zhao@freescale.com>
> Acked-by: Uwe Kleine-K?nig <u.kleine-koenig@pengutronix.de>
If you don't have comments, could you please merge this patch?
It's causing arch/arm/plat-mxc/include/mach/iomux-mx50.h incomplete.

Thanks
Richard
> ---
>  arch/arm/plat-mxc/include/mach/iomux-mx51.h |   16 ----------------
>  arch/arm/plat-mxc/include/mach/iomux-mx53.h |   16 ----------------
>  arch/arm/plat-mxc/include/mach/iomux-v3.h   |   15 +++++++++++++++
>  3 files changed, 15 insertions(+), 32 deletions(-)
> 
> diff --git a/arch/arm/plat-mxc/include/mach/iomux-mx51.h b/arch/arm/plat-mxc/include/mach/iomux-mx51.h
> index e1600f3..31af1f5 100644
> --- a/arch/arm/plat-mxc/include/mach/iomux-mx51.h
> +++ b/arch/arm/plat-mxc/include/mach/iomux-mx51.h
> @@ -15,22 +15,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;
> -
>  /* Pad control groupings */
>  #define MX51_UART1_PAD_CTRL	(PAD_CTL_HYS | PAD_CTL_PKE | PAD_CTL_PUE | \
>  				PAD_CTL_DSE_HIGH)
> diff --git a/arch/arm/plat-mxc/include/mach/iomux-mx53.h b/arch/arm/plat-mxc/include/mach/iomux-mx53.h
> index 80cb3c5..4155124 100644
> --- a/arch/arm/plat-mxc/include/mach/iomux-mx53.h
> +++ b/arch/arm/plat-mxc/include/mach/iomux-mx53.h
> @@ -21,22 +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;
> -
>  /* These 2 defines are for pins that may not have a mux register, but could
>   * have a pad setting register, and vice-versa. */
>  #define NON_MUX_I	0x00
> diff --git a/arch/arm/plat-mxc/include/mach/iomux-v3.h b/arch/arm/plat-mxc/include/mach/iomux-v3.h
> index 811716f..e1fd71b 100644
> --- a/arch/arm/plat-mxc/include/mach/iomux-v3.h
> +++ b/arch/arm/plat-mxc/include/mach/iomux-v3.h
> @@ -54,6 +54,21 @@ typedef struct deprecated_pad_desc {
>  	unsigned select_input:3;
>  } iomux_v3_cfg_t;
>  
> +/*
> + * various IOMUX alternate output functions (1-7)
> + */
> +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_SION = 0x1 << 4,	/* LOOPBACK:MUX SION bit */
> +};
> +
>  static inline unsigned int MUX_CTRL_OFS(iomux_v3_cfg_t *pad)
>  {
>  	return pad->mux_ctrl_ofs;
> -- 
> 1.6.3.3
>