From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3762DC2D0E4 for ; Sun, 15 Nov 2020 17:11:59 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 1D54422453 for ; Sun, 15 Nov 2020 17:11:58 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=alsa-project.org header.i=@alsa-project.org header.b="Mr0N8VWo"; dkim=pass (1024-bit key) header.d=kernel.org header.i=@kernel.org header.b="U84Dhcao" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1D54422453 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=alsa-devel-bounces@alsa-project.org 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 AB1D417A0; Sun, 15 Nov 2020 18:11:06 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz AB1D417A0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1605460316; bh=nLQvhMPRPmn8OBYUS7haupcAM25cdbBYOxtHEx0ld1E=; h=From:To:Subject:Date:In-Reply-To:References:Cc:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=Mr0N8VWo0A1ij+mdvOsH0hsLtM2ThV8Xf8RVBiGEdbHylejFsySRcoKvHfIaTiVzQ VZVYnI/Gg+Ep4WeTjstfSCEJt/tWjHwFiZyjPxbkVxtawTlLo0QYRbtVDHL7ouMDJz XMr4IQEevzeCr5J7Smk75iux2aYxin+ZnorU5PRM= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id A9402F8029B; Sun, 15 Nov 2020 18:10:15 +0100 (CET) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 573F3F8020B; Sun, 15 Nov 2020 18:10:13 +0100 (CET) Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id 3C4FCF801F5 for ; Sun, 15 Nov 2020 18:10:04 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 3C4FCF801F5 Authentication-Results: alsa1.perex.cz; dkim=pass (1024-bit key) header.d=kernel.org header.i=@kernel.org header.b="U84Dhcao" Received: from localhost.localdomain (adsl-84-226-167-205.adslplus.ch [84.226.167.205]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 12A4124198; Sun, 15 Nov 2020 17:09:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1605460202; bh=nLQvhMPRPmn8OBYUS7haupcAM25cdbBYOxtHEx0ld1E=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=U84DhcaoqGc5ScNqf/gUzmoe3lK2x7woUgZ2YR83LVYwL4il15/VjE1A83CrMWzD4 EqboYDLGRo+lHGcZ3VILVGxtMrtg4zqXdQ27FuDOoXg9eoSw7rFg7+xX2HLG+NpCGp Nf5csY7BoO+zqJ+LnWl6v2gXW/c48MlQgjuFwbAk= From: Krzysztof Kozlowski To: Maxime Ripard , Chen-Yu Tsai , Jernej Skrabec , Michael Turquette , Stephen Boyd , Mauro Carvalho Chehab , Sakari Ailus , Greg Kroah-Hartman , Liam Girdwood , Mark Brown , Jaroslav Kysela , Takashi Iwai , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-clk@vger.kernel.org, linux-media@vger.kernel.org, devel@driverdev.osuosl.org, alsa-devel@alsa-project.org Subject: [PATCH 1/3] clk: fix redefinition of clk_prepare on MIPS with HAVE_LEGACY_CLK Date: Sun, 15 Nov 2020 18:09:48 +0100 Message-Id: <20201115170950.304460-2-krzk@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201115170950.304460-1-krzk@kernel.org> References: <20201115170950.304460-1-krzk@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Krzysztof Kozlowski 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" COMMON_CLK even though is a user-selectable symbol, is still selected by multiple other config options. COMMON_CLK should not be used when legacy clocks are provided by architecture, so it correctly depends on !HAVE_LEGACY_CLK. However it is possible to create a config which selects both COMMON_CLK (by SND_SUN8I_CODEC) and HAVE_LEGACY_CLK (by SOC_RT305X) which leads to compile errors (MIPS architecture): drivers/clk/clk.c:855:6: error: redefinition of ‘clk_unprepare’ In file included from drivers/clk/clk.c:9: include/linux/clk.h:263:20: note: previous definition of ‘clk_unprepare’ was here The definitions clk_bulk_prepare() (and unprepare) already have proper surrounding #ifdef so add them also for clk_prepare()/clk_unprepare(). Signed-off-by: Krzysztof Kozlowski --- drivers/clk/clk.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c index f83dac54ed85..f4f68c7c2fb5 100644 --- a/drivers/clk/clk.c +++ b/drivers/clk/clk.c @@ -841,6 +841,7 @@ static void clk_core_unprepare_lock(struct clk_core *core) clk_prepare_unlock(); } +#ifdef CONFIG_HAVE_CLK_PREPARE /** * clk_unprepare - undo preparation of a clock source * @clk: the clk being unprepared @@ -860,6 +861,7 @@ void clk_unprepare(struct clk *clk) clk_core_unprepare_lock(clk->core); } EXPORT_SYMBOL_GPL(clk_unprepare); +#endif static int clk_core_prepare(struct clk_core *core) { @@ -921,6 +923,7 @@ static int clk_core_prepare_lock(struct clk_core *core) return ret; } +#ifdef CONFIG_HAVE_CLK_PREPARE /** * clk_prepare - prepare a clock source * @clk: the clk being prepared @@ -941,6 +944,7 @@ int clk_prepare(struct clk *clk) return clk_core_prepare_lock(clk->core); } EXPORT_SYMBOL_GPL(clk_prepare); +#endif /* CONFIG_HAVE_CLK_PREPARE */ static void clk_core_disable(struct clk_core *core) { -- 2.25.1 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7F04FC2D0E4 for ; Sun, 15 Nov 2020 17:10:29 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 30E2122453 for ; Sun, 15 Nov 2020 17:10:29 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="IAe3WjCB"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=kernel.org header.i=@kernel.org header.b="U84Dhcao" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 30E2122453 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=SOcVIQhyvtNoYzodymdeSab2HAavoqKd4azxrQUpiBs=; b=IAe3WjCBa+CTBSAbiFXYnpd6w bs+x72/pyOVTXMInjBnR4Pdn6ABlN/sUFGFk4rWujOpdlRdK8crC4pV0I3UhRXSi6Z8uj8BxmYHnz DIKv7EYn5pMUfuinFU6GxR5fTUI+lWiYByI4AdKq/mQugh+Fgdf7vnLHC6+LgJv/BxJyk9M/h5hRm B/5A6A3FxLhCk49j5/LYuJd2M98sVaH96stObKPqPiWkbPK+RC/mJqbbabWO4znIy41c4ODrpgY0+ vdUUfTVq9but03c8sYIzMSouqW6+7gLRnQ3ZU/pjZLbhT2kpluRTfF+GefAxf2f74nqRzpxxEAmix EAvA+Aplg==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1keLXS-0006cP-Sn; Sun, 15 Nov 2020 17:10:06 +0000 Received: from mail.kernel.org ([198.145.29.99]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1keLXO-0006b0-NM for linux-arm-kernel@lists.infradead.org; Sun, 15 Nov 2020 17:10:04 +0000 Received: from localhost.localdomain (adsl-84-226-167-205.adslplus.ch [84.226.167.205]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 12A4124198; Sun, 15 Nov 2020 17:09:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1605460202; bh=nLQvhMPRPmn8OBYUS7haupcAM25cdbBYOxtHEx0ld1E=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=U84DhcaoqGc5ScNqf/gUzmoe3lK2x7woUgZ2YR83LVYwL4il15/VjE1A83CrMWzD4 EqboYDLGRo+lHGcZ3VILVGxtMrtg4zqXdQ27FuDOoXg9eoSw7rFg7+xX2HLG+NpCGp Nf5csY7BoO+zqJ+LnWl6v2gXW/c48MlQgjuFwbAk= From: Krzysztof Kozlowski To: Maxime Ripard , Chen-Yu Tsai , Jernej Skrabec , Michael Turquette , Stephen Boyd , Mauro Carvalho Chehab , Sakari Ailus , Greg Kroah-Hartman , Liam Girdwood , Mark Brown , Jaroslav Kysela , Takashi Iwai , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-clk@vger.kernel.org, linux-media@vger.kernel.org, devel@driverdev.osuosl.org, alsa-devel@alsa-project.org Subject: [PATCH 1/3] clk: fix redefinition of clk_prepare on MIPS with HAVE_LEGACY_CLK Date: Sun, 15 Nov 2020 18:09:48 +0100 Message-Id: <20201115170950.304460-2-krzk@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201115170950.304460-1-krzk@kernel.org> References: <20201115170950.304460-1-krzk@kernel.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201115_121002_929463_F315D631 X-CRM114-Status: GOOD ( 18.25 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Krzysztof Kozlowski Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Q09NTU9OX0NMSyBldmVuIHRob3VnaCBpcyBhIHVzZXItc2VsZWN0YWJsZSBzeW1ib2wsIGlzIHN0 aWxsIHNlbGVjdGVkIGJ5Cm11bHRpcGxlIG90aGVyIGNvbmZpZyBvcHRpb25zLiAgQ09NTU9OX0NM SyBzaG91bGQgbm90IGJlIHVzZWQgd2hlbgpsZWdhY3kgY2xvY2tzIGFyZSBwcm92aWRlZCBieSBh cmNoaXRlY3R1cmUsIHNvIGl0IGNvcnJlY3RseSBkZXBlbmRzIG9uCiFIQVZFX0xFR0FDWV9DTEsu CgpIb3dldmVyIGl0IGlzIHBvc3NpYmxlIHRvIGNyZWF0ZSBhIGNvbmZpZyB3aGljaCBzZWxlY3Rz IGJvdGggQ09NTU9OX0NMSwooYnkgU05EX1NVTjhJX0NPREVDKSBhbmQgSEFWRV9MRUdBQ1lfQ0xL IChieSBTT0NfUlQzMDVYKSB3aGljaCBsZWFkcyB0bwpjb21waWxlIGVycm9ycyAoTUlQUyBhcmNo aXRlY3R1cmUpOgoKICAgIGRyaXZlcnMvY2xrL2Nsay5jOjg1NTo2OiBlcnJvcjogcmVkZWZpbml0 aW9uIG9mIOKAmGNsa191bnByZXBhcmXigJkKICAgIEluIGZpbGUgaW5jbHVkZWQgZnJvbSBkcml2 ZXJzL2Nsay9jbGsuYzo5OgogICAgaW5jbHVkZS9saW51eC9jbGsuaDoyNjM6MjA6IG5vdGU6IHBy ZXZpb3VzIGRlZmluaXRpb24gb2Yg4oCYY2xrX3VucHJlcGFyZeKAmSB3YXMgaGVyZQoKVGhlIGRl ZmluaXRpb25zIGNsa19idWxrX3ByZXBhcmUoKSAoYW5kIHVucHJlcGFyZSkgYWxyZWFkeSBoYXZl IHByb3BlcgpzdXJyb3VuZGluZyAjaWZkZWYgc28gYWRkIHRoZW0gYWxzbyBmb3IgY2xrX3ByZXBh cmUoKS9jbGtfdW5wcmVwYXJlKCkuCgpTaWduZWQtb2ZmLWJ5OiBLcnp5c3p0b2YgS296bG93c2tp IDxrcnprQGtlcm5lbC5vcmc+Ci0tLQogZHJpdmVycy9jbGsvY2xrLmMgfCA0ICsrKysKIDEgZmls ZSBjaGFuZ2VkLCA0IGluc2VydGlvbnMoKykKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2Nsay9jbGsu YyBiL2RyaXZlcnMvY2xrL2Nsay5jCmluZGV4IGY4M2RhYzU0ZWQ4NS4uZjRmNjhjN2MyZmI1IDEw MDY0NAotLS0gYS9kcml2ZXJzL2Nsay9jbGsuYworKysgYi9kcml2ZXJzL2Nsay9jbGsuYwpAQCAt ODQxLDYgKzg0MSw3IEBAIHN0YXRpYyB2b2lkIGNsa19jb3JlX3VucHJlcGFyZV9sb2NrKHN0cnVj dCBjbGtfY29yZSAqY29yZSkKIAljbGtfcHJlcGFyZV91bmxvY2soKTsKIH0KIAorI2lmZGVmIENP TkZJR19IQVZFX0NMS19QUkVQQVJFCiAvKioKICAqIGNsa191bnByZXBhcmUgLSB1bmRvIHByZXBh cmF0aW9uIG9mIGEgY2xvY2sgc291cmNlCiAgKiBAY2xrOiB0aGUgY2xrIGJlaW5nIHVucHJlcGFy ZWQKQEAgLTg2MCw2ICs4NjEsNyBAQCB2b2lkIGNsa191bnByZXBhcmUoc3RydWN0IGNsayAqY2xr KQogCWNsa19jb3JlX3VucHJlcGFyZV9sb2NrKGNsay0+Y29yZSk7CiB9CiBFWFBPUlRfU1lNQk9M X0dQTChjbGtfdW5wcmVwYXJlKTsKKyNlbmRpZgogCiBzdGF0aWMgaW50IGNsa19jb3JlX3ByZXBh cmUoc3RydWN0IGNsa19jb3JlICpjb3JlKQogewpAQCAtOTIxLDYgKzkyMyw3IEBAIHN0YXRpYyBp bnQgY2xrX2NvcmVfcHJlcGFyZV9sb2NrKHN0cnVjdCBjbGtfY29yZSAqY29yZSkKIAlyZXR1cm4g cmV0OwogfQogCisjaWZkZWYgQ09ORklHX0hBVkVfQ0xLX1BSRVBBUkUKIC8qKgogICogY2xrX3By ZXBhcmUgLSBwcmVwYXJlIGEgY2xvY2sgc291cmNlCiAgKiBAY2xrOiB0aGUgY2xrIGJlaW5nIHBy ZXBhcmVkCkBAIC05NDEsNiArOTQ0LDcgQEAgaW50IGNsa19wcmVwYXJlKHN0cnVjdCBjbGsgKmNs aykKIAlyZXR1cm4gY2xrX2NvcmVfcHJlcGFyZV9sb2NrKGNsay0+Y29yZSk7CiB9CiBFWFBPUlRf U1lNQk9MX0dQTChjbGtfcHJlcGFyZSk7CisjZW5kaWYgLyogQ09ORklHX0hBVkVfQ0xLX1BSRVBB UkUgKi8KIAogc3RhdGljIHZvaWQgY2xrX2NvcmVfZGlzYWJsZShzdHJ1Y3QgY2xrX2NvcmUgKmNv cmUpCiB7Ci0tIAoyLjI1LjEKCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fXwpsaW51eC1hcm0ta2VybmVsIG1haWxpbmcgbGlzdApsaW51eC1hcm0ta2VybmVs QGxpc3RzLmluZnJhZGVhZC5vcmcKaHR0cDovL2xpc3RzLmluZnJhZGVhZC5vcmcvbWFpbG1hbi9s aXN0aW5mby9saW51eC1hcm0ta2VybmVsCg==