Merge remote branch 'kumar/next' into merge

diff --combined arch/powerpc/boot/dts/mpc8308rdb.dts
index d3db02f,1e2b888..a0bd188
--- 1/arch/powerpc/boot/dts/mpc8308rdb.dts
--- 2/arch/powerpc/boot/dts/mpc8308rdb.dts
+++ b/arch/powerpc/boot/dts/mpc8308rdb.dts
@@@ -109,7 -109,7 +109,7 @@@
                #address-cells = <1>;
                #size-cells = <1>;
                device_type = "soc";
-               compatible = "fsl,mpc8315-immr", "simple-bus";
+               compatible = "fsl,mpc8308-immr", "simple-bus";
                ranges = <0 0xe0000000 0x00100000>;
                reg = <0xe0000000 0x00000200>;
                bus-frequency = <0>;
@@@ -265,14 -265,6 +265,14 @@@
                        interrupt-parent = < &ipic >;
                };
  
 +              dma@2c000 {
 +                      compatible = "fsl,mpc8308-dma", "fsl,mpc5121-dma";
 +                      reg = <0x2c000 0x1800>;
 +                      interrupts = <3 0x8
 +                                      94 0x8>;
 +                      interrupt-parent = < &ipic >;
 +              };
 +
        };
  
        pci0: pcie@e0009000 {

diff --combined arch/powerpc/sysdev/fsl_rio.c
index 9f99bef,4c518d1..8c6cab0
--- 1/arch/powerpc/sysdev/fsl_rio.c
--- 2/arch/powerpc/sysdev/fsl_rio.c
+++ b/arch/powerpc/sysdev/fsl_rio.c
@@@ -973,6 -973,7 +973,6 @@@ fsl_rio_dbell_handler(int irq, void *de
        if (dsr & DOORBELL_DSR_QFI) {
                pr_info("RIO: doorbell queue full\n");
                out_be32(&priv->msg_regs->dsr, DOORBELL_DSR_QFI);
 -              goto out;
        }
  
        /* XXX Need to check/dispatch until queue empty */
@@@ -1555,8 -1556,6 +1555,6 @@@ int fsl_rio_setup(struct platform_devic
        saved_mcheck_exception = ppc_md.machine_check_exception;
        ppc_md.machine_check_exception = fsl_rio_mcheck_exception;
  #endif
-       /* Ensure that RFXE is set */
-       mtspr(SPRN_HID1, (mfspr(SPRN_HID1) | 0x20000));
  
        return 0;
  err: