From patchwork Wed Jul 12 15:55:30 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Hovold X-Patchwork-Id: 9837073 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 75F30602D8 for ; Wed, 12 Jul 2017 15:57:32 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6675F203B9 for ; Wed, 12 Jul 2017 15:57:32 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5A2A02860E; Wed, 12 Jul 2017 15:57:32 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.3 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_NONE,RCVD_IN_SORBS_SPAM,T_DKIM_INVALID autolearn=no version=3.3.1 Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8A82D203B9 for ; Wed, 12 Jul 2017 15:57:31 +0000 (UTC) Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 3B157267025; Wed, 12 Jul 2017 17:57:27 +0200 (CEST) X-Original-To: alsa-devel@alsa-project.org Delivered-To: alsa-devel@alsa-project.org Received: by alsa0.perex.cz (Postfix, from userid 1000) id 53A0D267029; Wed, 12 Jul 2017 17:57:25 +0200 (CEST) Received: from mail-lf0-f68.google.com (mail-lf0-f68.google.com [209.85.215.68]) by alsa0.perex.cz (Postfix) with ESMTP id 7E600267025 for ; Wed, 12 Jul 2017 17:57:20 +0200 (CEST) Received: by mail-lf0-f68.google.com with SMTP id z78so3464743lff.2 for ; Wed, 12 Jul 2017 08:57:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=YD0hjuEHGswxQiJ5mI2mX/bTjqjvm8maXvb6o5suibc=; b=LvRq4YXQFk7gyIPxutLKvQtp5trnRMeb4XDWprE48/xtqRAbJ7w9mlc603gcN5kfg1 yZIfz8vFadfCtwrDC6s7R696Wi23ybE4Zm9lBBMjoWUVu+i8Y9YlA4ooFWL3BkJtCsxV FpWWifgb9aXqn8vPAZkzsHN61v2/KslsvPAZH/POkrLXmszmmLYCWMJRSMras+UQiFm1 aKFWIYC6+nrFndU4WSyU+lWAal4dhmbgZHsF8ALjr2qv8zVyeK+Qd/oI0eppu3pymycH Y6xb6UfyJ3a9s+OffSn7vculc/u0TKLHvbunRm4PWQeiwLviiv3DI286E5BFEYXi7cQz h7EA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=YD0hjuEHGswxQiJ5mI2mX/bTjqjvm8maXvb6o5suibc=; b=WvZ/Ngh4+zbb/OlJgjSGl9QFISZYT2RktaTFkUEE+7bvq4pQ+LIncf6VOCuG4ULEnv lS5R6IyTMJwTXzkAHgehty3kdtANsR91GkuBH+akYIglI/WO7s2qAQSmWffIElv9sYTG v8b05aDtujpXrlWnE5UR8dAZ02YAss+dTztY10hgoJ6pvXrnqpvzoK/dMDnm0lXwAY26 wShcVjAOP/chwv9DzUuXGFDhXg+G1DEBA72ASQC27z7W/2RGTtvmdoh7dWwQPKI59i3M 72xKVJUUpPSRDuAlCHVbelF9iNMTXOLLeInIyFnJyvLObKXEHQJg5DWCp7tUgoYyE5hh OsVw== X-Gm-Message-State: AIVw112RneqvuEJefOwN+uskxZPj6UvNtW+z+y/2UUkrzP2Ltnvi0AVq /Rn8q9zzfnbFrA== X-Received: by 10.25.207.9 with SMTP id f9mr2174525lfg.152.1499875039735; Wed, 12 Jul 2017 08:57:19 -0700 (PDT) Received: from xi.terra (c-42c8e255.07-184-6d6c6d4.cust.bredbandsbolaget.se. [85.226.200.66]) by smtp.gmail.com with ESMTPSA id h38sm617526lfi.33.2017.07.12.08.57.18 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 12 Jul 2017 08:57:18 -0700 (PDT) Received: from johan by xi.terra with local (Exim 4.89) (envelope-from ) id 1dVK0u-0004dn-Me; Wed, 12 Jul 2017 17:57:20 +0200 From: Johan Hovold To: Liam Girdwood , Mark Brown Date: Wed, 12 Jul 2017 17:55:30 +0200 Message-Id: <20170712155530.17765-2-johan@kernel.org> X-Mailer: git-send-email 2.13.2 In-Reply-To: <20170712155530.17765-1-johan@kernel.org> References: <20170712155530.17765-1-johan@kernel.org> Cc: alsa-devel@alsa-project.org, Kuninori Morimoto , Linus Walleij , linux-kernel@vger.kernel.org, stable , Takashi Iwai , Johan Hovold Subject: [alsa-devel] [PATCH 2/2] Revert "ASoC: ux500: drop platform DAI assignments" X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org X-Virus-Scanned: ClamAV using ClamSMTP This reverts commit f1013cdeeeb9 ("ASoC: ux500: drop platform DAI assignments"), which seems to have been based on a misunderstanding and prevents the platform driver callbacks from being made (e.g. to preallocate DMA memory). The real culprit for the warnings about attempts to create duplicate procfs entries was commit 99b04f4c4051 ("ASoC: add Component level pcm_new/pcm_free" that broke PCM creation on systems that use more than one platform component. Fixes: f1013cdeeeb9 ("ASoC: ux500: drop platform DAI assignments") Cc: stable # 4.11 Cc: Linus Walleij Signed-off-by: Johan Hovold Reviewed-by: Linus Walleij Tested-by: Linus Walleij --- sound/soc/ux500/mop500.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sound/soc/ux500/mop500.c b/sound/soc/ux500/mop500.c index b50f68a439ce..ba9fc099cf67 100644 --- a/sound/soc/ux500/mop500.c +++ b/sound/soc/ux500/mop500.c @@ -33,6 +33,7 @@ static struct snd_soc_dai_link mop500_dai_links[] = { .stream_name = "ab8500_0", .cpu_dai_name = "ux500-msp-i2s.1", .codec_dai_name = "ab8500-codec-dai.0", + .platform_name = "ux500-msp-i2s.1", .codec_name = "ab8500-codec.0", .init = mop500_ab8500_machine_init, .ops = mop500_ab8500_ops, @@ -42,6 +43,7 @@ static struct snd_soc_dai_link mop500_dai_links[] = { .stream_name = "ab8500_1", .cpu_dai_name = "ux500-msp-i2s.3", .codec_dai_name = "ab8500-codec-dai.1", + .platform_name = "ux500-msp-i2s.3", .codec_name = "ab8500-codec.0", .init = NULL, .ops = mop500_ab8500_ops, @@ -85,6 +87,8 @@ 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].cpu_dai_name = NULL; + mop500_dai_links[i].platform_of_node = msp_np[i]; + mop500_dai_links[i].platform_name = NULL; mop500_dai_links[i].codec_of_node = codec_np; mop500_dai_links[i].codec_name = NULL; }