Merge tag 'at91-dt' of git://github.com/at91linux/linux-at91 into next/dt

From Nicolas Ferre:

Big DT-centric update for AT91:
- Calao boards update, removal of one board C file and
  associated defconfig, Kconfig Makefile lines
- several Acme boards updates
- addition of watchdog, uart and pinctrl descriptions for
  several products
- modification of RTC compatible string for 9x5 family

* tag 'at91-dt' of git://github.com/at91linux/linux-at91: (21 commits)
  ARM: at91/dt: add pinctrl definition for at91 tc blocks
  ARM: at91/dts: add the watchdog nodes for at91 boards
  ARM: at91/dtsi: add the watchdog nodes for at91 SoC
  ARM: at91: drop non DT: Calao USB-A96x
  ARM: at91: dt: add Calao USB-A9G20 low power version
  ARM: at91: dt: usb-a9263: add dataflash support
  ARM: at91: dt: usb-a9263: update shutdown controller
  ARM: at91: dt: usb-a9260: update shutdown controller
  ARM: at91: dt: sam9260: add i2c gpio pinctrl
  ARM: at91: switch Fox G20 board .dts to pre-processor defines
  ARM: at91: add Acme Systems Fox G20 board
  ARM: at91/at91-ariag25.dts: UART0/1 nodes are disabled
  ARM: at91/at91sam9x5.dtsi: add UART0/1 nodes
  ARM: at91/at91-ariag25.dts: add RTC node
  ARM: at91: at91sam9x5 RTC is not compatible with at91rm9200 one
  ARM: at91: udpate defconfigs
  ARM: at91: dt: switch to standard IRQ flag defines
  ARM: at91: dt: switch to pinctrl to pre-processor
  ARM: at91: dt: add pinctrl pre-processor define
  ARM: at91: dt: switch to standard GPIO flag defines.
  ...

Signed-off-by: Olof Johansson <olof@lixom.net>

1 files changed, 35 insertions, 0 deletions

diff --git a/include/dt-bindings/pinctrl/at91.h b/include/dt-bindings/pinctrl/at91.h
new file mode 100644
index 000000000000..d7988b4d8af9
--- /dev/null
+++ b/include/dt-bindings/pinctrl/at91.h
@@ -0,0 +1,35 @@
+/*
+ * This header provides constants for most at91 pinctrl bindings.
+ *
+ * Copyright (C) 2013 Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
+ *
+ * GPLv2 only
+ */
+
+#ifndef __DT_BINDINGS_AT91_PINCTRL_H__
+#define __DT_BINDINGS_AT91_PINCTRL_H__
+
+#define AT91_PINCTRL_NONE               (0 << 0)
+#define AT91_PINCTRL_PULL_UP            (1 << 0)
+#define AT91_PINCTRL_MULTI_DRIVE        (1 << 1)
+#define AT91_PINCTRL_DEGLITCH           (1 << 2)
+#define AT91_PINCTRL_PULL_DOWN          (1 << 3)
+#define AT91_PINCTRL_DIS_SCHMIT         (1 << 4)
+#define AT91_PINCTRL_DEBOUNCE           (1 << 16)
+#define AT91_PINCTRL_DEBOUNCE_VA(x)     (x << 17)
+
+#define AT91_PINCTRL_PULL_UP_DEGLITCH   (AT91_PINCTRL_PULL_UP | AT91_PINCTRL_DEGLITCH)
+
+#define AT91_PIOA       0
+#define AT91_PIOB       1
+#define AT91_PIOC       2
+#define AT91_PIOD       3
+#define AT91_PIOE       4
+
+#define AT91_PERIPH_GPIO        0
+#define AT91_PERIPH_A           1
+#define AT91_PERIPH_B           2
+#define AT91_PERIPH_C           3
+#define AT91_PERIPH_D           4
+
+#endif /* __DT_BINDINGS_AT91_PINCTRL_H__ */