Merge branch 'platform-ti-linux-3.14.y' of git://git.ti.com/~rrnayak/ti-linux-kernel...

TI-Feature: platform_base
TI-Tree: git://git.ti.com/~rrnayak/ti-linux-kernel/platform-linux-feature-tree.git
TI-Branch: platform-ti-linux-3.14.y

* 'platform-ti-linux-3.14.y' of git://git.ti.com/~rrnayak/ti-linux-kernel/platform-linux-feature-tree:
  ti_config_fragments/baseport.cfg: Add IOdelay configuration driver
  ARM: dts: dra7: Add iodelay module
  pinctrl: Introduce TI IOdelay configuration driver
  pinctrl: bindings: pinctrl: Add support for TI's IODelay configuration
  pinctrl: dra: dt-bindings: Add virtual mode configuration option

Conflicts:
	include/dt-bindings/pinctrl/dra.h

Signed-off-by: Dan Murphy <DMurphy@ti.com>

diff --cc arch/arm/boot/dts/dra7.dtsi
Simple merge

diff --cc include/dt-bindings/pinctrl/dra.h
index 3d1aa25,a7e4ae3..3bbc5f3
--- 1/include/dt-bindings/pinctrl/dra.h
--- 2/include/dt-bindings/pinctrl/dra.h
+++ b/include/dt-bindings/pinctrl/dra.h
@@@ -47,13 -69,9 +69,17 @@@
  #define PIN_INPUT_PULLUP      (PULL_ENA | INPUT_EN | PULL_UP)
  #define PIN_INPUT_PULLDOWN    (PULL_ENA | INPUT_EN)
  
 +/* Off mode states */
 +#define PIN_OFF_NONE          0
 +#define PIN_OFF_OUTPUT_HIGH   (OFF_EN | OFFOUT_EN | OFFOUT_VAL)
 +#define PIN_OFF_OUTPUT_LOW    (OFF_EN | OFFOUT_EN)
 +#define PIN_OFF_INPUT_PULLUP  (OFF_EN | OFF_PULL_EN | OFF_PULL_UP)
 +#define PIN_OFF_INPUT_PULLDOWN        (OFF_EN | OFF_PULL_EN)
 +#define PIN_OFF_WAKEUPENABLE  WAKEUP_EN
 +
+ /* DRA7 IODELAY configuration parameters */
+ #define A_DELAY(val)          ((val) & 0xFFFF)
+ #define G_DELAY(val)          (((val) & 0xFFFF) << 16)
+ 
  #endif