From: Kukjin Kim Date: Tue, 17 Mar 2015 17:23:01 +0000 (+0900) Subject: Merge branch 'v4.1-next/dt-samsung' into for-next X-Git-Tag: KARO-TXA5-2015-06-26~141^2~8 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=cb06c6eb60f977c78299bdaba2a541b56e70462e;p=karo-tx-linux.git Merge branch 'v4.1-next/dt-samsung' into for-next Conflicts: Documentation/devicetree/bindings/arm/exynos/power_domain.txt --- cb06c6eb60f977c78299bdaba2a541b56e70462e diff --cc Documentation/devicetree/bindings/arm/exynos/power_domain.txt index 1e097037349c,c47e79be4605..5da38c5ed476 --- a/Documentation/devicetree/bindings/arm/exynos/power_domain.txt +++ b/Documentation/devicetree/bindings/arm/exynos/power_domain.txt @@@ -22,8 -22,9 +22,11 @@@ Optional Properties - pclkN, clkN: Pairs of parent of input clock and input clock to the devices in this power domain. Maximum of 4 pairs (N = 0 to 3) are supported currently. + - asbN: Clocks required by asynchronous bridges (ASB) present in + the power domain. These clock should be enabled during power + domain on/off operations. +- power-domains: phandle pointing to the parent power domain, for more details + see Documentation/devicetree/bindings/power/power_domain.txt Node of a device using power domains must have a power-domains property defined with a phandle to respective power domain.