From: Zhou Zhu <zzhu3-eYqpPyKDWXRBDgjK7y7TUQ@public.gmane.org> To: linux-fbdev-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, Tomi Valkeinen <tomi.valkeinen-l0cyMroinI0@public.gmane.org>, Jean-Christophe Plagniol-Villard <plagnioj-sclMFOaUSTBWk0Htik3J/w@public.gmane.org>, Haojian Zhuang <haojian.zhuang-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>, Sascha Hauer <s.hauer-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>, Jingoo Han <jg1.han-Sze3O3UU22JBDgjK7y7TUQ@public.gmane.org>, devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org Cc: Chao Xie <chao.xie-eYqpPyKDWXRBDgjK7y7TUQ@public.gmane.org>, Guoqing Li <ligq-eYqpPyKDWXRBDgjK7y7TUQ@public.gmane.org>, Zhou Zhu <zzhu3-eYqpPyKDWXRBDgjK7y7TUQ@public.gmane.org> Subject: [PATCH v2 2/4] video: mmp: no need to get clk_name from mach_info Date: Tue, 14 Jan 2014 19:16:22 +0800 [thread overview] Message-ID: <1389698184-28761-3-git-send-email-zzhu3@marvell.com> (raw) In-Reply-To: <1389698184-28761-1-git-send-email-zzhu3-eYqpPyKDWXRBDgjK7y7TUQ@public.gmane.org> As the display controller has only one clock, no need to get clk_name from mach_info Signed-off-by: Zhou Zhu <zzhu3-eYqpPyKDWXRBDgjK7y7TUQ@public.gmane.org> --- drivers/video/mmp/hw/mmp_ctrl.c | 4 ++-- include/video/mmp_disp.h | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/video/mmp/hw/mmp_ctrl.c b/drivers/video/mmp/hw/mmp_ctrl.c index 8621a9f..b65913e 100644 --- a/drivers/video/mmp/hw/mmp_ctrl.c +++ b/drivers/video/mmp/hw/mmp_ctrl.c @@ -521,9 +521,9 @@ static int mmphw_probe(struct platform_device *pdev) } /* get clock */ - ctrl->clk = devm_clk_get(ctrl->dev, mi->clk_name); + ctrl->clk = devm_clk_get(ctrl->dev, NULL); if (IS_ERR(ctrl->clk)) { - dev_err(ctrl->dev, "unable to get clk %s\n", mi->clk_name); + dev_err(ctrl->dev, "unable to get clk for %s\n", ctrl->name); ret = -ENOENT; goto failed; } diff --git a/include/video/mmp_disp.h b/include/video/mmp_disp.h index 9fd9398..05a3a60 100644 --- a/include/video/mmp_disp.h +++ b/include/video/mmp_disp.h @@ -344,7 +344,6 @@ struct mmp_mach_path_config { struct mmp_mach_plat_info { const char *name; - const char *clk_name; int path_num; struct mmp_mach_path_config *paths; }; -- 1.7.9.5 -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html
WARNING: multiple messages have this Message-ID (diff)
From: Zhou Zhu <zzhu3@marvell.com> To: linux-fbdev-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, Tomi Valkeinen <tomi.valkeinen-l0cyMroinI0@public.gmane.org>, Jean-Christophe Plagniol-Villard <plagnioj-sclMFOaUSTBWk0Htik3J/w@public.gmane.org>, Haojian Zhuang <haojian.zhuang-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>, Sascha Hauer <s.hauer-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>, Jingoo Han <jg1.han-Sze3O3UU22JBDgjK7y7TUQ@public.gmane.org>, devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org Cc: Chao Xie <chao.xie-eYqpPyKDWXRBDgjK7y7TUQ@public.gmane.org>, Guoqing Li <ligq-eYqpPyKDWXRBDgjK7y7TUQ@public.gmane.org>, Zhou Zhu <zzhu3-eYqpPyKDWXRBDgjK7y7TUQ@public.gmane.org> Subject: [PATCH v2 2/4] video: mmp: no need to get clk_name from mach_info Date: Tue, 14 Jan 2014 11:16:22 +0000 [thread overview] Message-ID: <1389698184-28761-3-git-send-email-zzhu3@marvell.com> (raw) In-Reply-To: <1389698184-28761-1-git-send-email-zzhu3-eYqpPyKDWXRBDgjK7y7TUQ@public.gmane.org> As the display controller has only one clock, no need to get clk_name from mach_info Signed-off-by: Zhou Zhu <zzhu3@marvell.com> --- drivers/video/mmp/hw/mmp_ctrl.c | 4 ++-- include/video/mmp_disp.h | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/video/mmp/hw/mmp_ctrl.c b/drivers/video/mmp/hw/mmp_ctrl.c index 8621a9f..b65913e 100644 --- a/drivers/video/mmp/hw/mmp_ctrl.c +++ b/drivers/video/mmp/hw/mmp_ctrl.c @@ -521,9 +521,9 @@ static int mmphw_probe(struct platform_device *pdev) } /* get clock */ - ctrl->clk = devm_clk_get(ctrl->dev, mi->clk_name); + ctrl->clk = devm_clk_get(ctrl->dev, NULL); if (IS_ERR(ctrl->clk)) { - dev_err(ctrl->dev, "unable to get clk %s\n", mi->clk_name); + dev_err(ctrl->dev, "unable to get clk for %s\n", ctrl->name); ret = -ENOENT; goto failed; } diff --git a/include/video/mmp_disp.h b/include/video/mmp_disp.h index 9fd9398..05a3a60 100644 --- a/include/video/mmp_disp.h +++ b/include/video/mmp_disp.h @@ -344,7 +344,6 @@ struct mmp_mach_path_config { struct mmp_mach_plat_info { const char *name; - const char *clk_name; int path_num; struct mmp_mach_path_config *paths; }; -- 1.7.9.5
next prev parent reply other threads:[~2014-01-14 11:16 UTC|newest] Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top 2014-01-14 11:16 [PATCH v2 0/4] video: mmp: add device tree suppport Zhou Zhu 2014-01-14 11:16 ` Zhou Zhu [not found] ` <1389698184-28761-1-git-send-email-zzhu3-eYqpPyKDWXRBDgjK7y7TUQ@public.gmane.org> 2014-01-14 11:16 ` [PATCH v2 1/4] arm: mmp: remove not used disp clk_name in ttc_dkb Zhou Zhu 2014-01-14 11:16 ` Zhou Zhu 2014-01-14 11:16 ` Zhou Zhu [this message] 2014-01-14 11:16 ` [PATCH v2 2/4] video: mmp: no need to get clk_name from mach_info Zhou Zhu 2014-01-14 11:16 ` [PATCH v2 3/4] video: mmp: add devm_mmp_get_path_by_phandle for DT Zhou Zhu 2014-01-14 11:16 ` Zhou Zhu [not found] ` <1389698184-28761-4-git-send-email-zzhu3-eYqpPyKDWXRBDgjK7y7TUQ@public.gmane.org> 2014-02-10 12:32 ` Tomi Valkeinen 2014-02-10 12:32 ` Tomi Valkeinen [not found] ` <52F8C6F6.5000200-l0cyMroinI0@public.gmane.org> 2014-02-11 1:03 ` Zhou Zhu 2014-02-11 1:03 ` Zhou Zhu 2014-01-14 11:16 ` [PATCH v2 4/4] video: mmp: add device tree support Zhou Zhu 2014-01-14 11:16 ` Zhou Zhu [not found] ` <1389698184-28761-5-git-send-email-zzhu3-eYqpPyKDWXRBDgjK7y7TUQ@public.gmane.org> 2014-02-10 12:43 ` Tomi Valkeinen 2014-02-10 12:43 ` Tomi Valkeinen [not found] ` <52F8C96F.7050107-l0cyMroinI0@public.gmane.org> 2014-02-11 3:27 ` Zhou Zhu 2014-02-11 3:27 ` Zhou Zhu [not found] ` <52F998B7.7060203-eYqpPyKDWXRBDgjK7y7TUQ@public.gmane.org> 2014-02-12 10:11 ` Tomi Valkeinen 2014-02-12 10:11 ` Tomi Valkeinen 2014-02-17 14:37 ` Mark Rutland 2014-02-17 14:37 ` Mark Rutland [not found] ` <20140217143736.GC19308-NuALmloUBlrZROr8t4l/smS4ubULX0JqMm0uRHvK7Nw@public.gmane.org> 2014-03-04 11:28 ` Zhou Zhu 2014-03-04 11:28 ` Zhou Zhu [not found] ` <CAJATT-5sQc7vsUhoFKdDnstqjj2R_yQ+Wk1NRf20UTM4-ndMSA-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org> 2014-03-05 9:33 ` Tomi Valkeinen 2014-03-05 9:33 ` Tomi Valkeinen [not found] ` <5316EF76.1050304-l0cyMroinI0@public.gmane.org> 2014-03-14 10:43 ` Zhou Zhu 2014-03-14 10:43 ` Zhou Zhu 2014-01-20 1:58 ` [PATCH v2 0/4] video: mmp: add device tree suppport Zhou Zhu 2014-01-20 1:58 ` Zhou Zhu
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=1389698184-28761-3-git-send-email-zzhu3@marvell.com \ --to=zzhu3-eyqppykdwxrbdgjk7y7tuq@public.gmane.org \ --cc=chao.xie-eYqpPyKDWXRBDgjK7y7TUQ@public.gmane.org \ --cc=devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \ --cc=haojian.zhuang-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org \ --cc=jg1.han-Sze3O3UU22JBDgjK7y7TUQ@public.gmane.org \ --cc=ligq-eYqpPyKDWXRBDgjK7y7TUQ@public.gmane.org \ --cc=linux-fbdev-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \ --cc=plagnioj-sclMFOaUSTBWk0Htik3J/w@public.gmane.org \ --cc=s.hauer-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org \ --cc=tomi.valkeinen-l0cyMroinI0@public.gmane.org \ /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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.