From: Richard Zhao Date: Thu, 6 Jan 2011 11:05:39 +0000 (+0800) Subject: arm: mxc: move IOMUX_CONFIG_SION definition to iomux-v3.h X-Git-Tag: MMI-PSA29.97-13-9~21008^2~3^2~21 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=14c6500e7547704255f94c63fc6016ae5cbed1c9;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git arm: mxc: move IOMUX_CONFIG_SION definition to iomux-v3.h Signed-off-by: Richard Zhao Signed-off-by: Sascha Hauer --- diff --git a/arch/arm/plat-mxc/include/mach/iomux-mx53.h b/arch/arm/plat-mxc/include/mach/iomux-mx53.h index 5deee019c29e..2673007d3eb2 100644 --- a/arch/arm/plat-mxc/include/mach/iomux-mx53.h +++ b/arch/arm/plat-mxc/include/mach/iomux-mx53.h @@ -34,7 +34,6 @@ typedef enum iomux_config { 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 diff --git a/arch/arm/plat-mxc/include/mach/iomux-v3.h b/arch/arm/plat-mxc/include/mach/iomux-v3.h index 2277b01c855d..82620af1922f 100644 --- a/arch/arm/plat-mxc/include/mach/iomux-v3.h +++ b/arch/arm/plat-mxc/include/mach/iomux-v3.h @@ -105,6 +105,7 @@ typedef u64 iomux_v3_cfg_t; #define PAD_CTL_SRE_FAST (1 << 0) #define PAD_CTL_SRE_SLOW (0 << 0) +#define IOMUX_CONFIG_SION (0x1 << 4) #define MX51_NUM_GPIO_PORT 4