Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1204194

[PATCH RFC 2/5] drm/msm/hdmi: make use of standard gpio properties.

Show all headers | View raw

This patch modifies the driver to support standard gpio properties along
with deprecated properties. This will help us upstream and cleanup the
non-standard properties over the time.

Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
---
 drivers/gpu/drm/msm/hdmi/hdmi.c | 35 +++++++++++++++++++++++++----------
 1 file changed, 25 insertions(+), 10 deletions(-)

diff --git a/drivers/gpu/drm/msm/hdmi/hdmi.c b/drivers/gpu/drm/msm/hdmi/hdmi.c
index 8145362..e918889 100644
--- a/drivers/gpu/drm/msm/hdmi/hdmi.c
+++ b/drivers/gpu/drm/msm/hdmi/hdmi.c
@@ -339,19 +339,34 @@ static const struct of_device_id dt_match[] = {
 };
 
 #ifdef CONFIG_OF
+/* This code will be removed once we move to gpiod based calls */
 static int get_gpio(struct device *dev, struct device_node *of_node, const char *name)
 {
+	char name2[32];
 	int gpio = of_get_named_gpio(of_node, name, 0);
-	if (gpio < 0) {
-		char name2[32];
-		snprintf(name2, sizeof(name2), "%s-gpio", name);
-		gpio = of_get_named_gpio(of_node, name2, 0);
-		if (gpio < 0) {
-			dev_err(dev, "failed to get gpio: %s (%d)\n",
-					name, gpio);
-			gpio = -1;
-		}
-	}
+
+	if (gpio_is_valid(gpio))
+		goto deprecated;
+
+	snprintf(name2, sizeof(name2), "%s-gpio", name);
+	gpio = of_get_named_gpio(of_node, name2, 0);
+
+	if (gpio_is_valid(gpio))
+		goto deprecated;
+
+
+	snprintf(name2, sizeof(name2), "%s-gpios", name);
+	gpio = of_get_named_gpio(of_node, name2, 0);
+
+	if (gpio_is_valid(gpio))
+		return gpio;
+
+	dev_err(dev, "failed to get gpio: %s (%d)\n", name, gpio);
+
+	return -1;
+
+deprecated:
+	dev_warn(dev, "binding deprecated for %s\n", name);
 	return gpio;
 }
 #endif
-- 
1.9.1

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH RFC 0/5] drm/msm/hdmi: DT bindings cleanup Srinivas Kandagatla <srinivas.kandagatla@linaro.org> - 2015-08-10 14:00 +0200
  [PATCH RFC 2/5] drm/msm/hdmi: make use of standard gpio properties. Srinivas Kandagatla <srinivas.kandagatla@linaro.org> - 2015-08-10 14:00 +0200
    Re: [PATCH RFC 2/5] drm/msm/hdmi: make use of standard gpio  properties. Thierry Reding <thierry.reding@gmail.com> - 2015-08-10 14:40 +0200
      Re: [PATCH RFC 2/5] drm/msm/hdmi: make use of standard gpio properties. Srinivas Kandagatla <srinivas.kandagatla@linaro.org> - 2015-08-10 15:20 +0200
        Re: [PATCH RFC 2/5] drm/msm/hdmi: make use of standard gpio  properties. Thierry Reding <thierry.reding@gmail.com> - 2015-08-10 15:30 +0200
          Re: [PATCH RFC 2/5] drm/msm/hdmi: make use of standard gpio properties. Srinivas Kandagatla <srinivas.kandagatla@linaro.org> - 2015-08-10 16:00 +0200
  [PATCH RFC 1/5] drm/msm/hdmi: deprecate non standard gpio properties. Srinivas Kandagatla <srinivas.kandagatla@linaro.org> - 2015-08-10 14:00 +0200
    Re: [PATCH RFC 1/5] drm/msm/hdmi: deprecate non standard gpio  properties. Thierry Reding <thierry.reding@gmail.com> - 2015-08-10 14:50 +0200
      Re: [PATCH RFC 1/5] drm/msm/hdmi: deprecate non standard gpio properties. Rob Herring <robherring2@gmail.com> - 2015-08-11 00:10 +0200
        Re: [PATCH RFC 1/5] drm/msm/hdmi: deprecate non standard gpio  properties. Bjorn Andersson <bjorn.andersson@sonymobile.com> - 2015-08-11 00:30 +0200
          Re: [PATCH RFC 1/5] drm/msm/hdmi: deprecate non standard gpio properties. Rob Clark <robdclark@gmail.com> - 2015-08-11 02:30 +0200
  [PATCH RFC 4/5] drm/msm/hdmi: deprecate non standard clock-names Srinivas Kandagatla <srinivas.kandagatla@linaro.org> - 2015-08-10 14:10 +0200
    Re: [PATCH RFC 4/5] drm/msm/hdmi: deprecate non standard clock-names Thierry Reding <thierry.reding@gmail.com> - 2015-08-10 15:00 +0200
      Re: [PATCH RFC 4/5] drm/msm/hdmi: deprecate non standard clock-names Srinivas Kandagatla <srinivas.kandagatla@linaro.org> - 2015-08-10 15:20 +0200
        Re: [PATCH RFC 4/5] drm/msm/hdmi: deprecate non standard clock-names Thierry Reding <thierry.reding@gmail.com> - 2015-08-10 15:40 +0200
          Re: [PATCH RFC 4/5] drm/msm/hdmi: deprecate non standard clock-names Srinivas Kandagatla <srinivas.kandagatla@linaro.org> - 2015-08-10 15:50 +0200
  [PATCH RFC 5/5] drm/msm/hdmi: remove _clk suffix from clock names. Srinivas Kandagatla <srinivas.kandagatla@linaro.org> - 2015-08-10 14:10 +0200

csiph-web