On Tue, Oct 17, 2017 at 06:49:57AM -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 HDMI code so we can drop the "_clk" suffix
> in bindings while maintaing backwards compatibility.
>
> Signed-off-by: Rob Clark <robdclark@xxxxxxxxx>
Reviewed-by: Sean Paul <seanpaul@xxxxxxxxxxxx>
> ---
> drivers/gpu/drm/msm/hdmi/hdmi.c | 10 +++++-----
> drivers/gpu/drm/msm/hdmi/hdmi_phy.c | 2 +-
> drivers/gpu/drm/msm/hdmi/hdmi_phy_8960.c | 2 +-
> drivers/gpu/drm/msm/hdmi/hdmi_phy_8996.c | 4 +---
> drivers/gpu/drm/msm/hdmi/hdmi_phy_8x74.c | 3 +--
> 5 files changed, 9 insertions(+), 12 deletions(-)
>
> diff --git a/drivers/gpu/drm/msm/hdmi/hdmi.c b/drivers/gpu/drm/msm/hdmi/hdmi.c
> index 17e069a133a4..e63dc0fb55f8 100644
> --- a/drivers/gpu/drm/msm/hdmi/hdmi.c
> +++ b/drivers/gpu/drm/msm/hdmi/hdmi.c
> @@ -208,7 +208,7 @@ static struct hdmi *msm_hdmi_init(struct platform_device *pdev)
> for (i = 0; i < config->hpd_clk_cnt; i++) {
> struct clk *clk;
>
> - clk = devm_clk_get(&pdev->dev, config->hpd_clk_names[i]);
> + clk = msm_clk_get(pdev, config->hpd_clk_names[i]);
> if (IS_ERR(clk)) {
> ret = PTR_ERR(clk);
> dev_err(&pdev->dev, "failed to get hpd clk: %s (%d)\n",
> @@ -228,7 +228,7 @@ static struct hdmi *msm_hdmi_init(struct platform_device *pdev)
> for (i = 0; i < config->pwr_clk_cnt; i++) {
> struct clk *clk;
>
> - clk = devm_clk_get(&pdev->dev, config->pwr_clk_names[i]);
> + clk = msm_clk_get(pdev, config->pwr_clk_names[i]);
> if (IS_ERR(clk)) {
> ret = PTR_ERR(clk);
> dev_err(&pdev->dev, "failed to get pwr clk: %s (%d)\n",
> @@ -361,7 +361,7 @@ static const char *hpd_reg_names_none[] = {};
> static struct hdmi_platform_config hdmi_tx_8660_config;
>
> static const char *hpd_reg_names_8960[] = {"core-vdda", "hdmi-mux"};
> -static const char *hpd_clk_names_8960[] = {"core_clk", "master_iface_clk", "slave_iface_clk"};
> +static const char *hpd_clk_names_8960[] = {"core", "master_iface", "slave_iface"};
>
> static struct hdmi_platform_config hdmi_tx_8960_config = {
> HDMI_CFG(hpd_reg, 8960),
> @@ -370,8 +370,8 @@ static struct hdmi_platform_config hdmi_tx_8960_config = {
>
> static const char *pwr_reg_names_8x74[] = {"core-vdda", "core-vcc"};
> static const char *hpd_reg_names_8x74[] = {"hpd-gdsc", "hpd-5v"};
> -static const char *pwr_clk_names_8x74[] = {"extp_clk", "alt_iface_clk"};
> -static const char *hpd_clk_names_8x74[] = {"iface_clk", "core_clk", "mdp_core_clk"};
> +static const char *pwr_clk_names_8x74[] = {"extp", "alt_iface"};
> +static const char *hpd_clk_names_8x74[] = {"iface", "core", "mdp_core"};
> static unsigned long hpd_clk_freq_8x74[] = {0, 19200000, 0};
>
> static struct hdmi_platform_config hdmi_tx_8974_config = {
> diff --git a/drivers/gpu/drm/msm/hdmi/hdmi_phy.c b/drivers/gpu/drm/msm/hdmi/hdmi_phy.c
> index 534ce5b49781..5e631392dc85 100644
> --- a/drivers/gpu/drm/msm/hdmi/hdmi_phy.c
> +++ b/drivers/gpu/drm/msm/hdmi/hdmi_phy.c
> @@ -48,7 +48,7 @@ static int msm_hdmi_phy_resource_init(struct hdmi_phy *phy)
> for (i = 0; i < cfg->num_clks; i++) {
> struct clk *clk;
>
> - clk = devm_clk_get(dev, cfg->clk_names[i]);
> + clk = msm_clk_get(phy->pdev, cfg->clk_names[i]);
> if (IS_ERR(clk)) {
> ret = PTR_ERR(clk);
> dev_err(dev, "failed to get phy clock: %s (%d)\n",
> diff --git a/drivers/gpu/drm/msm/hdmi/hdmi_phy_8960.c b/drivers/gpu/drm/msm/hdmi/hdmi_phy_8960.c
> index e6ee6b745ab7..0980da8ec966 100644
> --- a/drivers/gpu/drm/msm/hdmi/hdmi_phy_8960.c
> +++ b/drivers/gpu/drm/msm/hdmi/hdmi_phy_8960.c
> @@ -48,7 +48,7 @@ static const char * const hdmi_phy_8960_reg_names[] = {
> };
>
> static const char * const hdmi_phy_8960_clk_names[] = {
> - "slave_iface_clk",
> + "slave_iface",
> };
>
> const struct hdmi_phy_cfg msm_hdmi_phy_8960_cfg = {
> diff --git a/drivers/gpu/drm/msm/hdmi/hdmi_phy_8996.c b/drivers/gpu/drm/msm/hdmi/hdmi_phy_8996.c
> index 1fb7645cc721..630a0a0b55be 100644
> --- a/drivers/gpu/drm/msm/hdmi/hdmi_phy_8996.c
> +++ b/drivers/gpu/drm/msm/hdmi/hdmi_phy_8996.c
> @@ -758,9 +758,7 @@ static const char * const hdmi_phy_8996_reg_names[] = {
> };
>
> static const char * const hdmi_phy_8996_clk_names[] = {
> - "mmagic_iface_clk",
> - "iface_clk",
> - "ref_clk",
> + "mmagic_iface", "iface", "ref",
> };
>
> const struct hdmi_phy_cfg msm_hdmi_phy_8996_cfg = {
> diff --git a/drivers/gpu/drm/msm/hdmi/hdmi_phy_8x74.c b/drivers/gpu/drm/msm/hdmi/hdmi_phy_8x74.c
> index c4a61e537851..4a8b8468586a 100644
> --- a/drivers/gpu/drm/msm/hdmi/hdmi_phy_8x74.c
> +++ b/drivers/gpu/drm/msm/hdmi/hdmi_phy_8x74.c
> @@ -41,8 +41,7 @@ static const char * const hdmi_phy_8x74_reg_names[] = {
> };
>
> static const char * const hdmi_phy_8x74_clk_names[] = {
> - "iface_clk",
> - "alt_iface_clk"
> + "iface", "alt_iface"
> };
>
> const struct hdmi_phy_cfg msm_hdmi_phy_8x74_cfg = {
> --
> 2.13.6
>
> _______________________________________________
> dri-devel mailing list
> dri-devel@xxxxxxxxxxxxxxxxxxxxx
> https://lists.freedesktop.org/mailman/listinfo/dri-devel
--
Sean Paul, Software Engineer, Google / Chromium OS
--
To unsubscribe from this list: send the line "unsubscribe linux-arm-msm" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
