From patchwork Thu Aug 9 15:47:31 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 10627 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 35B2E23ECF for ; Thu, 9 Aug 2012 15:48:23 +0000 (UTC) Received: from mail-gh0-f180.google.com (mail-gh0-f180.google.com [209.85.160.180]) by fiordland.canonical.com (Postfix) with ESMTP id 04565A18A43 for ; Thu, 9 Aug 2012 15:48:22 +0000 (UTC) Received: by mail-gh0-f180.google.com with SMTP id g10so584535ghb.11 for ; Thu, 09 Aug 2012 08:48:22 -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=7AcOiKIJMH9LwKdZQRqwiMgumVoCpFWYEEx01lhjaYo=; b=C1k+6BVH2f/ht3HvI3DpV5rA9dsk90LSZW/06YooFiYlDnuKgjDlZqpfRNEMO5F+6A H097tuRVkt25oF/t5votG/2OQHKrwf9BX7qhNtIBTnON3HPwRnGu41QuFFkqlP4vMXoz B8bUs6Or/M2SV2hXv97IEfmEbfp7YUd4Pr+xkBfkpmdspOwc2aW1WJD8AK0Z7y23Kbin U7ut7Auuu2mWogUpcNS+5DzR9K3Q0ohmU7UaDwNOrAgkAPzhtHU2UszsZljwSB3ePpM4 TR7vlAOaF1TT5JOylEoVDWTLFElu/e3nA/m6lGstGRCmdP1ftW1dQIvG1Qy6tlzugpvO tilQ== Received: by 10.50.57.168 with SMTP id j8mr1569645igq.16.1344527302410; Thu, 09 Aug 2012 08:48:22 -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.50.184.200 with SMTP id ew8csp15243igc; Thu, 9 Aug 2012 08:48:21 -0700 (PDT) Received: by 10.180.84.169 with SMTP id a9mr3968822wiz.8.1344527300793; Thu, 09 Aug 2012 08:48:20 -0700 (PDT) Received: from mail-wg0-f50.google.com (mail-wg0-f50.google.com [74.125.82.50]) by mx.google.com with ESMTPS id ed3si2922594wib.27.2012.08.09.08.48.20 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 09 Aug 2012 08:48:20 -0700 (PDT) Received-SPF: neutral (google.com: 74.125.82.50 is neither permitted nor denied by best guess record for domain of lee.jones@linaro.org) client-ip=74.125.82.50; Authentication-Results: mx.google.com; spf=neutral (google.com: 74.125.82.50 is neither permitted nor denied by best guess record for domain of lee.jones@linaro.org) smtp.mail=lee.jones@linaro.org Received: by mail-wg0-f50.google.com with SMTP id ds11so531652wgb.31 for ; Thu, 09 Aug 2012 08:48:20 -0700 (PDT) Received: by 10.216.240.3 with SMTP id d3mr7127483wer.87.1344527297508; Thu, 09 Aug 2012 08:48:17 -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 q4sm2278954wix.9.2012.08.09.08.48.16 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 09 Aug 2012 08:48:16 -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, broonie@opensource.wolfsonmicro.com, Lee Jones , alsa-devel@alsa-project.org Subject: [PATCH 05/22] ASoC: Ux500: Enable MOP500 driver for Device Tree Date: Thu, 9 Aug 2012 16:47:31 +0100 Message-Id: <1344527268-5964-6-git-send-email-lee.jones@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1344527268-5964-1-git-send-email-lee.jones@linaro.org> References: <1344527268-5964-1-git-send-email-lee.jones@linaro.org> X-Gm-Message-State: ALoCoQmklhGw3sTDEDTq0fRDx37jAmpKEzPH0UKdt76XYarZMPVt3XGyDaF5TtMUHH1Ks9bd4l4y Here we ensure that the MOP500 audio driver will be probed during a Device Tree boot. We also parse the sound node to link together the codec, dma and the CPU-side Digital Audio Interface. CC: alsa-devel@alsa-project.org Signed-off-by: Lee Jones --- sound/soc/ux500/mop500.c | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/sound/soc/ux500/mop500.c b/sound/soc/ux500/mop500.c index 31c4d26..6840df7 100644 --- a/sound/soc/ux500/mop500.c +++ b/sound/soc/ux500/mop500.c @@ -16,6 +16,7 @@ #include #include #include +#include #include #include @@ -56,8 +57,35 @@ static struct snd_soc_card mop500_card = { .num_links = ARRAY_SIZE(mop500_dai_links), }; +static int __devinit mop500_of_probe(struct platform_device *pdev, + struct device_node *np) +{ + struct device_node *codec_np, *msp_np[2]; + int i; + + msp_np[0] = of_parse_phandle(np, "stericsson,cpu-dai", 0); + msp_np[1] = of_parse_phandle(np, "stericsson,cpu-dai", 1); + codec_np = of_parse_phandle(np, "stericsson,audio-codec", 0); + + if (!(msp_np[0] && msp_np[1] && codec_np)) { + dev_err(&pdev->dev, "Phandle missing or invalid\n"); + return -EINVAL; + } + + for (i = 0; i < 2; i++) { + mop500_dai_links[i].cpu_of_node = msp_np[i]; + mop500_dai_links[i].cpu_dai_name = NULL; + mop500_dai_links[i].codec_of_node = codec_np; + mop500_dai_links[i].codec_name = NULL; + } + + snd_soc_of_parse_card_name(&mop500_card, "stericsson,card-name"); + + return 0; +} static int __devinit mop500_probe(struct platform_device *pdev) { + struct device_node *np = pdev->dev.of_node; int ret; pr_debug("%s: Enter.\n", __func__); @@ -66,6 +94,12 @@ static int __devinit mop500_probe(struct platform_device *pdev) mop500_card.dev = &pdev->dev; + if (np) { + ret = mop500_of_probe(pdev, np); + if (ret) + return ret; + } + dev_dbg(&pdev->dev, "%s: Card %s: Set platform drvdata.\n", __func__, mop500_card.name); platform_set_drvdata(pdev, &mop500_card); @@ -101,10 +135,16 @@ static int __devexit mop500_remove(struct platform_device *pdev) return 0; } +static const struct of_device_id snd_soc_mop500_match[] = { + { .compatible = "stericsson,snd-soc-mop500", }, + {}, +}; + static struct platform_driver snd_soc_mop500_driver = { .driver = { .owner = THIS_MODULE, .name = "snd-soc-mop500", + .of_match_table = snd_soc_mop500_match, }, .probe = mop500_probe, .remove = __devexit_p(mop500_remove),