drm/msm/hdmi: Use pinctrl in HDMI driver
Subsystems (4)
v3 cover drm/msm/hdmi: Use pinctrl in HDMI driver
Pinctrl support for HDMI needs a small fix before the actual implementation...
Stephane Viau (2):
drm/msm/hdmi: Point to the right struct device
drm/msm/hdmi: Use pinctrl in HDMI driver
Documentation/devicetree/bindings/drm/msm/hdmi.txt | 6 +++ drivers/gpu/drm/msm/hdmi/hdmi_connector.c | 43 ++++++++++++++-------- 2 files changed, 33 insertions(+), 16 deletions(-)
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 v3 1/2 drm/msm/hdmi: Point to the right struct device
DRM device's dev (hdmi->dev->dev) points to the mdss_mdp device handle. Instead, we should get a reference to the mdss_hdmi handle.
--- drivers/gpu/drm/msm/hdmi/hdmi_connector.c | 32 +++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-)
drivers/gpu/drm/msm/hdmi/hdmi_connector.c +16 -16
@@ -78,14 +78,14 @@ static void hdmi_phy_reset(struct hdmi *hdmi)static int gpio_config (struct hdmi *hdmi,bool on) { -struct drm_device *dev = hdmi->dev; +struct device *dev = &hdmi->pdev->dev;const struct hdmi_platform_config *config = hdmi->config;int ret;if (on) { ret =gpio_request (config->ddc_clk_gpio,"HDMI_DDC_CLK" );if (ret) { -dev_err (dev->dev,"'%s'(%d) gpio_request failed: %d\n" , +dev_err (dev,"'%s'(%d) gpio_request failed: %d\n" ,"HDMI_DDC_CLK" , config->ddc_clk_gpio, ret); goto error1; }
@@ -93,7 +93,7 @@ static int gpio_config(struct hdmi *hdmi, bool on) ret =gpio_request (config->ddc_data_gpio,"HDMI_DDC_DATA" );if (ret) { -dev_err (dev->dev,"'%s'(%d) gpio_request failed: %d\n" , +dev_err (dev,"'%s'(%d) gpio_request failed: %d\n" ,"HDMI_DDC_DATA" , config->ddc_data_gpio, ret); goto error2; }
@@ -101,7 +101,7 @@ static int gpio_config(struct hdmi *hdmi, bool on) ret =gpio_request (config->hpd_gpio,"HDMI_HPD" );if (ret) { -dev_err (dev->dev,"'%s'(%d) gpio_request failed: %d\n" , +dev_err (dev,"'%s'(%d) gpio_request failed: %d\n" ,"HDMI_HPD" , config->hpd_gpio, ret); goto error3; }
@@ -111,7 +111,7 @@ static int gpio_config(struct hdmi *hdmi, bool on)if (config->mux_en_gpio !=-1 ) { ret =gpio_request (config->mux_en_gpio,"HDMI_MUX_EN" );if (ret) { -dev_err (dev->dev,"'%s'(%d) gpio_request failed: %d\n" , +dev_err (dev,"'%s'(%d) gpio_request failed: %d\n" ,"HDMI_MUX_EN" , config->mux_en_gpio, ret); goto error4; }
@@ -121,7 +121,7 @@ static int gpio_config(struct hdmi *hdmi, bool on)if (config->mux_sel_gpio !=-1 ) { ret =gpio_request (config->mux_sel_gpio,"HDMI_MUX_SEL" );if (ret) { -dev_err (dev->dev,"'%s'(%d) gpio_request failed: %d\n" , +dev_err (dev,"'%s'(%d) gpio_request failed: %d\n" ,"HDMI_MUX_SEL" , config->mux_sel_gpio, ret); goto error5; }
@@ -132,7 +132,7 @@ static int gpio_config(struct hdmi *hdmi, bool on) ret =gpio_request (config->mux_lpm_gpio,"HDMI_MUX_LPM" );if (ret) { -dev_err (dev->dev, +dev_err (dev,"'%s'(%d) gpio_request failed: %d\n" ,"HDMI_MUX_LPM" , config->mux_lpm_gpio, ret);
@@ -185,7 +185,7 @@ static int hpd_enable(struct hdmi_connector *hdmi_connector) {struct hdmi *hdmi = hdmi_connector->hdmi;const struct hdmi_platform_config *config = hdmi->config; -struct drm_device *dev = hdmi_connector->base.dev; +struct device *dev = &hdmi->pdev->dev;struct hdmi_phy *phy = hdmi->phy;uint32_t hpd_ctrl;int i, ret;
@@ -193,7 +193,7 @@ static int hpd_enable(struct hdmi_connector *hdmi_connector)for (i =0 ; i < config->hpd_reg_cnt; i++) { ret =regulator_enable (hdmi->hpd_regs[i]);if (ret) { -dev_err (dev->dev,"failed to enable hpd regulator: %s (%d)\n" , +dev_err (dev,"failed to enable hpd regulator: %s (%d)\n" , config->hpd_reg_names[i], ret); goto fail; }
@@ -201,7 +201,7 @@ static int hpd_enable(struct hdmi_connector *hdmi_connector) ret =gpio_config (hdmi, true);if (ret) { -dev_err (dev->dev,"failed to configure GPIOs: %d\n" , ret); +dev_err (dev,"failed to configure GPIOs: %d\n" , ret); goto fail; }
@@ -210,13 +210,13 @@ static int hpd_enable(struct hdmi_connector *hdmi_connector) ret =clk_set_rate (hdmi->hpd_clks[i], config->hpd_freq[i]);if (ret) -dev_warn (dev->dev,"failed to set clk %s (%d)\n" , +dev_warn (dev,"failed to set clk %s (%d)\n" , config->hpd_clk_names[i], ret); } ret =clk_prepare_enable (hdmi->hpd_clks[i]);if (ret) { -dev_err (dev->dev,"failed to enable hpd clk: %s (%d)\n" , +dev_err (dev,"failed to enable hpd clk: %s (%d)\n" , config->hpd_clk_names[i], ret); goto fail; }
@@ -253,7 +253,7 @@ static void hdp_disable(struct hdmi_connector *hdmi_connector) {struct hdmi *hdmi = hdmi_connector->hdmi;const struct hdmi_platform_config *config = hdmi->config; -struct drm_device *dev = hdmi_connector->base.dev; +struct device *dev = &hdmi->pdev->dev;int i, ret =0 ;/* Disable HPD interrupt */
@@ -266,12 +266,12 @@ static void hdp_disable(struct hdmi_connector *hdmi_connector) ret =gpio_config (hdmi, false);if (ret) -dev_warn (dev->dev,"failed to unconfigure GPIOs: %d\n" , ret); +dev_warn (dev,"failed to unconfigure GPIOs: %d\n" , ret);for (i =0 ; i < config->hpd_reg_cnt; i++) { ret =regulator_disable (hdmi->hpd_regs[i]);if (ret) -dev_warn (dev->dev,"failed to disable hpd regulator: %s (%d)\n" , +dev_warn (dev,"failed to disable hpd regulator: %s (%d)\n" , config->hpd_reg_names[i], ret); } }
@@ -483,7 +483,7 @@ struct drm_connector *hdmi_connector_init(struct hdmi *hdmi) ret =hpd_enable (hdmi_connector);if (ret) { -dev_err (hdmi->dev->dev,"failed to enable HPD: %d\n" , ret); +dev_err (&hdmi->pdev->dev,"failed to enable HPD: %d\n" , ret); goto fail; }
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 v3 2/2 drm/msm/hdmi: Use pinctrl in HDMI driver
In reply to Stephane ViauSome targets (eg: msm8994) use the pinctrl framework to configure interface pins. This change adds support for initialization and pinctrl active/sleep state control for the HDMI driver.
---
v3:
- Use pins binding handled in driver really_probe() [Ivan]
v2:
- Add devicetree binding documentation for pinctrl property [Ivan]
- Use pinctrl framework's PINCTRL_STATE_DEFAULT/SLEEP states [Ivan]
Documentation/devicetree/bindings/drm/msm/hdmi.txt | 6 ++++++ drivers/gpu/drm/msm/hdmi/hdmi_connector.c | 11 +++++++++++ 2 files changed, 17 insertions(+)
Documentation/devicetree/bindings/drm/msm/hdmi.txt +6 -0
@@ -20,6 +20,9 @@ Required properties: Optional properties: - qcom,hdmi-tx-mux-en-gpio: hdmi mux enable pin - qcom,hdmi-tx-mux-sel-gpio: hdmi mux select pin +- pinctrl-names: the pin control state names; should contain "default" +- pinctrl-0: the default pinctrl state (active) +- pinctrl-1: the "sleep" pinctrl state Example:
@@ -44,5 +47,8 @@ Example: qcom,hdmi-tx-hpd = <&msmgpio 72 GPIO_ACTIVE_HIGH>; core-vdda-supply = <&pm8921_hdmi_mvs>; hdmi-mux-supply = <&ext_3p3v>; + pinctrl-names = "default", "sleep"; + pinctrl-0 = <&hpd_active &ddc_active &cec_active>; + pinctrl-1 = <&hpd_suspend &ddc_suspend &cec_suspend>; }; };
drivers/gpu/drm/msm/hdmi/hdmi_connector.c +11 -0
@@ -16,6 +16,7 @@*/ #include <linux/gpio.h> +#include <linux/pinctrl/consumer.h> #include "msm_kms.h" #include "hdmi.h"
@@ -199,6 +200,12 @@ static int hpd_enable(struct hdmi_connector *hdmi_connector) } } + ret =pinctrl_pm_select_default_state (dev); +if (ret) { +dev_err (dev,"pinctrl state chg failed: %d\n" , ret); + goto fail; + } + ret =gpio_config (hdmi, true);if (ret) {dev_err (dev,"failed to configure GPIOs: %d\n" , ret);
@@ -268,6 +275,10 @@ static void hdp_disable(struct hdmi_connector *hdmi_connector)if (ret)dev_warn (dev,"failed to unconfigure GPIOs: %d\n" , ret); + ret =pinctrl_pm_select_sleep_state (dev); +if (ret) +dev_warn (dev,"pinctrl state chg failed: %d\n" , ret); +for (i =0 ; i < config->hpd_reg_cnt; i++) { ret =regulator_disable (hdmi->hpd_regs[i]);if (ret)
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