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

[u-boot] / board / keymile / km_arm / fpga_config.c

diff --git a/board/keymile/km_arm/fpga_config.c b/board/keymile/km_arm/fpga_config.c
index 8ac63931ec5c288355be2156f92ed01eb7265a83..cbfc7d21759031668e07629a982f7e3809fea3ad 100644 (file)
--- a/board/keymile/km_arm/fpga_config.c
+++ b/board/keymile/km_arm/fpga_config.c
@@ -2,23 +2,7 @@
  * (C) Copyright 2012
  * Valentin Lontgchamp, Keymile AG, valentin.longchamp@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., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301 USA
+ * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <common.h>
@@ -99,7 +83,7 @@ static int boco_set_bits(u8 reg, u8 flags)
 #define FPGA_INIT_B    0x10
 #define FPGA_DONE      0x20
 
-static int fpga_done()
+static int fpga_done(void)
 {
        int ret = 0;
        u8 regval;
@@ -206,25 +190,30 @@ int wait_for_fpga_config(void)
 }
 
 #define PRST1          0x4
-#define BRIDGE_RST     0x4
+#define PCIE_RST       0x10
+#define TRAFFIC_RST    0x04
 
 int fpga_reset(void)
 {
        int ret = 0;
+       u8 resets;
 
        if (!check_boco2()) {
                /* we do not have BOCO2, this is not really used */
                return 0;
        }
 
-       ret = boco_clear_bits(PRST1, BRIDGE_RST);
+       /* if we have skipped, we only want to reset the PCIe part */
+       resets = skip ? PCIE_RST : PCIE_RST | TRAFFIC_RST;
+
+       ret = boco_clear_bits(PRST1, resets);
        if (ret)
                return ret;
 
        /* small delay for the pulse */
        udelay(10);
 
-       ret = boco_set_bits(PRST1, BRIDGE_RST);
+       ret = boco_set_bits(PRST1, resets);
        if (ret)
                return ret;
 
@@ -248,4 +237,3 @@ int toggle_eeprom_spi_bus(void)
 
        return 0;
 }
-