Merge commit 'linus/master' into merge-linus

Conflicts:

	arch/x86/kvm/i8254.c

1 files changed, 6 insertions, 1 deletions

diff --git a/arch/powerpc/boot/dts/mpc8313erdb.dts b/arch/powerpc/boot/dts/mpc8313erdb.dts
index 2a94ae0dc8b8..747f27676332 100644
--- a/arch/powerpc/boot/dts/mpc8313erdb.dts
+++ b/arch/powerpc/boot/dts/mpc8313erdb.dts
@@ -176,24 +176,28 @@
                         dma-channel@0 {
                                 compatible = "fsl,mpc8313-dma-channel", "fsl,elo-dma-channel";
                                 reg = <0 0x80>;
+                                cell-index = <0>;
                                 interrupt-parent = <&ipic>;
                                 interrupts = <71 8>;
                         };
                         dma-channel@80 {
                                 compatible = "fsl,mpc8313-dma-channel", "fsl,elo-dma-channel";
                                 reg = <0x80 0x80>;
+                                cell-index = <1>;
                                 interrupt-parent = <&ipic>;
                                 interrupts = <71 8>;
                         };
                         dma-channel@100 {
                                 compatible = "fsl,mpc8313-dma-channel", "fsl,elo-dma-channel";
                                 reg = <0x100 0x80>;
+                                cell-index = <2>;
                                 interrupt-parent = <&ipic>;
                                 interrupts = <71 8>;
                         };
                         dma-channel@180 {
                                 compatible = "fsl,mpc8313-dma-channel", "fsl,elo-dma-channel";
                                 reg = <0x180 0x28>;
+                                cell-index = <3>;
                                 interrupt-parent = <&ipic>;
                                 interrupts = <71 8>;
                         };
@@ -359,7 +363,8 @@
                         #interrupt-cells = <1>;
                         #size-cells = <2>;
                         #address-cells = <3>;
-                        reg = <0xe0008500 0x100>;
+                        reg = <0xe0008500 0x100         /* internal registers */
+                               0xe0008300 0x8>;         /* config space access registers */
                         compatible = "fsl,mpc8349-pci";
                         device_type = "pci";
                 };