drm/msm: Add power supplies config for apq8084
Subsystems (4)
cover drm/msm: Add power supplies config for apq8084
The first patch makes it easier to have a different number of regulators depending on the target. It is followed by the addition of the apq8084's regulator config. Finally, the last patch makes things easier when a new device needs to be added, especially when they share the same information.
Stephane Viau (3):
drm/msm/hdmi: use dynamic allocation for hdmi resources drm/msm/hdmi: Add HDMI platform config for apq8084 drm/msm/hdmi: rework hdmi configurations, using dt_match[]
Documentation/devicetree/bindings/drm/msm/hdmi.txt | 2 + drivers/gpu/drm/msm/hdmi/hdmi.c | 144 ++++++++++++++------- drivers/gpu/drm/msm/hdmi/hdmi.h | 8 +- 3 files changed, 105 insertions(+), 49 deletions(-)
Signature · 8 lines
Qualcomm Innovation Center, Inc. The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project _______________________________________________ dri-devel mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH 1/3 drm/msm/hdmi: use dynamic allocation for hdmi resources
Instead of reporting BUG_ON when resources arrays are not dimensioned correctly, this patch does a dynamic allocation of these arrays. This is needed for the following patches that add a regulator for a new target.
--- drivers/gpu/drm/msm/hdmi/hdmi.c | 33 +++++++++++++++++++++++++++++---- drivers/gpu/drm/msm/hdmi/hdmi.h | 8 ++++---- 2 files changed, 33 insertions(+), 8 deletions(-)
drivers/gpu/drm/msm/hdmi/hdmi.c +29 -4
@@ -65,6 +65,11 @@ static void hdmi_destroy(struct hdmi *hdmi)if (hdmi->i2c)hdmi_i2c_destroy (hdmi->i2c); +devm_kfree (&hdmi->pdev->dev, hdmi->pwr_clks); +devm_kfree (&hdmi->pdev->dev, hdmi->hpd_clks); +devm_kfree (&hdmi->pdev->dev, hdmi->pwr_regs); +devm_kfree (&hdmi->pdev->dev, hdmi->hpd_regs); +platform_set_drvdata (hdmi->pdev,NULL ); }
@@ -106,7 +111,12 @@ static struct hdmi *hdmi_init(struct platform_device *pdev) goto fail; } -BUG_ON (config->hpd_reg_cnt >ARRAY_SIZE (hdmi->hpd_regs)); + hdmi->hpd_regs =devm_kzalloc (&pdev->dev,sizeof (hdmi->hpd_regs[0 ]) * + config->hpd_reg_cnt,GFP_KERNEL ); +if (!hdmi->hpd_regs) { + ret = -ENOMEM ; + goto fail; + }for (i =0 ; i < config->hpd_reg_cnt; i++) {struct regulator *reg;
@@ -122,7 +132,12 @@ static struct hdmi *hdmi_init(struct platform_device *pdev) hdmi->hpd_regs[i] = reg; } -BUG_ON (config->pwr_reg_cnt >ARRAY_SIZE (hdmi->pwr_regs)); + hdmi->pwr_regs =devm_kzalloc (&pdev->dev,sizeof (hdmi->pwr_regs[0 ]) * + config->pwr_reg_cnt,GFP_KERNEL ); +if (!hdmi->pwr_regs) { + ret = -ENOMEM ; + goto fail; + }for (i =0 ; i < config->pwr_reg_cnt; i++) {struct regulator *reg;
@@ -138,7 +153,12 @@ static struct hdmi *hdmi_init(struct platform_device *pdev) hdmi->pwr_regs[i] = reg; } -BUG_ON (config->hpd_clk_cnt >ARRAY_SIZE (hdmi->hpd_clks)); + hdmi->hpd_clks =devm_kzalloc (&pdev->dev,sizeof (hdmi->hpd_clks[0 ]) * + config->hpd_clk_cnt,GFP_KERNEL ); +if (!hdmi->hpd_clks) { + ret = -ENOMEM ; + goto fail; + }for (i =0 ; i < config->hpd_clk_cnt; i++) {struct clk *clk;
@@ -153,7 +173,12 @@ static struct hdmi *hdmi_init(struct platform_device *pdev) hdmi->hpd_clks[i] = clk; } -BUG_ON (config->pwr_clk_cnt >ARRAY_SIZE (hdmi->pwr_clks)); + hdmi->pwr_clks =devm_kzalloc (&pdev->dev,sizeof (hdmi->pwr_clks[0 ]) * + config->pwr_clk_cnt,GFP_KERNEL ); +if (!hdmi->pwr_clks) { + ret = -ENOMEM ; + goto fail; + }for (i =0 ; i < config->pwr_clk_cnt; i++) {struct clk *clk;
drivers/gpu/drm/msm/hdmi/hdmi.h +4 -4
@@ -52,10 +52,10 @@ struct hdmi {void __iomem *mmio; -struct regulator *hpd_regs[2 ]; -struct regulator *pwr_regs[2 ]; -struct clk *hpd_clks[3 ]; -struct clk *pwr_clks[2 ]; +struct regulator **hpd_regs; +struct regulator **pwr_regs; +struct clk **hpd_clks; +struct clk **pwr_clks;struct hdmi_phy *phy;struct i2c_adapter *i2c;
Signature · 3 lines
Qualcomm Innovation Center, Inc. The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
PATCH RESEND 1/1 drm/msm/hdmi: use dynamic allocation for hdmi resources
Instead of reporting BUG_ON when resources arrays are not dimensioned correctly, this patch does a dynamic allocation of these arrays. This is needed for the following patches that add a regulator for a new target.
--- drivers/gpu/drm/msm/hdmi/hdmi.c | 28 ++++++++++++++++++++++++---- drivers/gpu/drm/msm/hdmi/hdmi.h | 8 ++++---- 2 files changed, 28 insertions(+), 8 deletions(-)
drivers/gpu/drm/msm/hdmi/hdmi.c +24 -4
@@ -106,7 +106,12 @@ static struct hdmi *hdmi_init(struct platform_device *pdev) goto fail; } -BUG_ON (config->hpd_reg_cnt >ARRAY_SIZE (hdmi->hpd_regs)); + hdmi->hpd_regs =devm_kzalloc (&pdev->dev,sizeof (hdmi->hpd_regs[0 ]) * + config->hpd_reg_cnt,GFP_KERNEL ); +if (!hdmi->hpd_regs) { + ret = -ENOMEM ; + goto fail; + }for (i =0 ; i < config->hpd_reg_cnt; i++) {struct regulator *reg;
@@ -122,7 +127,12 @@ static struct hdmi *hdmi_init(struct platform_device *pdev) hdmi->hpd_regs[i] = reg; } -BUG_ON (config->pwr_reg_cnt >ARRAY_SIZE (hdmi->pwr_regs)); + hdmi->pwr_regs =devm_kzalloc (&pdev->dev,sizeof (hdmi->pwr_regs[0 ]) * + config->pwr_reg_cnt,GFP_KERNEL ); +if (!hdmi->pwr_regs) { + ret = -ENOMEM ; + goto fail; + }for (i =0 ; i < config->pwr_reg_cnt; i++) {struct regulator *reg;
@@ -138,7 +148,12 @@ static struct hdmi *hdmi_init(struct platform_device *pdev) hdmi->pwr_regs[i] = reg; } -BUG_ON (config->hpd_clk_cnt >ARRAY_SIZE (hdmi->hpd_clks)); + hdmi->hpd_clks =devm_kzalloc (&pdev->dev,sizeof (hdmi->hpd_clks[0 ]) * + config->hpd_clk_cnt,GFP_KERNEL ); +if (!hdmi->hpd_clks) { + ret = -ENOMEM ; + goto fail; + }for (i =0 ; i < config->hpd_clk_cnt; i++) {struct clk *clk;
@@ -153,7 +168,12 @@ static struct hdmi *hdmi_init(struct platform_device *pdev) hdmi->hpd_clks[i] = clk; } -BUG_ON (config->pwr_clk_cnt >ARRAY_SIZE (hdmi->pwr_clks)); + hdmi->pwr_clks =devm_kzalloc (&pdev->dev,sizeof (hdmi->pwr_clks[0 ]) * + config->pwr_clk_cnt,GFP_KERNEL ); +if (!hdmi->pwr_clks) { + ret = -ENOMEM ; + goto fail; + }for (i =0 ; i < config->pwr_clk_cnt; i++) {struct clk *clk;
drivers/gpu/drm/msm/hdmi/hdmi.h +4 -4
@@ -52,10 +52,10 @@ struct hdmi {void __iomem *mmio; -struct regulator *hpd_regs[2 ]; -struct regulator *pwr_regs[2 ]; -struct clk *hpd_clks[3 ]; -struct clk *pwr_clks[2 ]; +struct regulator **hpd_regs; +struct regulator **pwr_regs; +struct clk **hpd_clks; +struct clk **pwr_clks;struct hdmi_phy *phy;struct i2c_adapter *i2c;
Signature · 8 lines
Qualcomm Innovation Center, Inc. The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project _______________________________________________ dri-devel mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH 2/3 drm/msm/hdmi: Add HDMI platform config for apq8084
In reply to Stephane ViauThis change add the regulator/clock configuration for MDP5 v1.3. This config is close to the one already existing for 8x74, except that one more regulator is needed (hpd-5v-en).
--- Documentation/devicetree/bindings/drm/msm/hdmi.txt | 1 + drivers/gpu/drm/msm/hdmi/hdmi.c | 17 +++++++++++++++++ 2 files changed, 18 insertions(+)
Documentation/devicetree/bindings/drm/msm/hdmi.txt +1 -0
@@ -2,6 +2,7 @@ Qualcomm adreno/snapdragon hdmi output Required properties: - compatible: one of the following + * "qcom,hdmi-tx-8084" * "qcom,hdmi-tx-8660" * "qcom,hdmi-tx-8960" - reg: Physical base address and length of the controller's registers
drivers/gpu/drm/msm/hdmi/hdmi.c +17 -0
@@ -334,6 +334,22 @@ static int hdmi_bind(struct device *dev, struct device *master, void *data) config.hpd_clk_cnt =ARRAY_SIZE (hpd_clk_names); config.pwr_clk_names = pwr_clk_names; config.pwr_clk_cnt =ARRAY_SIZE (pwr_clk_names); + }else if (of_device_is_compatible (of_node,"qcom,hdmi-tx-8084" )) { +static const char *hpd_reg_names[] = {"hpd-gdsc" ,"hpd-5v" ,"hpd-5v-en" }; +static const char *pwr_reg_names[] = {"core-vdda" ,"core-vcc" }; +static const char *hpd_clk_names[] = {"iface_clk" ,"core_clk" ,"mdp_core_clk" }; +static unsigned long hpd_clk_freq[] = {0 ,19200000 ,0 }; +static const char *pwr_clk_names[] = {"extp_clk" ,"alt_iface_clk" }; + config.phy_init = hdmi_phy_8x74_init; + config.hpd_reg_names = hpd_reg_names; + config.hpd_reg_cnt =ARRAY_SIZE (hpd_reg_names); + config.pwr_reg_names = pwr_reg_names; + config.pwr_reg_cnt =ARRAY_SIZE (pwr_reg_names); + config.hpd_clk_names = hpd_clk_names; + config.hpd_freq = hpd_clk_freq; + config.hpd_clk_cnt =ARRAY_SIZE (hpd_clk_names); + config.pwr_clk_names = pwr_clk_names; + config.pwr_clk_cnt =ARRAY_SIZE (pwr_clk_names); }else if (of_device_is_compatible (of_node,"qcom,hdmi-tx-8960" )) {static const char *hpd_clk_names[] = {"core_clk" ,"master_iface_clk" ,"slave_iface_clk" };static const char *hpd_reg_names[] = {"core-vdda" ,"hdmi-mux" };
@@ -439,6 +455,7 @@ static int hdmi_dev_remove(struct platform_device *pdev) }static const struct of_device_id dt_match[] = { + { .compatible ="qcom,hdmi-tx-8084" }, { .compatible ="qcom,hdmi-tx-8074" }, { .compatible ="qcom,hdmi-tx-8960" }, { .compatible ="qcom,hdmi-tx-8660" },
Signature · 3 lines
Qualcomm Innovation Center, Inc. The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
PATCH 3/3 drm/msm/hdmi: rework hdmi configurations, using dt_match[]
In reply to Stephane ViauIn the same idea mdp5_cfg was added, this change allows us to quickly add new instances, such as apq8084's HDMI in this case.
--- Documentation/devicetree/bindings/drm/msm/hdmi.txt | 1 + drivers/gpu/drm/msm/hdmi/hdmi.c | 128 +++++++++++---------- 2 files changed, 71 insertions(+), 58 deletions(-)
Documentation/devicetree/bindings/drm/msm/hdmi.txt +1 -0
@@ -3,6 +3,7 @@ Qualcomm adreno/snapdragon hdmi output Required properties: - compatible: one of the following * "qcom,hdmi-tx-8084" + * "qcom,hdmi-tx-8074" * "qcom,hdmi-tx-8660" * "qcom,hdmi-tx-8960" - reg: Physical base address and length of the controller's registers
drivers/gpu/drm/msm/hdmi/hdmi.c +70 -58
169 lines not on this page · raw message
Signature · 3 lines
Qualcomm Innovation Center, Inc. The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project