Message ID | 20230802190424.2963185-8-jonas@kwiboo.se |
---|---|
State | Accepted |
Delegated to: | Kever Yang |
Headers | show |
Series | rockchip: rk3568: Fix use of PCIe bifurcation | expand |
On 2023/8/3 03:04, Jonas Karlman wrote: > Enable mini PCIe slot, pcie3x1 node, now that the PCIe PHY driver > support bifurcation. > > A pinctrl is assigned for reset-gpios or the device may freeze running > pci enum and nothing is connected to the mini PCIe slot. > > Also drop the AHCI_PCI Kconfig option as this option is not required for > a functional M.2 SATA drive slot. > > Signed-off-by: Jonas Karlman <jonas@kwiboo.se> Reviewed-by: Kever Yang <kever.yang@rock-chips.com> Thanks, - Kever > --- > v2: > - No change > > arch/arm/dts/rk3568-radxa-e25-u-boot.dtsi | 11 +++++++++-- > configs/radxa-e25-rk3568_defconfig | 1 - > 2 files changed, 9 insertions(+), 3 deletions(-) > > diff --git a/arch/arm/dts/rk3568-radxa-e25-u-boot.dtsi b/arch/arm/dts/rk3568-radxa-e25-u-boot.dtsi > index 572bdc5665b1..1136f0bb3b81 100644 > --- a/arch/arm/dts/rk3568-radxa-e25-u-boot.dtsi > +++ b/arch/arm/dts/rk3568-radxa-e25-u-boot.dtsi > @@ -8,9 +8,16 @@ > }; > }; > > -/* PCIe PHY driver in U-Boot does not support bifurcation */ > &pcie3x1 { > - status = "disabled"; > + pinctrl-0 = <&pcie30x1_reset_h>; > +}; > + > +&pinctrl { > + pcie { > + pcie30x1_reset_h: pcie30x1-reset-h { > + rockchip,pins = <0 RK_PC3 RK_FUNC_GPIO &pcfg_pull_none>; > + }; > + }; > }; > > &sdhci { > diff --git a/configs/radxa-e25-rk3568_defconfig b/configs/radxa-e25-rk3568_defconfig > index a905100a794d..2dfff6af3bd1 100644 > --- a/configs/radxa-e25-rk3568_defconfig > +++ b/configs/radxa-e25-rk3568_defconfig > @@ -54,7 +54,6 @@ CONFIG_OF_SPL_REMOVE_PROPS="clock-names interrupt-parent assigned-clocks assigne > CONFIG_SPL_DM_SEQ_ALIAS=y > CONFIG_SPL_REGMAP=y > CONFIG_SPL_SYSCON=y > -CONFIG_AHCI_PCI=y > CONFIG_DWC_AHCI=y > CONFIG_SPL_CLK=y > CONFIG_ROCKCHIP_GPIO=y
diff --git a/arch/arm/dts/rk3568-radxa-e25-u-boot.dtsi b/arch/arm/dts/rk3568-radxa-e25-u-boot.dtsi index 572bdc5665b1..1136f0bb3b81 100644 --- a/arch/arm/dts/rk3568-radxa-e25-u-boot.dtsi +++ b/arch/arm/dts/rk3568-radxa-e25-u-boot.dtsi @@ -8,9 +8,16 @@ }; }; -/* PCIe PHY driver in U-Boot does not support bifurcation */ &pcie3x1 { - status = "disabled"; + pinctrl-0 = <&pcie30x1_reset_h>; +}; + +&pinctrl { + pcie { + pcie30x1_reset_h: pcie30x1-reset-h { + rockchip,pins = <0 RK_PC3 RK_FUNC_GPIO &pcfg_pull_none>; + }; + }; }; &sdhci { diff --git a/configs/radxa-e25-rk3568_defconfig b/configs/radxa-e25-rk3568_defconfig index a905100a794d..2dfff6af3bd1 100644 --- a/configs/radxa-e25-rk3568_defconfig +++ b/configs/radxa-e25-rk3568_defconfig @@ -54,7 +54,6 @@ CONFIG_OF_SPL_REMOVE_PROPS="clock-names interrupt-parent assigned-clocks assigne CONFIG_SPL_DM_SEQ_ALIAS=y CONFIG_SPL_REGMAP=y CONFIG_SPL_SYSCON=y -CONFIG_AHCI_PCI=y CONFIG_DWC_AHCI=y CONFIG_SPL_CLK=y CONFIG_ROCKCHIP_GPIO=y
Enable mini PCIe slot, pcie3x1 node, now that the PCIe PHY driver support bifurcation. A pinctrl is assigned for reset-gpios or the device may freeze running pci enum and nothing is connected to the mini PCIe slot. Also drop the AHCI_PCI Kconfig option as this option is not required for a functional M.2 SATA drive slot. Signed-off-by: Jonas Karlman <jonas@kwiboo.se> --- v2: - No change arch/arm/dts/rk3568-radxa-e25-u-boot.dtsi | 11 +++++++++-- configs/radxa-e25-rk3568_defconfig | 1 - 2 files changed, 9 insertions(+), 3 deletions(-)