From patchwork Mon Feb 13 16:17:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 56374 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp2438118wrn; Mon, 13 Feb 2023 08:25:22 -0800 (PST) X-Google-Smtp-Source: AK7set/vsRZWsyKH794x5Zhb7nl8kCgOIBroPNR9+0CzUk9bxf91yNTTORHiX2ygEzshuYmylhqa X-Received: by 2002:a17:90a:4a8d:b0:22b:b78f:ba04 with SMTP id f13-20020a17090a4a8d00b0022bb78fba04mr28782462pjh.41.1676305521925; Mon, 13 Feb 2023 08:25:21 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676305521; cv=none; d=google.com; s=arc-20160816; b=uyMktN3R7e6qQBLCG2dGsqhZLfboEUlxjAtMpDH5fxJhZDgNaL5HRY/vPWikaFa2yz Az7bqlBLZlpILUXj2D3zuY7ejltEoJ3SDIPsr86/MEm0qkJI+6VngA60EbO1LmJii45x bUYfrLt/vx0FQitwenv6yuqb3ThFlO4xjrN1UF1qH4OMJerJdJK8D0/QPb/CuTWjIhYq e58kc8N6W71UWrC/TYs6BItqgDQpzoxEE76/lk525fCjmX0azGQ49GHmCaeQZkFmw2gr efgM/qDVbY2JH4LyFLW4OZlTIHIfheSvWEe/aMVY1FMzCrE013Msvmf7emLO3bFd9yRD EeZw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=udrsylhcwaIR2bvdhMmFvj60CgP2HXZFhIFKg8Z9/Os=; b=qo6XkEfkvA3p11wgfU8q61xAcnOU3XJK4cpARRKoNYM5+Wu+d4kQup2URtatTXBRsK hzWSXfob2ZD+Bb5/HvfSbn2B7z3ETtZvp8CUTKKT+hMYAkpJvC866SFHh9vms33qTH9i n+Y+Oio51PDIOfpgM5V4bDies31yjLphBy5EzPyEJeX/VvbJ2Q5qJblaZZ7wwZp07SJI qhGaiPe2X/Ce/EsrUw0N+N/HIHhVPCrPb5ys1O3wNWEZByRCmiYgFfpL9zGu9e6q1rdW BKo95+q3zcbZ37kt2S3M5yvKZOT9GzaG4PE5n5P2Aqkj9UDCAzps3IM8eQ0Fw9DpRGb3 WfsA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=lykMT1i2; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id v24-20020a17090a899800b002312812e917si6068816pjn.63.2023.02.13.08.25.09; Mon, 13 Feb 2023 08:25:21 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=lykMT1i2; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230072AbjBMQQy (ORCPT + 99 others); Mon, 13 Feb 2023 11:16:54 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34092 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229607AbjBMQQw (ORCPT ); Mon, 13 Feb 2023 11:16:52 -0500 Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 11186196BF for ; Mon, 13 Feb 2023 08:16:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1676305012; x=1707841012; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=cZTTeKU937sx7b1HCCuAu24tBsbF1+KVsSvF5ZVAqfw=; b=lykMT1i2Dd0VjmMPj7kAnC0rAR/R7Mg9NpPch1aS5PADYN0+XYDAsxbO IqZxNqBImO0Yu+mcr8xmbLmY+ucL51jAlw9mFGJxIK/FrQGiAdFAMggpT KQ9eN7Sdfd5Jdh57ze6c372qlpZF20VMI2Rc8z2NqN21QtNsiL1pKMslp FVICWGdXV5NDDJ2H3ybSjp2oo6DH1FjjSWpoyMSs+nekqPZ9331Rk4WTd S1K5G3pZW5r4k9gnssENhjcMOyV25GLt1sam/HixxDkd9XMHMfrnZh/Qx VFd5toeRIq00zzz7ypDDExGVIg8pp3zNXHCVhK9nJw/2+10fPjOFs7y4d Q==; X-IronPort-AV: E=McAfee;i="6500,9779,10620"; a="310560334" X-IronPort-AV: E=Sophos;i="5.97,294,1669104000"; d="scan'208";a="310560334" Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Feb 2023 08:16:41 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10620"; a="670874415" X-IronPort-AV: E=Sophos;i="5.97,294,1669104000"; d="scan'208";a="670874415" Received: from black.fi.intel.com ([10.237.72.28]) by fmsmga007.fm.intel.com with ESMTP; 13 Feb 2023 08:16:39 -0800 Received: by black.fi.intel.com (Postfix, from userid 1003) id D9BC61A6; Mon, 13 Feb 2023 18:17:18 +0200 (EET) From: Andy Shevchenko To: Andy Shevchenko , alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org Cc: Liam Girdwood , Mark Brown , Jaroslav Kysela , Takashi Iwai Subject: [PATCH v1 1/1] ASoC: soc-ac97: Convert to agnostic GPIO API Date: Mon, 13 Feb 2023 18:17:13 +0200 Message-Id: <20230213161713.1450-1-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.39.1 MIME-Version: 1.0 X-Spam-Status: No, score=-4.3 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_PASS, SPF_NONE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1757733739156702412?= X-GMAIL-MSGID: =?utf-8?q?1757733739156702412?= The of_gpio.h is going to be removed. In preparation of that convert the driver to the agnostic API. Signed-off-by: Andy Shevchenko --- sound/soc/soc-ac97.c | 68 ++++++++++++++------------------------------ 1 file changed, 22 insertions(+), 46 deletions(-) diff --git a/sound/soc/soc-ac97.c b/sound/soc/soc-ac97.c index 32c5be61e2ec..40051f513c6a 100644 --- a/sound/soc/soc-ac97.c +++ b/sound/soc/soc-ac97.c @@ -14,10 +14,9 @@ #include #include #include -#include +#include #include #include -#include #include #include #include @@ -29,9 +28,9 @@ struct snd_ac97_reset_cfg { struct pinctrl_state *pstate_reset; struct pinctrl_state *pstate_warm_reset; struct pinctrl_state *pstate_run; - int gpio_sdata; - int gpio_sync; - int gpio_reset; + struct gpio_desc *reset_gpio; + struct gpio_desc *sdata_gpio; + struct gpio_desc *sync_gpio; }; static struct snd_ac97_bus soc_ac97_bus = { @@ -268,11 +267,11 @@ static void snd_soc_ac97_warm_reset(struct snd_ac97 *ac97) pinctrl_select_state(pctl, snd_ac97_rst_cfg.pstate_warm_reset); - gpio_direction_output(snd_ac97_rst_cfg.gpio_sync, 1); + gpiod_direction_output_raw(snd_ac97_rst_cfg.sync_gpio, 1); udelay(10); - gpio_direction_output(snd_ac97_rst_cfg.gpio_sync, 0); + gpiod_direction_output_raw(snd_ac97_rst_cfg.sync_gpio, 0); pinctrl_select_state(pctl, snd_ac97_rst_cfg.pstate_run); msleep(2); @@ -284,13 +283,13 @@ static void snd_soc_ac97_reset(struct snd_ac97 *ac97) pinctrl_select_state(pctl, snd_ac97_rst_cfg.pstate_reset); - gpio_direction_output(snd_ac97_rst_cfg.gpio_sync, 0); - gpio_direction_output(snd_ac97_rst_cfg.gpio_sdata, 0); - gpio_direction_output(snd_ac97_rst_cfg.gpio_reset, 0); + gpiod_direction_output_raw(snd_ac97_rst_cfg.sync_gpio, 0); + gpiod_direction_output_raw(snd_ac97_rst_cfg.sdata_gpio, 0); + gpiod_direction_output_raw(snd_ac97_rst_cfg.reset_gpio, 0); udelay(10); - gpio_direction_output(snd_ac97_rst_cfg.gpio_reset, 1); + gpiod_direction_output_raw(snd_ac97_rst_cfg.reset_gpio, 1); pinctrl_select_state(pctl, snd_ac97_rst_cfg.pstate_run); msleep(2); @@ -301,8 +300,6 @@ static int snd_soc_ac97_parse_pinctl(struct device *dev, { struct pinctrl *p; struct pinctrl_state *state; - int gpio; - int ret; p = devm_pinctrl_get(dev); if (IS_ERR(p)) { @@ -332,41 +329,20 @@ static int snd_soc_ac97_parse_pinctl(struct device *dev, } cfg->pstate_run = state; - gpio = of_get_named_gpio(dev->of_node, "ac97-gpios", 0); - if (gpio < 0) { - dev_err(dev, "Can't find ac97-sync gpio\n"); - return gpio; - } - ret = devm_gpio_request(dev, gpio, "AC97 link sync"); - if (ret) { - dev_err(dev, "Failed requesting ac97-sync gpio\n"); - return ret; - } - cfg->gpio_sync = gpio; + cfg->sync_gpio = devm_gpiod_get_index(dev, "ac97", 0, GPIOD_ASIS); + if (IS_ERR(cfg->sync_gpio)) + return dev_err_probe(dev, PTR_ERR(cfg->sync_gpio), "Can't find ac97-sync gpio\n"); + gpiod_set_consumer_name(cfg->sync_gpio, "AC97 link sync"); - gpio = of_get_named_gpio(dev->of_node, "ac97-gpios", 1); - if (gpio < 0) { - dev_err(dev, "Can't find ac97-sdata gpio %d\n", gpio); - return gpio; - } - ret = devm_gpio_request(dev, gpio, "AC97 link sdata"); - if (ret) { - dev_err(dev, "Failed requesting ac97-sdata gpio\n"); - return ret; - } - cfg->gpio_sdata = gpio; + cfg->sdata_gpio = devm_gpiod_get_index(dev, "ac97", 1, GPIOD_ASIS); + if (IS_ERR(cfg->sdata_gpio)) + return dev_err_probe(dev, PTR_ERR(cfg->sync_gpio), "Can't find ac97-sdata gpio\n"); + gpiod_set_consumer_name(cfg->sdata_gpio, "AC97 link sdata"); - gpio = of_get_named_gpio(dev->of_node, "ac97-gpios", 2); - if (gpio < 0) { - dev_err(dev, "Can't find ac97-reset gpio\n"); - return gpio; - } - ret = devm_gpio_request(dev, gpio, "AC97 link reset"); - if (ret) { - dev_err(dev, "Failed requesting ac97-reset gpio\n"); - return ret; - } - cfg->gpio_reset = gpio; + cfg->reset_gpio = devm_gpiod_get_index(dev, "ac97", 2, GPIOD_ASIS); + if (IS_ERR(cfg->reset_gpio)) + return dev_err_probe(dev, PTR_ERR(cfg->sync_gpio), "Can't find ac97-reset gpio\n"); + gpiod_set_consumer_name(cfg->reset_gpio, "AC97 link reset"); return 0; }