Message ID | 1583747589-17267-4-git-send-email-sanm@codeaurora.org (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | Add QUSB2 PHY support for SC7180 | expand |
On Mon, Mar 9, 2020 at 2:54 AM Sandeep Maheswaram <sanm@codeaurora.org> wrote: > @@ -774,8 +774,8 @@ static const struct of_device_id qusb2_phy_of_match_table[] = { > .compatible = "qcom,msm8998-qusb2-phy", > .data = &msm8998_phy_cfg, > }, { > - .compatible = "qcom,sdm845-qusb2-phy", > - .data = &sdm845_phy_cfg, > + .compatible = "qcom,qusb2-v2-phy", > + .data = &qusb2_v2_phy_cfg, > }, > { }, > }; Just as a heads up, Yongqin (cc'ed) reported this patch (now upstream) seems to be causing trouble on the db845c. It seems like its removing support for the "qcom,sdm845-qusb2-phy" compatible string, which is documented: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/Documentation/devicetree/bindings/phy/qcom,qusb2-phy.yaml#n23 and already in use: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/arch/arm64/boot/dts/qcom/sdm845.dtsi#n2389 Should this instead have been an addition of the "qcom,qusb2-v2-phy", line instead of replacing "qcom,sdm845-qusb2-phy"? thanks -john
Hi, On Thu, Apr 2, 2020 at 2:39 PM John Stultz <john.stultz@linaro.org> wrote: > > On Mon, Mar 9, 2020 at 2:54 AM Sandeep Maheswaram <sanm@codeaurora.org> wrote: > > @@ -774,8 +774,8 @@ static const struct of_device_id qusb2_phy_of_match_table[] = { > > .compatible = "qcom,msm8998-qusb2-phy", > > .data = &msm8998_phy_cfg, > > }, { > > - .compatible = "qcom,sdm845-qusb2-phy", > > - .data = &sdm845_phy_cfg, > > + .compatible = "qcom,qusb2-v2-phy", > > + .data = &qusb2_v2_phy_cfg, > > }, > > { }, > > }; > > Just as a heads up, Yongqin (cc'ed) reported this patch (now upstream) > seems to be causing trouble on the db845c. > > It seems like its removing support for the "qcom,sdm845-qusb2-phy" > compatible string, which is documented: > https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/Documentation/devicetree/bindings/phy/qcom,qusb2-phy.yaml#n23 > > and already in use: > https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/arch/arm64/boot/dts/qcom/sdm845.dtsi#n2389 > > Should this instead have been an addition of the "qcom,qusb2-v2-phy", > line instead of replacing "qcom,sdm845-qusb2-phy"? To avoid forking the discussion into two threads, I'll suggest that we focus on keeping the discussion in reply to your newly proposed patch. I've already replied there: https://lore.kernel.org/r/CAD=FV=VGT75c4_ErQAJgNtcCd2Jzv0A2KpfEkS637GqOhamj9Q@mail.gmail.com -Doug
diff --git a/drivers/phy/qualcomm/phy-qcom-qusb2.c b/drivers/phy/qualcomm/phy-qcom-qusb2.c index bf94a52..70c9da6 100644 --- a/drivers/phy/qualcomm/phy-qcom-qusb2.c +++ b/drivers/phy/qualcomm/phy-qcom-qusb2.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0 /* - * Copyright (c) 2017, The Linux Foundation. All rights reserved. + * Copyright (c) 2017, 2019, The Linux Foundation. All rights reserved. */ #include <linux/clk.h> @@ -177,7 +177,7 @@ static const struct qusb2_phy_init_tbl msm8998_init_tbl[] = { QUSB2_PHY_INIT_CFG(QUSB2PHY_PLL_DIGITAL_TIMERS_TWO, 0x19), }; -static const unsigned int sdm845_regs_layout[] = { +static const unsigned int qusb2_v2_regs_layout[] = { [QUSB2PHY_PLL_CORE_INPUT_OVERRIDE] = 0xa8, [QUSB2PHY_PLL_STATUS] = 0x1a0, [QUSB2PHY_PORT_TUNE1] = 0x240, @@ -191,7 +191,7 @@ static const unsigned int sdm845_regs_layout[] = { [QUSB2PHY_INTR_CTRL] = 0x230, }; -static const struct qusb2_phy_init_tbl sdm845_init_tbl[] = { +static const struct qusb2_phy_init_tbl qusb2_v2_init_tbl[] = { QUSB2_PHY_INIT_CFG(QUSB2PHY_PLL_ANALOG_CONTROLS_TWO, 0x03), QUSB2_PHY_INIT_CFG(QUSB2PHY_PLL_CLOCK_INVERTERS, 0x7c), QUSB2_PHY_INIT_CFG(QUSB2PHY_PLL_CMODE, 0x80), @@ -258,10 +258,10 @@ static const struct qusb2_phy_cfg msm8998_phy_cfg = { .update_tune1_with_efuse = true, }; -static const struct qusb2_phy_cfg sdm845_phy_cfg = { - .tbl = sdm845_init_tbl, - .tbl_num = ARRAY_SIZE(sdm845_init_tbl), - .regs = sdm845_regs_layout, +static const struct qusb2_phy_cfg qusb2_v2_phy_cfg = { + .tbl = qusb2_v2_init_tbl, + .tbl_num = ARRAY_SIZE(qusb2_v2_init_tbl), + .regs = qusb2_v2_regs_layout, .disable_ctrl = (PWR_CTRL1_VREF_SUPPLY_TRIM | PWR_CTRL1_CLAMP_N_EN | POWER_DOWN), @@ -774,8 +774,8 @@ static const struct of_device_id qusb2_phy_of_match_table[] = { .compatible = "qcom,msm8998-qusb2-phy", .data = &msm8998_phy_cfg, }, { - .compatible = "qcom,sdm845-qusb2-phy", - .data = &sdm845_phy_cfg, + .compatible = "qcom,qusb2-v2-phy", + .data = &qusb2_v2_phy_cfg, }, { }, };