From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E0E36291161; Mon, 14 Apr 2025 13:28:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744637299; cv=none; b=gUV8bACXcD5qKOhsMP8TiLhTx3tuOiAxa3uxriXOygycOGwIlXDxo3hAdAG1UEL46w1HRJjrTO+32k6mv/MbCIUQsW3S4nZvX36Ea+gsaU1MywtpudW9EEwIu/0TTNykP7jFo+Nlr0qBkJZNi0oj/dVLB7YVeVbJc2BG6Im9LLc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744637299; c=relaxed/simple; bh=XnD07pk/6ayreH2RF2D+WL2oa/0JbLWCPdWUdxtZWjA=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=RN3jwrkScAsEM2JAP7UlDuPPqDamL4WwtFTwfkhy6rKeq+ry4RLyyZK2JnrfQH/edDsPCDUv07BaRCJdeNMZR2FIcSgr1gfWISGiBPdvcgmJYJnS9g6Mc04KiBCafHY9BHKAV5VOIzO0IVhTA3dSppwTLspJ+Us1MK1hY/khTOw= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=FV0TSrh7; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="FV0TSrh7" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3202BC4AF09; Mon, 14 Apr 2025 13:28:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1744637296; bh=XnD07pk/6ayreH2RF2D+WL2oa/0JbLWCPdWUdxtZWjA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=FV0TSrh7Rlm8EgVMQ5Bi31qU7uLLgWCuYHwqoyjxZbiZ72+3jjpbo0qoLYEZWIM1K EazclQA9q1yn5M8gHoaApQyej6Kdw4McnJFX3YDcw+PQcPNA7JsOvpKQagQ0arZbtF FA0KCKBpKwsmKzpoLaTPNzzpDPVqRV7FqO4vgN0C+WcmHeKs4w0lkGgeB/jNt7eiHr WUR4tE+ugNCUK1hEJiyCbjC+9wXtRgjtfXOdmFveFk8dLxBcW9pE3zLfF2pcp3kedR FhwGUsOYpDXV9+tNr00VIuAFnxQWgA8VWoA1lnYJM48an1lBpA/SEzme0d/EXC5JM7 b6xJ70SAOB+TQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Andy Shevchenko , Bartosz Golaszewski , Sasha Levin , linus.walleij@linaro.org, brgl@bgdev.pl, linux-gpio@vger.kernel.org Subject: [PATCH AUTOSEL 6.13 20/34] gpiolib: of: Move Atmel HSMCI quirk up out of the regulator comment Date: Mon, 14 Apr 2025 09:27:14 -0400 Message-Id: <20250414132729.679254-20-sashal@kernel.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250414132729.679254-1-sashal@kernel.org> References: <20250414132729.679254-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.13.11 Content-Transfer-Encoding: 8bit From: Andy Shevchenko [ Upstream commit b8c7a1ac884cc267d1031f8de07f1a689a69fbab ] The regulator comment in of_gpio_set_polarity_by_property() made on top of a couple of the cases, while Atmel HSMCI quirk is not related to that. Make it clear by moving Atmel HSMCI quirk up out of the scope of the regulator comment. Signed-off-by: Andy Shevchenko Link: https://lore.kernel.org/r/20250402122058.1517393-3-andriy.shevchenko@linux.intel.com Signed-off-by: Bartosz Golaszewski Signed-off-by: Sasha Levin --- drivers/gpio/gpiolib-of.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/gpio/gpiolib-of.c b/drivers/gpio/gpiolib-of.c index 2e537ee979f3e..f12ddb48909c0 100644 --- a/drivers/gpio/gpiolib-of.c +++ b/drivers/gpio/gpiolib-of.c @@ -257,6 +257,9 @@ static void of_gpio_set_polarity_by_property(const struct device_node *np, { "fsl,imx8qm-fec", "phy-reset-gpios", "phy-reset-active-high" }, { "fsl,s32v234-fec", "phy-reset-gpios", "phy-reset-active-high" }, #endif +#if IS_ENABLED(CONFIG_MMC_ATMELMCI) + { "atmel,hsmci", "cd-gpios", "cd-inverted" }, +#endif #if IS_ENABLED(CONFIG_PCI_IMX6) { "fsl,imx6q-pcie", "reset-gpio", "reset-gpio-active-high" }, { "fsl,imx6sx-pcie", "reset-gpio", "reset-gpio-active-high" }, @@ -282,9 +285,6 @@ static void of_gpio_set_polarity_by_property(const struct device_node *np, #if IS_ENABLED(CONFIG_REGULATOR_GPIO) { "regulator-gpio", "enable-gpio", "enable-active-high" }, { "regulator-gpio", "enable-gpios", "enable-active-high" }, -#endif -#if IS_ENABLED(CONFIG_MMC_ATMELMCI) - { "atmel,hsmci", "cd-gpios", "cd-inverted" }, #endif }; unsigned int i; -- 2.39.5