aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation/devicetree/bindings/arm
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2013-10-28 17:47:50 -0400
committerOlof Johansson <olof@lixom.net>2013-10-28 17:47:50 -0400
commit5f55c317e4a8cd5c0a70a896886914e1b09d8bd7 (patch)
treec1da51a94a064c403fe864262c16da74e081f514 /Documentation/devicetree/bindings/arm
parent137f66ee147cb4a06ad1ee04484ae64a9f6ba3f3 (diff)
parentb4887e16375be312cf64642ac1d826186cb836bf (diff)
Merge tag 'omap-for-v3.13/dt-late' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/dt
Some more dts changes from Benoit Cousson <bcousson@baylibre.com> via Tony Lindgren: - Add a lot of N900 nodes - Add OPP table to OMAP5/DRA7 - Add support for Newflow NanoBone board - Add i2c aliases - Add McASP and audio support - Add reset/idle on init bindings for OMAP - Add more nodes for AM4272 * tag 'omap-for-v3.13/dt-late' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: (42 commits) ARM: dts: omap5-uevm: Remove pinmux for dmic pins ARM: dts: omap5-uevm: Correct twl6040 reset GPIO pinmux ARM: dts: TWL4030: Add power button support ARM: dts: omap3-n900: Add LP5523 support ARM: dts: omap3-n900: Add TLV320AIC3X support ARM: dts: omap3-n900:: Mux RX51_LCD_RESET_GPIO in DTS ARM: dts: omap3-n900: Add NAND support ARM: dts: omap3-n900: Specify regulator info ARM: dts: TWL4030: Add missing regulators ARM: dts: omap3-n900: Add LP5523 support ARM: dts: omap3-n900: Add vibrator device ARM: dts: omap3-n900: GPIO key definitions ARM: dts: omap3-n900: Add support for SD cards ARM: dts: omap3-n900: Add UART support ARM: dts: omap3-n900: Fix i2c bus speed ARM: dts: omap3-n900: Add pinctrl for i2c devices ARM: dts: DRA7: Add CPU OPP table ARM: dts: OMAP5: Add CPU OPP table ARM: dts: dra7-evm: add smps123 supply for CPU ARM: dts: omap5-uevm: add smps123 supply for CPU ... Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'Documentation/devicetree/bindings/arm')
-rw-r--r--Documentation/devicetree/bindings/arm/omap/omap.txt3
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 91b7049affa1..808c1543b0f8 100644
--- a/Documentation/devicetree/bindings/arm/omap/omap.txt
+++ b/Documentation/devicetree/bindings/arm/omap/omap.txt
@@ -21,7 +21,8 @@ Required properties:
21Optional properties: 21Optional properties:
22- ti,no_idle_on_suspend: When present, it prevents the PM to idle the module 22- ti,no_idle_on_suspend: When present, it prevents the PM to idle the module
23 during suspend. 23 during suspend.
24 24- ti,no-reset-on-init: When present, the module should not be reset at init
25- ti,no-idle-on-init: When present, the module should not be idled at init
25 26
26Example: 27Example:
27 28