Merge branch 'master' of git://git.denx.de/u-boot-usb

[u-boot] / board / samsung / smdk5250 / smdk5250.c

diff --git a/board/samsung/smdk5250/smdk5250.c b/board/samsung/smdk5250/smdk5250.c
index 04c863adfcbdbe945d5537662d90dafed0da965d..a5816e445c80308f9843728c6ea64428088d03fb 100644 (file)
--- a/board/samsung/smdk5250/smdk5250.c
+++ b/board/samsung/smdk5250/smdk5250.c
@@ -22,19 +22,46 @@
 
 #include <common.h>
 #include <asm/io.h>
+#include <i2c.h>
 #include <netdev.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/gpio.h>
 #include <asm/arch/mmc.h>
+#include <asm/arch/pinmux.h>
 #include <asm/arch/sromc.h>
 
 DECLARE_GLOBAL_DATA_PTR;
-struct exynos5_gpio_part1 *gpio1;
 
-int board_init(void)
+#ifdef CONFIG_SMC911X
+static int smc9115_pre_init(void)
 {
-       gpio1 = (struct exynos5_gpio_part1 *) samsung_get_base_gpio_part1();
+       u32 smc_bw_conf, smc_bc_conf;
+       int err;
+
+       /* Ethernet needs data bus width of 16 bits */
+       smc_bw_conf = SROMC_DATA16_WIDTH(CONFIG_ENV_SROM_BANK)
+                       | SROMC_BYTE_ENABLE(CONFIG_ENV_SROM_BANK);
+
+       smc_bc_conf = SROMC_BC_TACS(0x01) | SROMC_BC_TCOS(0x01)
+                       | SROMC_BC_TACC(0x06) | SROMC_BC_TCOH(0x01)
+                       | SROMC_BC_TAH(0x0C)  | SROMC_BC_TACP(0x09)
+                       | SROMC_BC_PMC(0x01);
+
+       /* Select and configure the SROMC bank */
+       err = exynos_pinmux_config(PERIPH_ID_SROMC,
+                               CONFIG_ENV_SROM_BANK | PINMUX_FLAG_16BIT);
+       if (err) {
+               debug("SROMC not configured\n");
+               return err;
+       }
+
+       s5p_config_sromc(CONFIG_ENV_SROM_BANK, smc_bw_conf, smc_bc_conf);
+       return 0;
+}
+#endif
 
+int board_init(void)
+{
        gd->bd->bi_boot_params = (PHYS_SDRAM_1 + 0x100UL);
        return 0;
 }
@@ -80,6 +107,16 @@ void dram_init_banksize(void)
                                                        PHYS_SDRAM_8_SIZE);
 }
 
+int board_eth_init(bd_t *bis)
+{
+#ifdef CONFIG_SMC911X
+       if (smc9115_pre_init())
+               return -1;
+       return smc911x_initialize(0, CONFIG_SMC911X_BASE);
+#endif
+       return 0;
+}
+
 #ifdef CONFIG_DISPLAY_BOARDINFO
 int checkboard(void)
 {
@@ -92,55 +129,80 @@ int checkboard(void)
 #ifdef CONFIG_GENERIC_MMC
 int board_mmc_init(bd_t *bis)
 {
-       int i, err;
+       int err;
 
-       /*
-        * MMC2 SD card GPIO:
-        *
-        * GPC2[0]      SD_2_CLK(2)
-        * GPC2[1]      SD_2_CMD(2)
-        * GPC2[2]      SD_2_CDn
-        * GPC2[3:6]    SD_2_DATA[0:3](2)
-        */
-       for (i = 0; i < 7; i++) {
-               /* GPC2[0:6] special function 2 */
-               s5p_gpio_cfg_pin(&gpio1->c2, i, GPIO_FUNC(0x2));
-
-               /* GPK2[0:6] drv 4x */
-               s5p_gpio_set_drv(&gpio1->c2, i, GPIO_DRV_4X);
-
-               /* GPK2[0:1] pull disable */
-               if (i == 0 || i == 1) {
-                       s5p_gpio_set_pull(&gpio1->c2, i, GPIO_PULL_NONE);
-                       continue;
-               }
-
-               /* GPK2[2:6] pull up */
-               s5p_gpio_set_pull(&gpio1->c2, i, GPIO_PULL_UP);
+       err = exynos_pinmux_config(PERIPH_ID_SDMMC0, PINMUX_FLAG_8BIT_MODE);
+       if (err) {
+               debug("SDMMC0 not configured\n");
+               return err;
        }
 
-       err = s5p_mmc_init(2, 4);
+       err = s5p_mmc_init(0, 8);
        return err;
 }
 #endif
 
-static void board_uart_init(void)
+static int board_uart_init(void)
+{
+       int err;
+
+       err = exynos_pinmux_config(PERIPH_ID_UART0, PINMUX_FLAG_NONE);
+       if (err) {
+               debug("UART0 not configured\n");
+               return err;
+       }
+
+       err = exynos_pinmux_config(PERIPH_ID_UART1, PINMUX_FLAG_NONE);
+       if (err) {
+               debug("UART1 not configured\n");
+               return err;
+       }
+
+       err = exynos_pinmux_config(PERIPH_ID_UART2, PINMUX_FLAG_NONE);
+       if (err) {
+               debug("UART2 not configured\n");
+               return err;
+       }
+
+       err = exynos_pinmux_config(PERIPH_ID_UART3, PINMUX_FLAG_NONE);
+       if (err) {
+               debug("UART3 not configured\n");
+               return err;
+       }
+
+       return 0;
+}
+
+#ifdef CONFIG_SYS_I2C_INIT_BOARD
+static int board_i2c_init(void)
 {
-       struct exynos5_gpio_part1 *gpio1 =
-               (struct exynos5_gpio_part1 *) samsung_get_base_gpio_part1();
-       int i;
-
-       /* UART1 GPIOs (part1) : GPA0CON[7:4] 0x2222 */
-       for (i = 4; i < 8; i++) {
-               s5p_gpio_set_pull(&gpio1->a0, i, GPIO_PULL_NONE);
-               s5p_gpio_cfg_pin(&gpio1->a0, i, GPIO_FUNC(0x2));
+       int i, err;
+
+       for (i = 0; i < CONFIG_MAX_I2C_NUM; i++) {
+               err = exynos_pinmux_config((PERIPH_ID_I2C0 + i),
+                                               PINMUX_FLAG_NONE);
+               if (err) {
+                       debug("I2C%d not configured\n", (PERIPH_ID_I2C0 + i));
+                       return err;
+               }
        }
+       i2c_init(CONFIG_SYS_I2C_SPEED, CONFIG_SYS_I2C_SLAVE);
+       return 0;
 }
+#endif
 
 #ifdef CONFIG_BOARD_EARLY_INIT_F
 int board_early_init_f(void)
 {
-       board_uart_init();
-       return 0;
+       int err;
+       err = board_uart_init();
+       if (err) {
+               debug("UART init failed\n");
+               return err;
+       }
+#ifdef CONFIG_SYS_I2C_INIT_BOARD
+       err = board_i2c_init();
+#endif
+       return err;
 }
 #endif