diff options
author | Olof Johansson <olof@lixom.net> | 2013-06-25 08:50:18 -0700 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2013-06-25 08:50:18 -0700 |
commit | cbe461f65427210fd0f2813d72383f66a46889f1 (patch) | |
tree | fae114aff1889ad38795c87f459d48962eebbc89 /Documentation | |
parent | e8f2ca97151892ab723dd8317313063cef79839d (diff) | |
parent | 983dbeb35f1543668b8f3b31a735bf2163f2b233 (diff) | |
download | blackbird-op-linux-cbe461f65427210fd0f2813d72383f66a46889f1.tar.gz blackbird-op-linux-cbe461f65427210fd0f2813d72383f66a46889f1.zip |
Merge tag 'soc-exynos5420-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/late
From Kukjin Kim, this adds pinctrl support for Exynos 5420.
* tag 'soc-exynos5420-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
pinctrl: exynos: add exynos5420 SoC specific data
ARM: dts: add pinctrl support to EXYNOS5420
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'Documentation')
-rw-r--r-- | Documentation/devicetree/bindings/pinctrl/samsung-pinctrl.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/pinctrl/samsung-pinctrl.txt b/Documentation/devicetree/bindings/pinctrl/samsung-pinctrl.txt index e15cfc4bb39e..4dee83746f5e 100644 --- a/Documentation/devicetree/bindings/pinctrl/samsung-pinctrl.txt +++ b/Documentation/devicetree/bindings/pinctrl/samsung-pinctrl.txt @@ -11,6 +11,7 @@ Required Properties: - "samsung,exynos4210-pinctrl": for Exynos4210 compatible pin-controller. - "samsung,exynos4x12-pinctrl": for Exynos4x12 compatible pin-controller. - "samsung,exynos5250-pinctrl": for Exynos5250 compatible pin-controller. + - "samsung,exynos5420-pinctrl": for Exynos5420 compatible pin-controller. - reg: Base address of the pin controller hardware module and length of the address space it occupies. |