[media] c8sectpfe: Update binding to reset-gpios

reset-gpios is more clear than rst-gpio.

This change has been done as one atomic commit but it
does breaks compatability with older dtbs.

Signed-off-by: Peter Griffin <peter.griffin@linaro.org>
Acked-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>

diff --git a/Documentation/devicetree/bindings/media/stih407-c8sectpfe.txt b/Documentation/devicetree/bindings/media/stih407-c8sectpfe.txt
index d4def767bdfea346df695d2d5a1a74577f0fbfea..e70d84051bcc8f4b34e85f22c79de7570f3ab31a 100644 (file)
--- a/Documentation/devicetree/bindings/media/stih407-c8sectpfe.txt
+++ b/Documentation/devicetree/bindings/media/stih407-c8sectpfe.txt
@@ -35,7 +35,7 @@ Required properties (tsin (child) node):
 
 - tsin-num     : tsin id of the InputBlock (must be between 0 to 6)
 - i2c-bus      : phandle to the I2C bus DT node which the demodulators & tuners on this tsin channel are connected.
 
 - tsin-num     : tsin id of the InputBlock (must be between 0 to 6)
 - i2c-bus      : phandle to the I2C bus DT node which the demodulators & tuners on this tsin channel are connected.

-- rst-gpio     : reset gpio for this tsin channel.
+- reset-gpios  : reset gpio for this tsin channel.

 
 Optional properties (tsin (child) node):
 
 
 Optional properties (tsin (child) node):
 


@@ -75,7 +75,7 @@ Example:
                        tsin-num                = <0>;
                        serial-not-parallel;
                        i2c-bus                 = <&ssc2>;
                        tsin-num                = <0>;
                        serial-not-parallel;
                        i2c-bus                 = <&ssc2>;

-                       rst-gpio                = <&pio15 4 0>;
+                       reset-gpios             = <&pio15 4 GPIO_ACTIVE_HIGH>;

                        dvb-card                = <STV0367_TDA18212_NIMA_1>;
                };
 
                        dvb-card                = <STV0367_TDA18212_NIMA_1>;
                };
 


@@ -83,7 +83,7 @@ Example:
                        tsin-num                = <3>;
                        serial-not-parallel;
                        i2c-bus                 = <&ssc3>;
                        tsin-num                = <3>;
                        serial-not-parallel;
                        i2c-bus                 = <&ssc3>;

-                       rst-gpio                = <&pio15 7 0>;
+                       reset-gpios             = <&pio15 7 GPIO_ACTIVE_HIGH>;

                        dvb-card                = <STV0367_TDA18212_NIMB_1>;
                };
        };
                        dvb-card                = <STV0367_TDA18212_NIMB_1>;
                };
        };

diff --git a/arch/arm/boot/dts/stihxxx-b2120.dtsi b/arch/arm/boot/dts/stihxxx-b2120.dtsi
index c11430a28ed3cb472873f1ebc13a1e3499317c3f..133375bc8aa503d57f85a2b0026ff432b496a2d3 100644 (file)
--- a/arch/arm/boot/dts/stihxxx-b2120.dtsi
+++ b/arch/arm/boot/dts/stihxxx-b2120.dtsi
@@ -6,8 +6,8 @@
  * it under the terms of the GNU General Public License version 2 as
  * published by the Free Software Foundation.
  */
  * it under the terms of the GNU General Public License version 2 as
  * published by the Free Software Foundation.
  */

-

 #include <dt-bindings/clock/stih407-clks.h>
 #include <dt-bindings/clock/stih407-clks.h>

+#include <dt-bindings/gpio/gpio.h>

 #include <dt-bindings/media/c8sectpfe.h>
 / {
        soc {
 #include <dt-bindings/media/c8sectpfe.h>
 / {
        soc {


@@ -131,7 +131,7 @@
                                tsin-num        = <0>;
                                serial-not-parallel;
                                i2c-bus         = <&ssc2>;
                                tsin-num        = <0>;
                                serial-not-parallel;
                                i2c-bus         = <&ssc2>;

-                               rst-gpio        = <&pio15 4 GPIO_ACTIVE_HIGH>;
+                               reset-gpios     = <&pio15 4 GPIO_ACTIVE_HIGH>;

                                dvb-card        = <STV0367_TDA18212_NIMA_1>;
                        };
                };
                                dvb-card        = <STV0367_TDA18212_NIMA_1>;
                        };
                };

diff --git a/drivers/media/platform/sti/c8sectpfe/c8sectpfe-core.c b/drivers/media/platform/sti/c8sectpfe/c8sectpfe-core.c
index 8490a65ae1c6703a3e14ff57dfc792c9d354fad5..78e3cb9a628f2258a6bb4ceb75f8068c2e0799ae 100644 (file)
--- a/drivers/media/platform/sti/c8sectpfe/c8sectpfe-core.c
+++ b/drivers/media/platform/sti/c8sectpfe/c8sectpfe-core.c
@@ -823,7 +823,7 @@ static int c8sectpfe_probe(struct platform_device *pdev)
                }
                of_node_put(i2c_bus);
 
                }
                of_node_put(i2c_bus);
 

-               tsin->rst_gpio = of_get_named_gpio(child, "rst-gpio", 0);
+               tsin->rst_gpio = of_get_named_gpio(child, "reset-gpios", 0);

 
                ret = gpio_is_valid(tsin->rst_gpio);
                if (!ret) {
 
                ret = gpio_is_valid(tsin->rst_gpio);
                if (!ret) {