summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorBjorn Helgaas <bhelgaas@google.com>2024-03-12 12:14:24 -0500
committerBjorn Helgaas <bhelgaas@google.com>2024-03-12 12:14:24 -0500
commitcab098b6f2531f26d447abd07ec7a77e2e442ec0 (patch)
tree20b37bf195285f442fdf0f8ee6ae81cdc1e4f984 /drivers
parent45a516f616cae50eabd81c1aa6b1bacbdf2f8c65 (diff)
parent039741a8d7c9a01c1bc84a5ac5aa770a5e138a30 (diff)
Merge branch 'pci/controller/broadcom'
- Fix polling for MDIO write completion, which previously used the wrong access width so it always indicated "completed" (Jonathan Bell) * pci/controller/broadcom: PCI: brcmstb: Fix broken brcm_pcie_mdio_write() polling
Diffstat (limited to 'drivers')
-rw-r--r--drivers/pci/controller/pcie-brcmstb.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pci/controller/pcie-brcmstb.c b/drivers/pci/controller/pcie-brcmstb.c
index 5b0730c3891b..c08683febdd4 100644
--- a/drivers/pci/controller/pcie-brcmstb.c
+++ b/drivers/pci/controller/pcie-brcmstb.c
@@ -336,7 +336,7 @@ static int brcm_pcie_mdio_write(void __iomem *base, u8 port,
readl(base + PCIE_RC_DL_MDIO_ADDR);
writel(MDIO_DATA_DONE_MASK | wrdata, base + PCIE_RC_DL_MDIO_WR_DATA);
- err = readw_poll_timeout_atomic(base + PCIE_RC_DL_MDIO_WR_DATA, data,
+ err = readl_poll_timeout_atomic(base + PCIE_RC_DL_MDIO_WR_DATA, data,
MDIO_WT_DONE(data), 10, 100);
return err;
}