Skip to contentSkip to conversation

wm1133-ev1: fix init for multimachine kernel

PATCH In review Eric Bénard 2 participants 4 messages Oct 21, 2010 – Oct 22, 2010

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 wm1133-ev1: fix init for multimachine kernel

when running a kernel built using mx3_defconfig, I get an error message
because wm1133-ev1 tries to alloc soc-audio even if not running on an
iMX31ads :
sysfs: cannot create duplicate filename '/devices/platform/soc-audio'
.../...
kobject_add_internal failed for soc-audio with -EEXIST, don't try to register things with the same name in the same directory.

This patch fix this problem.

Cc Liam Girdwood <[email protected]>
Cc Mark Brown <[email protected]>
---
 sound/soc/imx/wm1133-ev1.c |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)
sound/soc/imx/wm1133-ev1.c +5 -0
index a6e7d94..ef37440 100644
@@ -20,6 +20,7 @@
 #include <sound/pcm_params.h>
 #include <sound/soc.h>
 #include <sound/soc-dapm.h>
+#include <asm/mach-types.h>
 
 #include <mach/audmux.h>
 
@@ -269,6 +270,10 @@ static int __init wm1133_ev1_audio_init(void)
 	int ret;
 	unsigned int ptcr, pdcr;
 
+	if (!machine_is_mx31ads())
+		/* return happy. We might run on a totally different machine */
+		return 0;
+
 	/* SSI0 mastered by port 5 */
 	ptcr = MXC_AUDMUX_V2_PTCR_SYN |
 		MXC_AUDMUX_V2_PTCR_TFSDIR |
Signature · 6 lines
1.7.0.4

_______________________________________________
Alsa-devel mailing list
[email protected]
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
#1 lore raw

sound/soc/imx/wm1133-ev1.c static int __init wm1133_ev1_audio_init(void) · line 276

Quoted 4 lines · Eric Bénard
sound/soc/imx/wm1133-ev1.c +4 -0
+	if (!machine_is_mx31ads())
+		/* return happy. We might run on a totally different machine */
+		return 0;
+

This is not a sufficient check, we may be running on an mx31ads with a different PMIC module.

#2 lore raw

Hi Mark,

Quoted 9 lines · Mark Brown

sound/soc/imx/wm1133-ev1.c static int __init wm1133_ev1_audio_init(void) · line 276

Quoted 4 lines · Eric Bénard
sound/soc/imx/wm1133-ev1.c +4 -0
+	if (!machine_is_mx31ads())
+		/* return happy. We might run on a totally different machine */
+		return 0;
+

This is not a sufficient check, we may be running on an mx31ads with a different PMIC module.

in which case the current code would also fail ;-)

I don't have such a board but actual code triggers the error log when running the kernel on my board so I'm open to your suggestion for a better fix.

Thanks,
Eric

#3 lore raw
Quoted 11 lines · Eric Bénard
Quoted 4 lines · Mark Brown

On Thu, Oct 21, 2010 at 11:35:15PM +0200, Eric Bénard wrote:

This is not a sufficient check, we may be running on an mx31ads with a different PMIC module.

in which case the current code would also fail ;-)

I don't have such a board but actual code triggers the error log when running the kernel on my board so I'm open to your suggestion for a better fix.

Without adding machine fit checks it's always going to fail; machine type isn't quite enough. What we should be doing here is using the multi-component work to allow us to replace soc-audio devices with devices named for the machine driver (which is all round better anyway). I'll try to look at this for .38.