drm/msm/hdmi: Clean up HDMI gpio DT bindings

Make the following changes in the HDMI gpio bindings:

- Use "-gpios" as the suffix for all the gpio names
- Move all the gpios to optional, since there are platforms that use none
  of them.
- The HPD gpio is a standard one, remove the "qcom,hdmi-tx-" prefix from
  it.
- Remove the HDMI DDC clk/data gpios. They are just leftovers of an old
  way to configure pinctrl properties.
- Add a missing lpm gpio used on some platforms.

Make the necessary changes in the driver to incorporate these changes.

There hasn't been any upstream DT that uses the HDMI bindings, so it's
okay to change and move around these properties.

Cc: Rob Herring <robh@kernel.org>
Cc: devicetree@vger.kernel.org
Signed-off-by: Archit Taneja <architt@codeaurora.org>
Acked-by: Rob Herring <robh@kernel.org>
Signed-off-by: Rob Clark <robdclark@gmail.com>

1 files changed, 19 insertions, 2 deletions

diff --git a/drivers/gpu/drm/msm/hdmi/hdmi.c b/drivers/gpu/drm/msm/hdmi/hdmi.c
index 973720792236..a968cad509c2 100644
--- a/drivers/gpu/drm/msm/hdmi/hdmi.c
+++ b/drivers/gpu/drm/msm/hdmi/hdmi.c
@@ -422,12 +422,29 @@ static const struct {
 
 static int msm_hdmi_get_gpio(struct device_node *of_node, const char *name)
 {
-        int gpio = of_get_named_gpio(of_node, name, 0);
+        int gpio;
+
+        /* try with the gpio names as in the table (downstream bindings) */
+        gpio = of_get_named_gpio(of_node, name, 0);
         if (gpio < 0) {
                 char name2[32];
-                snprintf(name2, sizeof(name2), "%s-gpio", name);
+
+                /* try with the gpio names as in the upstream bindings */
+                snprintf(name2, sizeof(name2), "%s-gpios", name);
                 gpio = of_get_named_gpio(of_node, name2, 0);
                 if (gpio < 0) {
+                        char name3[32];
+
+                        /*
+                         * try again after stripping out the "qcom,hdmi-tx"
+                         * prefix. This is mainly to match "hpd-gpios" used
+                         * in the upstream bindings
+                         */
+                        if (sscanf(name2, "qcom,hdmi-tx-%s", name3))
+                                gpio = of_get_named_gpio(of_node, name3, 0);
+                }
+
+                if (gpio < 0) {
                         DBG("failed to get gpio: %s (%d)", name, gpio);
                         gpio = -1;
                 }