mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Sean Paul <seanpaul@chromium.org>
To: Rob Clark <robdclark@gmail.com>
Cc: dri-devel@lists.freedesktop.org, linux-arm-msm@vger.kernel.org,
	open list <linux-kernel@vger.kernel.org>,
	Masahiro Yamada <yamada.masahiro@socionext.com>,
	Daniel Vetter <daniel.vetter@ffwll.ch>,
	freedreno@lists.freedesktop.org
Subject: Re: [PATCH 2/4] drm/msm/edp: convert to msm_clk_get()
Date: Tue, 24 Oct 2017 08:13:08 -0400	[thread overview]
Message-ID: <20171024121308.yo3wd7tfumjbrn4g@art_vandelay> (raw)
In-Reply-To: <20171017104958.24588-3-robdclark@gmail.com>

On Tue, Oct 17, 2017 at 06:49:56AM -0400, Rob Clark wrote:
> 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>

> ---
>  drivers/gpu/drm/msm/edp/edp_ctrl.c | 22 +++++++++++-----------
>  1 file changed, 11 insertions(+), 11 deletions(-)
> 
> diff --git a/drivers/gpu/drm/msm/edp/edp_ctrl.c b/drivers/gpu/drm/msm/edp/edp_ctrl.c
> index e32a4a4f3797..7c72264101ff 100644
> --- a/drivers/gpu/drm/msm/edp/edp_ctrl.c
> +++ b/drivers/gpu/drm/msm/edp/edp_ctrl.c
> @@ -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)
>  {
> -	struct device *dev = &ctrl->pdev->dev;
> +	struct platform_device *pdev = ctrl->pdev;
>  	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)) {
>  		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;
>  		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)) {
>  		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;
>  		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)) {
>  		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;
>  		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)) {
>  		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;
>  		return ret;
>  	}
>  
>  	/* 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)) {
>  		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;
>  		return ret;
>  	}
> -- 
> 2.13.6
> 
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel

-- 
Sean Paul, Software Engineer, Google / Chromium OS

  reply	other threads:[~2017-10-24 12:13 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <20171017104958.24588-1-robdclark@gmail.com>
2017-10-17 10:49 ` [PATCH 1/4] drm/msm/dsi: " Rob Clark
2017-10-24 12:12   ` Sean Paul
2017-10-17 10:49 ` [PATCH 2/4] drm/msm/edp: " Rob Clark
2017-10-24 12:13   ` Sean Paul [this message]
2017-10-17 10:49 ` [PATCH 3/4] drm/msm/hdmi: " Rob Clark
2017-10-24 12:14   ` Sean Paul
2017-10-17 10:49 ` [PATCH 4/4] dt-bindings: display: msm: update clk names Rob Clark
2017-10-24  0:16   ` Rob Herring

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20171024121308.yo3wd7tfumjbrn4g@art_vandelay \
    --to=seanpaul@chromium.org \
    --cc=daniel.vetter@ffwll.ch \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=freedreno@lists.freedesktop.org \
    --cc=linux-arm-msm@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=robdclark@gmail.com \
    --cc=yamada.masahiro@socionext.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®