From patchwork Tue Oct 3 14:50:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 147927 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2a8e:b0:403:3b70:6f57 with SMTP id in14csp2139387vqb; Tue, 3 Oct 2023 07:52:29 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGPC8uNviyn5HiRpdireripUX0qlzAOC7Y8Xy61M/1AFOKvLA7+w0uOuxZ+I/lS52wEsGZC X-Received: by 2002:a05:6a00:b50:b0:68f:cc47:fcd7 with SMTP id p16-20020a056a000b5000b0068fcc47fcd7mr17091505pfo.28.1696344749139; Tue, 03 Oct 2023 07:52:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696344749; cv=none; d=google.com; s=arc-20160816; b=gpq5WQEPZBEvh8/s04c+tM6ht4gmaVPTzg+mdoMnB3iBQOLKKEu9samGc2v2Ow9zGu IOFLJ2kSp8urYY81GkMuQz8BypeZuAjphBVHFf5fYQrCNpXm+wOUgmbi+9dLh3k197CT f+JIOlMT2fkTkRK8KcpNnltyAP/GXQ50lfI+AFLWtxD1/O/OCpfPm1VPdpZkJVDFZx6m a67VVFXj67WdqiczcvYoM2D2o3fZ54OrE3zfaWYiSO9ZFWJl2oyJzdv5m/tECheLeaZo eoUcjPIgD9AkwxJXnQAqwY3kYUXmbsrHdOltJiD/D6/eHJUN4vXiYtP5CtnXPT0EKdGE 8qfw== 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=0LC9FxBCiC3OrfTLsSY8qEZzHDKeEz4Ow69tozPBiOU=; fh=i8s9joTDW7kzVrwG+9heqXI3pTy/Xs0lHlN+hguXk7Q=; b=FAYkP3XEiQxxqEqt/n+70nTD7jRslw+Oj3oT8BBtMoBMg5IxAUlYZ9tGR7OJY9Hbvj cN29C1fSPS5V8y4UL4V+IB3RsdaGwLJ5EV9TCUxCa6y3Rv7grfMhxRfyCDS4/zRnTLpo 5mHEXmMVQYKiYKYbTyRlVLJs6HEkNIrlC0VUuCGgLgFaE+scMruwtevPrL8NXLlLon0v CKNCFywfPdHdi3sHHFZGnDMYq2fcwfuUyMRd7HK5e1KTgFLCzqPNZcwhwjgsgXMqtZ5q iNZkAZOCUunnMCVa/nwZuYT70p2v5ji18iWj8p/AESOhvKhP9/UV4dysZoDHLtiNohOa MVmA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@bgdev-pl.20230601.gappssmtp.com header.s=20230601 header.b=DfhEG8N1; 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 z1-20020a63c041000000b005859ed0e6f4si1552913pgi.471.2023.10.03.07.52.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Oct 2023 07:52:29 -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=DfhEG8N1; 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 1AA5E82A8573; Tue, 3 Oct 2023 07:52:28 -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 S240398AbjJCOwS (ORCPT + 17 others); Tue, 3 Oct 2023 10:52:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47870 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240214AbjJCOvi (ORCPT ); Tue, 3 Oct 2023 10:51:38 -0400 Received: from mail-wm1-x335.google.com (mail-wm1-x335.google.com [IPv6:2a00:1450:4864:20::335]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D503DCE for ; Tue, 3 Oct 2023 07:51:32 -0700 (PDT) Received: by mail-wm1-x335.google.com with SMTP id 5b1f17b1804b1-405361bb94eso10662615e9.0 for ; Tue, 03 Oct 2023 07:51:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20230601.gappssmtp.com; s=20230601; t=1696344691; x=1696949491; 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=0LC9FxBCiC3OrfTLsSY8qEZzHDKeEz4Ow69tozPBiOU=; b=DfhEG8N1TQ+niwpn2oiprZQFtUsQK2ddMZuHmy9NfocuNqdyQhQVTRDBQmGDeDqLW1 yh79XKB4TcNaY/xP2awyPUVku2hl5Ah6cSFvyfj4AmRCUn7DUwfHCXTfdblyNxGdAwEU YIr2rHiuVc52fxJilYzRbsroo7BMOrtxOjiyrTwcGA2Es1cdoXpGs/fGNmz5PR8ii0ty +mzTspe+ChH9puSyXQskjEpMJZHaA4FZlhmk5iSlxmTSzyza9RGTNwHa1Rrgbd7X5tkN 6DfVk2OlfiG8d+31JcvgBu8if5ZLhTc5Esf6UbOBfOxu6QN/26fdor5ihXRNDfUfR0YT x9+Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696344691; x=1696949491; 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=0LC9FxBCiC3OrfTLsSY8qEZzHDKeEz4Ow69tozPBiOU=; b=FQBxmdeSp5fdLFIf+/C6zsv8H5WDLYE6CzCHeNG8YDkplmyKguCQoGFxzpTOd0HCnM p23ZPrnOyJ6tnY3rW+eBD96rBqy4MFgjr8c4fSuNeX4/l6Tx20rEhZmyklg9yqcigQej pA4q1TOjZUbFaVPp5VRwm33yOv0anb5wJvEhZ6Fdxw0YR2Q6FDJj3EDTRWl0dAbgCnbw wd3hpTCiT6LjAFb54fZUowbAXEbjAudkgbiCvKSEuexKaLA7WRs5YXm987r1ttyUp+p6 39A3XnRMZRHE8nTo7F+dudaf02YhTZIJKEK/3Kn+r4ptHK6toQ50KA1Upqt5oZ52pigB hWaw== X-Gm-Message-State: AOJu0YxR7iLVzH2DBUUKKXPRxkK43/DTqIDZVRjq8nPICLA25CCKSsgS /xvlJsrm8Su7oYReeL1UHlFSg/gQu1yoDySBTnY= X-Received: by 2002:a05:600c:2317:b0:402:f5c4:2e5a with SMTP id 23-20020a05600c231700b00402f5c42e5amr13357135wmo.37.1696344691351; Tue, 03 Oct 2023 07:51:31 -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.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Oct 2023 07:51:30 -0700 (PDT) From: Bartosz Golaszewski To: Linus Walleij , Andy Shevchenko Cc: linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org, Bartosz Golaszewski , Heiko Stuebner , linux-rockchip@lists.infradead.org Subject: [PATCH 11/36] gpio: rockchip: use new pinctrl GPIO helpers Date: Tue, 3 Oct 2023 16:50:49 +0200 Message-Id: <20231003145114.21637-12-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:52:28 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1778746391857711801 X-GMAIL-MSGID: 1778746391857711801 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 Acked-by: Heiko Stuebner --- drivers/gpio/gpio-rockchip.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpio/gpio-rockchip.c b/drivers/gpio/gpio-rockchip.c index 23040a8cea34..3576793f0bd9 100644 --- a/drivers/gpio/gpio-rockchip.c +++ b/drivers/gpio/gpio-rockchip.c @@ -159,9 +159,9 @@ static int rockchip_gpio_set_direction(struct gpio_chip *chip, if (input) - pinctrl_gpio_direction_input(bank->pin_base + offset); + pinctrl_gpio_direction_input_new(chip, offset); else - pinctrl_gpio_direction_output(bank->pin_base + offset); + pinctrl_gpio_direction_output_new(chip, offset); raw_spin_lock_irqsave(&bank->slock, flags); rockchip_gpio_writel_bit(bank, offset, data, bank->gpio_regs->port_ddr);