From patchwork Thu Apr 7 19:12:02 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janusz Krzysztofik X-Patchwork-Id: 12805637 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 8456CC433F5 for ; Thu, 7 Apr 2022 19:13:14 +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 38ADE1856; Thu, 7 Apr 2022 21:12:22 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 38ADE1856 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1649358792; bh=cyWRTbWk6jPCkI4saH+6DmKmfit7uIg6sqt8KrWXR/M=; h=From:To:Subject:Date:In-Reply-To:References:Cc:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=qPY0FSSciNt/Yng+jTG/yr/y/kS8oqQaFkH4YCDTcMPIGqjy0eOh62/9s7IZ12fzb M5d7I0ewyXf6xdIJoScqxqHSEyfds15xlJH9dI1Z2xRRTVfBWgVkQyCIg97GoD6VRC 8Ed0w+H6iej+bSeEs74pHhEc55k+8lf7CHmk5AG0= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id CC1CBF80141; Thu, 7 Apr 2022 21:12:21 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 13520F8024C; Thu, 7 Apr 2022 21:12:20 +0200 (CEST) Received: from mail-wr1-x432.google.com (mail-wr1-x432.google.com [IPv6:2a00:1450:4864:20::432]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id 549E4F80054 for ; Thu, 7 Apr 2022 21:12:16 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 549E4F80054 Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="A+CStoVm" Received: by mail-wr1-x432.google.com with SMTP id b19so9239257wrh.11 for ; Thu, 07 Apr 2022 12:12:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Wo9oqpOrlL09wrHzLGCPMOoNjd0NRRV4WyHm6QSjcXw=; b=A+CStoVmBS8zw62LuBlsUrhX2I1YUxgwfb+f5/O7FRMnJd6b9nnEikrHsg7/PRxtRH Lck0K0k8ZG68XgeWmn2r/CFr4jpWB/lq1dzu0crZKHE00y77I33GIGOqkApwQl9c0AiK s1Pz8B4aaV4ZfBBX1HM0XsbxC7l55sxVPNulxJAPnzMxR+65H0wzjKc4uic7Lq2bmKpW U2IrSpa7vCB+5FY0uCqynAcE7IrFsYa8b59GgBNZFfH0SvGngyK+i8B86qoLiT/24hG7 nxUvFCE01mGAcM9+vr781OG15rXJd6+AH7kne3SpiDJDHNHNcooD1T3ABX/algYOV5B+ 2BYg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Wo9oqpOrlL09wrHzLGCPMOoNjd0NRRV4WyHm6QSjcXw=; b=JfKOv/sWkjUR0XEBkRnZWHToPTs7Nm4nmFl/ZyJnbWuiVjryMjJ/gGfOACNZ1Me7qd g7LIhv9tJEWLzCVUEm3gPW2gueiLvDusX4a5bLVy+bvJwLUOaglGFX3Dd/2OxFD2nkP6 6xUD/d/vupruhP9krIYFtOWhBvup0HWNGy3hlndALQDyPeut55xdGryeDKrfZXhm+I7Z eoUNMo9rxstmlARpPl2cc9OQPhsajdTwBEne86uck232bYJ9ZYSqkRMYXiakrsSx1uT0 6snRqiU1m5NaIlfPw/LgKlcuZ4HyrAppRQqHyAimbBOmO6EsMBmo7tqj/mXrrlwyM29m Vi4w== X-Gm-Message-State: AOAM5309tPU3vobHzruy3Rntj7Bh+molgDtjK1GL5xv4T3bKHk3fRAsy s3BCPbaoa0YzEuVv9MX2CYs= X-Google-Smtp-Source: ABdhPJyjlLtutGu4Av6RCcJJ6lRpbII9jThxDgGtmFzfmmqcqo512nfOMQ15hrj5GS2FA0m25zeM6Q== X-Received: by 2002:a05:6000:118f:b0:206:81d:c030 with SMTP id g15-20020a056000118f00b00206081dc030mr11807807wrx.169.1649358734884; Thu, 07 Apr 2022 12:12:14 -0700 (PDT) Received: from dell.lan (93-181-165-181.internetia.net.pl. [93.181.165.181]) by smtp.gmail.com with ESMTPSA id l6-20020a1c2506000000b0038e6fe8e8d8sm11770610wml.5.2022.04.07.12.12.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Apr 2022 12:12:14 -0700 (PDT) From: Janusz Krzysztofik To: Mark Brown Subject: [PATCH v2] ASoC: ti: osk5912: Make it CCF clk API compatible Date: Thu, 7 Apr 2022 21:12:02 +0200 Message-Id: <20220407191202.46206-1-jmkrzyszt@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220402120106.131118-1-jmkrzyszt@gmail.com> References: <20220402120106.131118-1-jmkrzyszt@gmail.com> MIME-Version: 1.0 Cc: Janusz Krzysztofik , alsa-devel@alsa-project.org, linux-omap@vger.kernel.org, Peter Ujfalusi , Liam Girdwood 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 driver, OMAP1 specific, now omits clk_prepare/unprepare() steps, not supported by OMAP1 custom implementation of clock API. However, non-CCF stubs of those functions exist for use on such platforms until converted to CCF. Update the driver to be compatible with CCF implementation of clock API. v2: use clk_prepare_enable/clk_disable_unprepare() (Peter) Signed-off-by: Janusz Krzysztofik Acked-by: Peter Ujfalusi --- sound/soc/ti/osk5912.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/soc/ti/osk5912.c b/sound/soc/ti/osk5912.c index 40e29dda7e7a..2790c8915f55 100644 --- a/sound/soc/ti/osk5912.c +++ b/sound/soc/ti/osk5912.c @@ -27,12 +27,12 @@ static struct clk *tlv320aic23_mclk; static int osk_startup(struct snd_pcm_substream *substream) { - return clk_enable(tlv320aic23_mclk); + return clk_prepare_enable(tlv320aic23_mclk); } static void osk_shutdown(struct snd_pcm_substream *substream) { - clk_disable(tlv320aic23_mclk); + clk_disable_unprepare(tlv320aic23_mclk); } static int osk_hw_params(struct snd_pcm_substream *substream,