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

diff --combined board/keymile/common/common.c
index 86b81102e991cb17d78ca22df8fe55d0a6251e8f,544784a7d90a75fd7186e14985b0c1db86411913..136b2dee12a2f07caa85fd6ea781b8699691d3a9
--- 1/board/keymile/common/common.c
--- 2/board/keymile/common/common.c
+++ b/board/keymile/common/common.c
@@@ -5,7 -5,23 +5,7 @@@
   * (C) Copyright 2011
   * Holger Brunck, Keymile GmbH Hannover, holger.brunck@keymile.com
   *
 - * See file CREDITS for list of people who contributed to this
 - * project.
 - *
 - * 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.
 - *
 - * This program is distributed in the hope that it will be useful,
 - * but WITHOUT ANY WARRANTY; without even the implied warranty of
 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 - * GNU General Public License for more details.
 - *
 - * You should have received a copy of the GNU General Public License
 - * along with this program; if not, write to the Free Software
 - * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
 - * MA 02111-1307 USA
 + * SPDX-License-Identifier:   GPL-2.0+
   */
  
  #include <common.h>
@@@ -226,7 -242,7 +226,7 @@@ U_BOOT_CMD(km_setboardid, 1, 0, do_setb
   *                            application and in the init scripts (?)
   *    return 0 in case of match, 1 if not match or error
   */
- int do_checkboardidhwk(cmd_tbl_t *cmdtp, int flag, int argc,
+ static int do_checkboardidhwk(cmd_tbl_t *cmdtp, int flag, int argc,
                        char *const argv[])
  {
        unsigned long ivmbid = 0, ivmhwkey = 0;
@@@ -367,7 -383,7 +367,7 @@@ U_BOOT_CMD(km_checkbidhwk, 2, 0, do_che
   *  if the testpin of the board is asserted, return 1
   *  * else return 0
   */
- int do_checktestboot(cmd_tbl_t *cmdtp, int flag, int argc,
+ static int do_checktestboot(cmd_tbl_t *cmdtp, int flag, int argc,
                        char *const argv[])
  {
        int testpin = 0;

diff --combined board/keymile/common/ivm.c
index aabd3a85b72b56e96c506fca5f688da066377b4a,0deed1d6b8a539cf9d2110f3921ade5ea15a12fa..f0e91bbdfe4f310aae832f1924f2a7094e20fc95
--- 1/board/keymile/common/ivm.c
--- 2/board/keymile/common/ivm.c
+++ b/board/keymile/common/ivm.c
@@@ -2,7 -2,23 +2,7 @@@
   * (C) Copyright 2011
   * Holger Brunck, Keymile GmbH Hannover, holger.brunck@keymile.com
   *
 - * See file CREDITS for list of people who contributed to this
 - * project.
 - *
 - * 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.
 - *
 - * This program is distributed in the hope that it will be useful,
 - * but WITHOUT ANY WARRANTY; without even the implied warranty of
 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 - * GNU General Public License for more details.
 - *
 - * You should have received a copy of the GNU General Public License
 - * along with this program; if not, write to the Free Software
 - * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
 - * MA 02111-1307 USA
 + * SPDX-License-Identifier:   GPL-2.0+
   */
  
  #include <common.h>
@@@ -10,7 -26,7 +10,7 @@@
  #include <i2c.h>
  #include "common.h"
  
- int ivm_calc_crc(unsigned char *buf, int len)
+ static int ivm_calc_crc(unsigned char *buf, int len)
  {
        const unsigned short crc_tab[16] = {
                0x0000, 0xCC01, 0xD801, 0x1400,
@@@ -236,7 -252,7 +236,7 @@@ static int ivm_analyze_block2(unsigned 
        return 0;
  }
  
- int ivm_analyze_eeprom(unsigned char *buf, int len)
+ static int ivm_analyze_eeprom(unsigned char *buf, int len)
  {
        unsigned short  val;
        unsigned char   valbuf[CONFIG_SYS_IVM_EEPROM_PAGE_LEN];
@@@ -298,14 -314,29 +298,14 @@@
  
  int ivm_read_eeprom(void)
  {
 -#if defined(CONFIG_I2C_MUX)
 -      I2C_MUX_DEVICE *dev = NULL;
 -#endif
        uchar i2c_buffer[CONFIG_SYS_IVM_EEPROM_MAX_LEN];
 -      uchar   *buf;
 -      unsigned long dev_addr = CONFIG_SYS_IVM_EEPROM_ADR;
        int ret;
  
 -#if defined(CONFIG_I2C_MUX)
 -      /* First init the Bus, select the Bus */
 -      buf = (unsigned char *) getenv("EEprom_ivm");
 -      if (buf != NULL)
 -              dev = i2c_mux_ident_muxstring(buf);
 -      if (dev == NULL) {
 -              printf("Error couldnt add Bus for IVM\n");
 -              return -1;
 -      }
 -      i2c_set_bus_num(dev->busid);
 -#endif
 +      i2c_set_bus_num(CONFIG_KM_IVM_BUS);
        /* add deblocking here */
        i2c_make_abort();
  
 -      ret = i2c_read(dev_addr, 0, 1, i2c_buffer,
 +      ret = i2c_read(CONFIG_SYS_IVM_EEPROM_ADR, 0, 1, i2c_buffer,
                CONFIG_SYS_IVM_EEPROM_MAX_LEN);
        if (ret != 0) {
                printf("Error reading EEprom\n");

diff --combined board/keymile/km83xx/km83xx.c
index cd861c9f12568e4db34af7852711a29ce0df7960,d9f718eb3033a8e4d8361fe3104883839c659f85..76291a747c6e3c41b21d4eee2607364ac3fe749f
--- 1/board/keymile/km83xx/km83xx.c
--- 2/board/keymile/km83xx/km83xx.c
+++ b/board/keymile/km83xx/km83xx.c
@@@ -11,7 -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>
@@@ -28,7 -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 */
@@@ -92,6 -95,19 +92,6 @@@
        {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 */
@@@ -190,6 -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;
  }
  
@@@ -225,6 -243,11 +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
  
@@@ -277,7 -300,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;