Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions drivers/pci/controller/pcie-brcmstb.c
Original file line number Diff line number Diff line change
Expand Up @@ -1566,10 +1566,6 @@ static void brcm_config_clkreq(struct brcm_pcie *pcie)
mode = "safe";
}

/* Start out assuming safe mode (both mode bits cleared) */
clkreq_cntl = readl(pcie->base + HARD_DEBUG(pcie));
clkreq_cntl &= ~PCIE_CLKREQ_MASK;

if (strcmp(mode, "no-l1ss") == 0) {
/*
* "no-l1ss" -- Provides Clock Power Management, L0s, and
Expand Down Expand Up @@ -1766,6 +1762,11 @@ static int brcm_pcie_start_link(struct brcm_pcie *pcie)

brcm_pcie_stats_trigger(pcie, 0);

/* Disable CLKREQ# input prior to link-up */
tmp = readl(pcie->base + HARD_DEBUG(pcie));
tmp &= ~PCIE_CLKREQ_MASK;
writel(tmp, pcie->base + HARD_DEBUG(pcie));

/* Unassert the fundamental reset */
if (pcie->tperst_clk_ms) {
/*
Expand Down