| Message ID | 1477772534-14170-6-git-send-email-vivek.gautam@codeaurora.org (mailing list archive) |
|---|---|
| State | Not Applicable, archived |
| Delegated to: | Andy Gross |
| Headers | show |
On 2016-10-29 13:22, Vivek Gautam wrote: > The tx_iface_clk and rx_iface_clk no longer exist with UFS Phy > present on msm8996. So skip obtaining these clocks using > compatible match. > > Signed-off-by: Vivek Gautam <vivek.gautam@codeaurora.org> > --- > > New patch in v3 of this cleanup series. > Comes in place of the following patch in v2 - > phy: qcom-ufs: remove failure when rx/tx_iface_clk are absent > > drivers/phy/phy-qcom-ufs.c | 5 +++++ > 1 file changed, 5 insertions(+) > > diff --git a/drivers/phy/phy-qcom-ufs.c b/drivers/phy/phy-qcom-ufs.c > index a173b30..11c8cae 100644 > --- a/drivers/phy/phy-qcom-ufs.c > +++ b/drivers/phy/phy-qcom-ufs.c > @@ -184,6 +184,10 @@ int ufs_qcom_phy_clk_get(struct device *dev, > { > int err; > > + if (of_device_is_compatible(phy_common->dev->of_node, > + "qcom,msm8996-ufs-phy-qmp-14nm")) Vivek, This change looks good but you might need a minor change if we agree to change the compatible string name ("qcom,msm8996-ufs-phy-qmp-14nm") as commented on patch #4. > + goto skip_txrx_clk; > + > err = ufs_qcom_phy_clk_get(phy_common->dev, "tx_iface_clk", > &phy_common->tx_iface_clk); > if (err) > @@ -199,6 +203,7 @@ int ufs_qcom_phy_clk_get(struct device *dev, > if (err) > goto out; > > +skip_txrx_clk: > /* > * "ref_clk_parent" is optional hence don't abort init if it's not > * found.
On 2016-11-01 11:42, Subhash Jadavani wrote: > On 2016-10-29 13:22, Vivek Gautam wrote: >> The tx_iface_clk and rx_iface_clk no longer exist with UFS Phy >> present on msm8996. So skip obtaining these clocks using >> compatible match. >> >> Signed-off-by: Vivek Gautam <vivek.gautam@codeaurora.org> >> --- >> >> New patch in v3 of this cleanup series. >> Comes in place of the following patch in v2 - >> phy: qcom-ufs: remove failure when rx/tx_iface_clk are absent >> >> drivers/phy/phy-qcom-ufs.c | 5 +++++ >> 1 file changed, 5 insertions(+) >> >> diff --git a/drivers/phy/phy-qcom-ufs.c b/drivers/phy/phy-qcom-ufs.c >> index a173b30..11c8cae 100644 >> --- a/drivers/phy/phy-qcom-ufs.c >> +++ b/drivers/phy/phy-qcom-ufs.c >> @@ -184,6 +184,10 @@ int ufs_qcom_phy_clk_get(struct device *dev, >> { >> int err; >> >> + if (of_device_is_compatible(phy_common->dev->of_node, >> + "qcom,msm8996-ufs-phy-qmp-14nm")) > > Vivek, This change looks good but you might need a minor change if we > agree to change the compatible string name > ("qcom,msm8996-ufs-phy-qmp-14nm") as commented on patch #4. As I am ok with patch #4 after Vivek's clarifications, I am ok with this patch as well. Reviewed-by: Subhash Jadavani <subhashj@codeaurora.org> > >> + goto skip_txrx_clk; >> + >> err = ufs_qcom_phy_clk_get(phy_common->dev, "tx_iface_clk", >> &phy_common->tx_iface_clk); >> if (err) >> @@ -199,6 +203,7 @@ int ufs_qcom_phy_clk_get(struct device *dev, >> if (err) >> goto out; >> >> +skip_txrx_clk: >> /* >> * "ref_clk_parent" is optional hence don't abort init if it's not >> * found.
diff --git a/drivers/phy/phy-qcom-ufs.c b/drivers/phy/phy-qcom-ufs.c index a173b30..11c8cae 100644 --- a/drivers/phy/phy-qcom-ufs.c +++ b/drivers/phy/phy-qcom-ufs.c @@ -184,6 +184,10 @@ int ufs_qcom_phy_clk_get(struct device *dev, { int err; + if (of_device_is_compatible(phy_common->dev->of_node, + "qcom,msm8996-ufs-phy-qmp-14nm")) + goto skip_txrx_clk; + err = ufs_qcom_phy_clk_get(phy_common->dev, "tx_iface_clk", &phy_common->tx_iface_clk); if (err) @@ -199,6 +203,7 @@ int ufs_qcom_phy_clk_get(struct device *dev, if (err) goto out; +skip_txrx_clk: /* * "ref_clk_parent" is optional hence don't abort init if it's not * found.
The tx_iface_clk and rx_iface_clk no longer exist with UFS Phy present on msm8996. So skip obtaining these clocks using compatible match. Signed-off-by: Vivek Gautam <vivek.gautam@codeaurora.org> --- New patch in v3 of this cleanup series. Comes in place of the following patch in v2 - phy: qcom-ufs: remove failure when rx/tx_iface_clk are absent drivers/phy/phy-qcom-ufs.c | 5 +++++ 1 file changed, 5 insertions(+)