diff options
| author | Olof Johansson <olof@lixom.net> | 2015-01-21 15:23:24 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2015-01-21 15:23:24 -0800 |
| commit | a62d351dc54543513bdae5ff5dd679f6bffde632 (patch) | |
| tree | 199052df89f330a4cc6e08d18910eb780b03d7b2 /Documentation/devicetree/bindings/arm | |
| parent | 7f09a46fe9e0d5cb68a16c50f06e11600830b340 (diff) | |
| parent | dd548cf910809d2fb4429b42b899673bec1f3095 (diff) | |
| download | talos-obmc-linux-a62d351dc54543513bdae5ff5dd679f6bffde632.tar.gz talos-obmc-linux-a62d351dc54543513bdae5ff5dd679f6bffde632.zip | |
Merge tag 'sti-soc-for-v3.20-1' of git://git.stlinux.com/devel/kernel/linux-sti into next/soc
Merge "ARM: STi: SoC changes for v3.20, round 1" from Maxime Coquelin:
Highlights:
-----------
- Add support for STiH418 SoC
* tag 'sti-soc-for-v3.20-1' of git://git.stlinux.com/devel/kernel/linux-sti:
ARM: STi: Add STiH418 SoC support
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'Documentation/devicetree/bindings/arm')
| -rw-r--r-- | Documentation/devicetree/bindings/arm/sti.txt | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/arm/sti.txt b/Documentation/devicetree/bindings/arm/sti.txt index 92f16c78bb69..d70ec358736c 100644 --- a/Documentation/devicetree/bindings/arm/sti.txt +++ b/Documentation/devicetree/bindings/arm/sti.txt @@ -13,3 +13,7 @@ Boards with the ST STiH407 SoC shall have the following properties: Required root node property: compatible = "st,stih407"; +Boards with the ST STiH418 SoC shall have the following properties: +Required root node property: +compatible = "st,stih418"; + |
