From patchwork Thu Aug 9 15:47:39 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 10633 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 652AB23E02 for ; Thu, 9 Aug 2012 15:48:32 +0000 (UTC) Received: from mail-gg0-f180.google.com (mail-gg0-f180.google.com [209.85.161.180]) by fiordland.canonical.com (Postfix) with ESMTP id 33BD4A18440 for ; Thu, 9 Aug 2012 15:48:32 +0000 (UTC) Received: by mail-gg0-f180.google.com with SMTP id f1so585844ggn.11 for ; Thu, 09 Aug 2012 08:48:32 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf:from:to:cc :subject:date:message-id:x-mailer:in-reply-to:references :x-gm-message-state; bh=50o0l6mEvBziiuQ5utoUomeFDTMveaN05rNUmfIJH68=; b=APv3M18KtHAzOd6OQD1o26aXQ5ihGm/Y60R0WDe431Ho4pRPBRWn/5ejqHUW9ScXj7 7j/nu0Of7e7SYanV7ebcl5ntNHAeOLJnB+dF6LW2mHxxFkUaF3MVchO2pchtT441GUVW NzoUix5tiAwH+qrf0xNBXOFdvCvQQif/c03L/pwbpR5+C6Vlln2b+3S9Q3vvBaJktLIM txog2CwTSpfdDWniqSpmkfsPXDFCjcxpzQBmN477nnXu/+z0guGTgcY84vsTHlQUPDVj snvyay38zwLD72ahWtzyG8OoX+ut4V88iXKKlQNPP3xftN4k2AhuQLDxVgrqud9tXtti RqQg== Received: by 10.50.186.131 with SMTP id fk3mr1580289igc.31.1344527311620; Thu, 09 Aug 2012 08:48:31 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.50.184.200 with SMTP id ew8csp15261igc; Thu, 9 Aug 2012 08:48:30 -0700 (PDT) Received: by 10.216.85.130 with SMTP id u2mr11236931wee.202.1344527310256; Thu, 09 Aug 2012 08:48:30 -0700 (PDT) Received: from mail-wi0-f172.google.com (mail-wi0-f172.google.com [209.85.212.172]) by mx.google.com with ESMTPS id c35si2005758wec.3.2012.08.09.08.48.29 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 09 Aug 2012 08:48:30 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.212.172 is neither permitted nor denied by best guess record for domain of lee.jones@linaro.org) client-ip=209.85.212.172; Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.212.172 is neither permitted nor denied by best guess record for domain of lee.jones@linaro.org) smtp.mail=lee.jones@linaro.org Received: by mail-wi0-f172.google.com with SMTP id hm11so380135wib.13 for ; Thu, 09 Aug 2012 08:48:29 -0700 (PDT) Received: by 10.180.20.11 with SMTP id j11mr3945743wie.12.1344527309738; Thu, 09 Aug 2012 08:48:29 -0700 (PDT) Received: from localhost.localdomain (cpc1-aztw13-0-0-cust473.18-1.cable.virginmedia.com. [77.102.241.218]) by mx.google.com with ESMTPS id q4sm2278954wix.9.2012.08.09.08.48.28 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 09 Aug 2012 08:48:29 -0700 (PDT) From: Lee Jones To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: STEricsson_nomadik_linux@list.st.com, linus.walleij@stericsson.com, arnd@arndb.de, broonie@opensource.wolfsonmicro.com, Lee Jones Subject: [PATCH 13/22] ARM: ux500: Fork MSP platform registration for step-by-step DT enablement Date: Thu, 9 Aug 2012 16:47:39 +0100 Message-Id: <1344527268-5964-14-git-send-email-lee.jones@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1344527268-5964-1-git-send-email-lee.jones@linaro.org> References: <1344527268-5964-1-git-send-email-lee.jones@linaro.org> X-Gm-Message-State: ALoCoQm1/Emz74f3g53fGV3bd9UntMvLkE6rzybcYW84AGSE2ZvQmsrp/AdHJYxmlDcKlBA0LXXE We've done this before and it worked well last time. Here we're duplicating a complex registration function to ease the process of enabling it for Device Tree. As there are quite a few steps taken during the registration process, it makes sense to break them up into more manageable chunks. This patch will aid us. Signed-off-by: Lee Jones --- arch/arm/mach-ux500/board-mop500-msp.c | 20 ++++++++++++++++++++ arch/arm/mach-ux500/board-mop500.c | 2 +- 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/arch/arm/mach-ux500/board-mop500-msp.c b/arch/arm/mach-ux500/board-mop500-msp.c index 1a67577..24a3604 100644 --- a/arch/arm/mach-ux500/board-mop500-msp.c +++ b/arch/arm/mach-ux500/board-mop500-msp.c @@ -172,6 +172,26 @@ static struct msp_i2s_platform_data msp3_platform_data = { .msp_i2s_dma_tx = NULL, }; +/* Due for removal once the MSP driver has been fully DT:ed. */ +void mop500_of_msp_init(struct device *parent) +{ + pr_info("%s: Register platform-device 'snd-soc-u8500'.\n", __func__); + 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, + &msp0_platform_data); + db8500_add_msp_i2s(parent, 1, U8500_MSP1_BASE, IRQ_DB8500_MSP1, + &msp1_platform_data); + db8500_add_msp_i2s(parent, 2, U8500_MSP2_BASE, IRQ_DB8500_MSP2, + &msp2_platform_data); + db8500_add_msp_i2s(parent, 3, U8500_MSP3_BASE, IRQ_DB8500_MSP1, + &msp3_platform_data); + + pr_info("%s: Register platform-device 'ux500-pcm'\n", __func__); + platform_device_register(&ux500_pcm); +} + void mop500_msp_init(struct device *parent) { pr_info("%s: Register platform-device 'snd-soc-mop500'.\n", __func__); diff --git a/arch/arm/mach-ux500/board-mop500.c b/arch/arm/mach-ux500/board-mop500.c index 11dd962..8f419b1 100644 --- a/arch/arm/mach-ux500/board-mop500.c +++ b/arch/arm/mach-ux500/board-mop500.c @@ -807,7 +807,7 @@ static void __init u8500_init_machine(void) mop500_uib_init(); } else if (of_machine_is_compatible("calaosystems,snowball-a9500")) { - mop500_msp_init(parent); + mop500_of_msp_init(parent); } else if (of_machine_is_compatible("st-ericsson,hrefv60+")) { /* * The HREFv60 board removed a GPIO expander and routed