Commit 979db15b authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'remotes/lorenzo/pci/mediatek' 

- Fix refcount leak in mtk_pcie_subsys_powerup() (Miaoqian Lin)

- Reset PHY and MAC at probe time (AngeloGioacchino Del Regno)

* remotes/lorenzo/pci/mediatek:
  PCI: mediatek-gen3: Assert resets to ensure expected init state
  PCI: mediatek: Fix refcount leak in mtk_pcie_subsys_powerup()
parents 8d827006 1d565935

drivers/pci/controller/pcie-mediatek-gen3.c

+8 −0
Original line number Diff line number Diff line
@@ -838,6 +838,14 @@ static int mtk_pcie_setup(struct mtk_gen3_pcie *pcie) 
	if (err)

		return err;



	/*

	 * The controller may have been left out of reset by the bootloader

	 * so make sure that we get a clean start by asserting resets here.

	 */

	reset_control_assert(pcie->phy_reset);

	reset_control_assert(pcie->mac_reset);

	usleep_range(10, 20);



	/* Don't touch the hardware registers before power up */

	err = mtk_pcie_power_up(pcie);

	if (err)

drivers/pci/controller/pcie-mediatek.c

+1 −0
Original line number Diff line number Diff line
@@ -1008,6 +1008,7 @@ static int mtk_pcie_subsys_powerup(struct mtk_pcie *pcie) 
					   "mediatek,generic-pciecfg");

	if (cfg_node) {

		pcie->cfg = syscon_node_to_regmap(cfg_node);

		of_node_put(cfg_node);

		if (IS_ERR(pcie->cfg))

			return PTR_ERR(pcie->cfg);

	}