Merge branch 'next' of git://git.denx.de/u-boot-mpc83xx

[people/ms/u-boot.git] / board / keymile / km83xx / km83xx.c

diff --git a/board/keymile/km83xx/km83xx.c b/board/keymile/km83xx/km83xx.c
index faaa39bc201cceebeb6dddb0d52dbc6658937dd9..76291a747c6e3c41b21d4eee2607364ac3fe749f 100644 (file)
--- a/board/keymile/km83xx/km83xx.c
+++ b/board/keymile/km83xx/km83xx.c
@@ -11,10 +11,7 @@
  * (C) Copyright 2008 - 2010
  * Heiko Schocher, DENX Software Engineering, hs@denx.de.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
+ * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <common.h>
@@ -31,7 +28,7 @@
 
 #include "../common/common.h"
 
-const qe_iop_conf_t qe_iop_conf_tab[] = {
+static const qe_iop_conf_t qe_iop_conf_tab[] = {
        /* port pin dir open_drain assign */
 #if defined(CONFIG_MPC8360)
        /* MDIO */
@@ -95,19 +92,6 @@ const qe_iop_conf_t qe_iop_conf_tab[] = {
        {0,  0, 0, 0, QE_IOP_TAB_END},
 };
 
-static int board_init_i2c_busses(void)
-{
-       I2C_MUX_DEVICE *dev = NULL;
-       uchar *dtt_bus = (uchar *)"pca9547:70:a";
-
-       /* Set up the Bus for the DTTs */
-       dev = i2c_mux_ident_muxstring(dtt_bus);
-       if (dev == NULL)
-               printf("Error couldn't add Bus for DTT\n");
-
-       return 0;
-}
-
 #if defined(CONFIG_SUVD3)
 const uint upma_table[] = {
        0x1ffedc00, 0x0ffcdc80, 0x0ffcdc80, 0x0ffcdc04, /* Words 0 to 3 */
@@ -206,8 +190,6 @@ int board_early_init_r(void)
 
 int misc_init_r(void)
 {
-       /* add board specific i2c busses */
-       board_init_i2c_busses();
        return 0;
 }
 
@@ -243,6 +225,11 @@ static struct mv88e_sw_reg extsw_conf[] = {
        { PORT(5), 0x1A, 0xADB1 },
        /* port 6, unused, this port has no phy */
        { PORT(6), PORT_CTRL, PORT_DIS },
+       /*
+        * Errata Fix: 1.9V Output from Internal 1.8V Regulator,
+        * acc . MV-S300889-00D.pdf , clause 4.5
+        */
+       { PORT(5), 0x1A, 0xADB1 },
 };
 #endif
 
@@ -295,7 +282,7 @@ int last_stage_init(void)
        return 0;
 }
 
-int fixed_sdram(void)
+static int fixed_sdram(void)
 {
        immap_t *im = (immap_t *)CONFIG_SYS_IMMR;
        u32 msize = 0;