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

[u-boot] / board / Marvell / rd6281a / rd6281a.c

diff --git a/board/Marvell/rd6281a/rd6281a.c b/board/Marvell/rd6281a/rd6281a.c
index 0d76146b658069e44e54ec98a64057ac9421bf6c..33ef0c78e5bba9d18ecb15b57f1a1db567506c42 100644 (file)
--- a/board/Marvell/rd6281a/rd6281a.c
+++ b/board/Marvell/rd6281a/rd6281a.c
@@ -3,35 +3,20 @@
  * Marvell Semiconductor <www.marvell.com>
  * Written-by: Prafulla Wadaskar <prafulla@marvell.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>
 #include <miiphy.h>
 #include <netdev.h>
+#include <asm/arch/cpu.h>
 #include <asm/arch/kirkwood.h>
 #include <asm/arch/mpp.h>
 #include "rd6281a.h"
 
 DECLARE_GLOBAL_DATA_PTR;
 
-int board_init(void)
+int board_early_init_f(void)
 {
        /*
         * default gpio configuration
@@ -43,7 +28,7 @@ int board_init(void)
                        RD6281A_OE_LOW, RD6281A_OE_HIGH);
 
        /* Multi-Purpose Pins Functionality configuration */
-       u32 kwmpp_config[] = {
+       static const u32 kwmpp_config[] = {
                MPP0_NF_IO2,
                MPP1_NF_IO3,
                MPP2_NF_IO4,
@@ -96,8 +81,12 @@ int board_init(void)
                MPP49_GPIO,
                0
        };
-       kirkwood_mpp_conf(kwmpp_config);
+       kirkwood_mpp_conf(kwmpp_config, NULL);
+       return 0;
+}
 
+int board_init(void)
+{
        /*
         * arch number of board
         */
@@ -135,11 +124,11 @@ void mv_phy_88e1116_init(char *name)
        miiphy_write(name, devadr, MV88E1116_PGADR_REG, 0);
 
        /* reset the phy */
-       if (miiphy_read (name, devadr, PHY_BMCR, &reg) != 0) {
+       if (miiphy_read (name, devadr, MII_BMCR, &reg) != 0) {
                printf("Err..(%s) PHY status read failed\n", __FUNCTION__);
                return;
        }
-       if (miiphy_write (name, devadr, PHY_BMCR, reg | 0x8000) != 0) {
+       if (miiphy_write (name, devadr, MII_BMCR, reg | 0x8000) != 0) {
                printf("Err..(%s) PHY reset failed\n", __FUNCTION__);
                return;
        }