From: Linus Walleij <linus.walleij@linaro.org>
Date: Mon, 15 Oct 2012 07:54:59 +0000 (+0200)
Subject: Merge branch 'devel' into for-next
X-Git-Tag: next-20121016~16^2~2
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=de1d1897e9cc8f7f685d47c401addabae7ce1615;p=karo-tx-linux.git

Merge branch 'devel' into for-next

Conflicts:
	drivers/pinctrl/pinctrl-nomadik.c
---

de1d1897e9cc8f7f685d47c401addabae7ce1615
diff --cc drivers/pinctrl/pinctrl-nomadik.c
index 01aea1c3b5fa,2bf6049aa7cb..a4a424768377
--- a/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>