diff options
| -rw-r--r-- | arch/arm/include/asm/arch-mx5/iomux-mx51.h | 10 | ||||
| -rw-r--r-- | arch/arm/include/asm/imx-common/iomux-v3.h | 10 | ||||
| -rw-r--r-- | board/boundary/nitrogen6x/nitrogen6x.c | 42 | ||||
| -rw-r--r-- | board/freescale/mx6qarm2/mx6qarm2.c | 17 | ||||
| -rw-r--r-- | board/freescale/mx6qsabreauto/mx6qsabreauto.c | 17 | ||||
| -rw-r--r-- | board/freescale/mx6qsabrelite/mx6qsabrelite.c | 30 | ||||
| -rw-r--r-- | board/freescale/mx6qsabresd/mx6qsabresd.c | 17 | ||||
| -rw-r--r-- | board/freescale/mx6slevk/mx6slevk.c | 12 | ||||
| -rw-r--r-- | board/freescale/titanium/titanium.c | 20 | ||||
| -rw-r--r-- | board/wandboard/wandboard.c | 17 | 
10 files changed, 82 insertions, 110 deletions
| diff --git a/arch/arm/include/asm/arch-mx5/iomux-mx51.h b/arch/arm/include/asm/arch-mx5/iomux-mx51.h index 5f96dc499..328c1880e 100644 --- a/arch/arm/include/asm/arch-mx5/iomux-mx51.h +++ b/arch/arm/include/asm/arch-mx5/iomux-mx51.h @@ -22,7 +22,7 @@  #include <asm/imx-common/iomux-v3.h>  /* Pad control groupings */ -#define MX51_UART_PAD_CTRL	(PAD_CTL_PKE | PAD_CTL_PUE | PAD_CTL_DSE_HIGH | \ +#define MX51_UART_PAD_CTRL	(PAD_CTL_PUE | PAD_CTL_DSE_HIGH | \  				PAD_CTL_HYS | PAD_CTL_SRE_FAST)  #define MX51_I2C_PAD_CTRL	(PAD_CTL_SRE_FAST | PAD_CTL_ODE | \  				PAD_CTL_DSE_HIGH | PAD_CTL_PUS_100K_UP | \ @@ -30,13 +30,11 @@  #define MX51_ESDHC_PAD_CTRL	(PAD_CTL_SRE_FAST | PAD_CTL_ODE | \  				PAD_CTL_DSE_HIGH | PAD_CTL_PUS_100K_UP | \  				PAD_CTL_HYS) -#define MX51_USBH1_PAD_CTRL	(PAD_CTL_PKE | PAD_CTL_SRE_FAST | \ -				PAD_CTL_DSE_HIGH | PAD_CTL_PUS_100K_UP | \ -				PAD_CTL_HYS | PAD_CTL_PUE) +#define MX51_USBH1_PAD_CTRL	(PAD_CTL_SRE_FAST | PAD_CTL_DSE_HIGH | \ +				PAD_CTL_PUS_100K_UP | PAD_CTL_HYS)  #define MX51_ECSPI_PAD_CTRL	(PAD_CTL_PKE | PAD_CTL_HYS | \  				PAD_CTL_DSE_HIGH | PAD_CTL_SRE_FAST) -#define MX51_SDHCI_PAD_CTRL	(PAD_CTL_PKE | PAD_CTL_DSE_HIGH | \ -				PAD_CTL_PUS_47K_UP | PAD_CTL_PUE | \ +#define MX51_SDHCI_PAD_CTRL	(PAD_CTL_DSE_HIGH | PAD_CTL_PUS_47K_UP | \  				PAD_CTL_SRE_FAST | PAD_CTL_DVS)  #define MX51_GPIO_PAD_CTRL	(PAD_CTL_DSE_HIGH | PAD_CTL_PKE | PAD_CTL_SRE_FAST) diff --git a/arch/arm/include/asm/imx-common/iomux-v3.h b/arch/arm/include/asm/imx-common/iomux-v3.h index 2ba0a053d..0b4e76333 100644 --- a/arch/arm/include/asm/imx-common/iomux-v3.h +++ b/arch/arm/include/asm/imx-common/iomux-v3.h @@ -99,11 +99,11 @@ typedef u64 iomux_v3_cfg_t;  #define PAD_CTL_HYS		(1 << 16) -#define PAD_CTL_PUS_100K_DOWN	(0 << 14) -#define PAD_CTL_PUS_47K_UP	(1 << 14) -#define PAD_CTL_PUS_100K_UP	(2 << 14) -#define PAD_CTL_PUS_22K_UP	(3 << 14) -#define PAD_CTL_PUE		(1 << 13) +#define PAD_CTL_PUS_100K_DOWN	(0 << 14 | PAD_CTL_PUE) +#define PAD_CTL_PUS_47K_UP	(1 << 14 | PAD_CTL_PUE) +#define PAD_CTL_PUS_100K_UP	(2 << 14 | PAD_CTL_PUE) +#define PAD_CTL_PUS_22K_UP	(3 << 14 | PAD_CTL_PUE) +#define PAD_CTL_PUE		(1 << 13 | PAD_CTL_PKE)  #define PAD_CTL_PKE		(1 << 12)  #define PAD_CTL_ODE		(1 << 11) diff --git a/board/boundary/nitrogen6x/nitrogen6x.c b/board/boundary/nitrogen6x/nitrogen6x.c index cc071d6d3..e155556ce 100644 --- a/board/boundary/nitrogen6x/nitrogen6x.c +++ b/board/boundary/nitrogen6x/nitrogen6x.c @@ -47,40 +47,34 @@  DECLARE_GLOBAL_DATA_PTR; -#define UART_PAD_CTRL  (PAD_CTL_PKE | PAD_CTL_PUE |	       \ -	PAD_CTL_PUS_100K_UP | PAD_CTL_SPEED_MED |	       \ -	PAD_CTL_DSE_40ohm   | PAD_CTL_SRE_FAST  | PAD_CTL_HYS) +#define UART_PAD_CTRL  (PAD_CTL_PUS_100K_UP |			\ +	PAD_CTL_SPEED_MED | PAD_CTL_DSE_40ohm |			\ +	PAD_CTL_SRE_FAST  | PAD_CTL_HYS) -#define USDHC_PAD_CTRL (PAD_CTL_PKE | PAD_CTL_PUE |	       \ -	PAD_CTL_PUS_47K_UP  | PAD_CTL_SPEED_LOW |	       \ -	PAD_CTL_DSE_80ohm   | PAD_CTL_SRE_FAST  | PAD_CTL_HYS) +#define USDHC_PAD_CTRL (PAD_CTL_PUS_47K_UP |			\ +	PAD_CTL_SPEED_LOW | PAD_CTL_DSE_80ohm |			\ +	PAD_CTL_SRE_FAST  | PAD_CTL_HYS) -#define ENET_PAD_CTRL  (PAD_CTL_PKE | PAD_CTL_PUE |		\ -	PAD_CTL_PUS_100K_UP | PAD_CTL_SPEED_MED	  |		\ -	PAD_CTL_DSE_40ohm   | PAD_CTL_HYS) +#define ENET_PAD_CTRL  (PAD_CTL_PUS_100K_UP |			\ +	PAD_CTL_SPEED_MED | PAD_CTL_DSE_40ohm | PAD_CTL_HYS) -#define SPI_PAD_CTRL (PAD_CTL_HYS |				\ -	PAD_CTL_PUS_100K_DOWN | PAD_CTL_SPEED_MED |		\ +#define SPI_PAD_CTRL (PAD_CTL_HYS | PAD_CTL_SPEED_MED |		\  	PAD_CTL_DSE_40ohm     | PAD_CTL_SRE_FAST) -#define BUTTON_PAD_CTRL (PAD_CTL_PKE | PAD_CTL_PUE |		\ -	PAD_CTL_PUS_100K_UP | PAD_CTL_SPEED_MED   |		\ -	PAD_CTL_DSE_40ohm   | PAD_CTL_HYS) +#define BUTTON_PAD_CTRL (PAD_CTL_PUS_100K_UP |			\ +	PAD_CTL_SPEED_MED | PAD_CTL_DSE_40ohm | PAD_CTL_HYS) -#define I2C_PAD_CTRL	(PAD_CTL_PKE | PAD_CTL_PUE |		\ -	PAD_CTL_PUS_100K_UP | PAD_CTL_SPEED_MED |		\ -	PAD_CTL_DSE_40ohm | PAD_CTL_HYS |			\ +#define I2C_PAD_CTRL	(PAD_CTL_PUS_100K_UP |			\ +	PAD_CTL_SPEED_MED | PAD_CTL_DSE_40ohm | PAD_CTL_HYS |	\  	PAD_CTL_ODE | PAD_CTL_SRE_FAST) -#define WEAK_PULLUP	(PAD_CTL_PKE | PAD_CTL_PUE |		\ -	PAD_CTL_PUS_100K_UP | PAD_CTL_SPEED_MED |		\ -	PAD_CTL_DSE_40ohm | PAD_CTL_HYS |			\ +#define WEAK_PULLUP	(PAD_CTL_PUS_100K_UP |			\ +	PAD_CTL_SPEED_MED | PAD_CTL_DSE_40ohm | PAD_CTL_HYS |	\  	PAD_CTL_SRE_SLOW) -#define WEAK_PULLDOWN	(PAD_CTL_PKE | PAD_CTL_PUE |		\ -	PAD_CTL_PUS_100K_DOWN | PAD_CTL_SPEED_MED |		\ -	PAD_CTL_DSE_40ohm | PAD_CTL_HYS |			\ -	PAD_CTL_SRE_SLOW) +#define WEAK_PULLDOWN	(PAD_CTL_PUS_100K_DOWN |		\ +	PAD_CTL_SPEED_MED | PAD_CTL_DSE_40ohm |			\ +	PAD_CTL_HYS | PAD_CTL_SRE_SLOW)  #define OUTPUT_40OHM (PAD_CTL_SPEED_MED|PAD_CTL_DSE_40ohm) diff --git a/board/freescale/mx6qarm2/mx6qarm2.c b/board/freescale/mx6qarm2/mx6qarm2.c index ff7f5e83a..e33674665 100644 --- a/board/freescale/mx6qarm2/mx6qarm2.c +++ b/board/freescale/mx6qarm2/mx6qarm2.c @@ -35,17 +35,16 @@  DECLARE_GLOBAL_DATA_PTR; -#define UART_PAD_CTRL  (PAD_CTL_PKE | PAD_CTL_PUE |		\ -	PAD_CTL_PUS_100K_UP | PAD_CTL_SPEED_MED |		\ -	PAD_CTL_DSE_40ohm   | PAD_CTL_SRE_FAST  | PAD_CTL_HYS) +#define UART_PAD_CTRL  (PAD_CTL_PUS_100K_UP |			\ +	PAD_CTL_SPEED_MED | PAD_CTL_DSE_40ohm |			\ +	PAD_CTL_SRE_FAST  | PAD_CTL_HYS) -#define USDHC_PAD_CTRL (PAD_CTL_PKE | PAD_CTL_PUE |		\ -	PAD_CTL_PUS_47K_UP  | PAD_CTL_SPEED_LOW |		\ -	PAD_CTL_DSE_80ohm   | PAD_CTL_SRE_FAST  | PAD_CTL_HYS) +#define USDHC_PAD_CTRL (PAD_CTL_PUS_47K_UP |			\ +	PAD_CTL_SPEED_LOW | PAD_CTL_DSE_80ohm |			\ +	PAD_CTL_SRE_FAST  | PAD_CTL_HYS) -#define ENET_PAD_CTRL  (PAD_CTL_PKE | PAD_CTL_PUE |		\ -	PAD_CTL_PUS_100K_UP | PAD_CTL_SPEED_MED   |		\ -	PAD_CTL_DSE_40ohm   | PAD_CTL_HYS) +#define ENET_PAD_CTRL  (PAD_CTL_PUS_100K_UP |			\ +	PAD_CTL_SPEED_MED | PAD_CTL_DSE_40ohm | PAD_CTL_HYS)  int dram_init(void)  { diff --git a/board/freescale/mx6qsabreauto/mx6qsabreauto.c b/board/freescale/mx6qsabreauto/mx6qsabreauto.c index a3afa58ae..bfe4868e8 100644 --- a/board/freescale/mx6qsabreauto/mx6qsabreauto.c +++ b/board/freescale/mx6qsabreauto/mx6qsabreauto.c @@ -35,17 +35,16 @@  DECLARE_GLOBAL_DATA_PTR; -#define UART_PAD_CTRL  (PAD_CTL_PKE | PAD_CTL_PUE |            \ -	PAD_CTL_PUS_100K_UP | PAD_CTL_SPEED_MED |               \ -	PAD_CTL_DSE_40ohm   | PAD_CTL_SRE_FAST  | PAD_CTL_HYS) +#define UART_PAD_CTRL  (PAD_CTL_PUS_100K_UP |			\ +	PAD_CTL_SPEED_MED | PAD_CTL_DSE_40ohm |			\ +	PAD_CTL_SRE_FAST  | PAD_CTL_HYS) -#define USDHC_PAD_CTRL (PAD_CTL_PKE | PAD_CTL_PUE |            \ -	PAD_CTL_PUS_47K_UP  | PAD_CTL_SPEED_LOW |               \ -	PAD_CTL_DSE_80ohm   | PAD_CTL_SRE_FAST  | PAD_CTL_HYS) +#define USDHC_PAD_CTRL (PAD_CTL_PUS_47K_UP |			\ +	PAD_CTL_SPEED_LOW | PAD_CTL_DSE_80ohm |			\ +	PAD_CTL_SRE_FAST  | PAD_CTL_HYS) -#define ENET_PAD_CTRL  (PAD_CTL_PKE | PAD_CTL_PUE |		\ -	PAD_CTL_PUS_100K_UP | PAD_CTL_SPEED_MED   |		\ -	PAD_CTL_DSE_40ohm   | PAD_CTL_HYS) +#define ENET_PAD_CTRL  (PAD_CTL_PUS_100K_UP |			\ +	PAD_CTL_SPEED_MED | PAD_CTL_DSE_40ohm | PAD_CTL_HYS)  int dram_init(void)  { diff --git a/board/freescale/mx6qsabrelite/mx6qsabrelite.c b/board/freescale/mx6qsabrelite/mx6qsabrelite.c index 9f9cac82c..8ce054e42 100644 --- a/board/freescale/mx6qsabrelite/mx6qsabrelite.c +++ b/board/freescale/mx6qsabrelite/mx6qsabrelite.c @@ -45,29 +45,25 @@  DECLARE_GLOBAL_DATA_PTR; -#define UART_PAD_CTRL  (PAD_CTL_PKE | PAD_CTL_PUE |	       \ -	PAD_CTL_PUS_100K_UP | PAD_CTL_SPEED_MED |	       \ -	PAD_CTL_DSE_40ohm   | PAD_CTL_SRE_FAST  | PAD_CTL_HYS) +#define UART_PAD_CTRL  (PAD_CTL_PUS_100K_UP |			\ +	PAD_CTL_SPEED_MED | PAD_CTL_DSE_40ohm |			\ +	PAD_CTL_SRE_FAST  | PAD_CTL_HYS) -#define USDHC_PAD_CTRL (PAD_CTL_PKE | PAD_CTL_PUE |	       \ -	PAD_CTL_PUS_47K_UP  | PAD_CTL_SPEED_LOW |	       \ -	PAD_CTL_DSE_80ohm   | PAD_CTL_SRE_FAST  | PAD_CTL_HYS) +#define USDHC_PAD_CTRL (PAD_CTL_PUS_47K_UP |			\ +	PAD_CTL_SPEED_LOW | PAD_CTL_DSE_80ohm |			\ +	PAD_CTL_SRE_FAST  | PAD_CTL_HYS) -#define ENET_PAD_CTRL  (PAD_CTL_PKE | PAD_CTL_PUE |		\ -	PAD_CTL_PUS_100K_UP | PAD_CTL_SPEED_MED	  |		\ -	PAD_CTL_DSE_40ohm   | PAD_CTL_HYS) +#define ENET_PAD_CTRL  (PAD_CTL_PUS_100K_UP |			\ +	PAD_CTL_SPEED_MED | PAD_CTL_DSE_40ohm | PAD_CTL_HYS) -#define SPI_PAD_CTRL (PAD_CTL_HYS |				\ -	PAD_CTL_PUS_100K_DOWN | PAD_CTL_SPEED_MED |		\ +#define SPI_PAD_CTRL (PAD_CTL_HYS | PAD_CTL_SPEED_MED |		\  	PAD_CTL_DSE_40ohm     | PAD_CTL_SRE_FAST) -#define BUTTON_PAD_CTRL (PAD_CTL_PKE | PAD_CTL_PUE |		\ -	PAD_CTL_PUS_100K_UP | PAD_CTL_SPEED_MED   |		\ -	PAD_CTL_DSE_40ohm   | PAD_CTL_HYS) +#define BUTTON_PAD_CTRL (PAD_CTL_PUS_100K_UP |			\ +	PAD_CTL_SPEED_MED | PAD_CTL_DSE_40ohm | PAD_CTL_HYS) -#define I2C_PAD_CTRL	(PAD_CTL_PKE | PAD_CTL_PUE |		\ -	PAD_CTL_PUS_100K_UP | PAD_CTL_SPEED_MED |		\ -	PAD_CTL_DSE_40ohm | PAD_CTL_HYS |			\ +#define I2C_PAD_CTRL	(PAD_CTL_PUS_100K_UP |			\ +	PAD_CTL_SPEED_MED | PAD_CTL_DSE_40ohm | PAD_CTL_HYS |	\  	PAD_CTL_ODE | PAD_CTL_SRE_FAST)  int dram_init(void) diff --git a/board/freescale/mx6qsabresd/mx6qsabresd.c b/board/freescale/mx6qsabresd/mx6qsabresd.c index bf9beef01..252982614 100644 --- a/board/freescale/mx6qsabresd/mx6qsabresd.c +++ b/board/freescale/mx6qsabresd/mx6qsabresd.c @@ -34,17 +34,16 @@  DECLARE_GLOBAL_DATA_PTR; -#define UART_PAD_CTRL  (PAD_CTL_PKE | PAD_CTL_PUE |            \ -	PAD_CTL_PUS_100K_UP | PAD_CTL_SPEED_MED |               \ -	PAD_CTL_DSE_40ohm   | PAD_CTL_SRE_FAST  | PAD_CTL_HYS) +#define UART_PAD_CTRL  (PAD_CTL_PUS_100K_UP |			\ +	PAD_CTL_SPEED_MED | PAD_CTL_DSE_40ohm |			\ +	PAD_CTL_SRE_FAST  | PAD_CTL_HYS) -#define USDHC_PAD_CTRL (PAD_CTL_PKE | PAD_CTL_PUE |            \ -	PAD_CTL_PUS_47K_UP  | PAD_CTL_SPEED_LOW |               \ -	PAD_CTL_DSE_80ohm   | PAD_CTL_SRE_FAST  | PAD_CTL_HYS) +#define USDHC_PAD_CTRL (PAD_CTL_PUS_47K_UP |			\ +	PAD_CTL_SPEED_LOW | PAD_CTL_DSE_80ohm |			\ +	PAD_CTL_SRE_FAST  | PAD_CTL_HYS) -#define ENET_PAD_CTRL  (PAD_CTL_PKE | PAD_CTL_PUE |		\ -	PAD_CTL_PUS_100K_UP | PAD_CTL_SPEED_MED   |		\ -	PAD_CTL_DSE_40ohm   | PAD_CTL_HYS) +#define ENET_PAD_CTRL  (PAD_CTL_PUS_100K_UP |			\ +	PAD_CTL_SPEED_MED | PAD_CTL_DSE_40ohm | PAD_CTL_HYS)  int dram_init(void)  { diff --git a/board/freescale/mx6slevk/mx6slevk.c b/board/freescale/mx6slevk/mx6slevk.c index fc6353e0f..69fe8fc0e 100644 --- a/board/freescale/mx6slevk/mx6slevk.c +++ b/board/freescale/mx6slevk/mx6slevk.c @@ -24,13 +24,13 @@  DECLARE_GLOBAL_DATA_PTR; -#define UART_PAD_CTRL  (PAD_CTL_PKE | PAD_CTL_PUE |		\ -	PAD_CTL_PUS_100K_UP | PAD_CTL_SPEED_MED |		\ -	PAD_CTL_DSE_40ohm   | PAD_CTL_SRE_FAST  | PAD_CTL_HYS) +#define UART_PAD_CTRL  (PAD_CTL_PUS_100K_UP |			\ +	PAD_CTL_SPEED_MED | PAD_CTL_DSE_40ohm |			\ +	PAD_CTL_SRE_FAST  | PAD_CTL_HYS) -#define USDHC_PAD_CTRL (PAD_CTL_PKE | PAD_CTL_PUE |		\ -	PAD_CTL_PUS_22K_UP  | PAD_CTL_SPEED_LOW |		\ -	PAD_CTL_DSE_80ohm   | PAD_CTL_SRE_FAST  | PAD_CTL_HYS) +#define USDHC_PAD_CTRL (PAD_CTL_PUS_22K_UP |			\ +	PAD_CTL_SPEED_LOW | PAD_CTL_DSE_80ohm |			\ +	PAD_CTL_SRE_FAST  | PAD_CTL_HYS)  int dram_init(void)  { diff --git a/board/freescale/titanium/titanium.c b/board/freescale/titanium/titanium.c index 894ebae9d..5250522d9 100644 --- a/board/freescale/titanium/titanium.c +++ b/board/freescale/titanium/titanium.c @@ -35,28 +35,16 @@  DECLARE_GLOBAL_DATA_PTR; -#define UART_PAD_CTRL  (PAD_CTL_PKE | PAD_CTL_PUE |			\ -			PAD_CTL_PUS_100K_UP | PAD_CTL_SPEED_MED |	\ +#define UART_PAD_CTRL  (PAD_CTL_PUS_100K_UP | PAD_CTL_SPEED_MED |	\  			PAD_CTL_DSE_40ohm   | PAD_CTL_SRE_FAST  | PAD_CTL_HYS) -#define USDHC_PAD_CTRL (PAD_CTL_PKE | PAD_CTL_PUE |			\ -			PAD_CTL_PUS_47K_UP  | PAD_CTL_SPEED_LOW |	\ +#define USDHC_PAD_CTRL (PAD_CTL_PUS_47K_UP  | PAD_CTL_SPEED_LOW |	\  			PAD_CTL_DSE_80ohm   | PAD_CTL_SRE_FAST  | PAD_CTL_HYS) -#define ENET_PAD_CTRL  (PAD_CTL_PKE | PAD_CTL_PUE |			\ -			PAD_CTL_PUS_100K_UP | PAD_CTL_SPEED_MED	  |	\ +#define ENET_PAD_CTRL  (PAD_CTL_PUS_100K_UP | PAD_CTL_SPEED_MED	  |	\  			PAD_CTL_DSE_40ohm   | PAD_CTL_HYS) -#define SPI_PAD_CTRL (PAD_CTL_HYS |					\ -		      PAD_CTL_PUS_100K_DOWN | PAD_CTL_SPEED_MED |	\ -		      PAD_CTL_DSE_40ohm     | PAD_CTL_SRE_FAST) - -#define BUTTON_PAD_CTRL (PAD_CTL_PKE | PAD_CTL_PUE |			\ -			 PAD_CTL_PUS_100K_UP | PAD_CTL_SPEED_MED   |	\ -			 PAD_CTL_DSE_40ohm   | PAD_CTL_HYS) - -#define I2C_PAD_CTRL	(PAD_CTL_PKE | PAD_CTL_PUE |			\ -			 PAD_CTL_PUS_100K_UP | PAD_CTL_SPEED_MED |	\ +#define I2C_PAD_CTRL	(PAD_CTL_PUS_100K_UP | PAD_CTL_SPEED_MED |	\  			 PAD_CTL_DSE_40ohm | PAD_CTL_HYS |		\  			 PAD_CTL_ODE | PAD_CTL_SRE_FAST) diff --git a/board/wandboard/wandboard.c b/board/wandboard/wandboard.c index c71c90d65..bb983528b 100644 --- a/board/wandboard/wandboard.c +++ b/board/wandboard/wandboard.c @@ -27,17 +27,16 @@  DECLARE_GLOBAL_DATA_PTR; -#define UART_PAD_CTRL  (PAD_CTL_PKE | PAD_CTL_PUE |		\ -	PAD_CTL_PUS_100K_UP | PAD_CTL_SPEED_MED |		\ -	PAD_CTL_DSE_40ohm   | PAD_CTL_SRE_FAST  | PAD_CTL_HYS) +#define UART_PAD_CTRL  (PAD_CTL_PUS_100K_UP |			\ +	PAD_CTL_SPEED_MED | PAD_CTL_DSE_40ohm |			\ +	PAD_CTL_SRE_FAST  | PAD_CTL_HYS) -#define USDHC_PAD_CTRL (PAD_CTL_PKE | PAD_CTL_PUE |		\ -	PAD_CTL_PUS_47K_UP  | PAD_CTL_SPEED_LOW |		\ -	PAD_CTL_DSE_80ohm   | PAD_CTL_SRE_FAST  | PAD_CTL_HYS) +#define USDHC_PAD_CTRL (PAD_CTL_PUS_47K_UP |			\ +	PAD_CTL_SPEED_LOW | PAD_CTL_DSE_80ohm |			\ +	PAD_CTL_SRE_FAST  | PAD_CTL_HYS) -#define ENET_PAD_CTRL  (PAD_CTL_PKE | PAD_CTL_PUE |		\ -	PAD_CTL_PUS_100K_UP | PAD_CTL_SPEED_MED   |		\ -	PAD_CTL_DSE_40ohm   | PAD_CTL_HYS) +#define ENET_PAD_CTRL  (PAD_CTL_PUS_100K_UP |			\ +	PAD_CTL_SPEED_MED | PAD_CTL_DSE_40ohm | PAD_CTL_HYS)  #define USDHC1_CD_GPIO		IMX_GPIO_NR(1, 2)  #define USDHC3_CD_GPIO		IMX_GPIO_NR(3, 9) |