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: 10317 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 83A9B23E23 for ; Fri, 27 Jul 2012 12:46:17 +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 52F39A1853E for ; Fri, 27 Jul 2012 12:46:17 +0000 (UTC) Received: by mail-gg0-f180.google.com with SMTP id f1so3108301ggn.11 for ; Fri, 27 Jul 2012 05:46:17 -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=Z2h3eZ5yFWd4vm8TSJWjvEMh/XMQE3HkfoNI8p6zLiU=; b=FEb/3WWHrdLfCH9m+F9speygbpi0ox/DZQ/whDh7QEUzm8KQ7n0BX36/I9LgaH5VsW xL7U0/vmXsChF0/p/FzkdDVEWXmojaHF9Bee78ofaVOe2l00pkP5Xhk2M4OKTva5MMk7 ewg+U/f0Dm3l2t6QQ9kResRo8pQ+b5DSZDYZnOSGRuQdQDNhvq3CfZxieTKjkJl6jqc3 T1fB+FvDclaVHCWh1IJvbdZhALkw6qVchglcwuOJ3bciyWIhOKHnYj//ZgAT2v9Q6F8o EDIXcxEgjXdYS+wMY2nCoXzRMvimNYxmyvKqrJCqvC9wdE70L2tdB5Y1mm034TEHagry jMkw== Received: by 10.50.209.73 with SMTP id mk9mr1721327igc.66.1343393176661; Fri, 27 Jul 2012 05:46:16 -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 bs3csp29841icc; Fri, 27 Jul 2012 05:46:15 -0700 (PDT) Received: by 10.180.19.169 with SMTP id g9mr21968967wie.9.1343393175066; Fri, 27 Jul 2012 05:46:15 -0700 (PDT) Received: from mail-we0-f178.google.com (mail-we0-f178.google.com [74.125.82.178]) by mx.google.com with ESMTPS id i4si6684588wiv.45.2012.07.27.05.46.14 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 27 Jul 2012 05:46:15 -0700 (PDT) Received-SPF: neutral (google.com: 74.125.82.178 is neither permitted nor denied by best guess record for domain of lee.jones@linaro.org) client-ip=74.125.82.178; Authentication-Results: mx.google.com; spf=neutral (google.com: 74.125.82.178 is neither permitted nor denied by best guess record for domain of lee.jones@linaro.org) smtp.mail=lee.jones@linaro.org Received: by weyu7 with SMTP id u7so2422355wey.37 for ; Fri, 27 Jul 2012 05:46:14 -0700 (PDT) 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 Cc: STEricsson_nomadik_linux@list.st.com, linus.walleij@stericsson.com, arnd@arndb.de, olalilja@yahoo.se, ola.o.lilja@stericsson.com, alsa-devel@alsa-project.org, lrg@ti.com, broonie@opensource.wolfsonmicro.com, Lee Jones 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: ALoCoQnWPylcZ7CLK8ax20PEPQ6NtsCe1pmu/krUR5BJ+0gq4+uDhb1yV1JHeffg9nQflFJo+8yb 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,