diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-03-11 21:35:54 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-03-11 21:35:54 +0100 |
| commit | 2a4fb270daa9c1f1d1b86a53d66ed86cc64ad232 (patch) | |
| tree | ecd460327f14eae49ed5938b76216104eed9d11d /Documentation | |
| parent | Merge tag 'media/v4.5-5' of git://git.kernel.org/pub/scm/linux/kernel/git/mch... (diff) | |
| parent | ARM: mvebu: fix overlap of Crypto SRAM with PCIe memory window (diff) | |
| download | linux-2a4fb270daa9c1f1d1b86a53d66ed86cc64ad232.tar.xz linux-2a4fb270daa9c1f1d1b86a53d66ed86cc64ad232.zip | |
Merge tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull ARM SoC fixes from Olof Johansson:
"Two more fixes for 4.5:
- One is a fix for OMAP that is urgently needed to avoid DRA7xx chips
from premature aging, by always keeping the Ethernet clock enabled.
- The other solves a I/O memory layout issue on Armada, where SROM
and PCI memory windows were conflicting in some configurations"
* tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
ARM: mvebu: fix overlap of Crypto SRAM with PCIe memory window
ARM: dts: dra7: do not gate cpsw clock due to errata i877
ARM: OMAP2+: hwmod: Introduce ti,no-idle dt property
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/devicetree/bindings/arm/omap/omap.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/arm/omap/omap.txt b/Documentation/devicetree/bindings/arm/omap/omap.txt index a2bd593881ca..66422d663184 100644 --- a/Documentation/devicetree/bindings/arm/omap/omap.txt +++ b/Documentation/devicetree/bindings/arm/omap/omap.txt @@ -23,6 +23,7 @@ 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-idle: When present, the module is never allowed to idle. Example: |