2023-04-20 07:30:19

by Krzysztof Kozlowski

Subject: [PATCH] ARM: dts: qcom: ipq4019: fix broken NAND controller properties override

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: <[email protected]>
Fixes: 9e1e00f18afc ("ARM: dts: qcom: Fix node name for NAND controller node")
Signed-off-by: Krzysztof Kozlowski <[email protected]>
---
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(-)

diff --git a/arch/arm/boot/dts/qcom-ipq4019-ap.dk04.1-c1.dts b/arch/arm/boot/dts/qcom-ipq4019-ap.dk04.1-c1.dts
index 79b0c6318e52..0993f840d1fc 100644
--- 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 @@ soc {
dma-controller@7984000 {
status = "okay";
};
-
- qpic-nand@79b0000 {
- status = "okay";
- };
};
};
+
+&nand {
+ status = "okay";
+};
diff --git a/arch/arm/boot/dts/qcom-ipq4019-ap.dk04.1.dtsi b/arch/arm/boot/dts/qcom-ipq4019-ap.dk04.1.dtsi
index a63b3778636d..468ebc40d2ad 100644
--- 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 @@ pci@40000000 {
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";
+};
diff --git a/arch/arm/boot/dts/qcom-ipq4019-ap.dk07.1.dtsi b/arch/arm/boot/dts/qcom-ipq4019-ap.dk07.1.dtsi
index 0107f552f520..7ef635997efa 100644
--- 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 @@ i2c@78b7000 { /* BLSP1 QUP2 */
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";
+};
--
2.34.1

2023-04-20 08:49:13

by Manivannan Sadhasivam

Subject: Re: [PATCH] ARM: dts: qcom: ipq4019: fix broken NAND controller properties override

On Thu, Apr 20, 2023 at 09:28:11AM +0200, Krzysztof Kozlowski wrote:
> 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: <[email protected]>
> Fixes: 9e1e00f18afc ("ARM: dts: qcom: Fix node name for NAND controller node")
> Signed-off-by: Krzysztof Kozlowski <[email protected]>

Reviewed-by: Manivannan Sadhasivam <[email protected]>

- Mani

> ---
> 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(-)
>
> diff --git a/arch/arm/boot/dts/qcom-ipq4019-ap.dk04.1-c1.dts b/arch/arm/boot/dts/qcom-ipq4019-ap.dk04.1-c1.dts
> index 79b0c6318e52..0993f840d1fc 100644
> --- 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 @@ soc {
> dma-controller@7984000 {
> status = "okay";
> };
> -
> - qpic-nand@79b0000 {
> - status = "okay";
> - };
> };
> };
> +
> +&nand {
> + status = "okay";
> +};
> diff --git a/arch/arm/boot/dts/qcom-ipq4019-ap.dk04.1.dtsi b/arch/arm/boot/dts/qcom-ipq4019-ap.dk04.1.dtsi
> index a63b3778636d..468ebc40d2ad 100644
> --- 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 @@ pci@40000000 {
> 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";
> +};
> diff --git a/arch/arm/boot/dts/qcom-ipq4019-ap.dk07.1.dtsi b/arch/arm/boot/dts/qcom-ipq4019-ap.dk07.1.dtsi
> index 0107f552f520..7ef635997efa 100644
> --- 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 @@ i2c@78b7000 { /* BLSP1 QUP2 */
> 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";
> +};
> --
> 2.34.1
>

--
மணிவண்ணன் சதாசிவம்

2023-04-20 10:49:32

by Konrad Dybcio

Subject: Re: [PATCH] ARM: dts: qcom: ipq4019: fix broken NAND controller properties override

On 20.04.2023 09:28, Krzysztof Kozlowski wrote:
> 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: <[email protected]>
Cc: <[email protected]> # 5.12

(g show 9e1e00f18afc:Makefile | head, rounded up to first release)


Reviewed-by: Konrad Dybcio <[email protected]>

Konrad
> Fixes: 9e1e00f18afc ("ARM: dts: qcom: Fix node name for NAND controller node")
> Signed-off-by: Krzysztof Kozlowski <[email protected]>
> ---
> 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(-)
>
> diff --git a/arch/arm/boot/dts/qcom-ipq4019-ap.dk04.1-c1.dts b/arch/arm/boot/dts/qcom-ipq4019-ap.dk04.1-c1.dts
> index 79b0c6318e52..0993f840d1fc 100644
> --- 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 @@ soc {
> dma-controller@7984000 {
> status = "okay";
> };
> -
> - qpic-nand@79b0000 {
> - status = "okay";
> - };
> };
> };
> +
> +&nand {
> + status = "okay";
> +};
> diff --git a/arch/arm/boot/dts/qcom-ipq4019-ap.dk04.1.dtsi b/arch/arm/boot/dts/qcom-ipq4019-ap.dk04.1.dtsi
> index a63b3778636d..468ebc40d2ad 100644
> --- 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 @@ pci@40000000 {
> 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";
> +};
> diff --git a/arch/arm/boot/dts/qcom-ipq4019-ap.dk07.1.dtsi b/arch/arm/boot/dts/qcom-ipq4019-ap.dk07.1.dtsi
> index 0107f552f520..7ef635997efa 100644
> --- 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 @@ i2c@78b7000 { /* BLSP1 QUP2 */
> 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";
> +};

2023-04-20 13:00:50

by Krzysztof Kozlowski

Subject: Re: [PATCH] ARM: dts: qcom: ipq4019: fix broken NAND controller properties override

On 20/04/2023 12:42, Konrad Dybcio wrote:
>
>
> On 20.04.2023 09:28, Krzysztof Kozlowski wrote:
>> 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: <[email protected]>
> Cc: <[email protected]> # 5.12
>
> (g show 9e1e00f18afc:Makefile | head, rounded up to first release)

You do not have to do this. The Fixes tag defines backporting.

Best regards,
Krzysztof

2023-05-25 05:41:01

by Bjorn Andersson

Subject: Re: [PATCH] ARM: dts: qcom: ipq4019: fix broken NAND controller properties override

On Thu, 20 Apr 2023 09:28:11 +0200, Krzysztof Kozlowski wrote:
> 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
>
>

Applied, thanks!

[1/1] ARM: dts: qcom: ipq4019: fix broken NAND controller properties override
commit: fd1db0249b0971642770aa4c987771b7c592557f

Best regards,
--
Bjorn Andersson <[email protected]>