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 21:37:21 +0400
committerRussell King <rmk+kernel@arm.linux.org.uk>2012-01-20 21:37:21 +0400
commit216f63c41cac9f9f8f181fc19be399293c8c934e (patch)
tree32b793de24f008d79403ac504e27e239767c8932 /arch/arm/mach-sa1100/collie.c
parentdcd6c92267155e70a94b3927bce681ce74b80d1f (diff)
downloadlinux-216f63c41cac9f9f8f181fc19be399293c8c934e.tar.xz
Revert "ARM: sa1100: Refactor mcp-sa11x0 to use platform resources."
This reverts commit af9081ae64b941d32239b947882cd59ba855c5db. This revert is necessary to revert 5dd7bf59e0e8563265b3e5b33276099ef628fcc7.
Diffstat (limited to 'arch/arm/mach-sa1100/collie.c')
-rw-r--r--arch/arm/mach-sa1100/collie.c10
1 files changed, 0 insertions, 10 deletions
diff --git a/arch/arm/mach-sa1100/collie.c b/arch/arm/mach-sa1100/collie.c
index c483912d08af..6b7c74b304cf 100644
--- a/arch/arm/mach-sa1100/collie.c
+++ b/arch/arm/mach-sa1100/collie.c
@@ -357,16 +357,6 @@ static void __init collie_init(void)
sa11x0_register_mtd(&collie_flash_data, collie_flash_resources,
ARRAY_SIZE(collie_flash_resources));
-
- /*
- * Setup the PPC unit correctly.
- */
- PPDR &= ~PPC_RXD4;
- PPDR |= PPC_TXD4 | PPC_SCLK | PPC_SFRM;
- PSDR |= PPC_RXD4;
- PSDR &= ~(PPC_TXD4 | PPC_SCLK | PPC_SFRM);
- PPSR &= ~(PPC_TXD4 | PPC_SCLK | PPC_SFRM);
-
sa11x0_register_mcp(&collie_mcp_data);
sharpsl_save_param();