arm64: dts: amlogic: meson-axg: NAND fix and PCIe PHY adjustment
Subsystems (2)
v3 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 v3:
- squash "disable pcie_phy node by default" and "enable pcie_phy in meson-axg-s400" patches
- Link to v2:
https://lore.kernel.org/all/[email protected]/
Changes in v2:
- Add patch to disable nfc node by default.
- Link to v1:
https://lore.kernel.org/all/[email protected]/
Jun Yan (3):
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
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
PATCH v3 1/3 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
@@ -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
PATCH v3 2/3 arm64: dts: amlogic: meson-axg: Add missing nand_rb0 pin to nand_all_pins
In reply to Jun YanThe 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.
--- 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
@@ -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
PATCH v3 3/3 arm64: dts: amlogic: meson-axg: Disable pcie_phy node by default
In reply to Jun YanSet 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)
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 ++++ arch/arm64/boot/dts/amlogic/meson-axg.dtsi | 1 + 2 files changed, 5 insertions(+)
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>;
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"; }; pdm: audio-controller@ff632000 {
Signature · 1 line
2.54.0
[email protected]
AI reviewRe: [PATCH v3 3/3] 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] Enabling pcie_phy on meson-axg-s400.dts is insufficient to support PCIe functionality because its hardware dependency mipi_pcie_analog_dphy remains disabled. --
commit cd94d06969e9f9a23ea319f406b8e86e8ed9ec44
Author: Jun Yan <[email protected]>
arm64: dts: amlogic: meson-axg: Disable pcie_phy node by default
This patch disables the pcie_phy node by default in the meson-axg dtsi file to suppress deferred probe warnings on boards that do not use it. It then explicitly enables pcie_phy in the meson-axg-s400 board device tree to preserve its PCIe functionality.
Quoted 4 lines
arch/arm64/boot/dts/amlogic/meson-axg-s400.dts +0
-0
[ ... ]
arch/arm64/boot/dts/amlogic/meson-axg-s400.dts &pcieB { · line 453
Quoted 7 lines
arch/arm64/boot/dts/amlogic/meson-axg-s400.dts +3
-0@@ -448,6 +448,10 @@ &pcieB { status = "okay"; }; +&pcie_phy { + status = "okay"; +};
[Severity: High]
This is a pre-existing issue, but is it sufficient to only enable pcie_phy to restore PCIe functionality on the s400 board?
The pcie_phy node depends on the mipi_pcie_analog_dphy analog PHY via its phys property. Looking at meson-axg.dtsi, mipi_pcie_analog_dphy is 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";
};If the analog PHY is not also overridden to "okay" here in meson-axg-s400.dts, will the analog PHY driver fail to probe, causing devm_phy_get(dev, "analog") in the pcie_phy driver to continually return -EPROBE_DEFER?
Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=3
Re: [PATCH v3 3/3] arm64: dts: amlogic: meson-axg: Disable pcie_phy node by default
Quoted 46 lines
Thank you for your contribution! Sashiko AI review found 1 potential issue(s) to consider:
Pre-existing issues:
- [High] Enablingpcie_phyonmeson-axg-s400.dtsis insufficient to support PCIe functionality because its hardware dependencymipi_pcie_analog_dphyremains disabled. --commit
cd94d06969e9f9a23ea319f406b8e86e8ed9ec44
Author: Jun Yan <[email protected]>arm64: dts: amlogic: meson-axg: Disable
pcie_phynode by defaultThis patch disables the
pcie_phynode by default in the meson-axg dtsi file to suppress deferred probe warnings on boards that do not use it. It then explicitly enablespcie_phyin the meson-axg-s400 board device tree to preserve its PCIe functionality.Quoted 4 lines
arch/arm64/boot/dts/amlogic/meson-axg-s400.dts +0
-0[ ... ]
arch/arm64/boot/dts/amlogic/meson-axg-s400.dts &pcieB { · line 453
Quoted 7 lines
arch/arm64/boot/dts/amlogic/meson-axg-s400.dts +3
-0@@ -448,6 +448,10 @@ &pcieB { status = "okay"; }; +&pcie_phy { + status = "okay"; +};[Severity: High]
This is a pre-existing issue, but is it sufficient to only enablepcie_phyto restore PCIe functionality on the s400 board?The
pcie_phynode depends on themipi_pcie_analog_dphyanalog PHY via its phys property. Looking atmeson-axg.dtsi,mipi_pcie_analog_dphyis 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"; };
Quoted 4 lines
If the analog PHY is not also overridden to "okay" here in
meson-axg-s400.dts, will the analog PHY driver fail to probe, causingdevm_phy_get(dev, "analog")in thepcie_phydriver to continually return -EPROBE_DEFER?
I'd like to add an additional patch to resolve this pre-existing issue reported by Sashiko. Unfortunately I don't have S400 hardware available for testing.
Quoted 2 lines
Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=3