Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc

* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
  [POWERPC] Fix return value from memcpy
  [POWERPC] iseries: Define insw et al. so libata/ide will compile
  [POWERPC] Fix irq enable/disable in smp_generic_take_timebase
  [POWERPC] Fix problem with time not advancing on 32-bit platforms
  [POWERPC] Restore copyright notice in arch/powerpc/kernel/fpu.S
  [POWERPC] Fix up ibm_architecture_vec definition
  [POWERPC] Make OF irq map code detect more error cases
  [POWERPC] Support for "weird" MPICs and fixup mpc7448_hpc2
  [POWERPC] Fix MPIC sense codes in documentation
  [POWERPC] Fix performance regression in IRQ radix tree locking
  [POWERPC] Add mpc7448hpc2 device tree source file
  [POWERPC] Add MPC8349E MDS device tree source file to arch/powerpc/boot/dts
  [POWERPC] modify mpc83xx platforms to use new IRQ layer
  [POWERPC] Adapt ipic driver to new host_ops interface, add set_irq_type to set IRQ sense
  [POWERPC] back up old school ipic.[hc] to arch/ppc
  [POWERPC] Use mpc8641hpcn PIC base address from dev tree.
  [POWERPC] Allow MPC8641 HPCN to build with CONFIG_PCI disabled too.
  [POWERPC] Fix powerpc 44x_mmu build
  [POWERPC] Remove flush_dcache_all export

2 files changed, 17 insertions, 12 deletions

diff --git a/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c b/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c
index 146da3001c67..0b1b52168bb7 100644
--- a/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c
+++ b/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c
@@ -52,6 +52,7 @@ unsigned long pci_dram_offset = 0;
 #endif
 
 
+#ifdef CONFIG_PCI
 static void mpc86xx_8259_cascade(unsigned int irq, struct irq_desc *desc,
                                  struct pt_regs *regs)
 {
@@ -60,40 +61,43 @@ static void mpc86xx_8259_cascade(unsigned int irq, struct irq_desc *desc,
                 generic_handle_irq(cascade_irq, regs);
         desc->chip->eoi(irq);
 }
+#endif  /* CONFIG_PCI */
 
 void __init
 mpc86xx_hpcn_init_irq(void)
 {
         struct mpic *mpic1;
-        struct device_node *np, *cascade_node = NULL;
+        struct device_node *np;
+        struct resource res;
+#ifdef CONFIG_PCI
+        struct device_node *cascade_node = NULL;
         int cascade_irq;
-        phys_addr_t openpic_paddr;
+#endif
 
+        /* Determine PIC address. */
         np = of_find_node_by_type(NULL, "open-pic");
         if (np == NULL)
                 return;
-
-        /* Determine the Physical Address of the OpenPIC regs */
-        openpic_paddr = get_immrbase() + MPC86xx_OPENPIC_OFFSET;
+        of_address_to_resource(np, 0, &res);
 
         /* Alloc mpic structure and per isu has 16 INT entries. */
-        mpic1 = mpic_alloc(np, openpic_paddr,
+        mpic1 = mpic_alloc(np, res.start,
                         MPIC_PRIMARY | MPIC_WANTS_RESET | MPIC_BIG_ENDIAN,
                         16, NR_IRQS - 4,
                         " MPIC     ");
         BUG_ON(mpic1 == NULL);
 
-        mpic_assign_isu(mpic1, 0, openpic_paddr + 0x10000);
+        mpic_assign_isu(mpic1, 0, res.start + 0x10000);
 
         /* 48 Internal Interrupts */
-        mpic_assign_isu(mpic1, 1, openpic_paddr + 0x10200);
-        mpic_assign_isu(mpic1, 2, openpic_paddr + 0x10400);
-        mpic_assign_isu(mpic1, 3, openpic_paddr + 0x10600);
+        mpic_assign_isu(mpic1, 1, res.start + 0x10200);
+        mpic_assign_isu(mpic1, 2, res.start + 0x10400);
+        mpic_assign_isu(mpic1, 3, res.start + 0x10600);
 
         /* 16 External interrupts
          * Moving them from [0 - 15] to [64 - 79]
          */
-        mpic_assign_isu(mpic1, 4, openpic_paddr + 0x10000);
+        mpic_assign_isu(mpic1, 4, res.start + 0x10000);
 
         mpic_init(mpic1);
 
diff --git a/arch/powerpc/platforms/86xx/pci.c b/arch/powerpc/platforms/86xx/pci.c
index bc5139043112..a8c8f0a44055 100644
--- a/arch/powerpc/platforms/86xx/pci.c
+++ b/arch/powerpc/platforms/86xx/pci.c
@@ -188,7 +188,8 @@ int __init add_bridge(struct device_node *dev)
 
         printk(KERN_INFO "Found MPC86xx PCIE host bridge at 0x%08lx. "
                "Firmware bus number: %d->%d\n",
-                rsrc.start, hose->first_busno, hose->last_busno);
+               (unsigned long) rsrc.start,
+               hose->first_busno, hose->last_busno);
 
         DBG(" ->Hose at 0x%p, cfg_addr=0x%p,cfg_data=0x%p\n",
                 hose, hose->cfg_addr, hose->cfg_data);