On Sat, 3 Aug 2013 14:48:55 +0100 Russell King - ARM Linux linux@arm.linux.org.uk wrote:
On Wed, Jul 31, 2013 at 08:18:58AM +0200, Jean-Francois Moine wrote:
diff --git a/sound/soc/kirkwood/kirkwood-i2s.c b/sound/soc/kirkwood/kirkwood-i2s.c index 9844010..4f817a2 100644 --- a/sound/soc/kirkwood/kirkwood-i2s.c +++ b/sound/soc/kirkwood/kirkwood-i2s.c @@ -25,7 +25,7 @@
#include "kirkwood.h"
-#define DRV_NAME "kirkwood-i2s" +#define DRV_NAME "mvebu-pcm-audio"
This breaks non-DT users of this driver. The device in arch/arm/mach-kirkwood is left as "kirkwood-i2s" but the platform device is now called something different.
Oops, sorry, the patch to arch/arm/mach-kirkwood/common.c went away when I pulled the last kernel.
static struct of_device_id kirkwood_i2s_of_match[] = {
- { .compatible = "marvell,kirkwood-i2s" },
- { .compatible = "marvell,mvebu-pcm-audio" },
You've only just introduced "marvell,kirkwood-i2s" in the previous patch. Why introduce something and then immediately change its name? This makes no sense what so ever.
2 patches for 2 different purposes. The first one just adds the DT support. It is enough for DT based kernels. But some people wanted the device name to be changed to 'mvebu'. So, the second patch.