lkml.org 
[lkml]   [2015]   [Aug]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH RFC 2/5] drm/msm/hdmi: make use of standard gpio properties.
Date
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


\
 
 \ /
  Last update: 2015-08-10 14:21    [W:0.161 / U:0.048 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site