tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

phy: qcom-qmp-usb: make QPHY_PCS_MISC_CLAMP_ENABLE access conditional

The register QPHY_V[34]_PCS_MISC_CLAMP_ENABLE is present only on some
SoC families. Other platforms (qcm2290) can have PCS_MISC region, but do
not have this register. Add it to the register layout table and check
that it is defined before toggling CLAMP settings.

Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Link: https://lore.kernel.org/r/20230824211952.1397699-5-dmitry.baryshkov@linaro.org
Signed-off-by: Vinod Koul <vkoul@kernel.org>

authored by

Dmitry Baryshkov and committed by
Vinod Koul 6e940226 fcf63482

+17 -5
+17 -5
drivers/phy/qualcomm/phy-qcom-qmp-usb.c
··· 94 94 QPHY_PCS_AUTONOMOUS_MODE_CTRL, 95 95 QPHY_PCS_LFPS_RXTERM_IRQ_CLEAR, 96 96 QPHY_PCS_POWER_DOWN_CONTROL, 97 + QPHY_PCS_MISC_CLAMP_ENABLE, 97 98 /* Keep last to ensure regs_layout arrays are properly initialized */ 98 99 QPHY_LAYOUT_SIZE 99 100 }; ··· 115 114 [QPHY_PCS_AUTONOMOUS_MODE_CTRL] = QPHY_V3_PCS_AUTONOMOUS_MODE_CTRL, 116 115 [QPHY_PCS_LFPS_RXTERM_IRQ_CLEAR] = QPHY_V3_PCS_LFPS_RXTERM_IRQ_CLEAR, 117 116 [QPHY_PCS_POWER_DOWN_CONTROL] = QPHY_V3_PCS_POWER_DOWN_CONTROL, 117 + [QPHY_PCS_MISC_CLAMP_ENABLE] = QPHY_V3_PCS_MISC_CLAMP_ENABLE, 118 + }; 119 + 120 + static const unsigned int qmp_v3_usb3phy_regs_layout_qcm2290[QPHY_LAYOUT_SIZE] = { 121 + [QPHY_SW_RESET] = QPHY_V3_PCS_SW_RESET, 122 + [QPHY_START_CTRL] = QPHY_V3_PCS_START_CONTROL, 123 + [QPHY_PCS_STATUS] = QPHY_V3_PCS_PCS_STATUS, 124 + [QPHY_PCS_AUTONOMOUS_MODE_CTRL] = QPHY_V3_PCS_AUTONOMOUS_MODE_CTRL, 125 + [QPHY_PCS_LFPS_RXTERM_IRQ_CLEAR] = QPHY_V3_PCS_LFPS_RXTERM_IRQ_CLEAR, 126 + [QPHY_PCS_POWER_DOWN_CONTROL] = QPHY_V3_PCS_POWER_DOWN_CONTROL, 118 127 }; 119 128 120 129 static const unsigned int qmp_v4_usb3phy_regs_layout[QPHY_LAYOUT_SIZE] = { ··· 136 125 /* In PCS_USB */ 137 126 [QPHY_PCS_AUTONOMOUS_MODE_CTRL] = QPHY_V4_PCS_USB3_AUTONOMOUS_MODE_CTRL, 138 127 [QPHY_PCS_LFPS_RXTERM_IRQ_CLEAR] = QPHY_V4_PCS_USB3_LFPS_RXTERM_IRQ_CLEAR, 128 + [QPHY_PCS_MISC_CLAMP_ENABLE] = QPHY_V4_PCS_MISC_CLAMP_ENABLE, 139 129 }; 140 130 141 131 static const unsigned int qmp_v5_usb3phy_regs_layout[QPHY_LAYOUT_SIZE] = { ··· 1535 1523 .pcs_tbl_num = ARRAY_SIZE(qcm2290_usb3_pcs_tbl), 1536 1524 .vreg_list = qmp_phy_vreg_l, 1537 1525 .num_vregs = ARRAY_SIZE(qmp_phy_vreg_l), 1538 - .regs = qmp_v3_usb3phy_regs_layout, 1526 + .regs = qmp_v3_usb3phy_regs_layout_qcm2290, 1539 1527 }; 1540 1528 1541 1529 static void qmp_usb_configure_lane(void __iomem *base, ··· 1773 1761 qphy_setbits(pcs_usb, cfg->regs[QPHY_PCS_AUTONOMOUS_MODE_CTRL], intr_mask); 1774 1762 1775 1763 /* Enable i/o clamp_n for autonomous mode */ 1776 - if (pcs_misc) 1777 - qphy_clrbits(pcs_misc, QPHY_V3_PCS_MISC_CLAMP_ENABLE, CLAMP_EN); 1764 + if (pcs_misc && cfg->regs[QPHY_PCS_MISC_CLAMP_ENABLE]) 1765 + qphy_clrbits(pcs_misc, cfg->regs[QPHY_PCS_MISC_CLAMP_ENABLE], CLAMP_EN); 1778 1766 } 1779 1767 1780 1768 static void qmp_usb_disable_autonomous_mode(struct qmp_usb *qmp) ··· 1784 1772 void __iomem *pcs_misc = qmp->pcs_misc; 1785 1773 1786 1774 /* Disable i/o clamp_n on resume for normal mode */ 1787 - if (pcs_misc) 1788 - qphy_setbits(pcs_misc, QPHY_V3_PCS_MISC_CLAMP_ENABLE, CLAMP_EN); 1775 + if (pcs_misc && cfg->regs[QPHY_PCS_MISC_CLAMP_ENABLE]) 1776 + qphy_setbits(pcs_misc, cfg->regs[QPHY_PCS_MISC_CLAMP_ENABLE], CLAMP_EN); 1789 1777 1790 1778 qphy_clrbits(pcs_usb, cfg->regs[QPHY_PCS_AUTONOMOUS_MODE_CTRL], 1791 1779 ARCVR_DTCT_EN | ARCVR_DTCT_EVENT_SEL | ALFPS_DTCT_EN);