diff options
| author | Kevin Hilman <khilman@linaro.org> | 2013-10-18 02:05:07 +0400 |
|---|---|---|
| committer | Kevin Hilman <khilman@linaro.org> | 2013-10-18 02:05:15 +0400 |
| commit | 0d481d4187d05b253374bda9e146fa3bc17a9244 (patch) | |
| tree | 5775d9734fe8cde9a20a0a3e44f162449589120c /arch/arm/mach-kirkwood/include | |
| parent | 7bc13d78c647979abd6632d95fefd0b353122b0c (diff) | |
| parent | d7f5baeedbdb48d4f5bb2b4f6f56f32b7f2f7aff (diff) | |
| download | linux-0d481d4187d05b253374bda9e146fa3bc17a9244.tar.xz | |
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 'arch/arm/mach-kirkwood/include')
| -rw-r--r-- | arch/arm/mach-kirkwood/include/mach/bridge-regs.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-kirkwood/include/mach/bridge-regs.h b/arch/arm/mach-kirkwood/include/mach/bridge-regs.h index 91242c944d7a..8b9d1c9ff199 100644 --- a/arch/arm/mach-kirkwood/include/mach/bridge-regs.h +++ b/arch/arm/mach-kirkwood/include/mach/bridge-regs.h @@ -78,4 +78,6 @@ #define CGC_TDM (1 << 20) #define CGC_RESERVED (0x6 << 21) +#define MEMORY_PM_CTRL (BRIDGE_VIRT_BASE + 0x118) + #endif |