From patchwork Thu Jul 26 10:28:50 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 10264 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 1802223E56 for ; Thu, 26 Jul 2012 10:29:42 +0000 (UTC) Received: from mail-yw0-f52.google.com (mail-yw0-f52.google.com [209.85.213.52]) by fiordland.canonical.com (Postfix) with ESMTP id D5964A18EF6 for ; Thu, 26 Jul 2012 10:29:41 +0000 (UTC) Received: by mail-yw0-f52.google.com with SMTP id p61so1778500yhp.11 for ; Thu, 26 Jul 2012 03:29:41 -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=182aEWcGSIEFOIblCwEO+LKJuAQ6MRO3OZccyvZUNao=; b=PESFCQtYQzuIvxBS2/B5kRuPJb1ewhssXEnk9c7z3zrvnAHf0QJ1wNwhFvBFNPWL6w DtwHAX6/vdrcCcrjK7nQxyCu37BVlMpZ4FqxNQT3Jdpq4tpGOt//xUxcaI3erEkXjERc 60Nol4Q+eBwLmTdN1bPbtuJ379irqDVOq/mmY60BJ8LRqdkjw5PkcOwJMI35F0ZJAhlX +kck1YwsxHGkSC/+u0nAdPz5muzUb+EGx3Pn2/+LTw1RQLYKIwdRuaoDqZGQgSRA4gP9 0ppmtiamDAuKDcOKbkgYdTm3SX9+xWE39Y+mjI+itM2lwitDM3i9kl/5qiguVYVETHhd 2Cmw== Received: by 10.50.182.229 with SMTP id eh5mr1187298igc.38.1343298581314; Thu, 26 Jul 2012 03:29:41 -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.43.93.3 with SMTP id bs3csp133399icc; Thu, 26 Jul 2012 03:29:40 -0700 (PDT) Received: by 10.180.83.234 with SMTP id t10mr14885131wiy.0.1343298580034; Thu, 26 Jul 2012 03:29:40 -0700 (PDT) Received: from mail-wg0-f50.google.com (mail-wg0-f50.google.com [74.125.82.50]) by mx.google.com with ESMTPS id b19si27884710wel.147.2012.07.26.03.29.39 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 26 Jul 2012 03:29:40 -0700 (PDT) Received-SPF: neutral (google.com: 74.125.82.50 is neither permitted nor denied by best guess record for domain of lee.jones@linaro.org) client-ip=74.125.82.50; Authentication-Results: mx.google.com; spf=neutral (google.com: 74.125.82.50 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-wg0-f50.google.com with SMTP id ds11so1580987wgb.31 for ; Thu, 26 Jul 2012 03:29:39 -0700 (PDT) Received: by 10.217.0.145 with SMTP id l17mr3182700wes.133.1343298579540; Thu, 26 Jul 2012 03:29:39 -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 fb20sm11559455wid.1.2012.07.26.03.29.38 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 26 Jul 2012 03:29:39 -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, sameo@linux.intel.com, olalilja@yahoo.se, ola.o.lilja@stericsson.com, alsa-devel@alsa-project.org, lrg@ti.com, Lee Jones Subject: [PATCH 17/21] ASoC: Ux500: Enable ux500 PCM driver for Device Tree Date: Thu, 26 Jul 2012 11:28:50 +0100 Message-Id: <1343298534-13611-18-git-send-email-lee.jones@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1343298534-13611-1-git-send-email-lee.jones@linaro.org> References: <1343298534-13611-1-git-send-email-lee.jones@linaro.org> X-Gm-Message-State: ALoCoQl4TK3dVx+TYpfQENIqoWzSa0P06b2pT8hEMVI1FgZ37Uv+B6hDmdwuce/UXh2gwTNzO9YZ Here we pass platform registration from platform code over to Device Tree, when DT is enabled. Signed-off-by: Lee Jones --- arch/arm/mach-ux500/board-mop500-msp.c | 3 --- sound/soc/ux500/ux500_pcm.c | 6 ++++++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/arch/arm/mach-ux500/board-mop500-msp.c b/arch/arm/mach-ux500/board-mop500-msp.c index ce7fff9..890feb3 100644 --- a/arch/arm/mach-ux500/board-mop500-msp.c +++ b/arch/arm/mach-ux500/board-mop500-msp.c @@ -257,9 +257,6 @@ void mop500_of_msp_init(struct device *parent) "could not get MSP1 idlestate\n"); } } - - pr_info("%s: Register platform-device 'ux500-pcm'\n", __func__); - platform_device_register(&ux500_pcm); } void mop500_msp_init(struct device *parent) diff --git a/sound/soc/ux500/ux500_pcm.c b/sound/soc/ux500/ux500_pcm.c index 1a04e24..557da2d 100644 --- a/sound/soc/ux500/ux500_pcm.c +++ b/sound/soc/ux500/ux500_pcm.c @@ -304,10 +304,16 @@ static int __devinit ux500_pcm_drv_remove(struct platform_device *pdev) return 0; } +static const struct of_device_id ux500_pcm_match[] = { + { .compatible = "stericsson,ux500-pcm", }, + {}, +}; + static struct platform_driver ux500_pcm_driver = { .driver = { .name = "ux500-pcm", .owner = THIS_MODULE, + .of_match_table = ux500_pcm_match, }, .probe = ux500_pcm_drv_probe,