From mboxrd@z Thu Jan 1 00:00:00 1970 From: eric@eukrea.com (=?UTF-8?q?Eric=20B=C3=A9nard?=) Date: Tue, 13 Dec 2011 07:31:42 +0100 Subject: [PATCH 10/19] wm1133-ev1: only register when running on the right machine In-Reply-To: <1323757911-25217-1-git-send-email-eric@eukrea.com> References: <1323757911-25217-1-git-send-email-eric@eukrea.com> Message-ID: <1323757911-25217-10-git-send-email-eric@eukrea.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org without this fix, a kernel compiled with mx3_defconfig and running on a cpuimx35sd leads to : asoc: tlv320aic23-hifi <-> imx-ssi.0 mapping ok ------------[ cut here ]------------ WARNING: at fs/sysfs/dir.c:481 sysfs_add_one+0x88/0xb0() sysfs: cannot create duplicate filename '/devices/platform/soc-audio' Modules linked in: [] (unwind_backtrace+0x0/0xf0) from [] (warn_slowpath_common+0x4c/0x64) [] (warn_slowpath_common+0x4c/0x64) from [] (warn_slowpath_fmt+0x30/0x40) [] (warn_slowpath_fmt+0x30/0x40) from [] (sysfs_add_one+0x88/0xb0) [] (sysfs_add_one+0x88/0xb0) from [] (create_dir+0x60/0xb8) [] (create_dir+0x60/0xb8) from [] (sysfs_create_dir+0x80/0xc8) [] (sysfs_create_dir+0x80/0xc8) from [] (kobject_add_internal+0xac/0x1d0) [] (kobject_add_internal+0xac/0x1d0) from [] (kobject_add+0x50/0x98) [] (kobject_add+0x50/0x98) from [] (device_add+0xb0/0x5fc) [] (device_add+0xb0/0x5fc) from [] (platform_device_add+0xfc/0x238) [] (platform_device_add+0xfc/0x238) from [] (wm1133_ev1_audio_init+0x58/0x80) [] (wm1133_ev1_audio_init+0x58/0x80) from [] (do_one_initcall+0x34/0x17c) [] (do_one_initcall+0x34/0x17c) from [] (kernel_init+0x78/0x11c) [] (kernel_init+0x78/0x11c) from [] (kernel_thread_exit+0x0/0x8) ---[ end trace 4453d8d40de9f5ff ]--- kobject_add_internal failed for soc-audio with -EEXIST, don't try to register things with the same name in the same directory. [] (unwind_backtrace+0x0/0xf0) from [] (kobject_add_internal+0x1b8/0x1d0) [] (kobject_add_internal+0x1b8/0x1d0) from [] (kobject_add+0x50/0x98) [] (kobject_add+0x50/0x98) from [] (device_add+0xb0/0x5fc) [] (device_add+0xb0/0x5fc) from [] (platform_device_add+0xfc/0x238) [] (platform_device_add+0xfc/0x238) from [] (wm1133_ev1_audio_init+0x58/0x80) [] (wm1133_ev1_audio_init+0x58/0x80) from [] (do_one_initcall+0x34/0x17c) [] (do_one_initcall+0x34/0x17c) from [] (kernel_init+0x78/0x11c) [] (kernel_init+0x78/0x11c) from [] (kernel_thread_exit+0x0/0x8) Signed-off-by: Eric B?nard Cc: Liam Girdwood Cc: Mark Brown Cc: alsa-devel at alsa-project.org --- sound/soc/imx/wm1133-ev1.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/sound/soc/imx/wm1133-ev1.c b/sound/soc/imx/wm1133-ev1.c index 490a126..147ae69 100644 --- a/sound/soc/imx/wm1133-ev1.c +++ b/sound/soc/imx/wm1133-ev1.c @@ -20,6 +20,7 @@ #include #include #include +#include #include @@ -266,6 +267,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 | -- 1.7.6.4