diff options
| author | Olof Johansson | 2014-05-30 21:21:10 -0700 |
|---|---|---|
| committer | Olof Johansson | 2014-05-30 21:21:10 -0700 |
| commit | 0f16aa3c24a216d14d7f0587e1cbd2c1b51a38f3 (patch) | |
| tree | d42e6c228e730cac0e530c0266f29926a6a171a9 /Documentation/devicetree/bindings | |
| parent | bb195016513513c78954678c22d30a4b2d4a6b1f (diff) | |
| parent | 345e9bf08276395bd6620dfab56d1b679136d2ce (diff) | |
Merge tag 'samsung-dt-3' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/dt
Merge "Samsung 3rd DT updates for v3.16" from Kukjin Kim:
- add dts files support for new SoCs
: exynos3250 SoC
: exynos5260 SoC and exynos5260-xyref5260 board
: exynos5410 SoC and exynos5410-smdk5410 board
: exynos5800 SoC and exynos5800-peach-pi board
- exynos4210-origen and exynos4412-origen
: enable RTC and WDT nodes
: use key code macros
- exynos5250-arndale
: use key code macros
- exynos5420-arndale-octa
: add secure firmware support
- exynos5440
: update watchdog node name
* tag 'samsung-dt-3' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
ARM: dts: add secure firmware support for exynos5420-arndale-octa
ARM: dts: add pmu sysreg node to exynos3250
ARM: dts: correct the usb phy node in exynos5800-peach-pi
ARM: dts: correct the usb phy node in exynos5420-peach-pit
ARM: dts: add dts files for exynos5410 and exynos5410-smdk5410
ARM: dts: add dts files for exynos3250 SoC
ARM: dts: add mfc node for exynos5800
ARM: dts: add Vbus regulator for USB 3.0 on exynos5800-peach-pi
ARM: dts: enable fimd for exynos5800-peach-pi
ARM: dts: enable display controller for exynos5800-peach-pi
ARM: dts: enable hdmi for exynos5800-peach-pi
ARM: dts: add dts file for exynos5800-peach-pi board
ARM: dts: add dts file for exynos5800 SoC
ARM: dts: add dts file for exynos5260-xyref5260 board
ARM: dts: add dts files for exynos5260 SoC
ARM: dts: update watchdog node name in exynos5440
ARM: dts: use key code macros on Origen and Arndale boards
ARM: dts: enable RTC and WDT nodes on Origen boards
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'Documentation/devicetree/bindings')
| -rw-r--r-- | Documentation/devicetree/bindings/arm/samsung/pmu.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/arm/samsung/pmu.txt b/Documentation/devicetree/bindings/arm/samsung/pmu.txt index b562634db746..2a4ab046a8a1 100644 --- a/Documentation/devicetree/bindings/arm/samsung/pmu.txt +++ b/Documentation/devicetree/bindings/arm/samsung/pmu.txt @@ -2,6 +2,7 @@ SAMSUNG Exynos SoC series PMU Registers Properties: - compatible : should contain two values. First value must be one from following list: + - "samsung,exynos3250-pmu" - for Exynos3250 SoC, - "samsung,exynos4210-pmu" - for Exynos4210 SoC, - "samsung,exynos4212-pmu" - for Exynos4212 SoC, - "samsung,exynos4412-pmu" - for Exynos4412 SoC, |