From mboxrd@z Thu Jan  1 00:00:00 1970
From: Linus Walleij <linus.walleij@linaro.org>
Subject: Re: linux-next: build failure after merge of the sound-asoc tree
Date: Thu, 10 May 2012 10:30:50 +0200
Message-ID: <CACRpkdYsHXnWHvBw6Pt1atvwKP6KYjfu-PwQnL_L7-yW1-4_FA@mail.gmail.com>
References: <20120510143329.4cef3cd78ce5ea55416b1d93@canb.auug.org.au>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Return-path: <linux-next-owner@vger.kernel.org>
Received: from mail-yx0-f174.google.com ([209.85.213.174]:37864 "EHLO
	mail-yx0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1753715Ab2EJIav (ORCPT
	<rfc822;linux-next@vger.kernel.org>); Thu, 10 May 2012 04:30:51 -0400
Received: by yenm10 with SMTP id m10so1195529yen.19
        for <linux-next@vger.kernel.org>; Thu, 10 May 2012 01:30:51 -0700 (PDT)
In-Reply-To: <20120510143329.4cef3cd78ce5ea55416b1d93@canb.auug.org.au>
Sender: linux-next-owner@vger.kernel.org
List-ID: <linux-next.vger.kernel.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>, Mark Brown <broonie@opensource.wolfsonmicro.com>, Ola Lilja <ola.o.lilja@stericsson.com>
Cc: Liam Girdwood <lrg@ti.com>, linux-next@vger.kernel.org, linux-kernel@vger.kernel.org

On Thu, May 10, 2012 at 6:33 AM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:

> After merging the sound-asoc tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> In file included from sound/soc/ux500/ux500_msp_dai.c:21:0:
> include/linux/mfd/dbx500-prcmu.h:614:19: error: redefinition of 'prcmu_abb_read'
> include/linux/mfd/db8500-prcmu.h:673:19: note: previous definition of 'prcmu_abb_read' was here
> include/linux/mfd/dbx500-prcmu.h:619:19: error: redefinition of 'prcmu_abb_write'
> include/linux/mfd/db8500-prcmu.h:678:19: note: previous definition of 'prcmu_abb_write' was here
> include/linux/mfd/dbx500-prcmu.h:630:19: error: redefinition of 'prcmu_config_clkout'
> include/linux/mfd/db8500-prcmu.h:643:19: note: previous definition of 'prcmu_config_clkout' was here
> include/linux/mfd/dbx500-prcmu.h:692:20: error: redefinition of 'prcmu_ac_wake_req'
> include/linux/mfd/db8500-prcmu.h:683:20: note: previous definition of 'prcmu_ac_wake_req' was here
> include/linux/mfd/dbx500-prcmu.h:694:20: error: redefinition of 'prcmu_ac_sleep_req'
> include/linux/mfd/db8500-prcmu.h:685:20: note: previous definition of 'prcmu_ac_sleep_req' was here
> sound/soc/ux500/ux500_msp_dai.c:23:27: fatal error: mach/hardware.h: No such file or directory
> sound/soc/ux500/ux500_msp_i2s.c:21:27: fatal error: mach/hardware.h: No such file or directory
>
> Possibly caused by commit 3592b7f69a54 ("ASoC: Ux500: Add MSP I2S-driver").
>
> I have used the version of the sound-asoc tree from next-20120508 for today.

The PRCMU driver is only available on the UX500 platforms so building
on x86_64 does not make sense.

Ola/Mark: a simple patch like this should solve the issue I think?

diff --git a/sound/soc/ux500/Kconfig b/sound/soc/ux500/Kconfig
index 9b0ae4e..f454f06 100644
--- a/sound/soc/ux500/Kconfig
+++ b/sound/soc/ux500/Kconfig
@@ -4,6 +4,7 @@
 menuconfig SND_SOC_UX500
        tristate "SoC Audio support for Ux500 platform"
        depends on SND_SOC
+       depends on MFD_DB8500_PRCMU
        help
                Say Y if you want to enable ASoC-support for
                any of the Ux500 platforms (e.g. U8500).


But it seems it has a wider dependency on some MOP500 board
stuff being merged first, which is more of a problem I think, part
of that is pending in the Ux500 tree.

Yours,
Linus Walleij