Merge branch 'next/cleanup' into next/dt

diff --combined arch/arm/boot/dts/armada-370-xp.dtsi
index f2b6ae4f55d0b7e14d1450b2ec91beb305a19c70,7f10f627ae5b72b7f560732c6e8d5bb35b943e69..45839e53538e9c05e4005603c586abd650a3c744
--- 1/arch/arm/boot/dts/armada-370-xp.dtsi
--- 2/arch/arm/boot/dts/armada-370-xp.dtsi
+++ b/arch/arm/boot/dts/armada-370-xp.dtsi
@@@ -118,7 -118,7 +118,7 @@@
  
                        coherency-fabric@20200 {
                                compatible = "marvell,coherency-fabric";
-                               reg = <0x20200 0xb0>, <0x21810 0x1c>;
+                               reg = <0x20200 0xb0>, <0x21010 0x1c>;
                        };
  
                        serial@12000 {
@@@ -257,15 -257,6 +257,15 @@@
                                status = "disabled";
                        };
  
 +                      nand@d0000 {
 +                              compatible = "marvell,armada370-nand";
 +                              reg = <0xd0000 0x54>;
 +                              #address-cells = <1>;
 +                              #size-cells = <1>;
 +                              interrupts = <113>;
 +                              clocks = <&coredivclk 0>;
 +                              status = "disabled";
 +                      };
                };
        };
  

diff --combined arch/arm/mach-ux500/cpu-db8500.c
index 840452b89fc2eeacd9cbcea9831bb358a75f115c,12c7e5c03ea488336eac954daab98f4b6a22c649..d8f5ce430fa723db4b528274dc0010fb20c903ce
--- 1/arch/arm/mach-ux500/cpu-db8500.c
--- 2/arch/arm/mach-ux500/cpu-db8500.c
+++ b/arch/arm/mach-ux500/cpu-db8500.c
@@@ -21,32 -21,21 +21,32 @@@
  #include <linux/of.h>
  #include <linux/of_platform.h>
  #include <linux/regulator/machine.h>
 -#include <linux/platform_data/pinctrl-nomadik.h>
  #include <linux/random.h>
  
  #include <asm/pmu.h>
  #include <asm/mach/map.h>
  
  #include "setup.h"
 -#include "devices.h"
  #include "irqs.h"
  
 -#include "devices-db8500.h"
 -#include "db8500-regs.h"
 +#include "board-mop500-regulators.h"
  #include "board-mop500.h"
 +#include "db8500-regs.h"
  #include "id.h"
  
 +struct ab8500_platform_data ab8500_platdata = {
 +      .irq_base       = MOP500_AB8500_IRQ_BASE,
 +      .regulator      = &ab8500_regulator_plat_data,
 +};
 +
 +struct prcmu_pdata db8500_prcmu_pdata = {
 +      .ab_platdata    = &ab8500_platdata,
 +      .ab_irq         = IRQ_DB8500_AB8500,
 +      .irq_base       = IRQ_PRCMU_BASE,
 +      .version_offset = DB8500_PRCMU_FW_VERSION_OFFSET,
 +      .legacy_offset  = DB8500_PRCMU_LEGACY_OFFSET,
 +};
 +
  /* minimum static i/o mapping required to boot U8500 platforms */
  static struct map_desc u8500_uart_io_desc[] __initdata = {
        __IO_DEV_DESC(U8500_UART0_BASE, SZ_4K),
@@@ -151,6 -140,10 +151,10 @@@ static struct of_dev_auxdata u8500_auxd
        /* Requires call-back bindings. */
        OF_DEV_AUXDATA("arm,cortex-a9-pmu", 0, "arm-pmu", &db8500_pmu_platdata),
        /* Requires DMA bindings. */
+       OF_DEV_AUXDATA("arm,pl18x", 0x80126000, "sdi0",  &mop500_sdi0_data),
+       OF_DEV_AUXDATA("arm,pl18x", 0x80118000, "sdi1",  &mop500_sdi1_data),
+       OF_DEV_AUXDATA("arm,pl18x", 0x80005000, "sdi2",  &mop500_sdi2_data),
+       OF_DEV_AUXDATA("arm,pl18x", 0x80114000, "sdi4",  &mop500_sdi4_data),
        OF_DEV_AUXDATA("stericsson,ux500-msp-i2s", 0x80123000,
                       "ux500-msp-i2s.0", &msp0_platform_data),
        OF_DEV_AUXDATA("stericsson,ux500-msp-i2s", 0x80124000,
@@@ -166,6 -159,9 +170,6 @@@
        OF_DEV_AUXDATA("stericsson,ux500-hash", 0xa03c2000, "hash1", NULL),
        OF_DEV_AUXDATA("stericsson,snd-soc-mop500", 0, "snd-soc-mop500.0",
                        NULL),
 -      /* Requires device name bindings. */
 -      OF_DEV_AUXDATA("stericsson,db8500-pinctrl", U8500_PRCMU_BASE,
 -              "pinctrl-db8500", NULL),
        {},
  };