]> git.baikalelectronics.ru Git - kernel.git/commit
Revert "ARM: sa11x0: Implement autoloading of codec and codec pdata for mcp bus."
authorRussell King <rmk+kernel@arm.linux.org.uk>
Fri, 20 Jan 2012 17:38:58 +0000 (17:38 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Fri, 20 Jan 2012 17:38:58 +0000 (17:38 +0000)
commit1fe60fff3b65e13fd543dc55297bda195f71fada
tree100066fa2d26930a490ee10bb191957f3b3e2df3
parent5d16f437107ac1dbb8772cb3bed6ea6d214f4e34
Revert "ARM: sa11x0: Implement autoloading of codec and codec pdata for mcp bus."

This reverts commit e084cfc2ee4270502cd0f6145a04b5bc8a9b0216.

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.
15 files changed:
arch/arm/mach-sa1100/assabet.c
arch/arm/mach-sa1100/cerf.c
arch/arm/mach-sa1100/collie.c
arch/arm/mach-sa1100/include/mach/mcp.h
arch/arm/mach-sa1100/lart.c
arch/arm/mach-sa1100/shannon.c
arch/arm/mach-sa1100/simpad.c
drivers/mfd/mcp-core.c
drivers/mfd/mcp-sa11x0.c
drivers/mfd/ucb1x00-core.c
drivers/mfd/ucb1x00-ts.c
include/linux/mfd/mcp.h
include/linux/mfd/ucb1x00.h
include/linux/mod_devicetable.h
scripts/mod/file2alias.c