author | Dan Murphy <DMurphy@ti.com> | |
Thu, 29 Jan 2015 14:44:01 +0000 (08:44 -0600) | ||
committer | Dan Murphy <DMurphy@ti.com> | |
Thu, 29 Jan 2015 14:44:01 +0000 (08:44 -0600) |
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>
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>
1 | 2 | |||
---|---|---|---|---|
arch/arm/boot/dts/dra7.dtsi | patch | | diff1 | | diff2 | | blob | history |
include/dt-bindings/pinctrl/dra.h | patch | | diff1 | | diff2 | | blob | history |
diff --cc arch/arm/boot/dts/dra7.dtsi
Simple merge
diff --cc include/dt-bindings/pinctrl/dra.h
index 3d1aa257568424e6513925329ced6ca568051043,a7e4ae328675e59e48f95e5e7d51de4e4e826d78..3bbc5f3f53d22709f75f7ccb7dedd9adf4dd86b7
#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