Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0014eb75 authored by Peter Griffin's avatar Peter Griffin Committed by Mauro Carvalho Chehab
Browse files

[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: default avatarPeter Griffin <peter.griffin@linaro.org>
Acked-by: default avatarLee Jones <lee.jones@linaro.org>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent d90394b5

Documentation/devicetree/bindings/media/stih407-c8sectpfe.txt

+3 −3
Original line number Diff line number Diff line
@@ -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.

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

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



Optional properties (tsin (child) node):
@@ -75,7 +75,7 @@ Example: 
			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>;

		};
@@ -83,7 +83,7 @@ Example: 
			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>;

		};

	};

arch/arm/boot/dts/stihxxx-b2120.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -6,8 +6,8 @@ 
 * 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/gpio/gpio.h>

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

/ {

	soc {
@@ -131,7 +131,7 @@ 
				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>;

			};

		};

drivers/media/platform/sti/c8sectpfe/c8sectpfe-core.c

+1 −1
Original line number Diff line number Diff line
@@ -823,7 +823,7 @@ static int c8sectpfe_probe(struct platform_device *pdev) 
		}

		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) {