Hi,
On Fri, May 31, 2019 at 08:19:13PM +0000, Anand Moon wrote:
> This patch add missing PCIe gpio pin (#PCIE_PWR) for vcc3v3_pcie power
> regulator node also add missing reset pinctrl (#PCIE_PERST_L) for PCIe node.
>
> Signed-off-by: Anand Moon <linux.am...@gmail.com>
> ---
> using schematics: thanks for suggested by Manivannan
> [1] https://dl.vamrs.com/products/rock960/docs/hw/rock960_sch_v12_20180314.pdf
>
> Changes from prevoius patch:
> [2] https://patchwork.kernel.org/patch/10968695/
>
> Fix the suject and commit message and corrected the PWR and PERST
> configuration
> as per shematics and dts nodes.
> ---
> arch/arm64/boot/dts/rockchip/rk3399-ficus.dts | 7 +++++++
> arch/arm64/boot/dts/rockchip/rk3399-rock960.dts | 7 +++++++
> arch/arm64/boot/dts/rockchip/rk3399-rock960.dtsi | 3 +--
> 3 files changed, 15 insertions(+), 2 deletions(-)
>
> diff --git a/arch/arm64/boot/dts/rockchip/rk3399-ficus.dts
> b/arch/arm64/boot/dts/rockchip/rk3399-ficus.dts
> index 6b059bd7a04f..94e2a59bc1c7 100644
> --- a/arch/arm64/boot/dts/rockchip/rk3399-ficus.dts
> +++ b/arch/arm64/boot/dts/rockchip/rk3399-ficus.dts
> @@ -89,6 +89,8 @@
>
> &pcie0 {
> ep-gpios = <&gpio4 RK_PD4 GPIO_ACTIVE_HIGH>;
> + pinctrl-names = "default";
> + pinctrl-0 = <&pcie_clkreqn_cpm &pcie_perst_l>;
Looks like ep-gpio is wrong here :/ I probably referred old schematics
at that time. Correct pin mapping is,
ep-gpios = <&gpio2 RK_PD4 GPIO_ACTIVE_HIGH>;
And this should be fixed in a separate patch with "Fixes" tag!
> };
>
> &pinctrl {
> @@ -104,6 +106,11 @@
> rockchip,pins =
> <1 RK_PD0 RK_FUNC_GPIO &pcfg_pull_none>;
> };
> +
> + pcie_perst_l: pcie-perst-l {
> + rockchip,pins =
> + <4 RK_PD4 RK_FUNC_GPIO &pcfg_pull_none>;
> + };
> };
>
> usb2 {
> diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rock960.dts
> b/arch/arm64/boot/dts/rockchip/rk3399-rock960.dts
> index 12285c51cceb..665fe09c7c74 100644
> --- a/arch/arm64/boot/dts/rockchip/rk3399-rock960.dts
> +++ b/arch/arm64/boot/dts/rockchip/rk3399-rock960.dts
> @@ -64,6 +64,8 @@
>
> &pcie0 {
> ep-gpios = <&gpio2 RK_PA2 GPIO_ACTIVE_HIGH>;
> + pinctrl-names = "default";
> + pinctrl-0 = <&pcie_clkreqn_cpm &pcie_perst_l>;
> };
>
> &pinctrl {
> @@ -104,6 +106,11 @@
> rockchip,pins =
> <2 RK_PA5 RK_FUNC_GPIO &pcfg_pull_none>;
> };
> +
> + pcie_perst_l: pcie-perst-l {
> + rockchip,pins =
> + <2 RK_PA2 RK_FUNC_GPIO &pcfg_pull_none>;
> + };
> };
>
> usb2 {
> diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rock960.dtsi
> b/arch/arm64/boot/dts/rockchip/rk3399-rock960.dtsi
> index c7d48d41e184..3df0cd67b4b2 100644
> --- a/arch/arm64/boot/dts/rockchip/rk3399-rock960.dtsi
> +++ b/arch/arm64/boot/dts/rockchip/rk3399-rock960.dtsi
> @@ -55,6 +55,7 @@
>
> vcc3v3_pcie: vcc3v3-pcie-regulator {
> compatible = "regulator-fixed";
> + gpio = <&gpio2 RK_PA5 GPIO_ACTIVE_HIGH>;
Actually the PWR pin mapping is defined in a separate node for both Rock960
and Ficus in respective dts. So defining it here would be wrong as the PWR
pin mapping is different for both boards.
Thanks,
Mani
> enable-active-high;
> pinctrl-names = "default";
> pinctrl-0 = <&pcie_drv>;
> @@ -382,8 +383,6 @@
>
> &pcie0 {
> num-lanes = <4>;
> - pinctrl-names = "default";
> - pinctrl-0 = <&pcie_clkreqn_cpm>;
> vpcie3v3-supply = <&vcc3v3_pcie>;
> status = "okay";
> };
> --
> 2.21.0
>
