Merge commit 'kumar/next' into next

diff --cc arch/powerpc/Kconfig
Simple merge

diff --cc arch/powerpc/platforms/85xx/mpc85xx_mds.c
index 494513682d708d3356ea376339be8bf577f2333a,c8be7b528bb0fd0a5f572bfdfe1eb670117c34c5..da64be19d0997b75518ea1cdde2ecd6a16cbf884
--- 1/arch/powerpc/platforms/85xx/mpc85xx_mds.c
--- 2/arch/powerpc/platforms/85xx/mpc85xx_mds.c
+++ b/arch/powerpc/platforms/85xx/mpc85xx_mds.c
@@@ -322,10 -321,74 +321,74 @@@ static void __init mpc85xx_mds_qe_init(
                }
  
        }
+ }
+ 
+ static void __init mpc85xx_mds_qeic_init(void)
+ {
+       struct device_node *np;
+ 
+       np = of_find_compatible_node(NULL, NULL, "fsl,qe");
+       if (!of_device_is_available(np)) {
+               of_node_put(np);
+               return;
+       }
+ 
+       np = of_find_compatible_node(NULL, NULL, "fsl,qe-ic");
+       if (!np) {
+               np = of_find_node_by_type(NULL, "qeic");
+               if (!np)
+                       return;
+       }
+ 
+       if (machine_is(p1021_mds))
+               qe_ic_init(np, 0, qe_ic_cascade_low_mpic,
+                               qe_ic_cascade_high_mpic);
+       else
+               qe_ic_init(np, 0, qe_ic_cascade_muxed_mpic, NULL);
+       of_node_put(np);
+ }
+ #else
+ static void __init mpc85xx_publish_qe_devices(void) { }
+ static void __init mpc85xx_mds_qe_init(void) { }
+ static void __init mpc85xx_mds_qeic_init(void) { }
  #endif        /* CONFIG_QUICC_ENGINE */
  
+ static void __init mpc85xx_mds_setup_arch(void)
+ {
+ #ifdef CONFIG_PCI
+       struct pci_controller *hose;
+ #endif
+       dma_addr_t max = 0xffffffff;
+ 
+       if (ppc_md.progress)
+               ppc_md.progress("mpc85xx_mds_setup_arch()", 0);
+ 
+ #ifdef CONFIG_PCI
+       for_each_node_by_type(np, "pci") {
+               if (of_device_is_compatible(np, "fsl,mpc8540-pci") ||
+                   of_device_is_compatible(np, "fsl,mpc8548-pcie")) {
+                       struct resource rsrc;
+                       of_address_to_resource(np, 0, &rsrc);
+                       if ((rsrc.start & 0xfffff) == 0x8000)
+                               fsl_add_bridge(np, 1);
+                       else
+                               fsl_add_bridge(np, 0);
+ 
+                       hose = pci_find_hose_for_OF_device(np);
+                       max = min(max, hose->dma_window_base_cur +
+                                       hose->dma_window_size);
+               }
+       }
+ #endif
+ 
+ #ifdef CONFIG_SMP
+       mpc85xx_smp_init();
+ #endif
+ 
+       mpc85xx_mds_qe_init();
+ 
  #ifdef CONFIG_SWIOTLB
 -      if (lmb_end_of_DRAM() > max) {
 +      if (memblock_end_of_DRAM() > max) {
                ppc_swiotlb_enable = 1;
                set_pci_dma_ops(&swiotlb_dma_ops);
                ppc_md.pci_dma_dev_setup = pci_dma_dev_setup_swiotlb;

diff --cc arch/powerpc/sysdev/fsl_pci.c
Simple merge