arm64: dts: rockchip: Add missing pinctrl for PCIe30x4 node
Subsystems (2)
PATCH v3 1/3 arm64: dts: rockchip: Add missing pinctrl for PCIe30x4 node
Add missing pinctrl settings for PCIe 3.0 x4 clock request and wake signals. Each component of PCIe communication have the following control
signals: PERST, WAKE, CLKREQ, and REFCLK. These signals work to generate high-speed signals and communicate with other PCIe devices. Used by root complex to endpoint depending on the power state.
PERST is referred to as a fundamental reset. PERST should be held low until all the power rails in the system and the reference clock are stable. A transition from low to high in this signal usually indicates the beginning of link initialization.
WAKE signal is an active-low signal that is used to return the PCIe interface to an active state when in a low-power state.
CLKREQ signal is also an active-low signal and is used to request the reference clock.
Rename node from 'pcie3' to 'pcie30x4' to align with schematic nomenclature.
---
V3: use pinctrl local to board
V2: Update the commit messge to describe the changs.
use pinctl group as its pre define in pinctrl dtsi
--- .../arm64/boot/dts/rockchip/rk3588-rock-5b.dts | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-)
arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts +12 -6
@@ -338,7 +338,7 @@ &pcie30phy { &pcie3x4 { pinctrl-names = "default"; - pinctrl-0 = <&pcie3_rst>; + pinctrl-0 = <&pcie30x4_pins>; reset-gpios = <&gpio4 RK_PB6 GPIO_ACTIVE_HIGH>; vpcie3v3-supply = <&vcc3v3_pcie30>; status = "okay";
@@ -377,14 +377,20 @@ pcie2_2_rst: pcie2-2-rst { }; }; - pcie3 { - pcie3_rst: pcie3-rst { - rockchip,pins = <4 RK_PB6 RK_FUNC_GPIO &pcfg_pull_none>; - }; - + pcie30x4 { pcie3_vcc3v3_en: pcie3-vcc3v3-en { rockchip,pins = <1 RK_PA4 RK_FUNC_GPIO &pcfg_pull_none>; }; + + pcie30x4_pins: pcie30x4-pins { + rockchip,pins = + /* PCIE30X4_CLKREQn_M1_L */ + <4 RK_PB4 4 &pcfg_pull_up>, + /* PCIE30X4_PERSTn_M1_L */ + <4 RK_PB6 RK_FUNC_GPIO &pcfg_pull_down>, + /* PCIE30X4_WAKEn_M1_L */ + <4 RK_PB5 4 &pcfg_pull_down>; + }; }; usb {
Signature · 1 line
2.44.0
PATCH v3 2/3 arm64: dts: rockchip: Add missing pinctrl for PCIe30x1 node
Add missing pinctrl settings for PCIe 3.0 x1 clock request and wake signals. Each component of PCIe communication have the following control
signals: PERST, WAKE, CLKREQ, and REFCLK. These signals work to generate high-speed signals and communicate with other PCIe devices. Used by root complex to endpoint depending on the power state.
PERST is referred to as a fundamental reset. PERST should be held low until all the power rails in the system and the reference clock are stable. A transition from low to high in this signal usually indicates the beginning of link initialization.
WAKE signal is an active-low signal that is used to return the PCIe interface to an active state when in a low-power state.
CLKREQ signal is also an active-low signal and is used to request the reference clock.
Rename node from 'pcie2' to 'pcie30x1' to align with schematic nomenclature.
--- .../arm64/boot/dts/rockchip/rk3588-rock-5b.dts | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-)
arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts +13 -5
@@ -318,7 +318,7 @@ map2 { &pcie2x1l0 { pinctrl-names = "default"; - pinctrl-0 = <&pcie2_0_rst>; + pinctrl-0 = <&pcie30x1_pins>; reset-gpios = <&gpio4 RK_PA5 GPIO_ACTIVE_HIGH>; vpcie3v3-supply = <&vcc3v3_pcie2x1l0>; status = "okay";
@@ -364,16 +364,24 @@ hp_detect: hp-detect { }; pcie2 { - pcie2_0_rst: pcie2-0-rst { - rockchip,pins = <4 RK_PA5 RK_FUNC_GPIO &pcfg_pull_none>; + pcie2_2_rst: pcie2-2-rst { + rockchip,pins = <3 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>; }; + }; + pcie30x1 { pcie2_0_vcc3v3_en: pcie2-0-vcc-en { rockchip,pins = <1 RK_PD2 RK_FUNC_GPIO &pcfg_pull_none>; }; - pcie2_2_rst: pcie2-2-rst { - rockchip,pins = <3 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>; + pcie30x1_pins: pcie30x1-pins { + rockchip,pins = + /* PCIE30x1_0_CLKREQn_M1_L */ + <4 RK_PA3 4 &pcfg_pull_down>, + /* PCIE30x1_0_PERSTn_M1_L */ + <4 RK_PA5 RK_FUNC_GPIO &pcfg_pull_down>, + /* PCIE30x1_0_WAKEn_M1_L */ + <4 RK_PA4 4 &pcfg_pull_down>; }; };
Signature · 1 line
2.44.0
PATCH v3 3/3 arm64: dts: rockchip: Add missing pinctrl for PCIe20x1 node
In reply to Anand MoonAdd missing pinctrl settings for PCIe 2.0 x1 clock request and wake signals. Each component of PCIe communication have the following control
signals: PERST, WAKE, CLKREQ, and REFCLK. These signals work to generate high-speed signals and communicate with other PCIe devices. Used by root complex to endpoint depending on the power state.
PERST is referred to as a fundamental reset. PERST should be held low until all the power rails in the system and the reference clock are stable. A transition from low to high in this signal usually indicates the beginning of link initialization.
WAKE signal is an active-low signal that is used to return the PCIe interface to an active state when in a low-power state.
CLKREQ signal is also an active-low signal and is used to request the reference clock.
Rename node from 'pcie2' to 'pcie20x1' to align with schematic nomenclature.
--- arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-)
arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts +10 -4
@@ -326,7 +326,7 @@ &pcie2x1l0 { &pcie2x1l2 { pinctrl-names = "default"; - pinctrl-0 = <&pcie2_2_rst>; + pinctrl-0 = <&pcie20x12_pins>; reset-gpios = <&gpio3 RK_PB0 GPIO_ACTIVE_HIGH>; vpcie3v3-supply = <&vcc3v3_pcie2x1l2>; status = "okay";
@@ -363,9 +363,15 @@ hp_detect: hp-detect { }; }; - pcie2 { - pcie2_2_rst: pcie2-2-rst { - rockchip,pins = <3 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>; + pcie20x1 { + pcie20x12_pins: pcie20x12-pins { + rockchip,pins = + /* PCIE20_1_2_CLKREQn_M1_L */ + <3 RK_PC7 4 &pcfg_pull_up>, + /* PCIE_PERST_L */ + <3 RK_PB0 RK_FUNC_GPIO &pcfg_pull_up>, + /* PCIE20_1_2_WAKEn_M1_L */ + <3 RK_PD0 4 &pcfg_pull_up>; }; };
Signature · 1 line
2.44.0
Hi Jonas,
Quoted 51 lines · Anand Moon
Add missing pinctrl settings for PCIe 3.0 x4 clock request and wake signals. Each component of PCIe communication have the following control
signals: PERST, WAKE, CLKREQ, and REFCLK. These signals work to generate high-speed signals and communicate with other PCIe devices. Used by root complex to endpoint depending on the power state.PERST is referred to as a fundamental reset. PERST should be held low until all the power rails in the system and the reference clock are stable. A transition from low to high in this signal usually indicates the beginning of link initialization.
WAKE signal is an active-low signal that is used to return the PCIe interface to an active state when in a low-power state.
CLKREQ signal is also an active-low signal and is used to request the reference clock.
Rename node from 'pcie3' to 'pcie30x4' to align with schematic nomenclature.
Signed-off-by Anand Moon <[email protected]>---
V3: use pinctrl local to board
V2: Update the commit messge to describe the changs.
use pinctl group as its pre define in pinctrl dtsi--- .../arm64/boot/dts/rockchip/rk3588-rock-5b.dts | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-)arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts +1
-5@@ -338,7 +338,7 @@ &pcie30phy { &pcie3x4 { pinctrl-names = "default"; - pinctrl-0 = <&pcie3_rst>; + pinctrl-0 = <&pcie30x4_pins>; reset-gpios = <&gpio4 RK_PB6 GPIO_ACTIVE_HIGH>; vpcie3v3-supply = <&vcc3v3_pcie30>; status = "okay";@@ -377,14 +377,20 @@ pcie2_2_rst: pcie2-2-rst { }; }; - pcie3 { - pcie3_rst: pcie3-rst { - rockchip,pins = <4 RK_PB6 RK_FUNC_GPIO &pcfg_pull_none>; - };
arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts pcie2_2_rst: pcie2-2-rst { · line 388
Quoted 10 lines
arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts +6
-1- + pcie30x4 { pcie3_vcc3v3_en: pcie3-vcc3v3-en { rockchip,pins = <1 RK_PA4 RK_FUNC_GPIO &pcfg_pull_none>; }; + + pcie30x4_pins: pcie30x4-pins { + rockchip,pins = + /* PCIE30X4_CLKREQn_M1_L */ + <4 RK_PB4 4 &pcfg_pull_up>,
Should -------------^ replace with
RK_FUNC_GPIO ? since its a gpio controlled?
arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts pcie2_2_rst: pcie2-2-rst { · line 395
Quoted 7 lines
arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts +5
-0+ /* PCIE30X4_PERSTn_M1_L */ + <4 RK_PB6 RK_FUNC_GPIO &pcfg_pull_down>, + /* PCIE30X4_WAKEn_M1_L */ + <4 RK_PB5 4 &pcfg_pull_down>; + }; };
Thanks
-Anand