diff options
| author | Kevin Hilman <khilman@linaro.org> | 2013-10-17 15:05:07 -0700 |
|---|---|---|
| committer | Kevin Hilman <khilman@linaro.org> | 2013-10-17 15:05:15 -0700 |
| commit | 0d481d4187d05b253374bda9e146fa3bc17a9244 (patch) | |
| tree | 5775d9734fe8cde9a20a0a3e44f162449589120c /Documentation | |
| parent | 7bc13d78c647979abd6632d95fefd0b353122b0c (diff) | |
| parent | d7f5baeedbdb48d4f5bb2b4f6f56f32b7f2f7aff (diff) | |
| download | linux-0d481d4187d05b253374bda9e146fa3bc17a9244.tar.bz2 | |
Merge tag 'soc-3.13-2' of git://git.infradead.org/linux-mvebu into next/soc
From Jason Cooper:
mvebu soc changes for v3.13 (round 2)
- kirkwood
- remove mbus init, pcie clk init
- retain MAC addr for DT ethernet (work around broken IP)
- docs: clarify Armada SoCs
* tag 'soc-3.13-2' of git://git.infradead.org/linux-mvebu:
Documentation: arm/Marvell: clarify Armada SoCs that match 78xx0 pattern
ARM: kirkwood: retain MAC address for DT ethernet
ARM: kirkwood: Remove unneeded PCIe clock adding
ARM: kirkwood: Remove unneeded MBus initialization
ARM: kirkwood: Add standby support
Signed-off-by: Kevin Hilman <khilman@linaro.org>
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/arm/Marvell/README | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Documentation/arm/Marvell/README b/Documentation/arm/Marvell/README index 8f08a86e03b7..da0151db9964 100644 --- a/Documentation/arm/Marvell/README +++ b/Documentation/arm/Marvell/README @@ -88,6 +88,7 @@ EBU Armada family MV78230 MV78260 MV78460 + NOTE: not to be confused with the non-SMP 78xx0 SoCs Product Brief: http://www.marvell.com/embedded-processors/armada-xp/assets/Marvell-ArmadaXP-SoC-product%20brief.pdf No public datasheet available. |