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: 21370 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-vb0-f72.google.com (mail-vb0-f72.google.com [209.85.212.72]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 010CF20DB9 for ; Wed, 6 Nov 2013 10:17:00 +0000 (UTC) Received: by mail-vb0-f72.google.com with SMTP id w8sf8773185vbj.11 for ; Wed, 06 Nov 2013 02:17:00 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-unsubscribe; bh=TUNg8OoN+lyqG0JGw7IhU3hzy79qgp6DySzUfvSXijw=; b=TWt5wx6UMsOm6R8F1E8GJB5FN6BYT9NXgxwb3Cvz62DcnFsJv36kqXu/kyqsgUJZ7V In7miqEEzLHmKhR6dA7LZZBI0UOYIWNcbk69TE2Tz5Slq1oeXstkYLnucRY/XB05ai+2 fpZOsAlWCJUo3bGNEj/4Sr2VS22rrONlh8jpeqa6Q3+/i15cAgIgDDkxWH5wmrAp/Ak4 FQH+4tOExrt6J9OoeeJ3NU3LpE7xU4KvDt/IzZs5MOw7+iUeK6uNpY0ffKKWcnHSxmAW mW/OouxBDapQcGQ80Rh4dxaFvz9gltSn4GM1S6v84JFuPcZ2mqS4Mn7lVJ6+WEdL3lDI KukQ== X-Gm-Message-State: ALoCoQnDlXj0dLfCPAIKGUsHXgOU7VlpjyNKH7R/IHR78qYoqo+rGhfwjRlnx6PZ8ti58/NDkaqW X-Received: by 10.224.111.201 with SMTP id t9mr179468qap.8.1383733020797; Wed, 06 Nov 2013 02:17:00 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.1.15 with SMTP id 15ls579928qei.55.gmail; Wed, 06 Nov 2013 02:17:00 -0800 (PST) X-Received: by 10.221.29.200 with SMTP id rz8mr567087vcb.33.1383733020691; Wed, 06 Nov 2013 02:17:00 -0800 (PST) Received: from mail-vc0-f179.google.com (mail-vc0-f179.google.com [209.85.220.179]) by mx.google.com with ESMTPS id be7si8174455vcb.35.2013.11.06.02.17.00 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 06 Nov 2013 02:17:00 -0800 (PST) Received-SPF: neutral (google.com: 209.85.220.179 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.220.179; Received: by mail-vc0-f179.google.com with SMTP id hz11so6450599vcb.38 for ; Wed, 06 Nov 2013 02:17:00 -0800 (PST) X-Received: by 10.52.191.162 with SMTP id gz2mr1471071vdc.26.1383733020609; Wed, 06 Nov 2013 02:17:00 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.220.174.196 with SMTP id u4csp273206vcz; Wed, 6 Nov 2013 02:17:00 -0800 (PST) X-Received: by 10.42.94.208 with SMTP id c16mr1603499icn.18.1383733020044; Wed, 06 Nov 2013 02:17:00 -0800 (PST) Received: from mail-ie0-f181.google.com (mail-ie0-f181.google.com [209.85.223.181]) by mx.google.com with ESMTPS id i2si6999847igv.28.2013.11.06.02.16.59 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 06 Nov 2013 02:17:00 -0800 (PST) Received-SPF: neutral (google.com: 209.85.223.181 is neither permitted nor denied by best guess record for domain of lee.jones@linaro.org) client-ip=209.85.223.181; Received: by mail-ie0-f181.google.com with SMTP id ar20so17481523iec.12 for ; Wed, 06 Nov 2013 02:16:59 -0800 (PST) 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 Cc: linus.walleij@linaro.org, Lee Jones , alsa-devel@alsa-project.org, Mark Brown 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-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: lee.jones@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.220.179 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , This is required for indexing pre-defined channel configuration structures. Cc: alsa-devel@alsa-project.org Cc: Mark Brown Signed-off-by: Lee Jones --- 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)