karo: txul: remove i2c_gpio_pads

[karo-tx-uboot.git] / board / karo / tx6 / tx6ul.c

diff --git a/board/karo/tx6/tx6ul.c b/board/karo/tx6/tx6ul.c
index d97b26b733954989ef1bfbe0956e6a5a465aba3a..e77adff5a01d3dcb3e1bf9d9e76dd6fa58d4de33 100644 (file)
--- a/board/karo/tx6/tx6ul.c
+++ b/board/karo/tx6/tx6ul.c
@@ -81,12 +81,8 @@ char __csf_data[0] __attribute__((section(".__csf_data")));
                                        PAD_CTL_SPEED_LOW |             \
                                        PAD_CTL_DSE_34ohm |             \
                                        PAD_CTL_SRE_FAST)
-#define TX6UL_I2C_GPIO_PAD_CTRL        MUX_PAD_CTRL(PAD_CTL_PUS_22K_UP |       \
-                                       PAD_CTL_HYS |                   \
-                                       PAD_CTL_DSE_34ohm |             \
-                                       PAD_CTL_SPEED_MED)
 #define TX6UL_ENET_PAD_CTRL    MUX_PAD_CTRL(PAD_CTL_SPEED_HIGH |       \
-                                       PAD_CTL_DSE_48ohm |             \
+                                       PAD_CTL_DSE_120ohm |            \
                                        PAD_CTL_PUS_100K_UP |           \
                                        PAD_CTL_SRE_FAST)
 #define TX6UL_GPIO_OUT_PAD_CTRL        MUX_PAD_CTRL(PAD_CTL_SPEED_LOW |        \
@@ -124,15 +120,15 @@ static const iomux_v3_cfg_t const tx6ul_pads[] = {
 
 static const iomux_v3_cfg_t const tx6ul_enet1_pads[] = {
        /* FEC functions */
-       MX6_PAD_GPIO1_IO07__ENET1_MDC | MUX_PAD_CTRL(PAD_CTL_DSE_48ohm |
-                                                    PAD_CTL_SPEED_MED),
+       MX6_PAD_GPIO1_IO07__ENET1_MDC | MUX_PAD_CTRL(PAD_CTL_DSE_120ohm |
+                                                    PAD_CTL_SPEED_LOW),
        MX6_PAD_GPIO1_IO06__ENET1_MDIO | MUX_PAD_CTRL(PAD_CTL_PUS_100K_UP |
-                                                     PAD_CTL_DSE_48ohm |
-                                                     PAD_CTL_SPEED_MED),
-       MX6_PAD_ENET1_TX_CLK__ENET1_REF_CLK1 | MUX_CFG_SION |
-                                       MUX_PAD_CTRL(PAD_CTL_SPEED_MED |
-                                                    PAD_CTL_DSE_40ohm |
-                                                    PAD_CTL_SRE_FAST),
+                                                     PAD_CTL_DSE_120ohm |
+                                                     PAD_CTL_SPEED_LOW),
+       MX6_PAD_ENET1_TX_CLK__ENET1_REF_CLK1 | MUX_PAD_CTRL(PAD_CTL_SPEED_LOW |
+                                                    PAD_CTL_DSE_80ohm |
+                                                    PAD_CTL_SRE_SLOW),
+
        MX6_PAD_ENET1_RX_ER__ENET1_RX_ER | TX6UL_ENET_PAD_CTRL,
        MX6_PAD_ENET1_RX_EN__ENET1_RX_EN | TX6UL_ENET_PAD_CTRL,
        MX6_PAD_ENET1_RX_DATA1__ENET1_RDATA01 | TX6UL_ENET_PAD_CTRL,
@@ -143,10 +139,9 @@ static const iomux_v3_cfg_t const tx6ul_enet1_pads[] = {
 };
 
 static const iomux_v3_cfg_t const tx6ul_enet2_pads[] = {
-       MX6_PAD_ENET2_TX_CLK__ENET2_REF_CLK2 | MUX_CFG_SION |
-                                       MUX_PAD_CTRL(PAD_CTL_SPEED_HIGH |
-                                                    PAD_CTL_DSE_48ohm |
-                                                    PAD_CTL_SRE_FAST),
+       MX6_PAD_ENET2_TX_CLK__ENET2_REF_CLK2 | MUX_PAD_CTRL(PAD_CTL_SPEED_LOW |
+                                                           PAD_CTL_DSE_80ohm |
+                                                           PAD_CTL_SRE_SLOW),
        MX6_PAD_ENET2_RX_ER__ENET2_RX_ER | TX6UL_ENET_PAD_CTRL,
        MX6_PAD_ENET2_RX_EN__ENET2_RX_EN | TX6UL_ENET_PAD_CTRL,
        MX6_PAD_ENET2_RX_DATA1__ENET2_RDATA01 | TX6UL_ENET_PAD_CTRL,
@@ -164,14 +159,6 @@ static const iomux_v3_cfg_t const tx6ul_i2c_pads[] = {
                        TX6UL_I2C_PAD_CTRL, /* I2C SDA */
 };
 
-static const iomux_v3_cfg_t const tx6ul_i2c_gpio_pads[] = {
-       /* internal I2C set up for I2C bus recovery */
-       MX6_PAD_SNVS_TAMPER1__GPIO5_IO01 | MUX_CFG_SION |
-                       TX6UL_I2C_PAD_CTRL, /* I2C SCL */
-       MX6_PAD_SNVS_TAMPER0__GPIO5_IO00 | MUX_CFG_SION |
-                       TX6UL_I2C_PAD_CTRL, /* I2C SDA */
-};
-
 static const struct gpio const tx6ul_gpios[] = {
 #ifdef CONFIG_SYS_I2C_SOFT
        /* These two entries are used to forcefully reinitialize the I2C bus */
@@ -237,9 +224,6 @@ static void tx6ul_i2c_recover(void)
                setbits_le32(&scl_regs->gpio_dr, SCL_BIT);
                setbits_le32(&scl_regs->gpio_dir, SCL_BIT);
 
-               imx_iomux_v3_setup_multiple_pads(tx6ul_i2c_gpio_pads,
-                                                ARRAY_SIZE(tx6ul_i2c_gpio_pads));
-
                udelay(5);
 
                for (i = 0; i < 18; i++) {