From patchwork Tue Feb 28 14:43:43 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 9595815 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 9ADB360453 for ; Tue, 28 Feb 2017 14:44:02 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8FCCA281DB for ; Tue, 28 Feb 2017 14:44:02 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8466A284FF; Tue, 28 Feb 2017 14:44:02 +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.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_NONE,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 B6B8C281DB for ; Tue, 28 Feb 2017 14:44:01 +0000 (UTC) Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 6DDE626583C; Tue, 28 Feb 2017 15:43:59 +0100 (CET) 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 EFF6B265142; Tue, 28 Feb 2017 15:43:57 +0100 (CET) Received: from mail-lf0-f45.google.com (mail-lf0-f45.google.com [209.85.215.45]) by alsa0.perex.cz (Postfix) with ESMTP id 24376265142 for ; Tue, 28 Feb 2017 15:43:51 +0100 (CET) Received: by mail-lf0-f45.google.com with SMTP id z127so6485625lfa.2 for ; Tue, 28 Feb 2017 06:43:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=l4BvbnBMsBk+dknGM9jK+/U9W6c5KqhhrcEJSm9xxl4=; b=aIAazCoiWZ3HLeTkKSyg4ZNXJKZ/FKLLGrvso/9n8DmyrhNI76kiE33HYgalGNpqqO MAqj/tGd9K6cJl4czARuaDmntktfkT9DQ3Lwy+K/P07qZbIx+jyV9akh4B+KLBNxf9+z dD/khRSA9bxXN7oeGFbEgC1cuCgMsCc04xoyc= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=l4BvbnBMsBk+dknGM9jK+/U9W6c5KqhhrcEJSm9xxl4=; b=dMXOH8Julws5f/zWowrjz8zI7b+o+kIAp9jEtu46a2Xf6OpTs40EsIiHu/3B3ZWnAU jPQcqKc0IlWu3VX6KmoJksvg9OkC3Ap5132XzOKz/tlzhX6rgX1Qb15WQYkIEnNUrx8f a1Tz0DmTUFy6+8bh/Vke9cP2M6R3ojS8KqiUK5nb4bTTElty3Vh+1RD9UjS6yALs6tFR MwLnA9y39Mou1FrAbNKx3r3eGdOe6uOCHAirwcX89NOhmUTfqnk/Ppso9v7ZUbf1cLkN kxyxWT7VI7g385TDVWDgcolEK+RaybTpyNEg8mXMjAx1pTMvKX5CEiEaxhEofgcF1jHZ HFNQ== X-Gm-Message-State: AMke39kU464c1nIdaU0GSTDbpeyWsFRu65MXK5K/hVEnWg79PFFfkJfgZMBj4n+OcxHveVQ8 X-Received: by 10.25.211.132 with SMTP id k126mr1010453lfg.61.1488293030979; Tue, 28 Feb 2017 06:43:50 -0800 (PST) Received: from gnarp.ideon.se ([85.235.10.227]) by smtp.gmail.com with ESMTPSA id h3sm441120lfj.0.2017.02.28.06.43.49 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 28 Feb 2017 06:43:49 -0800 (PST) From: Linus Walleij To: Liam Girdwood , Mark Brown Date: Tue, 28 Feb 2017 15:43:43 +0100 Message-Id: <20170228144343.10721-1-linus.walleij@linaro.org> X-Mailer: git-send-email 2.9.3 Cc: alsa-devel@alsa-project.org, Lee Jones , Linus Walleij , Ulf Hansson Subject: [alsa-devel] [PATCH] 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 platform is completely probed by device tree nowadays, so we need to do a bigger cleanup removing all the non-DT codepaths. This cleanup must however go in as a fix since it fixes a regression. Currently when Ux500 audio is enabled, dmesg complains like this: entry->name == "prealloc" entry->name == "prealloc_max" entry->name == "prealloc" ------------[ cut here ]------------ WARNING: CPU: 0 PID: 95 at ../fs/proc/generic.c:346 proc_register+0xf0/0x110 proc_dir_entry 'sub0/prealloc' already registered (...) entry->name == "prealloc_max" ------------[ cut here ]------------ WARNING: CPU: 0 PID: 95 at ../fs/proc/generic.c:346 proc_register+0xf0/0x110 proc_dir_entry 'sub0/prealloc_max' already registered (...) snd-soc-mop500 soc:sound: ab8500-codec-dai.0 <-> 80124000.msp mapping ok entry->name == "prealloc" entry->name == "prealloc_max" entry->name == "prealloc" ------------[ cut here ]------------ WARNING: CPU: 0 PID: 95 at ../fs/proc/generic.c:346 proc_register+0xf0/0x110 proc_dir_entry 'sub0/prealloc' already registered (...) entry->name == "prealloc_max" ------------[ cut here ]------------ WARNING: CPU: 0 PID: 95 at ../fs/proc/generic.c:346 proc_register+0xf0/0x110 proc_dir_entry 'sub0/prealloc_max' already registered snd-soc-mop500 soc:sound: ab8500-codec-dai.1 <-> 80125000.msp mapping ok This is because PCMs are created twice for the same hardware, and this happens because both "platform" and "CPU" DAI links are specified. But platform/CPU is an either/or pair, not a both/and pair. This has maybe worked in the past, but it is causing trouble now, so let us begin the cleanups by removing the platform assignment and silencing the boot noise, and make a proper DT cleanup for the next kernel cycle. Cc: Ulf Hansson Cc: Lee Jones Signed-off-by: Linus Walleij --- sound/soc/ux500/mop500.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/sound/soc/ux500/mop500.c b/sound/soc/ux500/mop500.c index ba9fc099cf67..b50f68a439ce 100644 --- a/sound/soc/ux500/mop500.c +++ b/sound/soc/ux500/mop500.c @@ -33,7 +33,6 @@ 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, @@ -43,7 +42,6 @@ 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, @@ -87,8 +85,6 @@ 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; }