diff mbox

[2/3] drm/tegra: Use nvidia,hpd-gpios property

Message ID 1397736181-1593-3-git-send-email-thierry.reding@gmail.com
State Superseded, archived
Headers show

Commit Message

Thierry Reding April 17, 2014, 12:03 p.m. UTC 
From: Thierry Reding <treding@nvidia.com>

Make use of the new nvidia,hpd-gpios property and remove support for the
deprecated nvidia,hpd-gpio property.

Signed-off-by: Thierry Reding <treding@nvidia.com>
---
 Documentation/devicetree/bindings/gpu/nvidia,tegra20-host1x.txt | 8 ++++----
 drivers/gpu/drm/tegra/output.c                                  | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)
diff mbox

Patch

diff --git a/Documentation/devicetree/bindings/gpu/nvidia,tegra20-host1x.txt b/Documentation/devicetree/bindings/gpu/nvidia,tegra20-host1x.txt
index efa8b8451f93..81cdc7f4f5b1 100644
--- a/Documentation/devicetree/bindings/gpu/nvidia,tegra20-host1x.txt
+++ b/Documentation/devicetree/bindings/gpu/nvidia,tegra20-host1x.txt
@@ -126,7 +126,7 @@  of the following host1x client modules:
   the RGB output associated with the controller. It can take the following
   optional properties:
   - nvidia,ddc-i2c-bus: phandle of an I2C controller used for DDC EDID probing
-  - nvidia,hpd-gpio: specifies a GPIO used for hotplug detection
+  - nvidia,hpd-gpios: specifies a GPIO used for hotplug detection
   - nvidia,edid: supplies a binary EDID blob
   - nvidia,panel: phandle of a display panel
 
@@ -151,7 +151,7 @@  of the following host1x client modules:
 
   Optional properties:
   - nvidia,ddc-i2c-bus: phandle of an I2C controller used for DDC EDID probing
-  - nvidia,hpd-gpio: specifies a GPIO used for hotplug detection
+  - nvidia,hpd-gpios: specifies a GPIO used for hotplug detection
   - nvidia,edid: supplies a binary EDID blob
   - nvidia,panel: phandle of a display panel
 
@@ -186,7 +186,7 @@  of the following host1x client modules:
 
   Optional properties:
   - nvidia,ddc-i2c-bus: phandle of an I2C controller used for DDC EDID probing
-  - nvidia,hpd-gpio: specifies a GPIO used for hotplug detection
+  - nvidia,hpd-gpios: specifies a GPIO used for hotplug detection
   - nvidia,edid: supplies a binary EDID blob
   - nvidia,panel: phandle of a display panel
 
@@ -210,7 +210,7 @@  of the following host1x client modules:
 
   Optional properties:
   - nvidia,ddc-i2c-bus: phandle of an I2C controller used for DDC EDID probing
-  - nvidia,hpd-gpio: specifies a GPIO used for hotplug detection
+  - nvidia,hpd-gpios: specifies a GPIO used for hotplug detection
   - nvidia,edid: supplies a binary EDID blob
   - nvidia,panel: phandle of a display panel
 
diff --git a/drivers/gpu/drm/tegra/output.c b/drivers/gpu/drm/tegra/output.c
index a3e4f1eca6f7..e8f50d57c95d 100644
--- a/drivers/gpu/drm/tegra/output.c
+++ b/drivers/gpu/drm/tegra/output.c
@@ -223,7 +223,7 @@  int tegra_output_probe(struct tegra_output *output)
 	}
 
 	output->hpd_gpio = of_get_named_gpio_flags(output->of_node,
-						   "nvidia,hpd-gpio", 0,
+						   "nvidia,hpd-gpios", 0,
 						   &flags);
 	if (gpio_is_valid(output->hpd_gpio)) {
 		unsigned long flags;