Fix JFFS2 support for legacy NAND driver.

[u-boot] / board / mpc8260ads / mpc8260ads.c

diff --git a/board/mpc8260ads/mpc8260ads.c b/board/mpc8260ads/mpc8260ads.c
index 21259634075f27a47f0432b37f770ee60e7f339a..93550e2ad01be9730f7e4f2cd4ea51ba433afef7 100644 (file)
--- a/board/mpc8260ads/mpc8260ads.c
+++ b/board/mpc8260ads/mpc8260ads.c
@@ -13,7 +13,7 @@
  * Yuli Barcohen <yuli@arabellasw.com>
  * Added support for SDRAM DIMMs SPD EEPROM, MII, Ethernet PHY init.
  *
- * Copyright (c) 2005 MontaVista Software, Inc.   
+ * Copyright (c) 2005 MontaVista Software, Inc.
  * Vitaly Bordug <vbordug@ru.mvista.com>
  * Added support for PCI.
  *
@@ -238,8 +238,9 @@ void reset_phy (void)
         * Do not bypass Rx/Tx (de)scrambler (fix configuration error)
         * Enable autonegotiation.
         */
-       miiphy_write(CFG_PHY_ADDR, 16, 0x610);
-       miiphy_write(CFG_PHY_ADDR, PHY_BMCR, PHY_BMCR_AUTON | PHY_BMCR_RST_NEG);
+       bb_miiphy_write(NULL, CFG_PHY_ADDR, 16, 0x610);
+       bb_miiphy_write(NULL, CFG_PHY_ADDR, PHY_BMCR,
+                       PHY_BMCR_AUTON | PHY_BMCR_RST_NEG);
 #else
        /*
         * Ethernet PHY is configured (by means of configuration pins)
@@ -247,9 +248,15 @@ void reset_phy (void)
         * to advertise all capabilities, including 100Mb/s, and
         * restart autonegotiation.
         */
-       miiphy_write(CFG_PHY_ADDR, PHY_ANAR, 0x01E1); /* Advertise all capabilities */
-       miiphy_write(CFG_PHY_ADDR, PHY_DCR,  0x0000); /* Do not bypass Rx/Tx (de)scrambler */
-       miiphy_write(CFG_PHY_ADDR, PHY_BMCR, PHY_BMCR_AUTON | PHY_BMCR_RST_NEG);
+
+       /* Advertise all capabilities */
+       bb_miiphy_write(NULL, CFG_PHY_ADDR, PHY_ANAR, 0x01E1);
+
+       /* Do not bypass Rx/Tx (de)scrambler */
+       bb_miiphy_write(NULL, CFG_PHY_ADDR, PHY_DCR,  0x0000);
+
+       bb_miiphy_write(NULL, CFG_PHY_ADDR, PHY_BMCR,
+                       PHY_BMCR_AUTON | PHY_BMCR_RST_NEG);
 #endif /* CONFIG_ADSTYPE == CFG_PQ2FADS */
 #endif /* CONFIG_MII */
 }
@@ -267,7 +274,7 @@ int board_early_init_f (void)
 
 #ifdef CONFIG_PCI
        volatile pci_ic_t* pci_ic = (pci_ic_t *) CFG_PCI_INT;
-       
+
        /* mask alll the PCI interrupts */
        pci_ic->pci_int_mask |= 0xfff00000;
 #endif