11 files changed, 12 insertions, 12 deletions

diff --git a/Documentation/devicetree/bindings/display/exynos/exynos_hdmi.txt b/Documentation/devicetree/bindings/display/exynos/exynos_hdmi.txt
index a2ec4c1c9382..6394ea9e3b9e 100644
--- a/Documentation/devicetree/bindings/display/exynos/exynos_hdmi.txt
+++ b/Documentation/devicetree/bindings/display/exynos/exynos_hdmi.txt
@@ -9,7 +9,7 @@ Required properties:
 - reg: physical base address of the hdmi and length of memory mapped
         region.
 - interrupts: interrupt number to the cpu.
-- hpd-gpio: following information about the hotplug gpio pin.
+- hpd-gpios: following information about the hotplug gpio pin.
         a) phandle of the gpio controller node.
         b) pin number within the gpio controller.
         c) optional flags and pull up/down.
@@ -56,7 +56,7 @@ Example:
                 compatible = "samsung,exynos4212-hdmi";
                 reg = <0x14530000 0x100000>;
                 interrupts = <0 95 0>;
-                hpd-gpio = <&gpx3 7 1>;
+                hpd-gpios = <&gpx3 7 1>;
                 ddc = <&hdmi_ddc_node>;
                 phy = <&hdmi_phy_node>;
                 samsung,syscon-phandle = <&pmu_system_controller>;
diff --git a/arch/arm/boot/dts/exynos4210-universal_c210.dts b/arch/arm/boot/dts/exynos4210-universal_c210.dts
index 9a75e3effbc9..cf95202fa310 100644
--- a/arch/arm/boot/dts/exynos4210-universal_c210.dts
+++ b/arch/arm/boot/dts/exynos4210-universal_c210.dts
@@ -269,7 +269,7 @@
 };
 
 &hdmi {
-        hpd-gpio = <&gpx3 7 GPIO_ACTIVE_HIGH>;
+        hpd-gpios = <&gpx3 7 GPIO_ACTIVE_HIGH>;
         pinctrl-names = "default";
         pinctrl-0 = <&hdmi_hpd>;
         hdmi-en-supply = <&hdmi_en>;
diff --git a/arch/arm/boot/dts/exynos4412-odroid-common.dtsi b/arch/arm/boot/dts/exynos4412-odroid-common.dtsi
index 58ad48e7b8f7..be644fe6a0fd 100644
--- a/arch/arm/boot/dts/exynos4412-odroid-common.dtsi
+++ b/arch/arm/boot/dts/exynos4412-odroid-common.dtsi
@@ -227,7 +227,7 @@
 };
 
 &hdmi {
-        hpd-gpio = <&gpx3 7 GPIO_ACTIVE_HIGH>;
+        hpd-gpios = <&gpx3 7 GPIO_ACTIVE_HIGH>;
         pinctrl-names = "default";
         pinctrl-0 = <&hdmi_hpd>;
         vdd-supply = <&ldo8_reg>;
diff --git a/arch/arm/boot/dts/exynos5250-arndale.dts b/arch/arm/boot/dts/exynos5250-arndale.dts
index ea70603f660d..3d981f32874d 100644
--- a/arch/arm/boot/dts/exynos5250-arndale.dts
+++ b/arch/arm/boot/dts/exynos5250-arndale.dts
@@ -152,7 +152,7 @@
 };
 
 &hdmi {
-        hpd-gpio = <&gpx3 7 GPIO_ACTIVE_LOW>;
+        hpd-gpios = <&gpx3 7 GPIO_ACTIVE_LOW>;
         vdd_osc-supply = <&ldo10_reg>;
         vdd_pll-supply = <&ldo8_reg>;
         vdd-supply = <&ldo8_reg>;
diff --git a/arch/arm/boot/dts/exynos5250-smdk5250.dts b/arch/arm/boot/dts/exynos5250-smdk5250.dts
index 381af134c4c8..7f27263728a1 100644
--- a/arch/arm/boot/dts/exynos5250-smdk5250.dts
+++ b/arch/arm/boot/dts/exynos5250-smdk5250.dts
@@ -116,7 +116,7 @@
 };
 
 &hdmi {
-        hpd-gpio = <&gpx3 7 GPIO_ACTIVE_HIGH>;
+        hpd-gpios = <&gpx3 7 GPIO_ACTIVE_HIGH>;
 };
 
 &i2c_0 {
diff --git a/arch/arm/boot/dts/exynos5250-snow-common.dtsi b/arch/arm/boot/dts/exynos5250-snow-common.dtsi
index fadbea744e1a..1055d25c0ccc 100644
--- a/arch/arm/boot/dts/exynos5250-snow-common.dtsi
+++ b/arch/arm/boot/dts/exynos5250-snow-common.dtsi
@@ -260,7 +260,7 @@
 };
 
 &hdmi {
-        hpd-gpio = <&gpx3 7 GPIO_ACTIVE_HIGH>;
+        hpd-gpios = <&gpx3 7 GPIO_ACTIVE_HIGH>;
         pinctrl-names = "default";
         pinctrl-0 = <&hdmi_hpd_irq>;
         phy = <&hdmiphy>;
diff --git a/arch/arm/boot/dts/exynos5250-spring.dts b/arch/arm/boot/dts/exynos5250-spring.dts
index 44f4292bfef6..1d52a79b2f18 100644
--- a/arch/arm/boot/dts/exynos5250-spring.dts
+++ b/arch/arm/boot/dts/exynos5250-spring.dts
@@ -91,7 +91,7 @@
 };
 
 &hdmi {
-        hpd-gpio = <&gpx3 7 GPIO_ACTIVE_HIGH>;
+        hpd-gpios = <&gpx3 7 GPIO_ACTIVE_HIGH>;
         pinctrl-names = "default";
         pinctrl-0 = <&hdmi_hpd_irq>;
         phy = <&hdmiphy>;
diff --git a/arch/arm/boot/dts/exynos5420-peach-pit.dts b/arch/arm/boot/dts/exynos5420-peach-pit.dts
index fe4e0915c0c6..f6f256fd9b5e 100644
--- a/arch/arm/boot/dts/exynos5420-peach-pit.dts
+++ b/arch/arm/boot/dts/exynos5420-peach-pit.dts
@@ -179,7 +179,7 @@
 
 &hdmi {
         status = "okay";
-        hpd-gpio = <&gpx3 7 GPIO_ACTIVE_HIGH>;
+        hpd-gpios = <&gpx3 7 GPIO_ACTIVE_HIGH>;
         pinctrl-names = "default";
         pinctrl-0 = <&hdmi_hpd_irq>;
         ddc = <&i2c_2>;
diff --git a/arch/arm/boot/dts/exynos5420-smdk5420.dts b/arch/arm/boot/dts/exynos5420-smdk5420.dts
index ed8f3426911b..29546465d3da 100644
--- a/arch/arm/boot/dts/exynos5420-smdk5420.dts
+++ b/arch/arm/boot/dts/exynos5420-smdk5420.dts
@@ -130,7 +130,7 @@
 
 &hdmi {
         status = "okay";
-        hpd-gpio = <&gpx3 7 GPIO_ACTIVE_HIGH>;
+        hpd-gpios = <&gpx3 7 GPIO_ACTIVE_HIGH>;
         pinctrl-names = "default";
         pinctrl-0 = <&hdmi_hpd_irq>;
 };
diff --git a/arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi b/arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi
index d04490d40b07..7bb8a370072a 100644
--- a/arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi
+++ b/arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi
@@ -250,7 +250,7 @@
 
 &hdmi {
         status = "okay";
-        hpd-gpio = <&gpx3 7 GPIO_ACTIVE_HIGH>;
+        hpd-gpios = <&gpx3 7 GPIO_ACTIVE_HIGH>;
         pinctrl-names = "default";
         pinctrl-0 = <&hdmi_hpd_irq>;
 
diff --git a/arch/arm/boot/dts/exynos5800-peach-pi.dts b/arch/arm/boot/dts/exynos5800-peach-pi.dts
index 5ec71e2400fd..51a8bca4691c 100644
--- a/arch/arm/boot/dts/exynos5800-peach-pi.dts
+++ b/arch/arm/boot/dts/exynos5800-peach-pi.dts
@@ -179,7 +179,7 @@
 
 &hdmi {
         status = "okay";
-        hpd-gpio = <&gpx3 7 GPIO_ACTIVE_HIGH>;
+        hpd-gpios = <&gpx3 7 GPIO_ACTIVE_HIGH>;
         pinctrl-names = "default";
         pinctrl-0 = <&hdmi_hpd_irq>;
         ddc = <&i2c_2>;