From patchwork Wed Nov 6 10:16:19 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 3146161 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 BBCD3BEEB2 for ; Wed, 6 Nov 2013 10:20:52 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 8CDE82037F for ; Wed, 6 Nov 2013 10:20:51 +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 01F2820134 for ; Wed, 6 Nov 2013 10:20:50 +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 1Ve0CG-0002yO-KY; Wed, 06 Nov 2013 10:18:49 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1Ve0Bh-0002P0-S9; Wed, 06 Nov 2013 10:18:13 +0000 Received: from mail-ie0-f180.google.com ([209.85.223.180]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Ve0Ao-0002EW-Qc for linux-arm-kernel@lists.infradead.org; Wed, 06 Nov 2013 10:17:22 +0000 Received: by mail-ie0-f180.google.com with SMTP id e14so16672995iej.39 for ; Wed, 06 Nov 2013 02:16:59 -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=TUNg8OoN+lyqG0JGw7IhU3hzy79qgp6DySzUfvSXijw=; b=Sb4nqpsV2XXebvAWF9jsQEFLpFhoSq2Q4PuDTfxD223cG5iciBPHa9u0YW3q1p3aqn lyaZ2W94WlwW6fTMInv4qE/ztFgHRcToYn3W/Xnxd53cW6xHsDnTpgccD9zktPaTeRj7 WaEYDlhus5lthkZf556w2SuGvporL5wCzbanRHS9R87Txv1a9D2xPEYHCi7bP2yZ8599 rgFc3GsOp9jGk/fuF5l2xtJCjVOVTJyG3UcHQV8Hf/F0opHgx2TPdyPw2X3Q372FwLy3 0vnGacPc5YioiNjDxu3EwIjO+SguHeeDNRjCy0PcXz6TnNZrnxmMxNnFltvYqjksYcGX 64qA== X-Gm-Message-State: ALoCoQmyFV5t9KiIcP4dBBxRg6+AxQD+hzGK/iALfeAyz4CPJn/Y602jyRjmHJUom1GsQVJMHyea X-Received: by 10.50.11.11 with SMTP id m11mr19409215igb.47.1383733019505; Wed, 06 Nov 2013 02:16:59 -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.16.57 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 06 Nov 2013 02:16:59 -0800 (PST) From: Lee Jones To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 07/13] ASoC: ux500_pcm: Extract MSP IDs from Device Tree Date: Wed, 6 Nov 2013 10:16:19 +0000 Message-Id: <1383732985-18928-8-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_051718_975102_BE38C7F2 X-CRM114-Status: GOOD ( 10.78 ) 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 This is required for indexing pre-defined channel configuration structures. Cc: alsa-devel@alsa-project.org Cc: Mark Brown Signed-off-by: Lee Jones Acked-by: Linus Walleij --- sound/soc/ux500/ux500_msp_i2s.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/sound/soc/ux500/ux500_msp_i2s.c b/sound/soc/ux500/ux500_msp_i2s.c index 1ca8b08..0a99372 100644 --- a/sound/soc/ux500/ux500_msp_i2s.c +++ b/sound/soc/ux500/ux500_msp_i2s.c @@ -665,6 +665,13 @@ int ux500_msp_i2s_init_msp(struct platform_device *pdev, sizeof(struct msp_i2s_platform_data), GFP_KERNEL); if (!platform_data) return -ENOMEM; + + if (!of_property_read_u32(np, "id", + &platform_data->id)) { + dev_err(&pdev->dev, + "No 'id' property found in DT\n"); + return -EINVAL; + } } } else if (!platform_data)