diff options
| author | Dan Murphy <DMurphy@ti.com> | 2015-01-29 08:44:01 -0600 |
|---|---|---|
| committer | Dan Murphy <DMurphy@ti.com> | 2015-01-29 08:44:01 -0600 |
| commit | 8811bd59fc9b07fe1d1bbe389bbac0e0d3a24936 (patch) | |
| tree | 29759b4cca258335cf9ca7a03ce4958bdeac9fb2 /arch | |
| parent | 6d1277fad6834e6001b8722b7688345bbfea0f11 (diff) | |
| parent | 99a2897c8b6e0b1d058c0db760cafd284e871fc8 (diff) | |
Merge branch 'platform-ti-linux-3.14.y' of git://git.ti.com/~rrnayak/ti-linux-kernel/platform-linux-feature-tree into ti-linux-3.14.y
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>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/boot/dts/dra7.dtsi | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/dra7.dtsi b/arch/arm/boot/dts/dra7.dtsi index f066adf0434..e65b69238d3 100644 --- a/arch/arm/boot/dts/dra7.dtsi +++ b/arch/arm/boot/dts/dra7.dtsi @@ -262,6 +262,13 @@ pinctrl-single,function-mask = <0x3fffffff>; }; + dra7_iodelay_core: padconf@4844a000 { + compatible = "ti,dra7-iodelay"; + reg = <0x4844a000 0x0d1c>; + #address-cells = <1>; + #size-cells = <0>; + }; + sdma: dma-controller@4a056000 { compatible = "ti,omap4430-sdma"; reg = <0x4a056000 0x1000>; |