From patchwork Tue Oct 3 14:50:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 147923 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2a8e:b0:403:3b70:6f57 with SMTP id in14csp2139116vqb; Tue, 3 Oct 2023 07:51:59 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHgBYOFNdHv42RKLrm7cTui0jnCvZlrh3n2tpd7PDX9yBMl8uG/fIKw476IMZsMKyv7gD1F X-Received: by 2002:a05:6a20:4284:b0:162:4f45:b415 with SMTP id o4-20020a056a20428400b001624f45b415mr18797839pzj.51.1696344718672; Tue, 03 Oct 2023 07:51:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696344718; cv=none; d=google.com; s=arc-20160816; b=qL8MANwihblEtEav4ImUiUWVxRvmXkqnqrj8cUZTG0BIJHTjkG5TVR9AivNe7l7MqV 4dWaqHlasJHxdQRNJmjY+QpSCwheqy8tFj9ctKAIGI6HwxXxN3qPxe0Bv7t/+pVEWelu 24mK+NdgozGaJwYnfIf1w6iHKRALkZZrvTXC7pR52DRWXyCNV17N10nF8V7NQETAlvt9 9FXSbLbmYQwDMaHlP//V2OC8NcHsB5iGbfv+bxAC/n9qfCSKEVu2CgPG5Nidp1DeDBHW I4UwrkFQ/OL0PaJy8VxFzTdeadZdd9E8DncMgvnSJYeGKujCMfegBefklUgPzbl2c4GJ WU6w== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=GdtmVBU6kbuKuNlqmo+NUmCZOtJiKsXYzRDePE/dKQY=; fh=hbZuELJbXWIM5e/N4D/KRXopoIKbPibjNuvPVI4PX74=; b=KRyfD42C7rVNLsvMOFJyN+VplrkOw9KZgURLwE6861zsGMrxIa38AZleFd30538JJ8 2KBKoT7cqB83GEw4gq6KcRNvWQvnQiPKymX5Y9wRoUkEJBdvMLpBojaKZnxBQUXah7VL RcIuqZE2SbpIx3Qs6i16qcTInNUF16hbJ6SWyAFdWQnK/R3d7dfJINnvoeV9G8MFfVsa xlSRs23XRSvFz490NnBWP46q4D6E1njvJR+EMZVb/kkwFeFmeYvtaDQ9/jQ4TSMLRH4G Elrxz1EYWw7QjSbU0ZUhqWIqAoq2S53PRLjJ9xXE4FjnGdrSd8h54JS1t0WBiJKn46Ei 2mfA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@bgdev-pl.20230601.gappssmtp.com header.s=20230601 header.b=jXakqBkh; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from howler.vger.email (howler.vger.email. [23.128.96.34]) by mx.google.com with ESMTPS id t32-20020a056a0013a000b0068e4a646d2csi1749818pfg.252.2023.10.03.07.51.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Oct 2023 07:51:58 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 as permitted sender) client-ip=23.128.96.34; Authentication-Results: mx.google.com; dkim=pass header.i=@bgdev-pl.20230601.gappssmtp.com header.s=20230601 header.b=jXakqBkh; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by howler.vger.email (Postfix) with ESMTP id 1DDF082A6776; Tue, 3 Oct 2023 07:51:58 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at howler.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240274AbjJCOv4 (ORCPT + 17 others); Tue, 3 Oct 2023 10:51:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34496 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240119AbjJCOvd (ORCPT ); Tue, 3 Oct 2023 10:51:33 -0400 Received: from mail-wm1-x32d.google.com (mail-wm1-x32d.google.com [IPv6:2a00:1450:4864:20::32d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 63147A1 for ; Tue, 3 Oct 2023 07:51:30 -0700 (PDT) Received: by mail-wm1-x32d.google.com with SMTP id 5b1f17b1804b1-40535597f01so9824635e9.3 for ; Tue, 03 Oct 2023 07:51:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20230601.gappssmtp.com; s=20230601; t=1696344689; x=1696949489; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=GdtmVBU6kbuKuNlqmo+NUmCZOtJiKsXYzRDePE/dKQY=; b=jXakqBkhtEuN7DMEJBXvkGRe3XTKFUaJCKM9DlRt4KV1JxCVzMivj8ykB5NGFX8qj2 V2bmXI7B/a41CKjup4pl1DYO0EbcgybwJv10wfFsSEc/lg3i1RNHPhIuyOOfFA+O5RXI pi5EWXBPs8ElaXlZUGRpZYN57mxP4oZISOilmm+qCgdk17VpyQCkI7xSnAUjzZWofuLV /Wlp4fetyMcUTxP8eX14IKOC3wFKJSk1ctxL+Zidu1w6IpQlszmiK8JD1aOVwmzFniTL vlQVP/DDI+zWn4w3pBkjhV0ycm1hYDbbxKxZ9OSeu7kotG/ZgAecoa7BRQnk3YxdCbZW ifqQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696344689; x=1696949489; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=GdtmVBU6kbuKuNlqmo+NUmCZOtJiKsXYzRDePE/dKQY=; b=qbuHOVaEjbVyNwNpZc7LnJTdzvFsvC84Dv62kQVtAqIQikhNKBVe135+fPTeBMN8Ij HKJpxZPxXQ7saygSToYyl4NDuJN4hodV9n2vTW39w/2whO4fn00iyP2WMQsa/31MoUe2 17N0SNHpjxwqds3eSfmCwfau5yNs0knCHPRGRis7MRu7NcLIU740gvGzE3wyyVaEs2by gcuCVA2gt0tinh7wnb1LCqpeZRXUvM7px2JPej2XJhnKLWbaTvtaKIoiUuYolNT5AT2k w17ji+Sa5S0LWOPQxiMmXDf0TF4KK7lOxqUSn2wAGx51BkC8OUyQw6h4LaYoxd5ea0bN 1o/A== X-Gm-Message-State: AOJu0YxJoSnhHchsjZFFJ2KMTppQk0xIdzxYQlDB+GQNprhueUCJKjsT 0dTR4onSiiuadJUDQ4aR72Lubl/G0CqXxus0V0g= X-Received: by 2002:a7b:ce95:0:b0:401:b2c7:349b with SMTP id q21-20020a7bce95000000b00401b2c7349bmr13017389wmj.7.1696344688864; Tue, 03 Oct 2023 07:51:28 -0700 (PDT) Received: from brgl-uxlite.home ([2a01:cb1d:334:ac00:1f2d:3479:a5de:fa35]) by smtp.gmail.com with ESMTPSA id c15-20020a05600c0acf00b003fe29f6b61bsm1462773wmr.46.2023.10.03.07.51.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Oct 2023 07:51:28 -0700 (PDT) From: Bartosz Golaszewski To: Linus Walleij , Andy Shevchenko Cc: linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org, Bartosz Golaszewski , Joel Stanley , Andrew Jeffery , linux-arm-kernel@lists.infradead.org, linux-aspeed@lists.ozlabs.org Subject: [PATCH 08/36] gpio: aspeed: use new pinctrl GPIO helpers Date: Tue, 3 Oct 2023 16:50:46 +0200 Message-Id: <20231003145114.21637-9-brgl@bgdev.pl> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231003145114.21637-1-brgl@bgdev.pl> References: <20231003145114.21637-1-brgl@bgdev.pl> MIME-Version: 1.0 X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_NONE autolearn=unavailable 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-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (howler.vger.email [0.0.0.0]); Tue, 03 Oct 2023 07:51:58 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1778746359753644055 X-GMAIL-MSGID: 1778746359753644055 From: Bartosz Golaszewski Replace the pinctrl helpers taking the global GPIO number as argument with the improved variants that instead take a pointer to the GPIO chip and the controller-relative offset. Signed-off-by: Bartosz Golaszewski Reviewed-by: Andrew Jeffery Acked-by: Uwe Kleine-König --- drivers/gpio/gpio-aspeed.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/gpio/gpio-aspeed.c b/drivers/gpio/gpio-aspeed.c index da33bbbdacb9..d3aa1cfd4ace 100644 --- a/drivers/gpio/gpio-aspeed.c +++ b/drivers/gpio/gpio-aspeed.c @@ -750,12 +750,12 @@ static int aspeed_gpio_request(struct gpio_chip *chip, unsigned int offset) if (!have_gpio(gpiochip_get_data(chip), offset)) return -ENODEV; - return pinctrl_gpio_request(chip->base + offset); + return pinctrl_gpio_request_new(chip, offset); } static void aspeed_gpio_free(struct gpio_chip *chip, unsigned int offset) { - pinctrl_gpio_free(chip->base + offset); + pinctrl_gpio_free_new(chip, offset); } static int usecs_to_cycles(struct aspeed_gpio *gpio, unsigned long usecs, @@ -973,7 +973,7 @@ static int aspeed_gpio_set_config(struct gpio_chip *chip, unsigned int offset, else if (param == PIN_CONFIG_BIAS_DISABLE || param == PIN_CONFIG_BIAS_PULL_DOWN || param == PIN_CONFIG_DRIVE_STRENGTH) - return pinctrl_gpio_set_config(offset, config); + return pinctrl_gpio_set_config_new(chip, offset, config); else if (param == PIN_CONFIG_DRIVE_OPEN_DRAIN || param == PIN_CONFIG_DRIVE_OPEN_SOURCE) /* Return -ENOTSUPP to trigger emulation, as per datasheet */