Merge branch 'nomadik' into for-next

Conflicts:
	drivers/pinctrl/pinctrl-nomadik.c

diff --cc drivers/pinctrl/pinctrl-nomadik.c
index cf82d9ce4deeccc8c19c6104103fee84854c945a,0a712c2b1e7284343836fc5afb6d69ded5afb1f2..f2fd99ba40e35ef16e128e1b69800316ef02cf6a
--- 1/drivers/pinctrl/pinctrl-nomadik.c
--- 2/drivers/pinctrl/pinctrl-nomadik.c
+++ b/drivers/pinctrl/pinctrl-nomadik.c
@@@ -30,20 -30,8 +30,21 @@@
  #include <linux/pinctrl/pinconf.h>
  /* Since we request GPIOs from ourself */
  #include <linux/pinctrl/consumer.h>
 +/*
 + * For the U8500 archs, use the PRCMU register interface, for the older
 + * Nomadik, provide some stubs. The functions using these will only be
 + * called on the U8500 series.
 + */
 +#ifdef CONFIG_ARCH_U8500
  #include <linux/mfd/dbx500-prcmu.h>
 +#else
 +static inline u32 prcmu_read(unsigned int reg) {
 +      return 0;
 +}
 +static inline void prcmu_write(unsigned int reg, u32 value) {}
 +static inline void prcmu_write_masked(unsigned int reg, u32 mask, u32 value) {}
 +#endif
+ #include <linux/platform_data/pinctrl-nomadik.h>
  
  #include <asm/mach/irq.h>