[PATCH 0/3] arm64: dts: amlogic: meson-axg: NAND fix and PCIe PHY adjustment

[PATCH 0/3] arm64: dts: amlogic: meson-axg: NAND fix and PCIe PHY adjustment

[Jun Yan]

- Fix NAND pinctrl by adding missing nand_rb0 pin.
- Disable unused pcie_phy to suppress probe warning.
- Re-enable pcie_phy on S400 board to keep PCIe working.

All changes have been tested on real hardware.

Jun Yan (3):
  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     | 4 +++-
 2 files changed, 7 insertions(+), 1 deletion(-)

-- 
2.54.0

[PATCH 1/3] arm64: dts: amlogic: meson-axg: Add missing nand_rb0 pin to nand_all_pins

[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")
Signed-off-by: Jun Yan <jerrysteve1101@gmail.com>
---
 arch/arm64/boot/dts/amlogic/meson-axg.dtsi | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/arch/arm64/boot/dts/amlogic/meson-axg.dtsi b/arch/arm64/boot/dts/amlogic/meson-axg.dtsi
index f1f53fd98ae2..b7a7f4fae7dc 100644
--- a/arch/arm64/boot/dts/amlogic/meson-axg.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-axg.dtsi
@@ -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;
-- 
2.54.0

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

[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)

Signed-off-by: Jun Yan <jerrysteve1101@gmail.com>
---
 arch/arm64/boot/dts/amlogic/meson-axg.dtsi | 1 +
 1 file changed, 1 insertion(+)

diff --git a/arch/arm64/boot/dts/amlogic/meson-axg.dtsi b/arch/arm64/boot/dts/amlogic/meson-axg.dtsi
index b7a7f4fae7dc..41a75e3d286a 100644
--- a/arch/arm64/boot/dts/amlogic/meson-axg.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-axg.dtsi
@@ -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 {
-- 
2.54.0

[PATCH 3/3] arm64: dts: amlogic: meson-axg-s400: Enable pcie_phy

[Jun Yan]

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

Signed-off-by: Jun Yan <jerrysteve1101@gmail.com>
---
 arch/arm64/boot/dts/amlogic/meson-axg-s400.dts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/arch/arm64/boot/dts/amlogic/meson-axg-s400.dts b/arch/arm64/boot/dts/amlogic/meson-axg-s400.dts
index 285c6ac1dd61..7ba249cc3d56 100644
--- a/arch/arm64/boot/dts/amlogic/meson-axg-s400.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-axg-s400.dts
@@ -448,6 +448,10 @@ &pcieB {
 	status = "okay";
 };
 
+&pcie_phy {
+	status = "okay";
+};
+
 &pwm_ab {
 	status = "okay";
 	pinctrl-0 = <&pwm_a_x20_pins>;
-- 
2.54.0

Re: [PATCH 1/3] arm64: dts: amlogic: meson-axg: Add missing nand_rb0 pin to nand_all_pins

[sashiko-bot]

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

Pre-existing issues:
- [High] eMMC boot failure due to BOOT_13 pinctrl conflict. Fix: Add status = "disabled" to the nfc node in meson-axg.dtsi.
--

commit c218ae59948e8bab6c68fcfdc539ef678ec3bdba
Author: Jun Yan <jerrysteve1101@gmail.com>

arm64: dts: amlogic: meson-axg: Add missing nand_rb0 pin to nand_all_pins

This commit updates the nand_all_pins pinctrl node to include the missing
nand_rb0 pin for the meson-axg platform. This ensures the ready/busy pin
is properly configured for NAND controller operation.

> diff --git a/arch/arm64/boot/dts/amlogic/meson-axg.dtsi b/arch/arm64/boot/dts/amlogic/meson-axg.dtsi
> index f1f53fd98ae25..b7a7f4fae7dc2 100644
> --- a/arch/arm64/boot/dts/amlogic/meson-axg.dtsi
> +++ b/arch/arm64/boot/dts/amlogic/meson-axg.dtsi

[ ... ]

> @@ -481,7 +481,8 @@ mux {
>  							 "nand_ale",
>  							 "nand_cle",
>  							 "nand_wen_clk",
> -							 "nand_ren_wr";
> +							 "nand_ren_wr",
> +							 "nand_rb0";

[Severity: High]
This isn't a bug introduced by this patch, but adding this pin exposes a
pre-existing issue where the nfc node unconditionally claims nand_all_pins.

Since nand_rb0 and emmc_ds share the BOOT_13 pin, does this force a strict
pinctrl collision between the NAND and eMMC nodes? 

If this collision causes the eMMC storage probe to fail and breaks the boot
process, should we add status = "disabled" to the nfc node in meson-axg.dtsi
to prevent this conflict when NAND is not actively used?

-- 
Sashiko AI review · https://sashiko.dev/#/patchset/20260529140605.1070764-1-jerrysteve1101@gmail.com?part=1

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

[sashiko-bot]

Thank you for your contribution! Sashiko AI review found 1 potential issue(s) to consider:
- [High] The commit enables `&pcie_phy` to support PCIe on the `meson-axg-s400` board, but fails to enable its required analog PHY dependency `&mipi_pcie_analog_dphy`, leaving PCIe completely non-functional.
--

commit 655f261362c29dc56c1723f3469b32281d8fffb8
Author: Jun Yan <jerrysteve1101@gmail.com>

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

This commit enables pcie_phy on the meson-axg-s400 board to support PCIe
functionality, as it is now disabled by default in the meson-axg dtsi.

> diff --git a/arch/arm64/boot/dts/amlogic/meson-axg-s400.dts b/arch/arm64/boot/dts/amlogic/meson-axg-s400.dts
> index 285c6ac1dd613..7ba249cc3d569 100644
> --- a/arch/arm64/boot/dts/amlogic/meson-axg-s400.dts
> +++ b/arch/arm64/boot/dts/amlogic/meson-axg-s400.dts
> @@ -448,6 +448,10 @@ &pcieB {
>  	status = "okay";
>  };
>  
> +&pcie_phy {
> +	status = "okay";
> +};

[Severity: High]
Does this node also need to enable the mipi_pcie_analog_dphy dependency?

In meson-axg.dtsi, the pcie_phy node depends on mipi_pcie_analog_dphy via
the property phys = <&mipi_pcie_analog_dphy>. Because the analog PHY is
disabled by default, the core driver model does not instantiate its platform
device and no PHY provider is registered.

This causes devm_phy_get(dev, "analog") to return -EPROBE_DEFER during
the probe of pcie_phy, which in turn causes the PCIe controllers (pcieA
and pcieB) to infinitely defer probing as well.

> +
>  &pwm_ab {
>  	status = "okay";
>  	pinctrl-0 = <&pwm_a_x20_pins>;

-- 
Sashiko AI review · https://sashiko.dev/#/patchset/20260529140605.1070764-1-jerrysteve1101@gmail.com?part=3