Unified codebase for TX28, TX48, TX51, TX53

[karo-tx-uboot.git] / board / logicpd / omap3som / omap3logic.c

diff --git a/board/logicpd/omap3som/omap3logic.c b/board/logicpd/omap3som/omap3logic.c
index 4f5fa8d25f4dae07c45eae5c8b437c196a527d1a..12bcfcb877382e206a3411fedbb7ee720af9c11d 100644 (file)
--- a/board/logicpd/omap3som/omap3logic.c
+++ b/board/logicpd/omap3som/omap3logic.c
@@ -140,21 +140,10 @@ int board_init(void)
 #if defined(CONFIG_GENERIC_MMC) && !defined(CONFIG_SPL_BUILD)
 int board_mmc_init(bd_t *bis)
 {
-       return omap_mmc_init(0);
+       return omap_mmc_init(0, 0, 0);
 }
 #endif
 
-/*
- * Routine: misc_init_r
- * Description: display die ID register
- */
-int misc_init_r(void)
-{
-       dieid_num_r();
-
-       return 0;
-}
-
 #ifdef CONFIG_SMC911X
 /* GPMC CS1 settings for Logic SOM LV/Torpedo LAN92xx Ethernet chip */
 static const u32 gpmc_lan92xx_config[] = {
@@ -200,6 +189,19 @@ void set_muxconf_regs(void)
        MUX_VAL(CP(GPMC_A3),            (IDIS | PTU | EN  | M0));
        MUX_VAL(CP(GPMC_A4),            (IDIS | PTU | EN  | M0));
        MUX_VAL(CP(GPMC_A5),            (IDIS | PTU | EN  | M0));
+       MUX_VAL(CP(GPMC_A6),            (IDIS | PTU | EN  | M0));
+       MUX_VAL(CP(GPMC_A7),            (IDIS | PTU | EN  | M0));
+       MUX_VAL(CP(GPMC_A8),            (IDIS | PTU | EN  | M0));
+       MUX_VAL(CP(GPMC_A9),            (IDIS | PTU | EN  | M0));
+       MUX_VAL(CP(GPMC_A10),           (IDIS | PTU | EN  | M0));
+       MUX_VAL(CP(GPMC_D0),            (IEN  | PTU | EN  | M0));
+       MUX_VAL(CP(GPMC_D1),            (IEN  | PTU | EN  | M0));
+       MUX_VAL(CP(GPMC_D2),            (IEN  | PTU | EN  | M0));
+       MUX_VAL(CP(GPMC_D3),            (IEN  | PTU | EN  | M0));
+       MUX_VAL(CP(GPMC_D4),            (IEN  | PTU | EN  | M0));
+       MUX_VAL(CP(GPMC_D5),            (IEN  | PTU | EN  | M0));
+       MUX_VAL(CP(GPMC_D6),            (IEN  | PTU | EN  | M0));
+       MUX_VAL(CP(GPMC_D7),            (IEN  | PTU | EN  | M0));
        MUX_VAL(CP(GPMC_D8),            (IEN  | PTU | EN  | M0));
        MUX_VAL(CP(GPMC_D9),            (IEN  | PTU | EN  | M0));
        MUX_VAL(CP(GPMC_D10),           (IEN  | PTU | EN  | M0));
@@ -209,6 +211,8 @@ void set_muxconf_regs(void)
        MUX_VAL(CP(GPMC_D14),           (IEN  | PTU | EN  | M0));
        MUX_VAL(CP(GPMC_D15),           (IEN  | PTU | EN  | M0));
        MUX_VAL(CP(GPMC_NCS0),          (IDIS | PTU | EN  | M0));
+       MUX_VAL(CP(GPMC_NCS1),          (IDIS | PTU | EN  | M0));
+       MUX_VAL(CP(GPMC_NCS2),          (IDIS | PTU | EN  | M0));
        MUX_VAL(CP(GPMC_NCS3),          (IDIS | PTD | DIS | M0));
        MUX_VAL(CP(GPMC_NCS5),          (IDIS | PTU | DIS | M4));
        MUX_VAL(CP(GPMC_NCS7),          (IDIS | PTD | DIS | M1)); /*GPMC_IO_DIR*/