From: Arnd Bergmann <arnd@arndb.de>
To: Lee Jones <lee.jones@linaro.org>
Cc: linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org,
STEricsson_nomadik_linux@list.st.com,
linus.walleij@stericsson.com, olalilja@yahoo.se,
ola.o.lilja@stericsson.com, alsa-devel@alsa-project.org,
broonie@opensource.wolfsonmicro.com, lrg@ti.com
Subject: Re: [PATCH 4/6] ARM: ux500: Fix merge error, so such struct 'snd_soc_u8500'
Date: Tue, 31 Jul 2012 20:58:03 +0000 [thread overview]
Message-ID: <201207312058.03640.arnd@arndb.de> (raw)
In-Reply-To: <1343741493-17671-9-git-send-email-lee.jones@linaro.org>
On Tuesday 31 July 2012, Lee Jones wrote:
> arch/arm/mach-ux500/board-mop500-msp.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/arch/arm/mach-ux500/board-mop500-msp.c b/arch/arm/mach-ux500/board-mop500-msp.c
> index 9960480..1b6a193 100644
> --- a/arch/arm/mach-ux500/board-mop500-msp.c
> +++ b/arch/arm/mach-ux500/board-mop500-msp.c
> @@ -228,7 +228,7 @@ int mop500_msp_init(struct device *parent)
> struct platform_device *msp1;
>
> pr_info("%s: Register platform-device 'snd-soc-u8500'.\n", __func__);
> - platform_device_register(&snd_soc_u8500);
> + platform_device_register(&snd_soc_mop500);
>
> pr_info("Initialize MSP I2S-devices.\n");
> db8500_add_msp_i2s(parent, 0, U8500_MSP0_BASE, IRQ_DB8500_MSP0,
Against which tree is this? In upstream I only see the snd_soc_u8500 device,
not snd_soc_mop500.
Arnd
WARNING: multiple messages have this Message-ID (diff)
From: Arnd Bergmann <arnd@arndb.de>
To: Lee Jones <lee.jones@linaro.org>
Cc: ola.o.lilja@stericsson.com, alsa-devel@alsa-project.org,
linus.walleij@stericsson.com,
broonie@opensource.wolfsonmicro.com, olalilja@yahoo.se,
linux-kernel@vger.kernel.org,
STEricsson_nomadik_linux@list.st.com, lrg@ti.com,
linux-arm-kernel@lists.infradead.org
Subject: Re: [PATCH 4/6] ARM: ux500: Fix merge error, so such struct 'snd_soc_u8500'
Date: Tue, 31 Jul 2012 20:58:03 +0000 [thread overview]
Message-ID: <201207312058.03640.arnd@arndb.de> (raw)
In-Reply-To: <1343741493-17671-9-git-send-email-lee.jones@linaro.org>
On Tuesday 31 July 2012, Lee Jones wrote:
> arch/arm/mach-ux500/board-mop500-msp.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/arch/arm/mach-ux500/board-mop500-msp.c b/arch/arm/mach-ux500/board-mop500-msp.c
> index 9960480..1b6a193 100644
> --- a/arch/arm/mach-ux500/board-mop500-msp.c
> +++ b/arch/arm/mach-ux500/board-mop500-msp.c
> @@ -228,7 +228,7 @@ int mop500_msp_init(struct device *parent)
> struct platform_device *msp1;
>
> pr_info("%s: Register platform-device 'snd-soc-u8500'.\n", __func__);
> - platform_device_register(&snd_soc_u8500);
> + platform_device_register(&snd_soc_mop500);
>
> pr_info("Initialize MSP I2S-devices.\n");
> db8500_add_msp_i2s(parent, 0, U8500_MSP0_BASE, IRQ_DB8500_MSP0,
Against which tree is this? In upstream I only see the snd_soc_u8500 device,
not snd_soc_mop500.
Arnd
WARNING: multiple messages have this Message-ID (diff)
From: arnd@arndb.de (Arnd Bergmann)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 4/6] ARM: ux500: Fix merge error, so such struct 'snd_soc_u8500'
Date: Tue, 31 Jul 2012 20:58:03 +0000 [thread overview]
Message-ID: <201207312058.03640.arnd@arndb.de> (raw)
In-Reply-To: <1343741493-17671-9-git-send-email-lee.jones@linaro.org>
On Tuesday 31 July 2012, Lee Jones wrote:
> arch/arm/mach-ux500/board-mop500-msp.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/arch/arm/mach-ux500/board-mop500-msp.c b/arch/arm/mach-ux500/board-mop500-msp.c
> index 9960480..1b6a193 100644
> --- a/arch/arm/mach-ux500/board-mop500-msp.c
> +++ b/arch/arm/mach-ux500/board-mop500-msp.c
> @@ -228,7 +228,7 @@ int mop500_msp_init(struct device *parent)
> struct platform_device *msp1;
>
> pr_info("%s: Register platform-device 'snd-soc-u8500'.\n", __func__);
> - platform_device_register(&snd_soc_u8500);
> + platform_device_register(&snd_soc_mop500);
>
> pr_info("Initialize MSP I2S-devices.\n");
> db8500_add_msp_i2s(parent, 0, U8500_MSP0_BASE, IRQ_DB8500_MSP0,
Against which tree is this? In upstream I only see the snd_soc_u8500 device,
not snd_soc_mop500.
Arnd
next prev parent reply other threads:[~2012-07-31 20:58 UTC|newest]
Thread overview: 145+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-07-31 13:31 [PATCH 1/6] Bugfixes and clean-ups bound for the v3.6 RCs Lee Jones
2012-07-31 13:31 ` Lee Jones
2012-07-31 13:31 ` Lee Jones
2012-07-31 13:31 ` [PATCH 1/6] ASoC: ab8500: Inform SoC Core that we have our own I/O arrangements Lee Jones
2012-07-31 13:31 ` Lee Jones
2012-07-31 13:31 ` [PATCH 1/6] ASoC: dapm: If one widget fails, do not force all subsequent widgets to fail too Lee Jones
2012-07-31 13:31 ` Lee Jones
2012-07-31 13:31 ` Lee Jones
2012-07-31 13:42 ` Mark Brown
2012-07-31 13:42 ` Mark Brown
2012-07-31 14:25 ` Lee Jones
2012-07-31 14:25 ` Lee Jones
2012-07-31 14:25 ` Lee Jones
2012-07-31 14:28 ` Mark Brown
2012-07-31 14:28 ` Mark Brown
2012-07-31 14:28 ` Mark Brown
2012-07-31 14:38 ` Lee Jones
2012-07-31 14:38 ` Lee Jones
2012-07-31 14:38 ` Lee Jones
2012-07-31 14:54 ` Mark Brown
2012-07-31 14:54 ` Mark Brown
2012-07-31 14:54 ` Mark Brown
2012-07-31 15:15 ` Lee Jones
2012-07-31 15:15 ` Lee Jones
2012-07-31 15:15 ` Lee Jones
2012-07-31 15:18 ` Mark Brown
2012-07-31 15:18 ` Mark Brown
2012-07-31 15:18 ` Mark Brown
2012-08-01 7:19 ` Lee Jones
2012-08-01 7:19 ` Lee Jones
2012-08-01 7:19 ` Lee Jones
2012-08-01 13:20 ` Mark Brown
2012-08-01 13:20 ` Mark Brown
2012-08-01 13:20 ` Mark Brown
2012-08-01 13:50 ` Lee Jones
2012-08-01 13:50 ` Lee Jones
2012-08-01 16:08 ` Mark Brown
2012-08-01 16:08 ` Mark Brown
2012-08-01 16:08 ` Mark Brown
2012-08-01 19:41 ` [alsa-devel] " Mark Brown
2012-08-01 19:41 ` Mark Brown
2012-08-01 19:41 ` Mark Brown
2012-08-02 7:45 ` [alsa-devel] " Lee Jones
2012-08-02 7:45 ` Lee Jones
2012-08-02 17:56 ` Mark Brown
2012-08-02 17:56 ` Mark Brown
2012-08-02 17:56 ` Mark Brown
2012-08-03 8:30 ` [alsa-devel] " Lee Jones
2012-08-03 8:30 ` Lee Jones
2012-08-03 8:30 ` Lee Jones
2012-08-04 0:48 ` [alsa-devel] " Mark Brown
2012-08-04 0:48 ` Mark Brown
2012-08-04 0:48 ` Mark Brown
2012-08-02 5:58 ` Ola Lilja
2012-08-02 5:58 ` Ola Lilja
2012-08-02 5:58 ` Ola Lilja
2012-08-02 9:59 ` Mark Brown
2012-08-02 9:59 ` Mark Brown
2012-08-02 9:59 ` Mark Brown
2012-08-10 11:43 ` Linus Walleij
2012-08-10 11:43 ` Linus Walleij
2012-08-10 11:43 ` Linus Walleij
2012-08-02 12:21 ` Lee Jones
2012-08-02 12:21 ` Lee Jones
2012-08-02 12:21 ` Lee Jones
2012-07-31 13:31 ` [PATCH 2/6] ARM: ux500: Remove unused snowball_of_platform_devs struct Lee Jones
2012-07-31 13:31 ` Lee Jones
2012-07-31 13:31 ` [PATCH 2/6] ASoC: ab8500: Inform SoC Core that we have our own I/O arrangements Lee Jones
2012-07-31 13:31 ` Lee Jones
2012-07-31 13:31 ` Lee Jones
2012-07-31 13:31 ` [PATCH 3/6] ARM: ux500: Fix merge error, so such struct 'snd_soc_u8500' Lee Jones
2012-07-31 13:31 ` Lee Jones
2012-07-31 16:46 ` Sergei Shtylyov
2012-07-31 16:46 ` Sergei Shtylyov
2012-08-01 7:37 ` Lee Jones
2012-08-01 7:37 ` Lee Jones
2012-08-01 7:37 ` Lee Jones
2012-08-01 8:19 ` Lee Jones
2012-08-01 8:19 ` Lee Jones
2012-08-01 8:19 ` Lee Jones
2012-08-01 8:46 ` [PATCH 3/6 v2] ARM: ux500: Fix merge error, no matching driver name for, 'snd_soc_u8500' Lee Jones
2012-08-01 8:46 ` Lee Jones
2012-08-01 8:46 ` Lee Jones
2012-07-31 13:31 ` [PATCH 3/6] ARM: ux500: Remove unused snowball_of_platform_devs struct Lee Jones
2012-07-31 13:31 ` Lee Jones
2012-07-31 13:31 ` Lee Jones
2012-07-31 20:58 ` Arnd Bergmann
2012-07-31 20:58 ` Arnd Bergmann
2012-07-31 20:58 ` Arnd Bergmann
2012-07-31 13:31 ` [PATCH 4/6] ARM: ux500: Ensure probing of Audio devices when Device Tree is enabled Lee Jones
2012-07-31 13:31 ` Lee Jones
2012-07-31 13:31 ` [PATCH 4/6] ARM: ux500: Fix merge error, so such struct 'snd_soc_u8500' Lee Jones
2012-07-31 13:31 ` Lee Jones
2012-07-31 13:31 ` Lee Jones
2012-07-31 20:58 ` Arnd Bergmann [this message]
2012-07-31 20:58 ` Arnd Bergmann
2012-07-31 20:58 ` Arnd Bergmann
2012-07-31 13:31 ` [PATCH 5/6] ARM: ux500: Enable HIGHMEM on all mop500 platforms Lee Jones
2012-07-31 13:31 ` Lee Jones
2012-07-31 13:31 ` Lee Jones
2012-07-31 13:56 ` Russell King - ARM Linux
2012-07-31 13:56 ` Russell King - ARM Linux
2012-07-31 13:56 ` Russell King - ARM Linux
2012-07-31 14:29 ` Lee Jones
2012-07-31 14:29 ` Lee Jones
2012-07-31 14:29 ` Lee Jones
2012-07-31 14:37 ` Russell King - ARM Linux
2012-07-31 14:37 ` Russell King - ARM Linux
2012-07-31 14:37 ` Russell King - ARM Linux
2012-07-31 20:50 ` Arnd Bergmann
2012-07-31 20:50 ` Arnd Bergmann
2012-07-31 20:50 ` Arnd Bergmann
2012-07-31 22:01 ` Russell King - ARM Linux
2012-07-31 22:01 ` Russell King - ARM Linux
2012-08-01 7:56 ` Lee Jones
2012-08-01 7:56 ` Lee Jones
2012-08-01 7:56 ` Lee Jones
2012-08-01 8:41 ` Russell King - ARM Linux
2012-08-01 8:41 ` Russell King - ARM Linux
2012-08-01 8:48 ` Lee Jones
2012-08-01 8:48 ` Lee Jones
2012-07-31 13:31 ` [PATCH 5/6] ARM: ux500: Ensure probing of Audio devices when Device Tree is enabled Lee Jones
2012-07-31 13:31 ` Lee Jones
2012-07-31 20:54 ` Arnd Bergmann
2012-07-31 20:54 ` Arnd Bergmann
2012-08-01 7:34 ` Lee Jones
2012-08-01 7:34 ` Lee Jones
2012-08-01 7:34 ` Lee Jones
2012-08-01 13:32 ` Arnd Bergmann
2012-08-01 13:32 ` Arnd Bergmann
2012-08-01 13:32 ` Arnd Bergmann
2012-08-01 13:55 ` Lee Jones
2012-08-01 13:55 ` Lee Jones
2012-08-01 13:55 ` Lee Jones
2012-08-01 14:32 ` Arnd Bergmann
2012-08-01 14:32 ` Arnd Bergmann
2012-07-31 13:31 ` [PATCH 6/6] ARM: ux500: Enable HIGHMEM on all mop500 platforms Lee Jones
2012-07-31 13:31 ` Lee Jones
2012-07-31 13:31 ` [PATCH 6/6] ASoC: Ux500: Move MSP pinctrl setup into the MSP driver Lee Jones
2012-07-31 13:31 ` Lee Jones
2012-07-31 13:40 ` [PATCH 1/6] Bugfixes and clean-ups bound for the v3.6 RCs Mark Brown
2012-07-31 13:40 ` Mark Brown
2012-07-31 14:30 ` Lee Jones
2012-07-31 14:30 ` Lee Jones
2012-07-31 14:30 ` Lee Jones
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=201207312058.03640.arnd@arndb.de \
--to=arnd@arndb.de \
--cc=STEricsson_nomadik_linux@list.st.com \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@opensource.wolfsonmicro.com \
--cc=lee.jones@linaro.org \
--cc=linus.walleij@stericsson.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=lrg@ti.com \
--cc=ola.o.lilja@stericsson.com \
--cc=olalilja@yahoo.se \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.