首页 发现 帮助
注册 登录
phyus
/
uboot-vybrid_public
8
0
派生 0
文件 工单管理 0 合并请求 0 Wiki
浏览代码

imx: iomux-v3: Include PKE and PUE to pad control pull definitions

PUE requires PKE to mean something, as do pull values with PUE, so do not
compell users to explicitly use PKE and PUE everywhere. This is also what is
done on Linux and what has already been done for i.MX51.

By the way, remove some unused pad control definitions.

There is no change of behavior.

Note that SPI_PAD_CTRL was defined by several boards with a pull value, but
without PKE or PUE, which means that no pull was actually enabled in the pad.
This might be a bug in those boards, but this patch does not change the
behavior, so it just removes the meaningless pull value from those definitions.

Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau@advansee.com>
Benoît Thébaudeau 12 年之前
父节点
246952083a
当前提交
7e2173cf82
共有 10 个文件被更改，包括 82 次插入 和 110 次删除
分列视图 显示文件统计
  1. 4 6
      arch/arm/include/asm/arch-mx5/iomux-mx51.h
  2. 5 5
      arch/arm/include/asm/imx-common/iomux-v3.h
  3. 18 24
      board/boundary/nitrogen6x/nitrogen6x.c
  4. 8 9
      board/freescale/mx6qarm2/mx6qarm2.c
  5. 8 9
      board/freescale/mx6qsabreauto/mx6qsabreauto.c
  6. 13 17
      board/freescale/mx6qsabrelite/mx6qsabrelite.c
  7. 8 9
      board/freescale/mx6qsabresd/mx6qsabresd.c
  8. 6 6
      board/freescale/mx6slevk/mx6slevk.c
  9. 4 16
      board/freescale/titanium/titanium.c
  10. 8 9
      board/wandboard/wandboard.c

+ 4 - 6
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)

+ 5 - 5
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)

+ 18 - 24
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)

+ 8 - 9
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)
 
 {

+ 8 - 9
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)
 
 {

+ 13 - 17
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)

+ 8 - 9
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)
 
 {

+ 6 - 6
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)
 
 {

+ 4 - 16
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)

+ 8 - 9
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)