Skip to contentSkip to conversation

arm64: dts: amlogic: meson-axg: NAND fix and PCIe PHY adjustment

PATCH Superseded Jun Yan 3 participants 9 messages Jun 17

Subsystems (2)

v2 of 4 Superseded Latest is v4 →

lore
Share & tools
lore

Jun Yan

author
#0 lore raw

v2 cover arm64: dts: amlogic: meson-axg: NAND fix and PCIe PHY adjustment

- Disable nfc node by default ahead of nand_rb0 pin addition.
- Add missing nand_rb0 pin to fix incomplete NAND pinctrl.
- Disable pcie_phy by default to suppress probe warning.
- Re-enable pcie_phy on S400 board to preserve PCIe functionality.

Changes in v2:
- Add patch to disable nfc node by default.
- Link to v1:
https://lore.kernel.org/all/[email protected]/

Jun Yan (4):
arm64: dts: amlogic: meson-axg: Disable nfc node by default
arm64: dts: amlogic: meson-axg: Add missing nand_rb0 pin to
nand_all_pins
arm64: dts: amlogic: meson-axg: Disable pcie_phy node by default
arm64: dts: amlogic: meson-axg-s400: Enable pcie_phy

 arch/arm64/boot/dts/amlogic/meson-axg-s400.dts | 4 ++++
 arch/arm64/boot/dts/amlogic/meson-axg.dtsi     | 5 ++++-
 2 files changed, 8 insertions(+), 1 deletion(-)
Signature · 1 line
2.54.0
author
#1 lore raw

PATCH v2 1/4 arm64: dts: amlogic: meson-axg: Disable nfc node by default

nand_rb0 and emmc_ds share one pad. Before enabling nand_rb0 for nfc, disable nfc nodes by default to resolve pinctrl resource contention.

No mainline AXG boards enable nfc currently thus no extra DTS adjustments are needed.

---
 arch/arm64/boot/dts/amlogic/meson-axg.dtsi | 1 +
 1 file changed, 1 insertion(+)
arch/arm64/boot/dts/amlogic/meson-axg.dtsi +1 -0
index f1f53fd98ae2..6457667d974e 100644
@@ -1999,6 +1999,7 @@ nfc: nand-controller@7800 {
 				clocks = <&clkc CLKID_SD_EMMC_C>,
 					 <&clkc CLKID_FCLK_DIV2>;
 				clock-names = "core", "device";
+				status = "disabled";
 			};
 
 			usb2_phy1: phy@9020 {
Signature · 1 line
2.54.0
author
#2 lore raw

PATCH v2 2/4 arm64: dts: amlogic: meson-axg: Add missing nand_rb0 pin to nand_all_pins

In reply to Jun Yan

The nand_all_pins pinctrl node was missing the nand_rb0 (ready/busy) pin description, which is required for NAND controller operation.

Add it to the pinmux list.

Fixes be18d53c32b2 ("arm64: dts: amlogic: meson-axg: pinctrl node for NAND")
---
 arch/arm64/boot/dts/amlogic/meson-axg.dtsi | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
arch/arm64/boot/dts/amlogic/meson-axg.dtsi +2 -1
index 6457667d974e..8ca3ac09b306 100644
@@ -481,7 +481,8 @@ mux {
 							 "nand_ale",
 							 "nand_cle",
 							 "nand_wen_clk",
-							 "nand_ren_wr";
+							 "nand_ren_wr",
+							 "nand_rb0";
 						function = "nand";
 						input-enable;
 						bias-pull-up;
Signature · 1 line
2.54.0
author
#3 lore raw

PATCH v2 3/4 arm64: dts: amlogic: meson-axg: Disable pcie_phy node by default

In reply to Jun Yan

Set the pcie_phy node to "disabled" as it is not used on some boards and should be enabled per-board when necessary.

This change suppresses the deferred probe warning:

platform ff644000.phy: deferred probe pending: (reason unknown)

---
 arch/arm64/boot/dts/amlogic/meson-axg.dtsi | 1 +
 1 file changed, 1 insertion(+)
arch/arm64/boot/dts/amlogic/meson-axg.dtsi +1 -0
index 8ca3ac09b306..5b8ef98f6d03 100644
@@ -328,6 +328,7 @@ pcie_phy: phy@ff644000 {
 			phys = <&mipi_pcie_analog_dphy>;
 			phy-names = "analog";
 			#phy-cells = <0>;
+			status = "disabled";
 		};
 
 		pdm: audio-controller@ff632000 {
Signature · 1 line
2.54.0
#4 lore raw

Re: [PATCH v2 3/4] arm64: dts: amlogic: meson-axg: Disable pcie_phy node by default

Thank you for your contribution! Sashiko AI review found 1 potential issue(s) to consider:

Thank you for your contribution! Sashiko AI review found 1 potential issue(s) to consider:

Pre-existing issues:
- [High] The S400 board fails to enable the underlying mipi_pcie_analog_dphy required by pcie_phy, leaving PCIe broken and the deferred probe warning unresolved on this board. --

commit 8447bc6097444b6a9914b09671ffb788547cd0fd
Author: Jun Yan <[email protected]>

arm64: dts: amlogic: meson-axg: Disable pcie_phy node by default

This commit disables the pcie_phy node by default in the meson-axg base devicetree to suppress a deferred probe warning on boards that do not use it.

Quoted 3 lines
arch/arm64/boot/dts/amlogic/meson-axg.dtsi +0 -0

[ ... ]

arch/arm64/boot/dts/amlogic/meson-axg.dtsi pcie_phy: phy@ff644000 { · line 332

Quoted 6 lines
arch/arm64/boot/dts/amlogic/meson-axg.dtsi +1 -0
@@ -328,6 +328,7 @@ pcie_phy: phy@ff644000 {
 			phys = <&mipi_pcie_analog_dphy>;
 			phy-names = "analog";
 			#phy-cells = <0>;
+			status = "disabled";
 		};

[Severity: High]
This isn't a bug introduced by this patch, but does the S400 board fail to enable the underlying mipi_pcie_analog_dphy required by pcie_phy?

Looking at arch/arm64/boot/dts/amlogic/meson-axg-s400.dts, the pcie_phy is enabled:

&pcie_phy {
	status = "okay";
};

However, the analog PHY it depends on (mipi_pcie_analog_dphy) is disabled by default in arch/arm64/boot/dts/amlogic/meson-axg.dtsi:

mipi_pcie_analog_dphy: phy {
	compatible = "amlogic,axg-mipi-pcie-analog-phy";
	#phy-cells = <0>;
	status = "disabled";
};

Since mipi_pcie_analog_dphy is never set to "okay" in the s400 board file, won't pcie_phy continue to indefinitely defer its probe waiting for the analog PHY, leaving PCIe broken on the S400 board?

Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=3
author
#5 lore raw

PATCH v2 4/4 arm64: dts: amlogic: meson-axg-s400: Enable pcie_phy

In reply to Jun Yan

The meson-axg dtsi now disables pcie_phy by default, so enable it for the s400 board to support PCIe functionality.

---
 arch/arm64/boot/dts/amlogic/meson-axg-s400.dts | 4 ++++
 1 file changed, 4 insertions(+)
arch/arm64/boot/dts/amlogic/meson-axg-s400.dts +4 -0
index 285c6ac1dd61..7ba249cc3d56 100644
@@ -448,6 +448,10 @@ &pcieB {
 	status = "okay";
 };
 
+&pcie_phy {
+	status = "okay";
+};
+
 &pwm_ab {
 	status = "okay";
 	pinctrl-0 = <&pwm_a_x20_pins>;
Signature · 1 line
2.54.0
#6 lore raw

Re: [PATCH v2 4/4] arm64: dts: amlogic: meson-axg-s400: Enable pcie_phy

Thank you for your contribution! Sashiko AI review found 1 potential issue(s) to consider:

Thank you for your contribution! Sashiko AI review found 1 potential issue(s) to consider:

Pre-existing issues:
- [High] Incomplete feature enablement causing permanent probe deferral for PCIe functionality. --

commit 202349024b583dc874155ce812fb658ddbab6228
Author: Jun Yan <[email protected]>

arm64: dts: amlogic: meson-axg-s400: Enable pcie_phy

This commit enables the pcie_phy node for the Amlogic meson-axg s400 board device tree to support PCIe functionality.

arch/arm64/boot/dts/amlogic/meson-axg-s400.dts &pcieB { · line 453

Quoted 11 lines
arch/arm64/boot/dts/amlogic/meson-axg-s400.dts +3 -0
index 285c6ac1dd613..7ba249cc3d569 100644
@@ -448,6 +448,10 @@ &pcieB {
 	status = "okay";
 };
 
+&pcie_phy {
+	status = "okay";
+};

[Severity: High]
This is a pre-existing issue, but does this incomplete enablement cause a permanent probe deferral?

The amlogic,axg-pcie-phy driver unconditionally calls devm_phy_get(dev, "analog") during probe. This maps to the mipi_pcie_analog_dphy node in meson-axg.dtsi, which is set to disabled by default:

arch/arm64/boot/dts/amlogic/meson-axg.dtsi:

mipi_pcie_analog_dphy: phy {
	compatible = "amlogic,axg-mipi-pcie-analog-phy";
	#phy-cells = <0>;
	status = "disabled";
};

Since mipi_pcie_analog_dphy is not also overridden to "okay" here in meson-axg-s400.dts, won't devm_phy_get() permanently return -EPROBE_DEFER, preventing pcie_phy and the dependent pcieA/pcieB nodes from initializing?

Quoted 4 lines
arch/arm64/boot/dts/amlogic/meson-axg-s400.dts +1 -0
+
 &pwm_ab {
 	status = "okay";
 	pinctrl-0 = <&pwm_a_x20_pins>;
Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=4
maintainer
#7 lore raw

Re: [PATCH v2 4/4] arm64: dts: amlogic: meson-axg-s400: Enable pcie_phy

In reply to Jun Yan
Quoted 13 lines · Jun Yan

The meson-axg dtsi now disables pcie_phy by default, so enable it for the s400 board to support PCIe functionality.

---
  arch/arm64/boot/dts/amlogic/meson-axg-s400.dts | 4 ++++
  1 file changed, 4 insertions(+)
arch/arm64/boot/dts/amlogic/meson-axg-s400.dts +0 -0
index 285c6ac1dd61..7ba249cc3d56 100644

arch/arm64/boot/dts/amlogic/meson-axg-s400.dts &pcieB { · line 457

Quoted 10 lines
arch/arm64/boot/dts/amlogic/meson-axg-s400.dts +4 -0
@@ -448,6 +448,10 @@ &pcieB {
  	status = "okay";
  };
 
+&pcie_phy {
+	status = "okay";
+};
+
  &pwm_ab {
  	status = "okay";
  	pinctrl-0 = <&pwm_a_x20_pins>;

Please squash this one with the previous patch

Thanks,
Neil

author
#8 lore raw

Re: [PATCH v2 4/4] arm64: dts: amlogic: meson-axg-s400: Enable pcie_phy

Quoted 16 lines
Quoted 16 lines

The meson-axg dtsi now disables pcie_phy by default, so enable it for the s400 board to support PCIe functionality.

---
  arch/arm64/boot/dts/amlogic/meson-axg-s400.dts | 4 ++++
  1 file changed, 4 insertions(+)
arch/arm64/boot/dts/amlogic/meson-axg-s400.dts +0 -0
index 285c6ac1dd61..7ba249cc3d56 100644
@@ -448,6 +448,10 @@ &pcieB {
  	status = "okay";
  };
 
Quoted 9 lines

arch/arm64/boot/dts/amlogic/meson-axg-s400.dts &pcieB { · line 457

Quoted 7 lines
arch/arm64/boot/dts/amlogic/meson-axg-s400.dts +4 -0
+&pcie_phy {
+	status = "okay";
+};
+
  &pwm_ab {
  	status = "okay";
  	pinctrl-0 = <&pwm_a_x20_pins>;

Please squash this one with the previous patch

Sure, will squash with the prior patch in v3

Quoted 4 lines

Thanks,
Neil