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

[platform/kernel/u-boot.git] / board / freescale / mx35pdk / mx35pdk.c

diff --git a/board/freescale/mx35pdk/mx35pdk.c b/board/freescale/mx35pdk/mx35pdk.c
index 12e84d7..9fabef5 100644 (file)
--- a/board/freescale/mx35pdk/mx35pdk.c
+++ b/board/freescale/mx35pdk/mx35pdk.c
@@ -3,23 +3,7 @@
  *
  * (C) Copyright 2008-2010 Freescale Semiconductor, Inc.
  *
- * 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>
@@ -245,7 +229,7 @@ int board_late_init(void)
 
                imx_iomux_v3_setup_pad(MX35_PAD_COMPARE__GPIO1_5);
 
-               gpio_direction_output(IMX_GPIO_NR(2, 5), 1);
+               gpio_direction_output(IMX_GPIO_NR(1, 5), 1);
        }
 
        val = mc9sdz60_reg_read(MC9SDZ60_REG_GPIO_1) | 0x04;
@@ -267,14 +251,12 @@ int board_late_init(void)
 
 int board_eth_init(bd_t *bis)
 {
-       int rc = -ENODEV;
 #if defined(CONFIG_SMC911X)
-       rc = smc911x_initialize(0, CONFIG_SMC911X_BASE);
+       int rc = smc911x_initialize(0, CONFIG_SMC911X_BASE);
+       if (rc)
+               return rc;
 #endif
-
-       cpu_eth_init(bis);
-
-       return rc;
+       return cpu_eth_init(bis);
 }
 
 #if defined(CONFIG_FSL_ESDHC)