arm64: dts: amlogic: meson-axg: NAND fix and PCIe PHY adjustment
Subsystems (2)
v4 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.
- Enable mipi_pcie_analog_dphy for PCIe on S400 board.
Changes in v4:
- Add patch to enable mipi_pcie_analog_dphy for PCIe on S400 board.
- Link to v3:
https://lore.kernel.org/all/[email protected]/
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 (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 mipi_pcie_analog_dphy for
PCIe
arch/arm64/boot/dts/amlogic/meson-axg-s400.dts | 8 ++++++++ arch/arm64/boot/dts/amlogic/meson-axg.dtsi | 5 ++++- 2 files changed, 12 insertions(+), 1 deletion(-)
Signature · 1 line
2.54.0
PATCH v4 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
@@ -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
Re: [PATCH v4 1/4] arm64: dts: amlogic: meson-axg: Disable nfc node by default
Quoted 8 lines · Jun Yan
nand_rb0andemmc_dsshare one pad. Before enablingnand_rb0for 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.
Signed-off-by Jun Yan <[email protected]>
PATCH v4 2/4 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
Re: [PATCH v4 2/4] arm64: dts: amlogic: meson-axg: Add missing nand_rb0 pin to nand_all_pins
Quoted 8 lines · Jun Yan
The
nand_all_pinspinctrl node was missing thenand_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 <[email protected]>
PATCH v4 3/4 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
Re: [PATCH v4 3/4] arm64: dts: amlogic: meson-axg: Disable pcie_phy node by default
Quoted 4 lines · Jun Yan
Set the
pcie_phynode to "disabled" as it is not used on some boards and should be enabled per-board when necessary.
Quoted 8 lines
This change suppresses the deferred probe warning:
platform ff644000.phy: deferred probe pending: (reason unknown)
The meson-axg dtsi now disables
pcie_phyby default, so enable it for the s400 board to support PCIe functionality.Signed-off-by Jun Yan <[email protected]>
PATCH v4 4/4 arm64: dts: amlogic: meson-axg-s400: enable mipi_pcie_analog_dphy for PCIe
In reply to Jun YanThe PCIe PHY node references mipi_pcie_analog_dphy via its phys property. Enable this analog PHY node to make PCIe functionally viable.
--- 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
@@ -431,6 +431,10 @@ gpio_speaker: gpio-controller@1f { }; }; +&mipi_pcie_analog_dphy { + status = "okay"; +}; + &pdm { pinctrl-0 = <&pdm_dclk_a14_pins>, <&pdm_din0_pins>, <&pdm_din1_pins>, <&pdm_din2_pins>, <&pdm_din3_pins>;
Signature · 1 line
2.54.0
Re: [PATCH v4 4/4] arm64: dts: amlogic: meson-axg-s400: enable mipi_pcie_analog_dphy for PCIe
Quoted 6 lines · Jun Yan
The PCIe PHY node references
mipi_pcie_analog_dphyvia its phys property. Enable this analog PHY node to make PCIe functionally viable.Fixes 9715b01da6cf ("arm64: dts: meson-axg-s400: enable PCIe M.2 Key E slots")Signed-off-by Jun Yan <[email protected]>
Hi,
Quoted 6 lines · Jun Yan
- Disable nfc node by default ahead of
nand_rb0pin addition.
- Add missingnand_rb0pin to fix incomplete NAND pinctrl.
- Disablepcie_phyby default to suppress probe warning.
- Re-enablepcie_phyon S400 board to preserve PCIe functionality.
- Enablemipi_pcie_analog_dphyfor PCIe on S400 board.
Quoted 6 lines
Changes in v4:
- Add patch to enablemipi_pcie_analog_dphyfor PCIe on S400 board.
- Link to v3:
https://lore.kernel.org/all/[email protected]/[...]
Thanks, Applied to https://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux.git (v7.3/arm64-dt)
[1/4] arm64: dts: amlogic: meson-axg: Disable nfc node by default
https://git.kernel.org/amlogic/c/77c63ef3be3972eb3d8aac2dd36f349d78620b0d [2/4] arm64: dts: amlogic: meson-axg: Add missing nand_rb0 pin to nand_all_pins https://git.kernel.org/amlogic/c/45eb76f9ab6854f79690d56d04df227429a536b8 [3/4] arm64: dts: amlogic: meson-axg: Disable pcie_phy node by default https://git.kernel.org/amlogic/c/25ab968f7d27f46927658150bf466cac856e4f4f [4/4] arm64: dts: amlogic: meson-axg-s400: enable mipi_pcie_analog_dphy for PCIe https://git.kernel.org/amlogic/c/7f1d0cc86cb70fa550163b6f70fd1d484c03218e
These changes has been applied on the intermediate git tree [1].
The v7.3/arm64-dt branch will then be sent via a formal Pull Request to the Linux SoC maintainers for inclusion in their intermediate git branches in order to be sent to Linus during the next merge window, or sooner if it's a set of fixes.
In the cases of fixes, those will be merged in the current release candidate kernel and as soon they appear on the Linux master branch they will be backported to the previous Stable and Long-Stable kernels [2].
The intermediate git branches are merged daily in the linux-next tree [3], people are encouraged testing these pre-release kernels and report issues on the relevant mailing-lists.
If problems are discovered on those changes, please submit a signed-off-by revert patch followed by a corrective changeset.
[1] https://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux.git
[2] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
[3] https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
Signature · 1 line
Neil