3.0.11 backport 11b8fc6ae54bf18a48c94e181c37ca135b858b42 is broken, please revert

[Koen Kooi]

Hi,

I noticed that audio stopped working after 3.0.10 which I narrowed down to:

11b8fc6ae54bf18a48c94e181c37ca135b858b42 mfd: Fix twl4030 dependencies for audio codec

The commit message has this bit:

"In commit 57fe7251f5bfc4332f24479376de48a1e8ca6211
the CONFIG_TWL4030_CODEC was renamed
into CONFIG_MFD_TWL4030_AUDIO, thatswhy the codec
was not detected."

Which is this one: http://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=commit;h=57fe7251f5bfc4332f24479376de48a1e8ca6211

Note the 4th of July date

koen@dominion:/OE/tentacle/build/tmp-angstrom_2010_x-eglibc/work/beagleboard-angstrom-linux-gnueabi/linux-3.0.12-r113a/git/drivers/mfd$ git log --oneline Kconfig
8509e14 mfd: Add Makefile and Kconfig Entries for tps65911 comparator
66c500f mfd: Fix build breakage caused by tps65910 gpio directory move
83545d8 GPIO: TPS65910: Move driver to drivers/gpio/
c01e36d linux-next: build failure after merge of the voltage tree
aec519b linux-next: build failure after merge of the voltage tree
27c6750 MFD: TPS65910: Add new mfd device for TPS65910
c013f0a mfd: Add pm8xxx irq support
cbdb53e mfd: Add Qualcomm PMIC 8921 core driver
1305134 mfd: Group NXP PCF50633* drivers together
37df003 mfd: Group TPSxxxxx power management chips together
8317797 mfd: add DB5500 PRCMU driver
650c2a2 mach-ux500: move the DB8500 PRCMU driver to MFD

Let's look at the top commit:

koen@dominion:/OE/tentacle/build/tmp-angstrom_2010_x-eglibc/work/beagleboard-angstrom-linux-gnueabi/linux-3.0.12-r113a/git/drivers/mfd$ git show 8509e14
commit 8509e142567d69e170a184ecf27d7a6a3239fd72
Author: Axel Lin <axel.lin@xxxxxxxxx>
Date:   Thu Jun 23 10:15:51 2011 +0800

So the commit that is referenced is not actually in 3.0.x! Long story short:

git revert 11b8fc6ae54bf18a48c94e181c37ca135b858b42 is broken ; make ; scp uImage beagleboard

root@beagleboard:~# cat /proc/asound/cards 
0 [omap3beagle    ]:  - omap3beagle
                     omap3beagle

So please revert  11b8fc6ae54bf18a48c94e181c37ca135b858b42 for 3.0.13, cherrypicking the TWL codec rename is a world of hurt since it needs other fixes to get pulled in as well.

regards,

Koen

Attachment: signature.asc
Description: Message signed with OpenPGP using GPGMail