diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-20 18:38:58 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-20 18:38:58 +0100 |
| commit | 65f2e753f1eb09d3a7e2a0d16408a5433b4097b2 (patch) | |
| tree | 100066fa2d26930a490ee10bb191957f3b3e2df3 /arch/arm/mach-sa1100/lart.c | |
| parent | Revert "ARM: sa1100: Refactor mcp-sa11x0 to use platform resources." (diff) | |
| download | linux-65f2e753f1eb09d3a7e2a0d16408a5433b4097b2.tar.xz linux-65f2e753f1eb09d3a7e2a0d16408a5433b4097b2.zip | |
Revert "ARM: sa11x0: Implement autoloading of codec and codec pdata for mcp bus."
This reverts commit 5dd7bf59e0e8563265b3e5b33276099ef628fcc7.
Conflicts:
scripts/mod/file2alias.c
This change is wrong on many levels. First and foremost, it causes a
regression. On boot on Assabet, which this patch gives a codec id of
'ucb1x00', it gives:
ucb1x00 ID not found: 1005
0x1005 is a valid ID for the UCB1300 device.
Secondly, this patch is way over the top in terms of complexity. The
only device which has been seen to be connected with this MCP code is
the UCB1x00 (UCB1200, UCB1300 etc) devices, and they all use the same
driver. Adding a match table, requiring the codec string to match the
hardware ID read out of the ID register, etc is completely over the top
when we can just read the hardware ID register.
Diffstat (limited to 'arch/arm/mach-sa1100/lart.c')
| -rw-r--r-- | arch/arm/mach-sa1100/lart.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mach-sa1100/lart.c b/arch/arm/mach-sa1100/lart.c index 48a8f4ef0fcd..af4e2761f3db 100644 --- a/arch/arm/mach-sa1100/lart.c +++ b/arch/arm/mach-sa1100/lart.c @@ -24,7 +24,6 @@ static struct mcp_plat_data lart_mcp_data = { .mccr0 = MCCR0_ADM, .sclk_rate = 11981000, - .codec = "ucb1x00", }; static void __init lart_init(void) |