Merge branch 'fixes' into cleanups

[karo-tx-uboot.git] / board / mimc / mimc200 / mimc200.c

diff --git a/board/mimc/mimc200/mimc200.c b/board/mimc/mimc200/mimc200.c
index 8516dcb8288bf83b1183fbf5882613584c2e145b..1092cd036da7c41061ce1dc25b3d405ddba6b059 100644 (file)
--- a/board/mimc/mimc200/mimc200.c
+++ b/board/mimc/mimc200/mimc200.c
@@ -27,6 +27,7 @@
 #include <asm/arch/clk.h>
 #include <asm/arch/gpio.h>
 #include <asm/arch/hmatrix.h>
+#include <asm/arch/portmux.h>
 #include <lcd.h>
 
 #define SM_PM_GCCTRL                           0x0060
@@ -54,98 +55,51 @@ int board_early_init_f(void)
        /* Enable SDRAM in the EBI mux */
        hmatrix_slave_write(EBI, SFR, HMATRIX_BIT(EBI_SDRAM_ENABLE));
 
-       gpio_enable_ebi();
-       gpio_enable_usart1();
-
-       /* enable higher address lines for larger flash devices */
-       gpio_select_periph_A(GPIO_PIN_PE16, 0); /* ADDR23 */
-       gpio_select_periph_A(GPIO_PIN_PE17, 0); /* ADDR24 */
-       gpio_select_periph_A(GPIO_PIN_PE18, 0); /* ADDR25 */
-
-       /* enable data flash chip select */
-       gpio_select_periph_A(GPIO_PIN_PE25, 0); /* NCS2 */
+       /* Enable 26 address bits and NCS2 */
+       portmux_enable_ebi(16, 26, PORTMUX_EBI_CS(2), PORTMUX_DRIVE_HIGH);
+       portmux_enable_usart1(PORTMUX_DRIVE_MIN);
 
        /* de-assert "force sys reset" pin */
-       gpio_set_value(GPIO_PIN_PD15, 1);       /* FORCE RESET  */
-       gpio_select_pio(GPIO_PIN_PD15, GPIOF_OUTPUT);
+       portmux_select_gpio(PORTMUX_PORT_D, 1 << 15,
+                       PORTMUX_DIR_OUTPUT | PORTMUX_INIT_HIGH);
 
        /* init custom i/o */
        /* cpu type inputs */
-       gpio_select_pio(GPIO_PIN_PE19, 0);
-       gpio_select_pio(GPIO_PIN_PE20, 0);
-       gpio_select_pio(GPIO_PIN_PE23, 0);
+       portmux_select_gpio(PORTMUX_PORT_E, (1 << 19) | (1 << 20) | (1 << 23),
+                       PORTMUX_DIR_INPUT);
        /* main board type inputs */
-       gpio_select_pio(GPIO_PIN_PB19, 0);
-       gpio_select_pio(GPIO_PIN_PB29, 0);
+       portmux_select_gpio(PORTMUX_PORT_B, (1 << 19) | (1 << 29),
+                       PORTMUX_DIR_INPUT);
        /* DEBUG input (use weak pullup) */
-       gpio_select_pio(GPIO_PIN_PE21, GPIOF_PULLUP);
+       portmux_select_gpio(PORTMUX_PORT_E, 1 << 21,
+                       PORTMUX_DIR_INPUT | PORTMUX_PULL_UP);
 
        /* are we suppressing the console ? */
-       if (gpio_get_value(GPIO_PIN_PE21) == 1)
+       if (gpio_get_value(GPIO_PIN_PE(21)) == 1)
                gd->flags |= GD_FLG_SILENT;
 
        /* reset phys */
-       gpio_select_pio(GPIO_PIN_PE24, 0);
-       gpio_set_value(GPIO_PIN_PC18, 1);       /* PHY RESET    */
-       gpio_select_pio(GPIO_PIN_PC18, GPIOF_OUTPUT);
+       portmux_select_gpio(PORTMUX_PORT_E, 1 << 24, PORTMUX_DIR_INPUT);
+       portmux_select_gpio(PORTMUX_PORT_C, 1 << 18,
+                       PORTMUX_DIR_OUTPUT | PORTMUX_INIT_HIGH);
 
        /* GCLK0 - 10MHz clock */
        writel(0x00000004, (void *)SM_BASE + SM_PM_GCCTRL);
-       gpio_select_periph_A(GPIO_PIN_PA30, 0);
+       portmux_select_peripheral(PORTMUX_PORT_A, 1 << 30, PORTMUX_FUNC_A, 0);
 
        udelay(5000);
 
        /* release phys reset */
-       gpio_set_value(GPIO_PIN_PC18, 0);       /* PHY RESET (Release)  */
+       gpio_set_value(GPIO_PIN_PC(18), 0);     /* PHY RESET (Release)  */
 
 #if defined(CONFIG_MACB)
        /* init macb0 pins */
-       gpio_select_periph_A(GPIO_PIN_PC3,  0); /* TXD0 */
-       gpio_select_periph_A(GPIO_PIN_PC4,  0); /* TXD1 */
-       gpio_select_periph_A(GPIO_PIN_PC7,  0); /* TXEN */
-       gpio_select_periph_A(GPIO_PIN_PC8,  0); /* TXCK */
-       gpio_select_periph_A(GPIO_PIN_PC9,  0); /* RXD0 */
-       gpio_select_periph_A(GPIO_PIN_PC10, 0); /* RXD1 */
-       gpio_select_periph_A(GPIO_PIN_PC13, 0); /* RXER */
-       gpio_select_periph_A(GPIO_PIN_PC15, 0); /* RXDV */
-       gpio_select_periph_A(GPIO_PIN_PC16, 0); /* MDC  */
-       gpio_select_periph_A(GPIO_PIN_PC17, 0); /* MDIO */
-#if !defined(CONFIG_RMII)
-       gpio_select_periph_A(GPIO_PIN_PC0,  0); /* COL  */
-       gpio_select_periph_A(GPIO_PIN_PC1,  0); /* CRS  */
-       gpio_select_periph_A(GPIO_PIN_PC2,  0); /* TXER */
-       gpio_select_periph_A(GPIO_PIN_PC5,  0); /* TXD2 */
-       gpio_select_periph_A(GPIO_PIN_PC6,  0); /* TXD3 */
-       gpio_select_periph_A(GPIO_PIN_PC11, 0); /* RXD2 */
-       gpio_select_periph_A(GPIO_PIN_PC12, 0); /* RXD3 */
-       gpio_select_periph_A(GPIO_PIN_PC14, 0); /* RXCK */
-#endif
-
-       /* init macb1 pins */
-       gpio_select_periph_B(GPIO_PIN_PD13, 0); /* TXD0 */
-       gpio_select_periph_B(GPIO_PIN_PD14, 0); /* TXD1 */
-       gpio_select_periph_B(GPIO_PIN_PD11, 0); /* TXEN */
-       gpio_select_periph_B(GPIO_PIN_PD12, 0); /* TXCK */
-       gpio_select_periph_B(GPIO_PIN_PD10, 0); /* RXD0 */
-       gpio_select_periph_B(GPIO_PIN_PD6,  0); /* RXD1 */
-       gpio_select_periph_B(GPIO_PIN_PD5,  0); /* RXER */
-       gpio_select_periph_B(GPIO_PIN_PD4,  0); /* RXDV */
-       gpio_select_periph_B(GPIO_PIN_PD3,  0); /* MDC  */
-       gpio_select_periph_B(GPIO_PIN_PD2,  0); /* MDIO */
-#if !defined(CONFIG_RMII)
-       gpio_select_periph_B(GPIO_PIN_PC19, 0); /* COL  */
-       gpio_select_periph_B(GPIO_PIN_PC23, 0); /* CRS  */
-       gpio_select_periph_B(GPIO_PIN_PC26, 0); /* TXER */
-       gpio_select_periph_B(GPIO_PIN_PC27, 0); /* TXD2 */
-       gpio_select_periph_B(GPIO_PIN_PC28, 0); /* TXD3 */
-       gpio_select_periph_B(GPIO_PIN_PC29, 0); /* RXD2 */
-       gpio_select_periph_B(GPIO_PIN_PC30, 0); /* RXD3 */
-       gpio_select_periph_B(GPIO_PIN_PC24, 0); /* RXCK */
-#endif
+       portmux_enable_macb0(PORTMUX_MACB_MII, PORTMUX_DRIVE_HIGH);
+       portmux_enable_macb1(PORTMUX_MACB_MII, PORTMUX_DRIVE_HIGH);
 #endif
 
 #if defined(CONFIG_MMC)
-       gpio_enable_mmci();
+       portmux_enable_mmci(0, PORTMUX_MMCI_4BIT, PORTMUX_DRIVE_LOW);
 #endif
 
        return 0;
@@ -171,10 +125,11 @@ phys_size_t initdram(int board_type)
        return actual_size;
 }
 
-void board_init_info(void)
+int board_early_init_r(void)
 {
        gd->bd->bi_phy_id[0] = 0x01;
        gd->bd->bi_phy_id[1] = 0x03;
+       return 0;
 }
 
 /* SPI chip select control */