xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

drm/msm/edp: convert to msm_clk_get()

Browse Source 
We already have, as a result of upstreaming the gpu bindings,
msm_clk_get() which will try to get the clock both without and with a
"_clk" suffix.  Use this in eDP code so we can drop the "_clk" suffix
in bindings while maintaing backwards compatibility.

Signed-off-by: Rob Clark <robdclark@gmail.com>
Reviewed-by: Sean Paul <seanpaul@chromium.org>
This commit is contained in:
Rob Clark
2017-10-16 16:39:59 -04:00
parent db9a3750eb
commit cf52ec24b2
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
drivers/gpu/drm/msm/edp/edp_ctrl.c
View File

@@ -150,46 +150,46 @@ static const struct edp_pixel_clk_div clk_divs[2][EDP_PIXEL_CLK_NUM] = {
static int edp_clk_init(struct edp_ctrl *ctrl) static int edp_clk_init(struct edp_ctrl *ctrl)
{ {
struct device *dev = &ctrl->pdev->dev; struct platform_device *pdev = ctrl->pdev;
int ret; int ret;
ctrl->aux_clk = devm_clk_get(dev, "core_clk"); ctrl->aux_clk = msm_clk_get(pdev, "core");
if (IS_ERR(ctrl->aux_clk)) { if (IS_ERR(ctrl->aux_clk)) {
ret = PTR_ERR(ctrl->aux_clk); ret = PTR_ERR(ctrl->aux_clk);
pr_err("%s: Can't find aux_clk, %d\n", __func__, ret); pr_err("%s: Can't find core clock, %d\n", __func__, ret);
ctrl->aux_clk = NULL; ctrl->aux_clk = NULL;
return ret; return ret;
} }
ctrl->pixel_clk = devm_clk_get(dev, "pixel_clk"); ctrl->pixel_clk = msm_clk_get(pdev, "pixel");
if (IS_ERR(ctrl->pixel_clk)) { if (IS_ERR(ctrl->pixel_clk)) {
ret = PTR_ERR(ctrl->pixel_clk); ret = PTR_ERR(ctrl->pixel_clk);
pr_err("%s: Can't find pixel_clk, %d\n", __func__, ret); pr_err("%s: Can't find pixel clock, %d\n", __func__, ret);
ctrl->pixel_clk = NULL; ctrl->pixel_clk = NULL;
return ret; return ret;
} }
ctrl->ahb_clk = devm_clk_get(dev, "iface_clk"); ctrl->ahb_clk = msm_clk_get(pdev, "iface");
if (IS_ERR(ctrl->ahb_clk)) { if (IS_ERR(ctrl->ahb_clk)) {
ret = PTR_ERR(ctrl->ahb_clk); ret = PTR_ERR(ctrl->ahb_clk);
pr_err("%s: Can't find ahb_clk, %d\n", __func__, ret); pr_err("%s: Can't find iface clock, %d\n", __func__, ret);
ctrl->ahb_clk = NULL; ctrl->ahb_clk = NULL;
return ret; return ret;
} }
ctrl->link_clk = devm_clk_get(dev, "link_clk"); ctrl->link_clk = msm_clk_get(pdev, "link");
if (IS_ERR(ctrl->link_clk)) { if (IS_ERR(ctrl->link_clk)) {
ret = PTR_ERR(ctrl->link_clk); ret = PTR_ERR(ctrl->link_clk);
pr_err("%s: Can't find link_clk, %d\n", __func__, ret); pr_err("%s: Can't find link clock, %d\n", __func__, ret);
ctrl->link_clk = NULL; ctrl->link_clk = NULL;
return ret; return ret;
} }
/* need mdp core clock to receive irq */ /* need mdp core clock to receive irq */
ctrl->mdp_core_clk = devm_clk_get(dev, "mdp_core_clk"); ctrl->mdp_core_clk = msm_clk_get(pdev, "mdp_core");
if (IS_ERR(ctrl->mdp_core_clk)) { if (IS_ERR(ctrl->mdp_core_clk)) {
ret = PTR_ERR(ctrl->mdp_core_clk); ret = PTR_ERR(ctrl->mdp_core_clk);
pr_err("%s: Can't find mdp_core_clk, %d\n", __func__, ret); pr_err("%s: Can't find mdp_core clock, %d\n", __func__, ret);
ctrl->mdp_core_clk = NULL; ctrl->mdp_core_clk = NULL;
return ret; return ret;
} }