Revert "ASoC: wm8994: Ensure there are enough BCLKs for four channels"

This reverts commit 3b6ae1807d29f8cacd63fddf513110f9308b4c8e.
Revert "ARM: OMAP2+: OPP: Fix to ensure check of right oppdef after bad one"

This reverts commit c3d6a03a5702fb0971109d235dd3c74a5bd08248.

Conflicts:
	arch/arm/mach-omap2/opp.c