diff options
| author | Tero Kristo <t-kristo@ti.com> | 2014-07-31 14:50:34 +0300 |
|---|---|---|
| committer | Tero Kristo <t-kristo@ti.com> | 2014-07-31 14:50:34 +0300 |
| commit | 2118361c2ceded9378c07161a947bcbd8e064685 (patch) | |
| tree | 49c866d37a3739671cf1ef0297558bc311a67677 /Documentation | |
| parent | 3b8a6e02c47ca2db36103308fc0ab8ff63095421 (diff) | |
| parent | 441124ca66605d31c28bc60892fa94d2f08fdc31 (diff) | |
Merge branch 'platform-ti-linux-3.14.y' into pm-ti-linux-3.14.y-next
Conflicts:
arch/arm/boot/dts/am43x-epos-evm.dts
Signed-off-by: Tero Kristo <t-kristo@ti.com>
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/devicetree/bindings/arm/omap/omap.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Documentation/devicetree/bindings/arm/omap/omap.txt b/Documentation/devicetree/bindings/arm/omap/omap.txt index 3600f323df8..5e73e29a935 100644 --- a/Documentation/devicetree/bindings/arm/omap/omap.txt +++ b/Documentation/devicetree/bindings/arm/omap/omap.txt @@ -23,7 +23,8 @@ Optional properties: during suspend. - ti,no-reset-on-init: When present, the module should not be reset at init - ti,no-idle-on-init: When present, the module should not be idled at init - +- ti,no_init: When present, the module is marked as disabled immediately and + no setup is done. Example: spinlock@1 { |