diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-20 12:37:21 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-20 12:37:21 -0500 |
| commit | 216f63c41cac9f9f8f181fc19be399293c8c934e (patch) | |
| tree | 32b793de24f008d79403ac504e27e239767c8932 /arch/arm/mach-sa1100/collie.c | |
| parent | dcd6c92267155e70a94b3927bce681ce74b80d1f (diff) | |
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.c | 10 |
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) | |||
| 357 | 357 | ||
| 358 | sa11x0_register_mtd(&collie_flash_data, collie_flash_resources, | 358 | sa11x0_register_mtd(&collie_flash_data, collie_flash_resources, |
| 359 | ARRAY_SIZE(collie_flash_resources)); | 359 | ARRAY_SIZE(collie_flash_resources)); |
| 360 | |||
| 361 | /* | ||
| 362 | * Setup the PPC unit correctly. | ||
| 363 | */ | ||
| 364 | PPDR &= ~PPC_RXD4; | ||
| 365 | PPDR |= PPC_TXD4 | PPC_SCLK | PPC_SFRM; | ||
| 366 | PSDR |= PPC_RXD4; | ||
| 367 | PSDR &= ~(PPC_TXD4 | PPC_SCLK | PPC_SFRM); | ||
| 368 | PPSR &= ~(PPC_TXD4 | PPC_SCLK | PPC_SFRM); | ||
| 369 | |||
| 370 | sa11x0_register_mcp(&collie_mcp_data); | 360 | sa11x0_register_mcp(&collie_mcp_data); |
| 371 | 361 | ||
| 372 | sharpsl_save_param(); | 362 | sharpsl_save_param(); |