diff options
| author | Olof Johansson <olof@lixom.net> | 2014-05-26 13:41:02 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2014-05-26 13:41:02 -0700 |
| commit | e469d6ba0ac0b75f6cd762fc497d35dec0d11fc2 (patch) | |
| tree | bf074f49dc211119e50a9b0ea20b7aae83ce3e03 /Documentation/arm | |
| parent | 2ca602de42863436cce275dde35c22496344d539 (diff) | |
| parent | 03dac26a831c51e544dc95ba12ea9e3520829e7e (diff) | |
| download | linux-e469d6ba0ac0b75f6cd762fc497d35dec0d11fc2.tar.gz linux-e469d6ba0ac0b75f6cd762fc497d35dec0d11fc2.tar.bz2 linux-e469d6ba0ac0b75f6cd762fc497d35dec0d11fc2.zip | |
Merge tag 'berlin-soc-3.16' of https://github.com/shesselba/linux-berlin into next/soc
Merge "ARM: berlin: SoC changes for v3.16" from Sebastian Hesselbart:
Despite relatively young Berlin SoC support, we already have support
for a BG2Q SoC provided by Alexandre Belloni and Antoine Tenart. Also,
we gained support for DW gpio and a pinctrl driver.
* tag 'berlin-soc-3.16' of https://github.com/shesselba/linux-berlin:
ARM: berlin: add the pinctrl dependency for the Marvell Berlin SoCs
ARM: berlin: add the LIBGPIO as a dependency for the BG2Q
ARM: berlin: add MACH_BERLIN_BG2Q symbol
ARM: berlin: add Marvell Armada 1500 pro to Marvell doc
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'Documentation/arm')
| -rw-r--r-- | Documentation/arm/Marvell/README | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Documentation/arm/Marvell/README b/Documentation/arm/Marvell/README index 963ec445e15a..2cce5401e323 100644 --- a/Documentation/arm/Marvell/README +++ b/Documentation/arm/Marvell/README @@ -234,6 +234,11 @@ Berlin family (Digital Entertainment) Core: Marvell PJ4B (ARMv7), Tauros3 L2CC Homepage: http://www.marvell.com/digital-entertainment/armada-1500/ Product Brief: http://www.marvell.com/digital-entertainment/armada-1500/assets/Marvell-ARMADA-1500-Product-Brief.pdf + 88DE3114, Armada 1500 Pro + Design name: BG2-Q + Core: Quad Core ARM Cortex-A9, PL310 L2CC + Homepage: http://www.marvell.com/digital-entertainment/armada-1500-pro/ + Product Brief: http://www.marvell.com/digital-entertainment/armada-1500-pro/assets/Marvell_ARMADA_1500_PRO-01_product_brief.pdf 88DE???? Design name: BG3 Core: ARM Cortex-A15, CA15 integrated L2CC |