This is a note to let you know that I've just added the patch titled
arm64: dts: qcom: x1e80100-crd: fix up PCIe6a pinctrl node
to the 6.10-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
arm64-dts-qcom-x1e80100-crd-fix-up-pcie6a-pinctrl-no.patch
and it can be found in the queue-6.10 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
commit f91cd8871e02869f220768b3c4567c17e5d8b58b
Author: Johan Hovold <johan+linaro@xxxxxxxxxx>
Date: Mon Jul 22 11:42:45 2024 +0200
arm64: dts: qcom: x1e80100-crd: fix up PCIe6a pinctrl node
[ Upstream commit 6e3902c499544291ac4fd1a1bb69f2e9037a0e86 ]
The PCIe6a pinctrl node appears to have been copied from the sc8280xp
CRD dts, which has the NVMe on pcie2a and uses some funny indentation.
Fix up the node name to match the x1e80100 use and label and use only
tabs for indentation.
Reviewed-by: Konrad Dybcio <konrad.dybcio@xxxxxxxxxx>
Signed-off-by: Johan Hovold <johan+linaro@xxxxxxxxxx>
Link: https://lore.kernel.org/r/20240722094249.26471-5-johan+linaro@xxxxxxxxxx
Signed-off-by: Bjorn Andersson <andersson@xxxxxxxxxx>
Stable-dep-of: 42b33ad18846 ("arm64: dts: qcom: x1e80100-crd: fix missing PCIe4 gpios")
Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>
diff --git a/arch/arm64/boot/dts/qcom/x1e80100-crd.dts b/arch/arm64/boot/dts/qcom/x1e80100-crd.dts
index 0d47c75e2ad8c..4096bb1ee4d3a 100644
--- a/arch/arm64/boot/dts/qcom/x1e80100-crd.dts
+++ b/arch/arm64/boot/dts/qcom/x1e80100-crd.dts
@@ -833,7 +833,7 @@ nvme_reg_en: nvme-reg-en-state {
bias-disable;
};
- pcie6a_default: pcie2a-default-state {
+ pcie6a_default: pcie6a-default-state {
clkreq-n-pins {
pins = "gpio153";
function = "pcie6a_clk";
@@ -849,11 +849,11 @@ perst-n-pins {
};
wake-n-pins {
- pins = "gpio154";
- function = "gpio";
- drive-strength = <2>;
- bias-pull-up;
- };
+ pins = "gpio154";
+ function = "gpio";
+ drive-strength = <2>;
+ bias-pull-up;
+ };
};
tpad_default: tpad-default-state {
