From: arnd@arndb•de (Arnd Bergmann)
To: linux-arm-kernel@lists•infradead.org
Subject: [PATCH 5/6] ARM: ux500: Ensure probing of Audio devices when Device Tree is enabled
Date: Tue, 31 Jul 2012 20:54:13 +0000 [thread overview]
Message-ID: <201207312054.13818.arnd@arndb.de> (raw)
In-Reply-To: <1343741493-17671-11-git-send-email-lee.jones@linaro.org>
On Tuesday 31 July 2012, Lee Jones wrote:
> diff --git a/arch/arm/mach-ux500/board-mop500.c b/arch/arm/mach-ux500/board-mop500.c
> index e641003..87a5cd7 100644
> --- a/arch/arm/mach-ux500/board-mop500.c
> +++ b/arch/arm/mach-ux500/board-mop500.c
> @@ -794,6 +794,7 @@ static void __init u8500_init_machine(void)
> ARRAY_SIZE(mop500_platform_devs));
>
> mop500_sdi_init(parent);
> + mop500_msp_init(parent);
> i2c0_devs = ARRAY_SIZE(mop500_i2c0_devices);
> i2c_register_board_info(0, mop500_i2c0_devices, i2c0_devs);
> i2c_register_board_info(2, mop500_i2c2_devices,
> @@ -801,6 +802,8 @@ static void __init u8500_init_machine(void)
>
> mop500_uib_init();
>
> + } else if (of_machine_is_compatible("calaosystems,snowball-a9500")) {
> + mop500_of_msp_init(parent);
> } else if (of_machine_is_compatible("st-ericsson,hrefv60+")) {
> /*
> * The HREFv60 board removed a GPIO expander and routed
> @@ -812,6 +815,7 @@ static void __init u8500_init_machine(void)
> ARRAY_SIZE(mop500_platform_devs));
>
> hrefv60_sdi_init(parent);
> + mop500_msp_init(parent);
>
> i2c0_devs = ARRAY_SIZE(mop500_i2c0_devices);
> i2c0_devs -= NUM_PRE_V60_I2C0_DEVICES;
Looks like you're adding the same call to each of the three cases:
mop500, snowball and hrefv60+. How about moving it before or after
the if/elseif block?
Arnd
next prev parent reply other threads:[~2012-07-31 20:54 UTC|newest]
Thread overview: 54+ 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 ` [PATCH 1/6] ASoC: ab8500: Inform SoC Core that we have our own I/O arrangements 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:42 ` Mark Brown
2012-07-31 14:25 ` Lee Jones
2012-07-31 14:28 ` Mark Brown
2012-07-31 14:38 ` Lee Jones
2012-07-31 14:54 ` Mark Brown
2012-07-31 15:15 ` Lee Jones
2012-07-31 15:18 ` Mark Brown
2012-08-01 7:19 ` Lee Jones
2012-08-01 13:20 ` Mark Brown
2012-08-01 13:50 ` Lee Jones
2012-08-01 16:08 ` Mark Brown
2012-08-01 19:41 ` [alsa-devel] " Mark Brown
2012-08-02 7:45 ` Lee Jones
2012-08-02 17:56 ` Mark Brown
2012-08-03 8:30 ` Lee Jones
2012-08-04 0:48 ` Mark Brown
2012-08-02 5:58 ` Ola Lilja
2012-08-02 9:59 ` Mark Brown
2012-08-10 11:43 ` Linus Walleij
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 ` [PATCH 2/6] ASoC: ab8500: Inform SoC Core that we have our own I/O arrangements 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 16:46 ` Sergei Shtylyov
2012-08-01 7:37 ` 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-07-31 13:31 ` [PATCH 3/6] ARM: ux500: Remove unused snowball_of_platform_devs struct Lee Jones
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 ` [PATCH 4/6] ARM: ux500: Fix merge error, so such struct 'snd_soc_u8500' Lee Jones
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:56 ` Russell King - ARM Linux
2012-07-31 14:29 ` Lee Jones
2012-07-31 14:37 ` Russell King - ARM Linux
2012-07-31 20:50 ` Arnd Bergmann
2012-07-31 22:01 ` Russell King - ARM Linux
2012-08-01 7:56 ` Lee Jones
2012-08-01 8:41 ` Russell King - ARM Linux
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 20:54 ` Arnd Bergmann [this message]
2012-08-01 7:34 ` Lee Jones
2012-08-01 13:32 ` Arnd Bergmann
2012-08-01 13:55 ` Lee Jones
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 ` [PATCH 6/6] ASoC: Ux500: Move MSP pinctrl setup into the MSP driver 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 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=201207312054.13818.arnd@arndb.de \
--to=arnd@arndb$(echo .)de \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox