mx6slevk: Convert to DM_ETH

[oweals/u-boot.git] / board / bosch / guardian / mux.c

diff --git a/board/bosch/guardian/mux.c b/board/bosch/guardian/mux.c
index 708c3e7fddba881e5e799aa7476f4a43ca370909..9c81f29f9f230d46bc29130e86db005cb1362736 100644 (file)
--- a/board/bosch/guardian/mux.c
+++ b/board/bosch/guardian/mux.c
@@ -26,28 +26,20 @@ static struct module_pin_mux i2c0_pin_mux[] = {
        {-1},
 };
 
-static struct module_pin_mux adc_voltages_en[] = {
-       {OFFSET(mcasp0_ahclkx), (MODE(7) | PULLUP_EN)},
+static struct module_pin_mux guardian_interfaces_pin_mux[] = {
+       {OFFSET(mcasp0_ahclkx), (MODE(7) | PULLDOWN_EN)},
+       {OFFSET(mcasp0_aclkx),  (MODE(7) | PULLUP_EN)},
+       {OFFSET(mii1_txd0),     (MODE(7) | PULLUP_EN)},
+       {OFFSET(uart1_rxd),     (MODE(7) | RXACTIVE | PULLUDDIS)},
+       {OFFSET(uart1_txd),     (MODE(7) | PULLUDDIS)},
+       {OFFSET(mii1_crs),      (MODE(7) | PULLDOWN_EN)},
+       {OFFSET(rmii1_refclk),  (MODE(7) | PULLDOWN_EN)},
+       {OFFSET(mii1_txd3),     (MODE(7) | PULLUDDIS)},
+       {OFFSET(mii1_rxdv),     (MODE(7) | PULLDOWN_EN)},
        {-1},
 };
 
-static struct module_pin_mux asp_power_en[] = {
-       {OFFSET(mcasp0_aclkx), (MODE(7) | PULLUP_EN)},
-       {-1},
-};
-
-static struct module_pin_mux switch_off_3v6_pin_mux[] = {
-       {OFFSET(mii1_txd0), (MODE(7) | PULLUP_EN)},
-       /*
-        * The uart1 lines are made floating inputs, based on the Guardian
-        * A2 Sample Power Supply Schematics
-        */
-       {OFFSET(uart1_rxd), (MODE(7) | PULLUDDIS)},
-       {OFFSET(uart1_txd), (MODE(7) | PULLUDDIS)},
-       {-1},
-};
-
-#ifdef CONFIG_NAND
+#ifdef CONFIG_MTD_RAW_NAND
 static struct module_pin_mux nand_pin_mux[] = {
        {OFFSET(gpmc_ad0),      (MODE(0) | PULLUDDIS | RXACTIVE)},
        {OFFSET(gpmc_ad1),      (MODE(0) | PULLUDDIS | RXACTIVE)},
@@ -90,10 +82,8 @@ void enable_i2c0_pin_mux(void)
 
 void enable_board_pin_mux(void)
 {
-#ifdef CONFIG_NAND
+#ifdef CONFIG_MTD_RAW_NAND
        configure_module_pin_mux(nand_pin_mux);
 #endif
-       configure_module_pin_mux(adc_voltages_en);
-       configure_module_pin_mux(asp_power_en);
-       configure_module_pin_mux(switch_off_3v6_pin_mux);
+       configure_module_pin_mux(guardian_interfaces_pin_mux);
 }