summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-sa1100/lart.c
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2012-01-26 22:06:54 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2012-01-26 22:06:54 +0100
commit9a95b9e7416c2e7fa799e54078a1adf84a7ed0bf (patch)
tree158cd337307a4a4e09a3fb5110f29ab0136bef6c /arch/arm/mach-sa1100/lart.c
parentARM: 7301/1: Rename the T() macro to TUSER() to avoid namespace conflicts (diff)
parentMFD: ucb1x00-ts: fix resume failure (diff)
downloadlinux-9a95b9e7416c2e7fa799e54078a1adf84a7ed0bf.tar.xz
linux-9a95b9e7416c2e7fa799e54078a1adf84a7ed0bf.zip
Merge branch 'sa11x0-mcp-fixes' into fixes
Diffstat (limited to 'arch/arm/mach-sa1100/lart.c')
-rw-r--r--arch/arm/mach-sa1100/lart.c10
1 files changed, 0 insertions, 10 deletions
diff --git a/arch/arm/mach-sa1100/lart.c b/arch/arm/mach-sa1100/lart.c
index d117ceab6215..af4e2761f3db 100644
--- a/arch/arm/mach-sa1100/lart.c
+++ b/arch/arm/mach-sa1100/lart.c
@@ -24,20 +24,10 @@
static struct mcp_plat_data lart_mcp_data = {
.mccr0 = MCCR0_ADM,
.sclk_rate = 11981000,
- .codec = "ucb1x00",
};
static void __init lart_init(void)
{
- /*
- * 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(&lart_mcp_data);
}