Merge tag 'ux500-devicetree-for-v3.12-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson into next/dt

From: Linus Walleij:
Ux500 device tree enablement base for the v3.12
development cycle:
- Various cleanups like remove non-existant hardware from
  the Snowball device tree, prefix all files with "ste-*"
- External regulators
- Documentation updates
- Delete some minor dangling platform data
- Pin control settings for U8540 through DT

* tag 'ux500-devicetree-for-v3.12-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson: (22 commits)
  ARM: ux500: fix devicetree builds
  ARM: ux500: Remove u9540.dts as it's been replaced
  ARM: ux500: Apply a ste-* prefix onto dbx5x0.dtsi
  ARM: ux500: Apply a ste-* prefix onto stuib.dtsi
  ARM: ux500: Apply a ste-* prefix onto hrefv60plus.dts
  ARM: ux500: Apply a ste-* prefix onto hrefprev60.dts Signed-off-by: Lee Jones <lee.jones@linaro.org>
  ARM: ux500: Apply a ste-* prefix onto href.dtsi
  ARM: ux500: Apply a ste-* prefix onto ccu9540.dts
  ARM: ux500: Apply a ste-* prefix onto ccu8540.dts
  ARM: ux500: Apply a ste-* prefix onto snowball.dts
  ARM: ux500: Remove Snowball DTS entry for ROHM BH1780GLI ambient light sensor
  ARM: ux500: Remove Snowball DTS entry for TPS61052 chip
  ARM: ux500: Remove Snowball DTS entry for National Semiconductor LP5521 LED chip
  ARM: ux500: Remove Toshiba TC35892 I/O Expander's DT entry from Snowball's DTS
  ARM: u8540: DT: Set pinctrl mapping to i2c0,1,2,4 & 5
  ARM: u8540: Add Pinctrl Device Tree settings for uart0, uart2
  ARM: ux500: Stop passing MMC's platform data for Device Tree boots
  Documentation: Update binding for Nomadik and DBx5x based platforms
  ARM: ux500: Supply external regulator names for Snowball's DT
  ARM: ux500: Provide a supply name for the AB8500 AUX regulators to use
  ...

1 files changed, 36 insertions, 0 deletions

diff --git a/include/dt-bindings/pinctrl/nomadik.h b/include/dt-bindings/pinctrl/nomadik.h
new file mode 100644
index 000000000000..638fb321a1cb
--- /dev/null
+++ b/include/dt-bindings/pinctrl/nomadik.h
@@ -0,0 +1,36 @@
+/*
+ * nomadik.h
+ *
+ * Copyright (C) ST-Ericsson SA 2013
+ * Author: Gabriel Fernandez <gabriel.fernandez@st.com> for ST-Ericsson.
+ * License terms:  GNU General Public License (GPL), version 2
+ */
+
+#define INPUT_NOPULL            0
+#define INPUT_PULLUP            1
+#define INPUT_PULLDOWN          2
+
+#define OUTPUT_LOW              0
+#define OUTPUT_HIGH             1
+#define DIR_OUTPUT              2
+
+#define SLPM_DISABLED           0
+#define SLPM_ENABLED            1
+
+#define SLPM_INPUT_NOPULL       0
+#define SLPM_INPUT_PULLUP       1
+#define SLPM_INPUT_PULLDOWN     2
+#define SLPM_DIR_INPUT          3
+
+#define SLPM_OUTPUT_LOW         0
+#define SLPM_OUTPUT_HIGH        1
+#define SLPM_DIR_OUTPUT         2
+
+#define SLPM_WAKEUP_DISABLE     0
+#define SLPM_WAKEUP_ENABLE      1
+
+#define GPIOMODE_DISABLED       0
+#define GPIOMODE_ENABLED        1
+
+#define SLPM_PDIS_DISABLED      0
+#define SLPM_PDIS_ENABLED       1