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 A9E86301A49; Mon, 5 May 2025 22:26:45 +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=1746484005; cv=none; b=HtFrx3L+0LnYKmOAOpQcdeUzaRHIjWLvJRstNjjP9EivJ+cp3/weIgwkSn5JHvjpkf44+nrbXFp2qb9angItJjt5cgwdrX+7wPq/YfaLKhhmZHR91KI12JsfkXmfhAFdx7PvQRlCCx3s7MMbgNhUCIBt0QplvVEdk2zAlly7ZWY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746484005; c=relaxed/simple; bh=7B9odQZRj2gC76z7NxjH0h9xUUpgvrl593tF6Jxvcd0=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version:Content-Type; b=nhUpqNA3Jf7ye072hOvWhDJvpx+WA7XW1t7qgtMXxdCp1RgW2V2fCgYaLCTEpOFm6q7bA3M5omaWCL+sKHdwYgWbH/hTAlHbaGromErGO91P3bCIltJ8FSv1AyJo6kbmitG69JAi7J0ks5+OVn5NnJ3djAJvE1QuZ7KCP5Uefx8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=iAqEbBoc; 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="iAqEbBoc" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 81438C4CEE4; Mon, 5 May 2025 22:26:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1746484005; bh=7B9odQZRj2gC76z7NxjH0h9xUUpgvrl593tF6Jxvcd0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=iAqEbBocZC57c9KDxDww09oZj+5qGuCvW8Lcg/N5Ece8tM6/8hfd0/fWk53dpu8bs sozNUYfFPGuJ4FqU4Zq4V8/czNC3/zB88FrnWoLXM4bDrcSwLCkn7LVEG6oNgo/6JC LSi3MXkk4ctd1fxQiDyLy/cduUPO1lo1VKJ7bVPX5k5dtTiKhUojqeDW9/WKf7x/85 QGrJaIJU1wi2xzEELcwvGYUg5jSzkY1KImxg1SHYtAQvejUiQJp+T3jjohgnRAv1VS A9byi1KjJ7JW6sJ2Ri11xEZW403k6sWoz5MzBkbEHcVYMrBzjAxwxf26rn3gTXfTKr HHkVoAzlP+Wfg== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Dang Huynh , =?UTF-8?q?Barnab=C3=A1s=20Cz=C3=A9m=C3=A1n?= , Linus Walleij , Sasha Levin , andersson@kernel.org, linux-arm-msm@vger.kernel.org, linux-gpio@vger.kernel.org Subject: [PATCH AUTOSEL 6.14 314/642] pinctrl: qcom: msm8917: Add MSM8937 wsa_reset pin Date: Mon, 5 May 2025 18:08:50 -0400 Message-Id: <20250505221419.2672473-314-sashal@kernel.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250505221419.2672473-1-sashal@kernel.org> References: <20250505221419.2672473-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.14.5 Content-Transfer-Encoding: 8bit From: Dang Huynh [ Upstream commit 3dd3ab690172b11758e17775cfbf98986ec0cb71 ] It looks like both 8917 and 8937 are the same except for one pin "wsa_reset". Signed-off-by: Dang Huynh Signed-off-by: Barnabás Czémán Link: https://lore.kernel.org/20250211-msm8937-v1-4-7d27ed67f708@mainlining.org Signed-off-by: Linus Walleij Signed-off-by: Sasha Levin --- drivers/pinctrl/qcom/Kconfig.msm | 4 ++-- drivers/pinctrl/qcom/pinctrl-msm8917.c | 8 +++++++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/drivers/pinctrl/qcom/Kconfig.msm b/drivers/pinctrl/qcom/Kconfig.msm index 35f47660a56b1..a0d63a6725393 100644 --- a/drivers/pinctrl/qcom/Kconfig.msm +++ b/drivers/pinctrl/qcom/Kconfig.msm @@ -138,10 +138,10 @@ config PINCTRL_MSM8916 Qualcomm TLMM block found on the Qualcomm 8916 platform. config PINCTRL_MSM8917 - tristate "Qualcomm 8917 pin controller driver" + tristate "Qualcomm 8917/8937 pin controller driver" help This is the pinctrl, pinmux, pinconf and gpiolib driver for the - Qualcomm TLMM block found on the Qualcomm MSM8917 platform. + Qualcomm TLMM block found on the Qualcomm MSM8917, MSM8937 platform. config PINCTRL_MSM8953 tristate "Qualcomm 8953 pin controller driver" diff --git a/drivers/pinctrl/qcom/pinctrl-msm8917.c b/drivers/pinctrl/qcom/pinctrl-msm8917.c index cff137bb3b23f..350636807b07d 100644 --- a/drivers/pinctrl/qcom/pinctrl-msm8917.c +++ b/drivers/pinctrl/qcom/pinctrl-msm8917.c @@ -539,6 +539,7 @@ enum msm8917_functions { msm_mux_webcam_standby, msm_mux_wsa_io, msm_mux_wsa_irq, + msm_mux_wsa_reset, msm_mux__, }; @@ -1123,6 +1124,10 @@ static const char * const wsa_io_groups[] = { "gpio94", "gpio95", }; +static const char * const wsa_reset_groups[] = { + "gpio96", +}; + static const char * const blsp_spi8_groups[] = { "gpio96", "gpio97", "gpio98", "gpio99", }; @@ -1378,6 +1383,7 @@ static const struct pinfunction msm8917_functions[] = { MSM_PIN_FUNCTION(webcam_standby), MSM_PIN_FUNCTION(wsa_io), MSM_PIN_FUNCTION(wsa_irq), + MSM_PIN_FUNCTION(wsa_reset), }; static const struct msm_pingroup msm8917_groups[] = { @@ -1616,5 +1622,5 @@ static void __exit msm8917_pinctrl_exit(void) } module_exit(msm8917_pinctrl_exit); -MODULE_DESCRIPTION("Qualcomm msm8917 pinctrl driver"); +MODULE_DESCRIPTION("Qualcomm msm8917/msm8937 pinctrl driver"); MODULE_LICENSE("GPL"); -- 2.39.5