diff options
author | Arnd Bergmann <arnd@arndb.de> | 2014-02-25 12:34:42 -0500 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2014-02-25 12:34:42 -0500 |
commit | 88dbede1da891a20b8499568122d29471c76b3b0 (patch) | |
tree | 8030ece8c13b21a63bdfda141bb2701d60415512 /Documentation/arm | |
parent | 4a70931bd1b9370291e757bb2989431805f0bc41 (diff) | |
parent | bc81526f379c78607e042ec15ebbe7e04c9950d5 (diff) |
Merge tag 'mvebu-soc-3xx-3.15' of git://git.infradead.org/linux-mvebu into next/soc
Merge "mvebu new SoCs for v3.15" from Jason Cooper:
- mvebu
- initial support for Armada 375, 380, and 385
Depends:
- tags/mvebu-soc-3.15 (resolves delete/rename hidden conflict)
* tag 'mvebu-soc-3xx-3.15' of git://git.infradead.org/linux-mvebu:
Documentation: arm: update Marvell documentation about Armada 375/38x
ARM: mvebu: add initial support for the Armada 380/385 SOCs
ARM: mvebu: add workaround for data abort issue on Armada 375
ARM: mvebu: add initial support for the Armada 375 SOCs
ARM: mvebu: add Armada 375 support to the system-controller driver
ARM: mvebu: make CPU_PJ4B selection a per-SoC choice
ARM: mvebu: rename DT machine structure for Armada 370/XP
ARM: mvebu: rename armada-370-xp.c to board-v7.c
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'Documentation/arm')
-rw-r--r-- | Documentation/arm/Marvell/README | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/Documentation/arm/Marvell/README b/Documentation/arm/Marvell/README index 5a930c1528ad..963ec445e15a 100644 --- a/Documentation/arm/Marvell/README +++ b/Documentation/arm/Marvell/README | |||
@@ -83,14 +83,24 @@ EBU Armada family | |||
83 | 88F6710 | 83 | 88F6710 |
84 | 88F6707 | 84 | 88F6707 |
85 | 88F6W11 | 85 | 88F6W11 |
86 | Product Brief: http://www.marvell.com/embedded-processors/armada-300/assets/Marvell_ARMADA_370_SoC.pdf | ||
87 | |||
88 | Armada 375 Flavors: | ||
89 | 88F6720 | ||
90 | Product Brief: http://www.marvell.com/embedded-processors/armada-300/assets/ARMADA_375_SoC-01_product_brief.pdf | ||
91 | |||
92 | Armada 380/385 Flavors: | ||
93 | 88F6810 | ||
94 | 88F6820 | ||
95 | 88F6828 | ||
86 | 96 | ||
87 | Armada XP Flavors: | 97 | Armada XP Flavors: |
88 | MV78230 | 98 | MV78230 |
89 | MV78260 | 99 | MV78260 |
90 | MV78460 | 100 | MV78460 |
91 | NOTE: not to be confused with the non-SMP 78xx0 SoCs | 101 | NOTE: not to be confused with the non-SMP 78xx0 SoCs |
102 | Product Brief: http://www.marvell.com/embedded-processors/armada-xp/assets/Marvell-ArmadaXP-SoC-product%20brief.pdf | ||
92 | 103 | ||
93 | Product Brief: http://www.marvell.com/embedded-processors/armada-xp/assets/Marvell-ArmadaXP-SoC-product%20brief.pdf | ||
94 | No public datasheet available. | 104 | No public datasheet available. |
95 | 105 | ||
96 | Core: Sheeva ARMv7 compatible | 106 | Core: Sheeva ARMv7 compatible |