summaryrefslogtreecommitdiff
path: root/arch/arm/mach-sa1100/collie.c
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2012-01-20 22:24:07 +0000
committerRussell King <rmk+kernel@arm.linux.org.uk>2012-02-03 17:38:02 +0000
commite36e26a8b761d1a601e284e2b5d8aff84de3b756 (patch)
tree45b13e9d5363036576fdefaeca5681db5a08cb1d /arch/arm/mach-sa1100/collie.c
parent7658e7f9a8122b0678e4b4280308560aa5444bd5 (diff)
MFD: mcp-sa11x0: move setup of PPC unit out of mcp-sa11x0.c
Patch taken from af9081ae64 (ARM: sa1100: Refactor mcp-sa11x0 to use platform resources.) by Jochen Friedrich <jochen@scram.de>, and consolidated to use a common function. Move the setup of the PPC unit out of mcp-sa11x0 into the core SA11x0 code, and call it from each platforms initialization file. This centralizes the setup of the PPC unit while not polluting the mcp-sa11x0 driver with these details. Acked-by: Jochen Friedrich <jochen@scram.de> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-sa1100/collie.c')
-rw-r--r--arch/arm/mach-sa1100/collie.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-sa1100/collie.c b/arch/arm/mach-sa1100/collie.c
index b9060e236def..efa2bc132cbf 100644
--- a/arch/arm/mach-sa1100/collie.c
+++ b/arch/arm/mach-sa1100/collie.c
@@ -341,6 +341,8 @@ static void __init collie_init(void)
GPSR |= _COLLIE_GPIO_UCB1x00_RESET;
+ sa11x0_ppc_configure_mcp();
+
platform_scoop_config = &collie_pcmcia_config;