| Message ID | 20230323144726.1614344-2-dmitry.baryshkov@linaro.org |
|---|---|
| State | Accepted |
| Commit | eb016875080cf035f588fa31c7d1e43dfe462451 |
| Headers | show |
| Series | [1/2] phy: qcom-qmp-combo: fix v3 offsets table | expand |
On 23/03/2023 15:47, Dmitry Baryshkov wrote: > The qmp_combo_offsets_v3 table is already used for v3 and v4 PHYs. Reuse > it for v6 too, dropping the separate qmp_combo_offsets_v6. > > Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> > --- > drivers/phy/qualcomm/phy-qcom-qmp-combo.c | 18 +----------------- > 1 file changed, 1 insertion(+), 17 deletions(-) > > diff --git a/drivers/phy/qualcomm/phy-qcom-qmp-combo.c b/drivers/phy/qualcomm/phy-qcom-qmp-combo.c > index 3b488d12c933..6850e04c329b 100644 > --- a/drivers/phy/qualcomm/phy-qcom-qmp-combo.c > +++ b/drivers/phy/qualcomm/phy-qcom-qmp-combo.c > @@ -1417,22 +1417,6 @@ static const struct qmp_combo_offsets qmp_combo_offsets_v5 = { > .dp_dp_phy = 0x2200, > }; > > -static const struct qmp_combo_offsets qmp_combo_offsets_v6 = { > - .com = 0x0000, > - .txa = 0x1200, > - .rxa = 0x1400, > - .txb = 0x1600, > - .rxb = 0x1800, > - .usb3_serdes = 0x1000, > - .usb3_pcs_misc = 0x1a00, > - .usb3_pcs = 0x1c00, > - .usb3_pcs_usb = 0x1f00, > - .dp_serdes = 0x2000, > - .dp_txa = 0x2200, > - .dp_txb = 0x2600, > - .dp_dp_phy = 0x2a00, > -}; > - > static const struct qmp_phy_cfg sc7180_usb3dpphy_cfg = { > .serdes_tbl = qmp_v3_usb3_serdes_tbl, > .serdes_tbl_num = ARRAY_SIZE(qmp_v3_usb3_serdes_tbl), > @@ -1759,7 +1743,7 @@ static const struct qmp_phy_cfg sm8350_usb3dpphy_cfg = { > }; > > static const struct qmp_phy_cfg sm8550_usb3dpphy_cfg = { > - .offsets = &qmp_combo_offsets_v6, > + .offsets = &qmp_combo_offsets_v3, > > .serdes_tbl = sm8550_usb3_serdes_tbl, > .serdes_tbl_num = ARRAY_SIZE(sm8550_usb3_serdes_tbl), Reviewed-by: Neil Armstrong <neil.armstrong@linaro.org>
diff --git a/drivers/phy/qualcomm/phy-qcom-qmp-combo.c b/drivers/phy/qualcomm/phy-qcom-qmp-combo.c index 3b488d12c933..6850e04c329b 100644 --- a/drivers/phy/qualcomm/phy-qcom-qmp-combo.c +++ b/drivers/phy/qualcomm/phy-qcom-qmp-combo.c @@ -1417,22 +1417,6 @@ static const struct qmp_combo_offsets qmp_combo_offsets_v5 = { .dp_dp_phy = 0x2200, }; -static const struct qmp_combo_offsets qmp_combo_offsets_v6 = { - .com = 0x0000, - .txa = 0x1200, - .rxa = 0x1400, - .txb = 0x1600, - .rxb = 0x1800, - .usb3_serdes = 0x1000, - .usb3_pcs_misc = 0x1a00, - .usb3_pcs = 0x1c00, - .usb3_pcs_usb = 0x1f00, - .dp_serdes = 0x2000, - .dp_txa = 0x2200, - .dp_txb = 0x2600, - .dp_dp_phy = 0x2a00, -}; - static const struct qmp_phy_cfg sc7180_usb3dpphy_cfg = { .serdes_tbl = qmp_v3_usb3_serdes_tbl, .serdes_tbl_num = ARRAY_SIZE(qmp_v3_usb3_serdes_tbl), @@ -1759,7 +1743,7 @@ static const struct qmp_phy_cfg sm8350_usb3dpphy_cfg = { }; static const struct qmp_phy_cfg sm8550_usb3dpphy_cfg = { - .offsets = &qmp_combo_offsets_v6, + .offsets = &qmp_combo_offsets_v3, .serdes_tbl = sm8550_usb3_serdes_tbl, .serdes_tbl_num = ARRAY_SIZE(sm8550_usb3_serdes_tbl),
The qmp_combo_offsets_v3 table is already used for v3 and v4 PHYs. Reuse it for v6 too, dropping the separate qmp_combo_offsets_v6. Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> --- drivers/phy/qualcomm/phy-qcom-qmp-combo.c | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-)