diff options
| author | Olof Johansson <olof@lixom.net> | 2015-01-19 10:57:35 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2015-01-19 10:57:35 -0800 |
| commit | e2a77c7ce479b871002410bd51a81e74c9f24260 (patch) | |
| tree | 3cd8710d838250138570fe6009876f9161c12236 /Documentation | |
| parent | 86d377dbb5d5fcea20879d16fb282b23f8726b9d (diff) | |
| parent | 7d76d03b9be8ea8977df45176336cc4fec6ac603 (diff) | |
| download | linux-e2a77c7ce479b871002410bd51a81e74c9f24260.tar.gz linux-e2a77c7ce479b871002410bd51a81e74c9f24260.tar.bz2 linux-e2a77c7ce479b871002410bd51a81e74c9f24260.zip | |
Merge tag 'atlas7-init-dts-for-3.20' of git://git.kernel.org/pub/scm/linux/kernel/git/baohua/linux into next/dt
Merge "CSR atlas7 init dts for 3.20" from Barry Song:
Drop Marco and add init dts stuff for Atlas7
CSR Marco SoC has never shipped to customers that could be interested
in mainline support. and new Atlas7 is a replacement SoC that is in
development.
So we drop Marco dts stuff, and add dts stuff for Atlas7.
* tag 'atlas7-init-dts-for-3.20' of git://git.kernel.org/pub/scm/linux/kernel/git/baohua/linux:
ARM: dts: add init dts file for CSR atlas7 SoC
ARM: dts: drop MARCO platform DT stuff
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/devicetree/bindings/arm/sirf.txt | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Documentation/devicetree/bindings/arm/sirf.txt b/Documentation/devicetree/bindings/arm/sirf.txt index c6ba6d3c747f..7b28ee6fee91 100644 --- a/Documentation/devicetree/bindings/arm/sirf.txt +++ b/Documentation/devicetree/bindings/arm/sirf.txt @@ -3,7 +3,9 @@ CSR SiRFprimaII and SiRFmarco device tree bindings. Required root node properties: - compatible: + - "sirf,atlas6-cb" : atlas6 "cb" evaluation board + - "sirf,atlas6" : atlas6 device based board + - "sirf,atlas7-cb" : atlas7 "cb" evaluation board + - "sirf,atlas7" : atlas7 device based board - "sirf,prima2-cb" : prima2 "cb" evaluation board - - "sirf,marco-cb" : marco "cb" evaluation board - "sirf,prima2" : prima2 device based board - - "sirf,marco" : marco device based board |