mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-06 02:50:43 +00:00
drm/msm/dsi: drop msm_dsi_phy_get_shared_timings
Instead of fetching shared timing through an extra function call, get them directly from msm_dsi_phy_enable. Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> Reviewed-by: Abhinav Kumar <abhinavk@codeaurora.org> Link: https://lore.kernel.org/r/20210709210729.953114-9-dmitry.baryshkov@linaro.org Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> Signed-off-by: Rob Clark <robdclark@chromium.org>
This commit is contained in:
parent
d119b7cb96
commit
94ad6ec987
3 changed files with 8 additions and 13 deletions
|
@ -164,10 +164,9 @@ struct msm_dsi_phy_clk_request {
|
||||||
void msm_dsi_phy_driver_register(void);
|
void msm_dsi_phy_driver_register(void);
|
||||||
void msm_dsi_phy_driver_unregister(void);
|
void msm_dsi_phy_driver_unregister(void);
|
||||||
int msm_dsi_phy_enable(struct msm_dsi_phy *phy,
|
int msm_dsi_phy_enable(struct msm_dsi_phy *phy,
|
||||||
struct msm_dsi_phy_clk_request *clk_req);
|
struct msm_dsi_phy_clk_request *clk_req,
|
||||||
|
struct msm_dsi_phy_shared_timings *shared_timings);
|
||||||
void msm_dsi_phy_disable(struct msm_dsi_phy *phy);
|
void msm_dsi_phy_disable(struct msm_dsi_phy *phy);
|
||||||
void msm_dsi_phy_get_shared_timings(struct msm_dsi_phy *phy,
|
|
||||||
struct msm_dsi_phy_shared_timings *shared_timing);
|
|
||||||
void msm_dsi_phy_set_usecase(struct msm_dsi_phy *phy,
|
void msm_dsi_phy_set_usecase(struct msm_dsi_phy *phy,
|
||||||
enum msm_dsi_phy_usecase uc);
|
enum msm_dsi_phy_usecase uc);
|
||||||
int msm_dsi_phy_get_clk_provider(struct msm_dsi_phy *phy,
|
int msm_dsi_phy_get_clk_provider(struct msm_dsi_phy *phy,
|
||||||
|
|
|
@ -123,8 +123,7 @@ static int enable_phy(struct msm_dsi *msm_dsi,
|
||||||
|
|
||||||
msm_dsi_host_get_phy_clk_req(msm_dsi->host, &clk_req, is_dual_dsi);
|
msm_dsi_host_get_phy_clk_req(msm_dsi->host, &clk_req, is_dual_dsi);
|
||||||
|
|
||||||
ret = msm_dsi_phy_enable(msm_dsi->phy, &clk_req);
|
ret = msm_dsi_phy_enable(msm_dsi->phy, &clk_req, shared_timings);
|
||||||
msm_dsi_phy_get_shared_timings(msm_dsi->phy, shared_timings);
|
|
||||||
|
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
|
@ -801,7 +801,8 @@ void __exit msm_dsi_phy_driver_unregister(void)
|
||||||
}
|
}
|
||||||
|
|
||||||
int msm_dsi_phy_enable(struct msm_dsi_phy *phy,
|
int msm_dsi_phy_enable(struct msm_dsi_phy *phy,
|
||||||
struct msm_dsi_phy_clk_request *clk_req)
|
struct msm_dsi_phy_clk_request *clk_req,
|
||||||
|
struct msm_dsi_phy_shared_timings *shared_timings)
|
||||||
{
|
{
|
||||||
struct device *dev = &phy->pdev->dev;
|
struct device *dev = &phy->pdev->dev;
|
||||||
int ret;
|
int ret;
|
||||||
|
@ -829,6 +830,9 @@ int msm_dsi_phy_enable(struct msm_dsi_phy *phy,
|
||||||
goto phy_en_fail;
|
goto phy_en_fail;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
memcpy(shared_timings, &phy->timing.shared_timings,
|
||||||
|
sizeof(*shared_timings));
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Resetting DSI PHY silently changes its PLL registers to reset status,
|
* Resetting DSI PHY silently changes its PLL registers to reset status,
|
||||||
* which will confuse clock driver and result in wrong output rate of
|
* which will confuse clock driver and result in wrong output rate of
|
||||||
|
@ -868,13 +872,6 @@ void msm_dsi_phy_disable(struct msm_dsi_phy *phy)
|
||||||
dsi_phy_disable_resource(phy);
|
dsi_phy_disable_resource(phy);
|
||||||
}
|
}
|
||||||
|
|
||||||
void msm_dsi_phy_get_shared_timings(struct msm_dsi_phy *phy,
|
|
||||||
struct msm_dsi_phy_shared_timings *shared_timings)
|
|
||||||
{
|
|
||||||
memcpy(shared_timings, &phy->timing.shared_timings,
|
|
||||||
sizeof(*shared_timings));
|
|
||||||
}
|
|
||||||
|
|
||||||
void msm_dsi_phy_set_usecase(struct msm_dsi_phy *phy,
|
void msm_dsi_phy_set_usecase(struct msm_dsi_phy *phy,
|
||||||
enum msm_dsi_phy_usecase uc)
|
enum msm_dsi_phy_usecase uc)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in a new issue