On Mon, Nov 05, 2018 at 12:33:04PM -0500, Sean Paul wrote:
> On Fri, Nov 02, 2018 at 02:45:34PM -0700, Matthias Kaehlcke wrote:
> > Get the PHY ref clock from the device tree instead of hardcoding
> > its name and rate.
> >
> > Signed-off-by: Matthias Kaehlcke <m...@chromium.org>
> > ---
> > drivers/gpu/drm/msm/dsi/pll/dsi_pll_10nm.c | 11 ++++++++++-
> > 1 file changed, 10 insertions(+), 1 deletion(-)
> >
> > diff --git a/drivers/gpu/drm/msm/dsi/pll/dsi_pll_10nm.c
> > b/drivers/gpu/drm/msm/dsi/pll/dsi_pll_10nm.c
> > index 4c03f0b7343ed..1016eb50df8f5 100644
> > --- a/drivers/gpu/drm/msm/dsi/pll/dsi_pll_10nm.c
> > +++ b/drivers/gpu/drm/msm/dsi/pll/dsi_pll_10nm.c
> > @@ -91,6 +91,8 @@ struct dsi_pll_10nm {
> > void __iomem *phy_cmn_mmio;
> > void __iomem *mmio;
> >
> > + struct clk *vco_ref_clk;
> > +
> > u64 vco_ref_clk_rate;
> > u64 vco_current_rate;
> >
> > @@ -630,7 +632,8 @@ static int pll_10nm_register(struct dsi_pll_10nm
> > *pll_10nm)
> > char clk_name[32], parent[32], vco_name[32];
> > char parent2[32], parent3[32], parent4[32];
> > struct clk_init_data vco_init = {
> > - .parent_names = (const char *[]){ "xo" },
> > + .parent_names = (const char *[]){
> > + __clk_get_name(pll_10nm->vco_ref_clk) },
> > .num_parents = 1,
>
> You should check the return of __clk_get_name() since you're setting
> num_parents
> to 1.
Is that actually needed? __clk_get_name() only returns NULL if the
passed clock is NULL, and this can't happen here since _init() fails
if the clock can't be obtained, or am I missing something here?
> Also, you should revert the patch that hardcodes 19.2MHz as part of this
> set.
Ooops, this somehow got dropped when moving the patch from my working
tree to the repo I use for upstreaming.
> > .name = vco_name,
> > .flags = CLK_IGNORE_UNUSED,
> > @@ -786,6 +789,12 @@ struct msm_dsi_pll *msm_dsi_pll_10nm_init(struct
> > platform_device *pdev, int id)
> > pll_10nm->id = id;
> > pll_10nm_list[id] = pll_10nm;
> >
> > + pll_10nm->vco_ref_clk = devm_clk_get(&pdev->dev, "ref");
> > + if (IS_ERR(pll_10nm->vco_ref_clk)) {
> > + dev_err(&pdev->dev, "couldn't get 'ref' clock\n");
>
> Please print the error message
Ok, except for -EPROBE_DEFER as per Stephen's comment.
> > + return (void *)pll_10nm->vco_ref_clk;
>
> Use ERR_CAST here
Will do
Cheers
Matthias
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
