diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-26 21:06:54 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-26 21:06:54 +0000 |
| commit | 9a95b9e7416c2e7fa799e54078a1adf84a7ed0bf (patch) | |
| tree | 158cd337307a4a4e09a3fb5110f29ab0136bef6c /arch/arm/mach-sa1100/shannon.c | |
| parent | 4e7682d077d693e34a993ae7a2831b522930ebcb (diff) | |
| parent | 0af5e4c36e70cfd4ae96d3704a425c414f530f2a (diff) | |
Merge branch 'sa11x0-mcp-fixes' into fixes
Diffstat (limited to 'arch/arm/mach-sa1100/shannon.c')
| -rw-r--r-- | arch/arm/mach-sa1100/shannon.c | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/arch/arm/mach-sa1100/shannon.c b/arch/arm/mach-sa1100/shannon.c index 748d34435b3f..318b2b766a0b 100644 --- a/arch/arm/mach-sa1100/shannon.c +++ b/arch/arm/mach-sa1100/shannon.c @@ -55,22 +55,11 @@ static struct resource shannon_flash_resource = { static struct mcp_plat_data shannon_mcp_data = { .mccr0 = MCCR0_ADM, .sclk_rate = 11981000, - .codec = "ucb1x00", }; static void __init shannon_init(void) { sa11x0_register_mtd(&shannon_flash_data, &shannon_flash_resource, 1); - - /* - * 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(&shannon_mcp_data); } |