From patchwork Wed Nov 6 10:16:21 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 3146281 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 6A8C9BEEB2 for ; Wed, 6 Nov 2013 10:42:53 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B1EDF204A7 for ; Wed, 6 Nov 2013 10:42:48 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 5245A201CB for ; Wed, 6 Nov 2013 10:42:47 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Ve0Cc-0003FQ-IX; Wed, 06 Nov 2013 10:19:11 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1Ve0Bz-0002Qh-9C; Wed, 06 Nov 2013 10:18:31 +0000 Received: from mail-ie0-f175.google.com ([209.85.223.175]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Ve0At-0002Eo-OR for linux-arm-kernel@lists.infradead.org; Wed, 06 Nov 2013 10:17:26 +0000 Received: by mail-ie0-f175.google.com with SMTP id aq17so17402449iec.34 for ; Wed, 06 Nov 2013 02:17:04 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=LYrGwf7naENzMDAz7JzNratEOI3m95/O4XOSkCdLyRo=; b=MfU1b+KFlb0C9BPMZxsz7HkOqjFOAWbn/LbltPInOvtvweReaqmPQ9up8j2yUUokFS fSocXfr6tp1aFv7QCBFPX+O93MEtBlEMY+a6K3cTh4xj3sU6DHGAJLlfdCNikattVK8N uJ57P+1JxHldA3CGX1otXmxnOfJHTYHs61kbEGeKOofEVWzRIFFWuXbqNd4x4ilSkdjA Th4iXO1BOFEZEEdkFY/p40BkxSCOrr+irqkWpqxCZksDGL8/vPwUkU6ITFH9nR3YZ1Ab +4rbNkNhsNC9EE4UVtDyOJJE+gfro8xCasQmQ1ZE7K5YC5R15SBCNOoLVUAExTj7NREW nboA== X-Gm-Message-State: ALoCoQnphpPVcyTMKV9xMZNRqOKWDjre4HHvd/KHJKZ9SgSirsBuqjSrzmp09TLplmKRTKLEuTY8 X-Received: by 10.42.70.5 with SMTP id d5mr1467049icj.39.1383733023885; Wed, 06 Nov 2013 02:17:03 -0800 (PST) Received: from localhost.localdomain (cpc15-aztw25-2-0-cust493.aztw.cable.virginm.net. [92.233.57.238]) by mx.google.com with ESMTPSA id ka1sm13308397igb.7.2013.11.06.02.17.01 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 06 Nov 2013 02:17:03 -0800 (PST) From: Lee Jones To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 09/13] ASoC: Ux500: Match platform by device node when booting Device Tree Date: Wed, 6 Nov 2013 10:16:21 +0000 Message-Id: <1383732985-18928-10-git-send-email-lee.jones@linaro.org> X-Mailer: git-send-email 1.8.1.2 In-Reply-To: <1383732985-18928-1-git-send-email-lee.jones@linaro.org> References: <1383732985-18928-1-git-send-email-lee.jones@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20131106_051723_891740_07A8F49C X-CRM114-Status: GOOD ( 11.74 ) X-Spam-Score: -2.6 (--) Cc: linus.walleij@linaro.org, Mark Brown , Lee Jones , alsa-devel@alsa-project.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP We're getting closer to fully enabling the Ux500 ASoC driver for Device Tree. When we switch over from using AUXDATA we'll need to match platform by only Device Tree nodes. In this patch we NULL out the platform_name, and supply nodes for each platform device. Cc: alsa-devel@alsa-project.org Cc: Mark Brown Signed-off-by: Lee Jones Acked-by: Linus Walleij --- sound/soc/ux500/mop500.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sound/soc/ux500/mop500.c b/sound/soc/ux500/mop500.c index 178d1ba..4dc7b81 100644 --- a/sound/soc/ux500/mop500.c +++ b/sound/soc/ux500/mop500.c @@ -90,7 +90,9 @@ static int mop500_of_probe(struct platform_device *pdev, for (i = 0; i < 2; i++) { mop500_dai_links[i].cpu_of_node = msp_np[i]; + mop500_dai_links[i].platform_of_node = msp_np[i]; mop500_dai_links[i].cpu_dai_name = NULL; + mop500_dai_links[i].platform_name = NULL; mop500_dai_links[i].codec_of_node = codec_np; mop500_dai_links[i].codec_name = NULL; }