From patchwork Fri Jul 27 12:45:48 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 1249541 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork1.kernel.org (Postfix) with ESMTP id B9DDE3FD48 for ; Fri, 27 Jul 2012 13:05:41 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1Suk9P-0004Wf-Ij; Fri, 27 Jul 2012 13:00:17 +0000 Received: from mail-we0-f177.google.com ([74.125.82.177]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1Sujvw-0001xp-Np for linux-arm-kernel@lists.infradead.org; Fri, 27 Jul 2012 12:46:21 +0000 Received: by weyr3 with SMTP id r3so2254319wey.36 for ; Fri, 27 Jul 2012 05:46:14 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :x-gm-message-state; bh=Z2h3eZ5yFWd4vm8TSJWjvEMh/XMQE3HkfoNI8p6zLiU=; b=bGYoAb373fVEZ91RtG+bzHcnWikhtMq6QguPUJLEc3IkTk715eMKWhxqOMZDHuBv5R eVYDarPzFDWveN/EctdezlByr/aj8PUw7PgnPAxA71Vp92YmIdRQG+Fj9Hs8xg4rDUSD w3aioRsWzgKxZU/VpGq3A4iHGAXnqed4AeSqE7wBWXea+PNvQ18cQntbk8VlAxLoo6X9 p25+9fRIWFs0YT7ZPFUO1Xv4SNY3YFSW/zs/V386fWwVAB2njdc4usNiel28PPMB/3nW 6xZnhzgcNgfQ4sWI9OrVnt3c3mS+bZrE1RoZF6FEUrux5YJ9rok3+CPgwJJaCMbLVarW I+qw== Received: by 10.216.234.231 with SMTP id s81mr1364601weq.34.1343393174442; Fri, 27 Jul 2012 05:46:14 -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 dc3sm12342025wib.7.2012.07.27.05.46.12 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 27 Jul 2012 05:46:13 -0700 (PDT) From: Lee Jones To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 04/18] ASoC: Ux500: Enable ux500 PCM driver for Device Tree Date: Fri, 27 Jul 2012 13:45:48 +0100 Message-Id: <1343393162-11938-5-git-send-email-lee.jones@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1343393162-11938-1-git-send-email-lee.jones@linaro.org> References: <1343393162-11938-1-git-send-email-lee.jones@linaro.org> X-Gm-Message-State: ALoCoQlc5ii6Hpj6joQ1xV8zY+35+yUZZ/Jbl4Tl58kMz29FEdV7FNW0T2EgbfZlZ3WZNCB5GUFT X-Spam-Note: CRM114 invocation failed X-Spam-Note: SpamAssassin invocation failed Cc: ola.o.lilja@stericsson.com, alsa-devel@alsa-project.org, linus.walleij@stericsson.com, arnd@arndb.de, broonie@opensource.wolfsonmicro.com, olalilja@yahoo.se, STEricsson_nomadik_linux@list.st.com, Lee Jones , lrg@ti.com X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org This simple patch ensures the PCM driver will be probed during boot-up when Device Tree is enabled. Signed-off-by: Lee Jones --- sound/soc/ux500/ux500_pcm.c | 6 ++++++ 1 file changed, 6 insertions(+) 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,