This is a note to let you know that I've just added the patch titled
ARM: dts: qcom: ipq4019: fix broken NAND controller properties override
to the 6.1-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:
arm-dts-qcom-ipq4019-fix-broken-nand-controller-properties-override.patch
and it can be found in the queue-6.1 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From edcbdd57de499305e2a3737d4a73fe387f71d84c Mon Sep 17 00:00:00 2001
From: Krzysztof Kozlowski <krzysztof.kozlowski@xxxxxxxxxx>
Date: Thu, 20 Apr 2023 09:28:11 +0200
Subject: ARM: dts: qcom: ipq4019: fix broken NAND controller properties override
From: Krzysztof Kozlowski <krzysztof.kozlowski@xxxxxxxxxx>
commit edcbdd57de499305e2a3737d4a73fe387f71d84c upstream.
After renaming NAND controller node name from "qpic-nand" to
"nand-controller", the board DTS/DTSI also have to be updated:
Warning (unit_address_vs_reg): /soc/qpic-nand@79b0000: node has a unit name, but no reg or ranges property
Cc: <stable@xxxxxxxxxxxxxxx>
Fixes: 9e1e00f18afc ("ARM: dts: qcom: Fix node name for NAND controller node")
Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@xxxxxxxxxx>
Reviewed-by: Konrad Dybcio <konrad.dybcio@xxxxxxxxxx>
Reviewed-by: Manivannan Sadhasivam <mani@xxxxxxxxxx>
Signed-off-by: Bjorn Andersson <andersson@xxxxxxxxxx>
Link: https://lore.kernel.org/r/20230420072811.36947-1-krzysztof.kozlowski@xxxxxxxxxx
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
arch/arm/boot/dts/qcom-ipq4019-ap.dk04.1-c1.dts | 8 ++++----
arch/arm/boot/dts/qcom-ipq4019-ap.dk04.1.dtsi | 10 +++++-----
arch/arm/boot/dts/qcom-ipq4019-ap.dk07.1.dtsi | 12 ++++++------
3 files changed, 15 insertions(+), 15 deletions(-)
--- a/arch/arm/boot/dts/qcom-ipq4019-ap.dk04.1-c1.dts
+++ b/arch/arm/boot/dts/qcom-ipq4019-ap.dk04.1-c1.dts
@@ -11,9 +11,9 @@
dma-controller@7984000 {
status = "okay";
};
-
- qpic-nand@79b0000 {
- status = "okay";
- };
};
};
+
+&nand {
+ status = "okay";
+};
--- a/arch/arm/boot/dts/qcom-ipq4019-ap.dk04.1.dtsi
+++ b/arch/arm/boot/dts/qcom-ipq4019-ap.dk04.1.dtsi
@@ -102,10 +102,10 @@
status = "okay";
perst-gpios = <&tlmm 38 GPIO_ACTIVE_LOW>;
};
-
- qpic-nand@79b0000 {
- pinctrl-0 = <&nand_pins>;
- pinctrl-names = "default";
- };
};
};
+
+&nand {
+ pinctrl-0 = <&nand_pins>;
+ pinctrl-names = "default";
+};
--- a/arch/arm/boot/dts/qcom-ipq4019-ap.dk07.1.dtsi
+++ b/arch/arm/boot/dts/qcom-ipq4019-ap.dk07.1.dtsi
@@ -65,11 +65,11 @@
dma-controller@7984000 {
status = "okay";
};
-
- qpic-nand@79b0000 {
- pinctrl-0 = <&nand_pins>;
- pinctrl-names = "default";
- status = "okay";
- };
};
};
+
+&nand {
+ pinctrl-0 = <&nand_pins>;
+ pinctrl-names = "default";
+ status = "okay";
+};
Patches currently in stable-queue which might be from krzysztof.kozlowski@xxxxxxxxxx are
queue-6.1/w1-w1_therm-fix-locking-behavior-in-convert_t.patch
queue-6.1/arm-dts-qcom-msm8974-do-not-use-underscore-in-node-n.patch
queue-6.1/memory-brcmstb_dpfe-fix-testing-array-offset-after-u.patch
queue-6.1/arm64-dts-qcom-msm8916-correct-camss-unit-address.patch
queue-6.1/arm64-dts-qcom-msm8994-correct-spmi-unit-address.patch
queue-6.1/arm64-dts-qcom-sm8350-correct-dma-controller-unit-ad.patch
queue-6.1/arm-dts-qcom-ipq4019-fix-broken-nand-controller-properties-override.patch
queue-6.1/arm64-dts-qcom-msm8916-correct-mmc-unit-address.patch
queue-6.1/arm64-dts-qcom-sdm845-correct-camss-unit-address.patch
queue-6.1/arm64-dts-microchip-sparx5-do-not-use-psci-on-refere.patch
queue-6.1/arm64-dts-qcom-msm8996-correct-camss-unit-address.patch
queue-6.1/arm64-dts-qcom-sm8350-add-gpi-dma-compatible-fallbac.patch
queue-6.1/regulator-tps65219-fix-matching-interrupts-for-their-regulators.patch
queue-6.1/nfc-llcp-fix-possible-use-of-uninitialized-variable-.patch
queue-6.1/arm64-dts-qcom-sdm845-polaris-add-missing-touchscree.patch
queue-6.1/w1-fix-loop-in-w1_fini.patch
queue-6.1/arm64-dts-qcom-sdm630-correct-camss-unit-address.patch
queue-6.1/arm64-dts-qcom-apq8096-fix-fixed-regulator-name-prop.patch
