Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0722bdd2 authored by Shawn Lin's avatar Shawn Lin Committed by Bjorn Helgaas
Browse files

PCI: rockchip: Move the deassert of pm/aclk/pclk after phy_init() 



Move deassert of pm/aclk/pclk after phy_init() as we want to optimize the
logic of reset control and reuse rockchip_pcie_init_port() later which
should fully follow the cold boot procedure of ROM code.

Signed-off-by: default avatarShawn Lin <shawn.lin@rock-chips.com>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Reviewed-by: default avatarBrian Norris <briannorris@chromium.org>
parent 9e663d3f

drivers/pci/host/pcie-rockchip.c

+20 −20
Original line number Diff line number Diff line
@@ -471,26 +471,6 @@ static int rockchip_pcie_init_port(struct rockchip_pcie *rockchip) 
		return err;

	}



	udelay(10);



	err = reset_control_deassert(rockchip->pm_rst);

	if (err) {

		dev_err(dev, "deassert pm_rst err %d\n", err);

		return err;

	}



	err = reset_control_deassert(rockchip->aclk_rst);

	if (err) {

		dev_err(dev, "deassert mgmt_sticky_rst err %d\n", err);

		return err;

	}



	err = reset_control_deassert(rockchip->pclk_rst);

	if (err) {

		dev_err(dev, "deassert mgmt_sticky_rst err %d\n", err);

		return err;

	}



	err = phy_init(rockchip->phy);

	if (err < 0) {

		dev_err(dev, "fail to init phy, err %d\n", err);
@@ -521,6 +501,26 @@ static int rockchip_pcie_init_port(struct rockchip_pcie *rockchip) 
		return err;

	}



	udelay(10);



	err = reset_control_deassert(rockchip->pm_rst);

	if (err) {

		dev_err(dev, "deassert pm_rst err %d\n", err);

		return err;

	}



	err = reset_control_deassert(rockchip->aclk_rst);

	if (err) {

		dev_err(dev, "deassert aclk_rst err %d\n", err);

		return err;

	}



	err = reset_control_deassert(rockchip->pclk_rst);

	if (err) {

		dev_err(dev, "deassert pclk_rst err %d\n", err);

		return err;

	}



	if (rockchip->link_gen == 2)

		rockchip_pcie_write(rockchip, PCIE_CLIENT_GEN_SEL_2,

				    PCIE_CLIENT_CONFIG);