From mboxrd@z Thu Jan 1 00:00:00 1970 From: Lee Jones Subject: Re: [PATCH 5/6] ARM: ux500: Ensure probing of Audio devices when Device Tree is enabled Date: Wed, 01 Aug 2012 08:34:06 +0100 Message-ID: <5018DBEE.9090203@linaro.org> References: <1343741493-17671-1-git-send-email-lee.jones@linaro.org> <1343741493-17671-11-git-send-email-lee.jones@linaro.org> <201207312054.13818.arnd@arndb.de> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8"; Format="flowed" Content-Transfer-Encoding: base64 Return-path: Received: from mail-ey0-f179.google.com (mail-ey0-f179.google.com [209.85.215.179]) by alsa0.perex.cz (Postfix) with ESMTP id AE735265357 for ; Wed, 1 Aug 2012 09:34:06 +0200 (CEST) Received: by eaaa13 with SMTP id a13so1301815eaa.38 for ; Wed, 01 Aug 2012 00:34:08 -0700 (PDT) In-Reply-To: <201207312054.13818.arnd@arndb.de> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org To: Arnd Bergmann 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 List-Id: alsa-devel@alsa-project.org T24gMzEvMDcvMTIgMjE6NTQsIEFybmQgQmVyZ21hbm4gd3JvdGU6Cj4gT24gVHVlc2RheSAzMSBK dWx5IDIwMTIsIExlZSBKb25lcyB3cm90ZToKPj4gZGlmZiAtLWdpdCBhL2FyY2gvYXJtL21hY2gt dXg1MDAvYm9hcmQtbW9wNTAwLmMgYi9hcmNoL2FybS9tYWNoLXV4NTAwL2JvYXJkLW1vcDUwMC5j Cj4+IGluZGV4IGU2NDEwMDMuLjg3YTVjZDcgMTAwNjQ0Cj4+IC0tLSBhL2FyY2gvYXJtL21hY2gt dXg1MDAvYm9hcmQtbW9wNTAwLmMKPj4gKysrIGIvYXJjaC9hcm0vbWFjaC11eDUwMC9ib2FyZC1t b3A1MDAuYwo+PiBAQCAtNzk0LDYgKzc5NCw3IEBAIHN0YXRpYyB2b2lkIF9faW5pdCB1ODUwMF9p bml0X21hY2hpbmUodm9pZCkKPj4gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgQVJS QVlfU0laRShtb3A1MDBfcGxhdGZvcm1fZGV2cykpOwo+Pgo+PiAgICAgICAgICAgICAgICAgIG1v cDUwMF9zZGlfaW5pdChwYXJlbnQpOwo+PiArICAgICAgICAgICAgICAgbW9wNTAwX21zcF9pbml0 KHBhcmVudCk7Cj4+ICAgICAgICAgICAgICAgICAgaTJjMF9kZXZzID0gQVJSQVlfU0laRShtb3A1 MDBfaTJjMF9kZXZpY2VzKTsKPj4gICAgICAgICAgICAgICAgICBpMmNfcmVnaXN0ZXJfYm9hcmRf aW5mbygwLCBtb3A1MDBfaTJjMF9kZXZpY2VzLCBpMmMwX2RldnMpOwo+PiAgICAgICAgICAgICAg ICAgIGkyY19yZWdpc3Rlcl9ib2FyZF9pbmZvKDIsIG1vcDUwMF9pMmMyX2RldmljZXMsCj4+IEBA IC04MDEsNiArODAyLDggQEAgc3RhdGljIHZvaWQgX19pbml0IHU4NTAwX2luaXRfbWFjaGluZSh2 b2lkKQo+Pgo+PiAgICAgICAgICAgICAgICAgIG1vcDUwMF91aWJfaW5pdCgpOwo+Pgo+PiArICAg ICAgIH0gZWxzZSBpZiAob2ZfbWFjaGluZV9pc19jb21wYXRpYmxlKCJjYWxhb3N5c3RlbXMsc25v d2JhbGwtYTk1MDAiKSkgewo+PiArICAgICAgICAgICAgICAgbW9wNTAwX29mX21zcF9pbml0KHBh cmVudCk7Cj4+ICAgICAgICAgIH0gZWxzZSBpZiAob2ZfbWFjaGluZV9pc19jb21wYXRpYmxlKCJz dC1lcmljc3NvbixocmVmdjYwKyIpKSB7Cj4+ICAgICAgICAgICAgICAgICAgLyoKPj4gICAgICAg ICAgICAgICAgICAgKiBUaGUgSFJFRnY2MCBib2FyZCByZW1vdmVkIGEgR1BJTyBleHBhbmRlciBh bmQgcm91dGVkCj4+IEBAIC04MTIsNiArODE1LDcgQEAgc3RhdGljIHZvaWQgX19pbml0IHU4NTAw X2luaXRfbWFjaGluZSh2b2lkKQo+PiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBB UlJBWV9TSVpFKG1vcDUwMF9wbGF0Zm9ybV9kZXZzKSk7Cj4+Cj4+ICAgICAgICAgICAgICAgICAg aHJlZnY2MF9zZGlfaW5pdChwYXJlbnQpOwo+PiArICAgICAgICAgICAgICAgbW9wNTAwX21zcF9p bml0KHBhcmVudCk7Cj4+Cj4+ICAgICAgICAgICAgICAgICAgaTJjMF9kZXZzID0gQVJSQVlfU0la RShtb3A1MDBfaTJjMF9kZXZpY2VzKTsKPj4gICAgICAgICAgICAgICAgICBpMmMwX2RldnMgLT0g TlVNX1BSRV9WNjBfSTJDMF9ERVZJQ0VTOwo+Cj4KPiBMb29rcyBsaWtlIHlvdSdyZSBhZGRpbmcg dGhlIHNhbWUgY2FsbCB0byBlYWNoIG9mIHRoZSB0aHJlZSBjYXNlczoKPiBtb3A1MDAsIHNub3di YWxsIGFuZCBocmVmdjYwKy4gSG93IGFib3V0IG1vdmluZyBpdCBiZWZvcmUgb3IgYWZ0ZXIKPiB0 aGUgaWYvZWxzZWlmIGJsb2NrPwoKVGhlIFNub3diYWxsIG9uZSBpcyBkaWZmZXJlbnQgJ21vcDUw MF9tc3BfaW5pdCcgLT4gJ21vcDUwMF9vZl9tc3BfaW5pdCcuCgotLSAKTGVlIEpvbmVzCkxpbmFy byBTVC1Fcmljc3NvbiBMYW5kaW5nIFRlYW0gTGVhZApMaW5hcm8ub3JnIOKUgiBPcGVuIHNvdXJj ZSBzb2Z0d2FyZSBmb3IgQVJNIFNvQ3MKRm9sbG93IExpbmFybzogRmFjZWJvb2sgfCBUd2l0dGVy IHwgQmxvZwpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpB bHNhLWRldmVsIG1haWxpbmcgbGlzdApBbHNhLWRldmVsQGFsc2EtcHJvamVjdC5vcmcKaHR0cDov L21haWxtYW4uYWxzYS1wcm9qZWN0Lm9yZy9tYWlsbWFuL2xpc3RpbmZvL2Fsc2EtZGV2ZWwK From mboxrd@z Thu Jan 1 00:00:00 1970 From: lee.jones@linaro.org (Lee Jones) Date: Wed, 01 Aug 2012 08:34:06 +0100 Subject: [PATCH 5/6] ARM: ux500: Ensure probing of Audio devices when Device Tree is enabled In-Reply-To: <201207312054.13818.arnd@arndb.de> References: <1343741493-17671-1-git-send-email-lee.jones@linaro.org> <1343741493-17671-11-git-send-email-lee.jones@linaro.org> <201207312054.13818.arnd@arndb.de> Message-ID: <5018DBEE.9090203@linaro.org> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On 31/07/12 21:54, Arnd Bergmann wrote: > 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? The Snowball one is different 'mop500_msp_init' -> 'mop500_of_msp_init'. -- Lee Jones Linaro ST-Ericsson Landing Team Lead Linaro.org ? Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754660Ab2HAHeO (ORCPT ); Wed, 1 Aug 2012 03:34:14 -0400 Received: from mail-ey0-f174.google.com ([209.85.215.174]:34079 "EHLO mail-ey0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754523Ab2HAHeM (ORCPT ); Wed, 1 Aug 2012 03:34:12 -0400 Message-ID: <5018DBEE.9090203@linaro.org> Date: Wed, 01 Aug 2012 08:34:06 +0100 From: Lee Jones User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:14.0) Gecko/20120714 Thunderbird/14.0 MIME-Version: 1.0 To: Arnd Bergmann 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 5/6] ARM: ux500: Ensure probing of Audio devices when Device Tree is enabled References: <1343741493-17671-1-git-send-email-lee.jones@linaro.org> <1343741493-17671-11-git-send-email-lee.jones@linaro.org> <201207312054.13818.arnd@arndb.de> In-Reply-To: <201207312054.13818.arnd@arndb.de> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 31/07/12 21:54, Arnd Bergmann wrote: > 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? The Snowball one is different 'mop500_msp_init' -> 'mop500_of_msp_init'. -- Lee Jones Linaro ST-Ericsson Landing Team Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog