summaryrefslogtreecommitdiffstats
path: root/Documentation/devicetree/bindings/arm
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2015-01-29 13:54:26 -0800
committerOlof Johansson <olof@lixom.net>2015-01-29 13:54:26 -0800
commita35306d3ad45df81fedbe65a1cc8214b91d03aca (patch)
tree1b77a28d37e2759d0a57b0f5fa0e9a335c271f77 /Documentation/devicetree/bindings/arm
parent1e4cd7e52bd0181ba057a5cda4116cb025b94635 (diff)
parent6591a02e17e6d6587c3cf7588d523fa6f26b584a (diff)
downloadlinux-a35306d3ad45df81fedbe65a1cc8214b91d03aca.tar.bz2
Merge tag 'samsung-dt-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/dt
Merge "Samsung 2nd DT updates for v3.20" from Kukjin Kim: - for all of Samsung SoCs : use generic power domain bindings : add 'dr_mode' property for hsotg/dwc2 devices - exynos3250-rinato and exynos3250-monk : add regulator-haptic - exynos5422-odroidxu3 : reduce total RAM by 22 MiB because last 22 MiB for secure monitor cannot be accessed by kernel : add on-board INA231 sensors and LDO26 of PMIC for the sensors * tag 'samsung-dt-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung: ARM: dts: reduce total RAM by 22 MiB for exynos5422-odroidxu3 ARM: dts: add on-board INA231 sensors for exynos5422-odroidxu3 ARM: dts: Add regulator-haptic node for exynos3250-monk ARM: dts: Add regulator-haptic node for exynos3250-rinato ARM: dts: add 'dr_mode' property to hsotg devices for exynos boards ARM: dts: convert to generic power domain bindings for exynos DT Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'Documentation/devicetree/bindings/arm')
-rw-r--r--Documentation/devicetree/bindings/arm/exynos/power_domain.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/devicetree/bindings/arm/exynos/power_domain.txt b/Documentation/devicetree/bindings/arm/exynos/power_domain.txt
index abde1ea8a119..f4445e5a2bbb 100644
--- a/Documentation/devicetree/bindings/arm/exynos/power_domain.txt
+++ b/Documentation/devicetree/bindings/arm/exynos/power_domain.txt
@@ -23,7 +23,7 @@ Optional Properties:
devices in this power domain. Maximum of 4 pairs (N = 0 to 3)
are supported currently.
-Node of a device using power domains must have a samsung,power-domain property
+Node of a device using power domains must have a power-domains property
defined with a phandle to respective power domain.
Example: