Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus

* 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus: (119 commits)
  MIPS: Delete unused function add_temporary_entry.
  MIPS: Set default pci cache line size.
  MIPS: Flush huge TLB
  MIPS: Octeon: Remove SYS_SUPPORTS_HIGHMEM.
  MIPS: Octeon: Add support for OCTEON II PCIe
  MIPS: Octeon: Update PCI Latency timer and enable more error reporting.
  MIPS: Alchemy: Update cpu-feature-overrides
  MIPS: Alchemy: db1200: Improve PB1200 detection.
  MIPS: Alchemy: merge Au1000 and Au1300-style IRQ controller code.
  MIPS: Alchemy: chain IRQ controllers to MIPS IRQ controller
  MIPS: Alchemy: irq: register pm at irq init time
  MIPS: Alchemy: Touchscreen support on DB1100
  MIPS: Alchemy: Hook up IrDA on DB1000/DB1100
  net/irda: convert au1k_ir to platform driver.
  MIPS: Alchemy: remove unused board headers
  MTD: nand: make au1550nd.c a platform_driver
  MIPS: Netlogic: Mark Netlogic chips as SMT capable
  MIPS: Netlogic: Add support for XLP 3XX cores
  MIPS: Netlogic: Merge some of XLR/XLP wakup code
  MIPS: Netlogic: Add default XLP config.
  ...

Fix up trivial conflicts in arch/mips/kernel/{perf_event_mipsxx.c,
traps.c} and drivers/tty/serial/Makefile

1 files changed, 19 insertions, 27 deletions

diff --git a/arch/mips/bcm63xx/boards/board_bcm963xx.c b/arch/mips/bcm63xx/boards/board_bcm963xx.c
index c22385400fc9..2f1773f3fb7a 100644
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -709,15 +709,9 @@ void __init board_prom_init(void)
         char cfe_version[32];
         u32 val;
 
-        /* read base address of boot chip select (0)
-         * 6345 does not have MPI but boots from standard
-         * MIPS Flash address */
-        if (BCMCPU_IS_6345())
-                val = 0x1fc00000;
-        else {
-                val = bcm_mpi_readl(MPI_CSBASE_REG(0));
-                val &= MPI_CSBASE_BASE_MASK;
-        }
+        /* read base address of boot chip select (0) */
+        val = bcm_mpi_readl(MPI_CSBASE_REG(0));
+        val &= MPI_CSBASE_BASE_MASK;
         boot_addr = (u8 *)KSEG1ADDR(val);
 
         /* dump cfe version */
@@ -797,18 +791,6 @@ void __init board_prom_init(void)
         }
 
         bcm_gpio_writel(val, GPIO_MODE_REG);
-
-        /* Generate MAC address for WLAN and
-         * register our SPROM */
-#ifdef CONFIG_SSB_PCIHOST
-        if (!board_get_mac_address(bcm63xx_sprom.il0mac)) {
-                memcpy(bcm63xx_sprom.et0mac, bcm63xx_sprom.il0mac, ETH_ALEN);
-                memcpy(bcm63xx_sprom.et1mac, bcm63xx_sprom.il0mac, ETH_ALEN);
-                if (ssb_arch_register_fallback_sprom(
-                                &bcm63xx_get_fallback_sprom) < 0)
-                        printk(KERN_ERR PFX "failed to register fallback SPROM\n");
-        }
-#endif
 }
 
 /*
@@ -895,13 +877,23 @@ int __init board_register_devices(void)
         if (board.has_dsp)
                 bcm63xx_dsp_register(&board.dsp);
 
-        /* read base address of boot chip select (0) */
-        if (BCMCPU_IS_6345())
-                val = 0x1fc00000;
-        else {
-                val = bcm_mpi_readl(MPI_CSBASE_REG(0));
-                val &= MPI_CSBASE_BASE_MASK;
+        /* Generate MAC address for WLAN and register our SPROM,
+         * do this after registering enet devices
+         */
+#ifdef CONFIG_SSB_PCIHOST
+        if (!board_get_mac_address(bcm63xx_sprom.il0mac)) {
+                memcpy(bcm63xx_sprom.et0mac, bcm63xx_sprom.il0mac, ETH_ALEN);
+                memcpy(bcm63xx_sprom.et1mac, bcm63xx_sprom.il0mac, ETH_ALEN);
+                if (ssb_arch_register_fallback_sprom(
+                                &bcm63xx_get_fallback_sprom) < 0)
+                        pr_err(PFX "failed to register fallback SPROM\n");
         }
+#endif
+
+        /* read base address of boot chip select (0) */
+        val = bcm_mpi_readl(MPI_CSBASE_REG(0));
+        val &= MPI_CSBASE_BASE_MASK;
+
         mtd_resources[0].start = val;
         mtd_resources[0].end = 0x1FFFFFFF;