diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2018-09-28 13:36:27 +0300 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2018-09-28 13:37:18 +0300 |
| commit | 262c083d13286ab7fd2d0cf3c5c2a4407a8fe918 (patch) | |
| tree | ba32bd61a6bbc78d4067970661b3d4f191f67b25 /Documentation | |
| parent | f3b1859bcfe222236780df40030a45dc0b5bff17 (diff) | |
| parent | 087682f5a75bec349cdcb34c29384a051587aa99 (diff) | |
| download | linux-262c083d13286ab7fd2d0cf3c5c2a4407a8fe918.tar.xz | |
Merge tag 'berlin64-dt-for-v4.20' of git://git.kernel.org/pub/scm/linux/kernel/git/jszhang/linux-berlin into next/dt
Berlin64 DT changes for v4.20
* tag 'berlin64-dt-for-v4.20' of git://git.kernel.org/pub/scm/linux/kernel/git/jszhang/linux-berlin:
arm64: dts: synaptics: add dtsi file for Synaptics AS370 SoC
dt-bindings: arm: syna: add support for the AS370 SoC
dt-bindings: arm: move berlin binding documentation to syna.txt
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/devicetree/bindings/arm/syna.txt (renamed from Documentation/devicetree/bindings/arm/marvell/marvell,berlin.txt) | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/Documentation/devicetree/bindings/arm/marvell/marvell,berlin.txt b/Documentation/devicetree/bindings/arm/syna.txt index 3bab18409b7a..2face46a5f64 100644 --- a/Documentation/devicetree/bindings/arm/marvell/marvell,berlin.txt +++ b/Documentation/devicetree/bindings/arm/syna.txt @@ -1,4 +1,9 @@ -Marvell Berlin SoC Family Device Tree Bindings +Synaptics SoC Device Tree Bindings + +According to https://www.synaptics.com/company/news/conexant-marvell +Synaptics has acquired the Multimedia Solutions Business of Marvell, so +berlin SoCs are now Synaptics' SoCs now. + --------------------------------------------------------------- Work in progress statement: @@ -13,6 +18,10 @@ stable binding/ABI. --------------------------------------------------------------- +Boards with the Synaptics AS370 SoC shall have the following properties: + Required root node property: + compatible: "syna,as370" + Boards with a SoC of the Marvell Berlin family, e.g. Armada 1500 shall have the following properties: |