Merge branch 'next' of /home/wd/git/u-boot/next

[u-boot] / board / esd / pmc440 / pmc440.c

diff --git a/board/esd/pmc440/pmc440.c b/board/esd/pmc440/pmc440.c
index c5dc486cd405c2319fb1d5b842a0b2a265fd4f2a..5236f44468f9d494ad6edd9dada2c9dadbd79102 100644 (file)
--- a/board/esd/pmc440/pmc440.c
+++ b/board/esd/pmc440/pmc440.c
@@ -29,7 +29,7 @@
 #include <common.h>
 #include <libfdt.h>
 #include <fdt_support.h>
-#include <ppc440.h>
+#include <asm/ppc440.h>
 #include <asm/processor.h>
 #include <asm/io.h>
 #include <asm/bitops.h>
@@ -39,6 +39,8 @@
 #include <miiphy.h>
 #endif
 #include <serial.h>
+#include <asm/4xx_pci.h>
+
 #include "fpga.h"
 #include "pmc440.h"
 
@@ -66,7 +68,7 @@ struct serial_device *default_serial_console(void)
         */
        mfsdr(SDR0_PINSTP, val);
        if (((val & 0xf0000000) >> 29) != 7)
-               return &serial1_device;
+               return &eserial2_device;
 
        ulong scratchreg = in_be32((void*)GPIO0_ISR3L);
        if (!(scratchreg & 0x80)) {
@@ -88,9 +90,9 @@ struct serial_device *default_serial_console(void)
        }
 
        if (scratchreg & 0x01)
-               return &serial1_device;
+               return &eserial2_device;
        else
-               return &serial0_device;
+               return &eserial1_device;
 }
 
 int board_early_init_f(void)
@@ -424,8 +426,8 @@ int misc_init_r(void)
         * This fix will make the MAL burst disabling patch for the Linux
         * EMAC driver obsolete.
         */
-       reg = mfdcr(PLB4_ACR) & ~PLB4_ACR_WRP;
-       mtdcr(PLB4_ACR, reg);
+       reg = mfdcr(PLB4A0_ACR) & ~PLB4Ax_ACR_WRP_MASK;
+       mtdcr(PLB4A0_ACR, reg);
 
 #ifdef CONFIG_FPGA
        pmc440_init_fpga();
@@ -600,24 +602,16 @@ void pci_target_init(struct pci_controller *hose)
 #endif /* defined(CONFIG_PCI) && defined(CONFIG_SYS_PCI_TARGET_INIT) */
 
 /*
- * pci_master_init
+ * Override weak default pci_master_init()
  */
 #if defined(CONFIG_PCI) && defined(CONFIG_SYS_PCI_MASTER_INIT)
 void pci_master_init(struct pci_controller *hose)
 {
-       unsigned short temp_short;
-
        /*
-        * Write the PowerPC440 EP PCI Configuration regs.
-        * Enable PowerPC440 EP to be a master on the PCI bus (PMM).
-        * Enable PowerPC440 EP to act as a PCI memory target (PTM).
+        * Only configure the master in monach mode
         */
-       if (is_monarch()) {
-               pci_read_config_word(0, PCI_COMMAND, &temp_short);
-               pci_write_config_word(0, PCI_COMMAND,
-                                     temp_short | PCI_COMMAND_MASTER |
-                                     PCI_COMMAND_MEMORY);
-       }
+       if (is_monarch())
+               __pci_master_init(hose);
 }
 #endif /* defined(CONFIG_PCI) && defined(CONFIG_SYS_PCI_MASTER_INIT) */
 
@@ -683,17 +677,6 @@ int is_pci_host(struct pci_controller *hose)
 }
 #endif /* defined(CONFIG_PCI) */
 
-#if defined(CONFIG_POST)
-/*
- * Returns 1 if keys pressed to start the power-on long-running tests
- * Called from board_init_f().
- */
-int post_hotkeys_pressed(void)
-{
-       return 0;       /* No hotkeys supported */
-}
-#endif /* CONFIG_POST */
-
 #ifdef CONFIG_RESET_PHY_R
 void reset_phy(void)
 {