From patchwork Fri Jul 4 08:52:59 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tushar Behera X-Patchwork-Id: 367047 Return-Path: X-Original-To: incoming-dt@patchwork.ozlabs.org Delivered-To: patchwork-incoming-dt@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 505ED14009C for ; Fri, 4 Jul 2014 18:56:39 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755831AbaGDI4h (ORCPT ); Fri, 4 Jul 2014 04:56:37 -0400 Received: from mail-pd0-f181.google.com ([209.85.192.181]:34705 "EHLO mail-pd0-f181.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755815AbaGDI4g (ORCPT ); Fri, 4 Jul 2014 04:56:36 -0400 Received: by mail-pd0-f181.google.com with SMTP id v10so1671275pde.12 for ; Fri, 04 Jul 2014 01:56:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id; bh=CQHFhk68gZub5XAhVY9NRLiU9OItKmbeWdJZzNJApBE=; b=QrinDI/sdPie4tR2h99izY1qYpok1dx1+gCAgbOOEgAQ89H9jfQHtvrLuMZ6HtIrbf R71LMvdS6KEclcoQLhcAt+tdkekCCsTq2NqgdoJ9XHg/e4M8hLhcwyBEIFz/sZTEFc9+ JFnTl7Uxq7b8c5rgNh8RJT2LHfw8HQFoBNGy/lrGnmzUOUWas7/ovFHYxtwbr1gZ284h bZrKE/Ay796ln5Mq+DpULeZ+yf2+7NLfL3npz/n06WdDeBFhxVBMQMsnjjqdb2du5OmH FGjbbaHDsOzYz1KmAGXtU66r15h6qXUQ7pQBIlVGjycdh0IzUQ0R/uiKiuDi9jD/Upz+ 9tNw== X-Received: by 10.68.220.137 with SMTP id pw9mr9853481pbc.24.1404464195824; Fri, 04 Jul 2014 01:56:35 -0700 (PDT) Received: from linaro.sisodomain.com ([14.140.216.146]) by mx.google.com with ESMTPSA id nz7sm8005901pdb.48.2014.07.04.01.56.30 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 04 Jul 2014 01:56:35 -0700 (PDT) From: Tushar Behera To: alsa-devel@alsa-project.org, linux-samsung-soc@vger.kernel.org Cc: linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, dianders@chromium.org, tiwai@suse.de, perex@perex.cz, broonie@kernel.org, lgirdwood@gmail.com, galak@codeaurora.org, kgene.kim@samsung.com, ijc+devicetree@hellion.org.uk, mark.rutland@arm.com, pawel.moll@arm.com, robh+dt@kernel.org, trblinux@gmail.com Subject: [PATCH 1/2] ASoC: samsung: Update sound-card name for Snow Date: Fri, 4 Jul 2014 14:22:59 +0530 Message-Id: <1404463980-25027-1-git-send-email-tushar.b@samsung.com> X-Mailer: git-send-email 1.7.9.5 Sender: devicetree-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org Snow sound-card driver supports multiple boards with different audio codecs. Updating the sound card name per board basis would provide some more information to the end-user. Signed-off-by: Tushar Behera --- Documentation/devicetree/bindings/sound/snow.txt | 4 ++++ sound/soc/samsung/snow.c | 3 +++ 2 files changed, 7 insertions(+) diff --git a/Documentation/devicetree/bindings/sound/snow.txt b/Documentation/devicetree/bindings/sound/snow.txt index e0b7a82..6df74f1 100644 --- a/Documentation/devicetree/bindings/sound/snow.txt +++ b/Documentation/devicetree/bindings/sound/snow.txt @@ -8,11 +8,15 @@ Required properties: - samsung,i2s-controller: The phandle of the Samsung I2S controller - samsung,audio-codec: The phandle of the audio codec +Optional: +- samsung,model: The name of the sound-card + Example: sound { compatible = "google,snow-audio-max98095"; + samsung,model = "Snow-I2S-MAX98095"; samsung,i2s-controller = <&i2s0>; samsung,audio-codec = <&max98095>; }; diff --git a/sound/soc/samsung/snow.c b/sound/soc/samsung/snow.c index 8bbd348..0acf5d0 100644 --- a/sound/soc/samsung/snow.c +++ b/sound/soc/samsung/snow.c @@ -92,6 +92,9 @@ static int snow_probe(struct platform_device *pdev) card->dev = &pdev->dev; + /* Update card-name if provided through DT, else use default name */ + snd_soc_of_parse_card_name(card, "samsung,model"); + ret = devm_snd_soc_register_card(&pdev->dev, card); if (ret) { dev_err(&pdev->dev, "snd_soc_register_card failed (%d)\n", ret);