Merge branch 'mvebu/mbus_dt' into mvebu/dove_pcie-mbus-dt

Conflicts:
	arch/arm/boot/dts/kirkwood.dtsi

diff --cc arch/arm/boot/dts/Makefile
Simple merge

diff --cc arch/arm/boot/dts/kirkwood-cloudbox.dts
Simple merge

diff --cc arch/arm/boot/dts/kirkwood-db.dtsi
index ca8bf362748ab78f95288af40289de6d27594954,45c1bf74ac00ce958968bf14077c58c886420565..c0e2a587917474a37a515ff7c70e133ee193f0ba
--- 1/arch/arm/boot/dts/kirkwood-db.dtsi
--- 2/arch/arm/boot/dts/kirkwood-db.dtsi
+++ b/arch/arm/boot/dts/kirkwood-db.dtsi
@@@ -77,29 -77,5 +77,21 @@@
                        cd-gpios = <&gpio1 6 0>;
                        status = "okay";
                };
- 
-               pcie-controller {
-                       status = "okay";
- 
-                       pcie@1,0 {
-                               status = "okay";
-                       };
-               };
        };
  };
 +
 +&mdio {
 +      status = "okay";
 +
 +      ethphy0: ethernet-phy@8 {
 +              device_type = "ethernet-phy";
 +              reg = <8>;
 +      };
 +};
 +
 +&eth0 {
 +      status = "okay";
 +      ethernet0-port@0 {
 +              phy-handle = <&ethphy0>;
 +      };
 +};

diff --cc arch/arm/boot/dts/kirkwood-dnskw.dtsi
Simple merge

diff --cc arch/arm/boot/dts/kirkwood-dockstar.dts
Simple merge

diff --cc arch/arm/boot/dts/kirkwood-dreamplug.dts
Simple merge

diff --cc arch/arm/boot/dts/kirkwood-goflexnet.dts
Simple merge

diff --cc arch/arm/boot/dts/kirkwood-guruplug-server-plus.dts
Simple merge

diff --cc arch/arm/boot/dts/kirkwood-ib62x0.dts
Simple merge

diff --cc arch/arm/boot/dts/kirkwood-iconnect.dts
Simple merge

diff --cc arch/arm/boot/dts/kirkwood-iomega_ix2_200.dts
Simple merge

diff --cc arch/arm/boot/dts/kirkwood-is2.dts
Simple merge

diff --cc arch/arm/boot/dts/kirkwood-km_kirkwood.dts
Simple merge

diff --cc arch/arm/boot/dts/kirkwood-lsxl.dtsi
Simple merge

diff --cc arch/arm/boot/dts/kirkwood-mplcec4.dts
Simple merge

diff --cc arch/arm/boot/dts/kirkwood-netgear_readynas_duo_v2.dts
Simple merge

diff --cc arch/arm/boot/dts/kirkwood-ns2-common.dtsi
Simple merge

diff --cc arch/arm/boot/dts/kirkwood-ns2.dts
Simple merge

diff --cc arch/arm/boot/dts/kirkwood-ns2lite.dts
Simple merge

diff --cc arch/arm/boot/dts/kirkwood-ns2max.dts
Simple merge

diff --cc arch/arm/boot/dts/kirkwood-ns2mini.dts
Simple merge

diff --cc arch/arm/boot/dts/kirkwood-openblocks_a6.dts
Simple merge

diff --cc arch/arm/boot/dts/kirkwood-sheevaplug-common.dtsi
Simple merge

diff --cc arch/arm/boot/dts/kirkwood-topkick.dts
Simple merge

diff --cc arch/arm/boot/dts/kirkwood-ts219-6281.dts
Simple merge

diff --cc arch/arm/boot/dts/kirkwood-ts219-6282.dts
Simple merge

diff --cc arch/arm/boot/dts/kirkwood-ts219.dtsi
index 102eaeb426aa91b3f10b8a24652143bf7122aca5,7019cf675df26dec61632c979a05ed51d9f04ef4..39158cf16258c9480de422996b8bda5c7a84dfc2
--- 1/arch/arm/boot/dts/kirkwood-ts219.dtsi
--- 2/arch/arm/boot/dts/kirkwood-ts219.dtsi
+++ b/arch/arm/boot/dts/kirkwood-ts219.dtsi
@@@ -87,28 -97,5 +97,21 @@@
                        status = "okay";
                        nr-ports = <2>;
                };
-               pcie-controller {
-                       status = "okay";
- 
-                       pcie@1,0 {
-                               status = "okay";
-                       };
-               };
        };
  };
 +
 +&mdio {
 +      status = "okay";
 +
 +      ethphy0: ethernet-phy {
 +              device_type = "ethernet-phy";
 +                /* overwrite reg property in board file */
 +      };
 +};
 +
 +&eth0 {
 +      status = "okay";
 +      ethernet0-port@0 {
 +              phy-handle = <&ethphy0>;
 +      };
 +};

diff --cc arch/arm/boot/dts/kirkwood.dtsi
index 1d6921d2d170de3732e2b2cf5f55bb36e80995fe,70f414d9bd9ac8e99a1dd14e28f564f96f3d2634..6489b982563a07958827dc2537dd6a467d8327e1
--- 1/arch/arm/boot/dts/kirkwood.dtsi
--- 2/arch/arm/boot/dts/kirkwood.dtsi
+++ b/arch/arm/boot/dts/kirkwood.dtsi
@@@ -20,7 -22,23 +22,16 @@@
               gpio0 = &gpio0;
               gpio1 = &gpio1;
        };
 -      intc: interrupt-controller {
 -              compatible = "marvell,orion-intc", "marvell,intc";
 -              interrupt-controller;
 -              #interrupt-cells = <1>;
 -              reg = <0xf1020204 0x04>,
 -                    <0xf1020214 0x04>;
 -      };
  
+       mbus {
+               compatible = "marvell,kirkwood-mbus", "simple-bus";
+               #address-cells = <2>;
+               #size-cells = <1>;
+               controller = <&mbusc>;
+               pcie-mem-aperture = <0xe0000000 0x10000000>; /* 256 MiB memory space */
+               pcie-io-aperture  = <0xf2000000 0x100000>;   /*   1 MiB    I/O space */
+       };
+ 
        ocp@f1000000 {
                compatible = "simple-bus";
                ranges = <0x00000000 0xf1000000 0x0100000
@@@ -30,30 -47,11 +40,35 @@@
                #address-cells = <1>;
                #size-cells = <1>;
  
 +              timer: timer@20300 {
 +                      compatible = "marvell,orion-timer";
 +                      reg = <0x20300 0x20>;
 +                      interrupt-parent = <&bridge_intc>;
 +                      interrupts = <1>, <2>;
 +                      clocks = <&core_clk 0>;
 +              };
 +
 +              intc: main-interrupt-ctrl@20200 {
 +                      compatible = "marvell,orion-intc";
 +                      interrupt-controller;
 +                      #interrupt-cells = <1>;
 +                      reg = <0x20200 0x10>, <0x20210 0x10>;
 +              };
 +
 +              bridge_intc: bridge-interrupt-ctrl@20110 {
 +                      compatible = "marvell,orion-bridge-intc";
 +                      interrupt-controller;
 +                      #interrupt-cells = <1>;
 +                      reg = <0x20110 0x8>;
 +                      interrupts = <1>;
 +                      marvell,#interrupts = <6>;
 +              };
 +
+               mbusc: mbus-controller@20000 {
+                       compatible = "marvell,mbus-controller";
+                       reg = <0x20000 0x80>, <0x1500 0x20>;
+               };
+ 
                core_clk: core-clocks@10030 {
                        compatible = "marvell,kirkwood-core-clock";
                        reg = <0x10030 0x4>;

diff --cc arch/arm/mach-kirkwood/board-dt.c
Simple merge

diff --cc arch/arm/mach-mvebu/platsmp.c
Simple merge

diff --cc arch/arm/mach-orion5x/edmini_v2-setup.c
index 7d316ede10aeeb78996abdc0eb32f704da366c52,0fc33c56cbb7a41cef84df1fb7f78740265cfdb9..f66c1b2ee8c1fe8b0f3b6e6eb2c026975bd27bbc
--- 1/arch/arm/mach-orion5x/edmini_v2-setup.c
--- 2/arch/arm/mach-orion5x/edmini_v2-setup.c
+++ b/arch/arm/mach-orion5x/edmini_v2-setup.c
@@@ -144,9 -152,12 +144,11 @@@ void __init edmini_v2_init(void
         * Configure peripherals.
         */
        orion5x_ehci0_init();
 -      orion5x_eth_init(&edmini_v2_eth_data);
  
-       mvebu_mbus_add_window("devbus-boot", EDMINI_V2_NOR_BOOT_BASE,
-                             EDMINI_V2_NOR_BOOT_SIZE);
+       mvebu_mbus_add_window_by_id(ORION_MBUS_DEVBUS_BOOT_TARGET,
+                                   ORION_MBUS_DEVBUS_BOOT_ATTR,
+                                   EDMINI_V2_NOR_BOOT_BASE,
+                                   EDMINI_V2_NOR_BOOT_SIZE);
        platform_device_register(&edmini_v2_nor_flash);
  
        pr_notice("edmini_v2: USB device port, flash write and power-off "