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 3300D29A3CD; Mon, 14 Apr 2025 13:29:26 +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=1744637367; cv=none; b=avq3imU30lU0fa92+bnZ+m4qMyg9qqdLMUENgOCjfhTIvZsBrid5mzzn4DUJbm/DJuaLISzn2dHGz/u/wJMU9/bKYZyfJqR4ydPIaICiok2mpmQP1nTzWiwVEtKtg5UAWnnxfaakVO/bN39rdAxbwjy1DtBF5axJrCtd4YlV1pU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744637367; c=relaxed/simple; bh=KCEN/dT9WHA4qh6KqQsVmoM0HMmN0+yy+HT90UCaZhY=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=K77WfG0yOn2/3dQdSVLqCHoyNjYQ3i7EcHqPZIaxO5R8M+lD/bfRfj6mCZmmn/RYvdtWUKQ1gVnm65EQN6CedcKwMNVneXDImyTiSTVuowv2aMIVdzXxwjezBy1CymOs6fZjtQPfz9SD2ODiQP1sHiP7Hjl58qn2FuNfDuK7+jw= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=lScCfJWp; 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="lScCfJWp" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 85DB5C4CEE2; Mon, 14 Apr 2025 13:29:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1744637366; bh=KCEN/dT9WHA4qh6KqQsVmoM0HMmN0+yy+HT90UCaZhY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=lScCfJWpKgW18wzjO7Qw2TnLV3WTdYJnBCsnnkyJ/67HX4o3Zm+jlFGZn/iRPolYC UnGaJoh2kWOc7JU5mu8P5DgRoGuM2YUIAkzyTwmuFnTUlLQYVlhoIoiIW4TOnidtiQ 4ubbyrx3LIuUo9Lo1VrxMztiAQT568lYtls1M4pzAnoidf+48QceQnW0a5EYfW7RZT ja+origKZpNMFAX/pEo8Ghiu2GKb93IwMVRwqZIrUlX9TdRFM/iKk2l/u4lM07NGu1 67LDCYpb2wiTc5L89li/M9F5NcfzUVyzHTszks24OPa3clnUJUhd1LIYTydC11qltc KP3tWOBiNeVxw== 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.12 16/30] gpiolib: of: Move Atmel HSMCI quirk up out of the regulator comment Date: Mon, 14 Apr 2025 09:28:33 -0400 Message-Id: <20250414132848.679855-16-sashal@kernel.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250414132848.679855-1-sashal@kernel.org> References: <20250414132848.679855-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@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.12.23 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 880f1efcaca53..8c9ccc0f60b01 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