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: 13407722 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (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 D45A4E7AD5E for ; Tue, 3 Oct 2023 14:51:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=2eVnEtSt199t97Cgyb/bwcD9USbVmAMpPrbjaxB39vA=; b=noRYpumZvq6TDn +uO777Ljn/1I0bD1OxZRrMc/nDgIlaXL29af5bbm41uS7UusjVJu3FJcwq4Pp6GKv6QxQ49pTcyqi OgL4lPcVfgf9QXzm/6ljyV+tLwI7jPUk4NjKj6tIRUJ3+u4jBq6bzrdfTtLk1PBzEo0da+mvyxH0e K4bfKk/DKABZ7swVWws3NZ6l7zWu19s/dAKTZRJOnCqsz4CpM6s05i6PXD7v9H3ONngOUUwnrSHVu KXsPmy3fWZWwtPVILCgoikSoRlBj5Ah2DyTU5vwsfkr75ts1pZezXO0rOvdp3tFuLyED/ZGF1S465 9qtV/v6Wi6VD4o4ZGW+w==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qngkH-00EpOh-25; Tue, 03 Oct 2023 14:51:33 +0000 Received: from mail-wm1-x32d.google.com ([2a00:1450:4864:20::32d]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qngkE-00EpNc-1z for linux-arm-kernel@lists.infradead.org; Tue, 03 Oct 2023 14:51:32 +0000 Received: by mail-wm1-x32d.google.com with SMTP id 5b1f17b1804b1-4056ce55e7eso9919275e9.2 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=lists.infradead.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=b/KJsSI+of4iwrLwvWabGGqKVDRsJGodRIKgIxI7cxZ3dJ+/ve3hTwlF9OCx71FuMp adZ8bUPiJb+QTo1Oc5Zjcmk/Gf/l8PMzvCes6gSU3OXxwZyJIZ8m3U7bMd4tXhKAdAme RctCMa+/118zvsLPc+U+5pp/4G32fE8yHja0ZhjbgypYfbTbO8YzyTBPNLUC07UJzWhA Qwumvk2fO0TvLyZqlHZ/IffGZK2DBgpk2EAoj+tvyzZdWfPnB04kDyJFlfRVLLFAMwv7 nifDyHcLEio6oJ2c3REu7GDGTpZwZ67ErE6FCHTbx63Uuofy4qWNV3C4H7PQl67sp/mO fhHQ== 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=mmVZ3iCocplpAnws19gNa9rdccKsH1x7Pm6VODimZ1odrybUKiEXVZUefuzCEAS0vu dCy5vtej2qGeUt83RZdwg1VU762txDMCj0I5I1bM4NXLxBaqWBVACp4KXEuGR8CfjM0n rAe6h9FzqchkLlQAE6F5hszfFibvqtDg3VoAxCPbyEuqL3JFv+bk7t+6gXE2YdGIcvJN ywaLmUMcHqKl4aVNDGn5XSBmGx17sz39s0YeVYT60l2ZUMwagwPNfs+n89hvv+tA4m48 1rXOexLGdyHx4n1PtAl4JQ/W1iYqxkXlaal9ywe2uJ02cH88xMCQRpEFnfdqcDpoC4kV Xtxg== X-Gm-Message-State: AOJu0YxN7EazVXtXiaXxi/43G3qRobEDUm7/OyBJBiiEyPe7m6VldbIB Dgjxa+zoi/KRIqFCCW1L64RdvQ== X-Google-Smtp-Source: AGHT+IF2Yqjlf5dCLqftkIXWdnHlJncSeaVfR3l4v1vd7ez4EG86XwGi+KzTftAAZ+upVwzbWRH4WA== 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-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20231003_075130_668579_432719B1 X-CRM114-Status: GOOD ( 13.38 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org 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 */