diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2018-10-01 16:02:56 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2018-10-02 12:05:18 +0200 |
| commit | 7ab78d02cae7963da9abefa15464b53adf04bc64 (patch) | |
| tree | 4a6c0c2becf67cf12b6f256392ed250d809a82a3 /Documentation | |
| parent | 1c15f655d160cce3779a4c7a5862407a90e0313f (diff) | |
| parent | 40ad192f9e88d1376320399e49b9d978b56a9477 (diff) | |
| download | linux-stable-7ab78d02cae7963da9abefa15464b53adf04bc64.tar.gz linux-stable-7ab78d02cae7963da9abefa15464b53adf04bc64.tar.bz2 linux-stable-7ab78d02cae7963da9abefa15464b53adf04bc64.zip | |
Merge tag 'mvebu-soc-4.20-1' of git://git.infradead.org/linux-mvebu into next/soc
mvebu soc for 4.20 (part 1)
- use dt_fixup to provide fallback for enable-method for Armada XP
- document the marvell,prestera compatible string
- update Thomas Petazzoni email in MAINTAINERS file
* tag 'mvebu-soc-4.20-1' of git://git.infradead.org/linux-mvebu:
dt-bindings: marvell,prestera: Add common compatible string
MAINTAINERS: replace free-electrons.com by bootlin.com for Thomas Petazzoni
ARM: mvebu: use dt_fixup to provide fallback for enable-method
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/devicetree/bindings/net/marvell,prestera.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/devicetree/bindings/net/marvell,prestera.txt b/Documentation/devicetree/bindings/net/marvell,prestera.txt index c329608fa887..83370ebf5b89 100644 --- a/Documentation/devicetree/bindings/net/marvell,prestera.txt +++ b/Documentation/devicetree/bindings/net/marvell,prestera.txt @@ -2,7 +2,7 @@ Marvell Prestera Switch Chip bindings ------------------------------------- Required properties: -- compatible: one of the following +- compatible: must be "marvell,prestera" and one of the following "marvell,prestera-98dx3236", "marvell,prestera-98dx3336", "marvell,prestera-98dx4251", @@ -21,7 +21,7 @@ switch { ranges = <0 MBUS_ID(0x03, 0x00) 0 0x100000>; packet-processor@0 { - compatible = "marvell,prestera-98dx3236"; + compatible = "marvell,prestera-98dx3236", "marvell,prestera"; reg = <0 0x4000000>; interrupts = <33>, <34>, <35>; dfx = <&dfx>; |