From patchwork Thu Sep 1 11:34:14 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Martin_Povi=C5=A1er?= X-Patchwork-Id: 602198 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id D6B10ECAAD1 for ; Thu, 1 Sep 2022 11:35:26 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id 601281620; Thu, 1 Sep 2022 13:34:34 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 601281620 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1662032124; bh=h9IV4eIYW5kh1aeXPCtiTU2SIaF+F2OU6T4VbJNn0B0=; h=From:To:Subject:Date:Cc:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From; b=rsa23Ha1M4nXnhfhNU3VNb8ShgzEYP3vTp7W4W0Htu0tiwzHpoG9eAWA6GEQH0Ig7 2l70AoCdoaNMtRNSwAANoGNI4Uxi+nFHAWB2FeFddkciq+xkI6otDwwS2zH9Aqxjcj 17xPZUNOHx6lhQFhDNx1DJ8NIW/JRcH/bMgMDkWE= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id EEBF5F800EB; Thu, 1 Sep 2022 13:34:33 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id EFE3CF8026D; Thu, 1 Sep 2022 13:34:31 +0200 (CEST) Received: from hutie.ust.cz (unknown [IPv6:2a03:3b40:fe:f0::1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id 46977F800EB for ; Thu, 1 Sep 2022 13:34:24 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 46977F800EB Authentication-Results: alsa1.perex.cz; dkim=pass (1024-bit key) header.d=cutebit.org header.i=@cutebit.org header.b="LJbzIZvX" From: =?utf-8?q?Martin_Povi=C5=A1er?= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cutebit.org; s=mail; t=1662032063; bh=64K6de8/WYbFY9mQuRbf7StfNJYaBkUUYkjBkby97iE=; h=From:To:Cc:Subject:Date; b=LJbzIZvXhb5XUcSgRAC6Eu5+ldNP5RqOgTHgRXWJbqEgRO08yUwNmOaJm92Y8GcnE X59dRQe1LOpgFJNtPQSlkSyYZbhk8PStP+BUrxFwMvgNetA6uWd53VFbZ3+XiAaQOX aLQ9Aomr4d0baGByf/w+uvTLODMhaU+t6whgiWYQ= To: Liam Girdwood , Mark Brown Subject: [PATCH 1/2] ASoC: apple: mca: Unselect COMMON_CLK in Kconfig Date: Thu, 1 Sep 2022 13:34:14 +0200 Message-Id: <20220901113415.27449-1-povik+lin@cutebit.org> MIME-Version: 1.0 Cc: =?utf-8?q?Martin_Povi=C5=A1er?= , kernel test robot , alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org, asahi@lists.linux.dev X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.15 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: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: "Alsa-devel" The MCA driver selects COMMON_CLK, which leads to misconfiguration on platforms with HAVE_LEGACY_CLK (under compile test). Kconfig catches the conflict with the following warning: WARNING: unmet direct dependencies detected for COMMON_CLK Depends on [n]: !HAVE_LEGACY_CLK [=y] Selected by [m]: - SND_SOC_APPLE_MCA [=m] && SOUND [=m] && !UML && SND [=m] && SND_SOC [=m] && (ARCH_APPLE || COMPILE_TEST [=y]) Eventually the build fails with errors like: >> drivers/clk/clk.c:867:6: error: redefinition of 'clk_unprepare' 867 | void clk_unprepare(struct clk *clk) | ^~~~~~~~~~~~~ In file included from drivers/clk/clk.c:9: include/linux/clk.h:303:20: note: previous definition of 'clk_unprepare' with type 'void(struct clk *)' 303 | static inline void clk_unprepare(struct clk *clk) | ^~~~~~~~~~~~~ which appears to be because COMMON_CLK is selected but HAVE_CLK_PREPARE is not. In the end it seems we had no business selecting COMMON_CLK from an unrelated driver like that, so remove the selection. The linux/clk.h API is there anyway. Fixes: 3df5d0d97289 ("ASoC: apple: mca: Start new platform driver") Reported-by: kernel test robot Signed-off-by: Martin Povišer --- sound/soc/apple/Kconfig | 1 - 1 file changed, 1 deletion(-) diff --git a/sound/soc/apple/Kconfig b/sound/soc/apple/Kconfig index 0ba955657e98..793f7782e0d7 100644 --- a/sound/soc/apple/Kconfig +++ b/sound/soc/apple/Kconfig @@ -2,7 +2,6 @@ config SND_SOC_APPLE_MCA tristate "Apple Silicon MCA driver" depends on ARCH_APPLE || COMPILE_TEST select SND_DMAENGINE_PCM - select COMMON_CLK default ARCH_APPLE help This option enables an ASoC platform driver for MCA peripherals found From patchwork Thu Sep 1 11:34:15 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Martin_Povi=C5=A1er?= X-Patchwork-Id: 601817 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id D808CECAAD3 for ; Thu, 1 Sep 2022 11:35:56 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id A003E1638; Thu, 1 Sep 2022 13:35:04 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz A003E1638 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1662032154; bh=vhVGC2cxDNjYnTqj5N1m7edVJ5wy/+WYxTQ1QdW+FSo=; h=From:To:Subject:Date:In-Reply-To:References:Cc:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=RXe5oIFbP58urZG7DKZ1YzLk8PcC2tEKfmLrbJKKnGsEYDYI3AgKP2GqImUD6Qn5h E57BokuzjWmJojpOR2CbNjfSRqMNzAtqUG5jzix5rFaetROt74QRTr1cvpKwZenu6+ sB2zlhkh+2lAJ2STVJyVVfoDcZV4bzROlmtyEoG8= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 9FAC5F804CF; Thu, 1 Sep 2022 13:34:34 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id C3C5FF804A9; Thu, 1 Sep 2022 13:34:31 +0200 (CEST) Received: from hutie.ust.cz (hutie.ust.cz [185.8.165.127]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id 9C1F6F80163 for ; Thu, 1 Sep 2022 13:34:25 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 9C1F6F80163 Authentication-Results: alsa1.perex.cz; dkim=pass (1024-bit key) header.d=cutebit.org header.i=@cutebit.org header.b="QSOcuJpz" From: =?utf-8?q?Martin_Povi=C5=A1er?= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cutebit.org; s=mail; t=1662032064; bh=9K/ubU5/lJjGhiEptyCyT26bzZBKS5AKwNVg/nBi83E=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=QSOcuJpz14lYalHW0hwAbrV86WhHflonxSZNXVfz/7SWgKa7GOJPPC0tbM5v6qdPP N2GOxWzXjIesNZIdh4BEnDZRrllg8T8DIyr5G6TIhE+IuvvaPo4nSjxJUiT0ZqQNZ8 BG1lKixb8MlkqZgL/JqpzD64vyoELj8omM92efVc= To: Liam Girdwood , Mark Brown Subject: [PATCH 2/2] MAINTAINERS: Fix file pattern for ARM/APPLE MACHINE SOUND DRIVERS Date: Thu, 1 Sep 2022 13:34:15 +0200 Message-Id: <20220901113415.27449-2-povik+lin@cutebit.org> In-Reply-To: <20220901113415.27449-1-povik+lin@cutebit.org> References: <20220901113415.27449-1-povik+lin@cutebit.org> MIME-Version: 1.0 Cc: =?utf-8?q?Martin_Povi=C5=A1er?= , alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org, asahi@lists.linux.dev X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.15 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: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: "Alsa-devel" This is what was meant of course. Fixes: 3df5d0d97289 ("ASoC: apple: mca: Start new platform driver") Signed-off-by: Martin Povišer --- MAINTAINERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MAINTAINERS b/MAINTAINERS index 5f91a6b62f2f..895e8ace80dd 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1905,7 +1905,7 @@ L: asahi@lists.linux.dev L: alsa-devel@alsa-project.org (moderated for non-subscribers) S: Maintained F: Documentation/devicetree/bindings/sound/apple,* -F: drivers/sound/apple/* +F: sound/soc/apple/* ARM/ARTPEC MACHINE SUPPORT M: Jesper Nilsson