Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

[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>

authored by

Peter Griffin and committed by
Mauro Carvalho Chehab
0014eb75 d90394b5

+6 -6
+3 -3
Documentation/devicetree/bindings/media/stih407-c8sectpfe.txt
··· 35 35 36 36 - tsin-num : tsin id of the InputBlock (must be between 0 to 6) 37 37 - i2c-bus : phandle to the I2C bus DT node which the demodulators & tuners on this tsin channel are connected. 38 - - rst-gpio : reset gpio for this tsin channel. 38 + - reset-gpios : reset gpio for this tsin channel. 39 39 40 40 Optional properties (tsin (child) node): 41 41 ··· 75 75 tsin-num = <0>; 76 76 serial-not-parallel; 77 77 i2c-bus = <&ssc2>; 78 - rst-gpio = <&pio15 4 0>; 78 + reset-gpios = <&pio15 4 GPIO_ACTIVE_HIGH>; 79 79 dvb-card = <STV0367_TDA18212_NIMA_1>; 80 80 }; 81 81 ··· 83 83 tsin-num = <3>; 84 84 serial-not-parallel; 85 85 i2c-bus = <&ssc3>; 86 - rst-gpio = <&pio15 7 0>; 86 + reset-gpios = <&pio15 7 GPIO_ACTIVE_HIGH>; 87 87 dvb-card = <STV0367_TDA18212_NIMB_1>; 88 88 }; 89 89 };
+2 -2
arch/arm/boot/dts/stihxxx-b2120.dtsi
··· 6 6 * it under the terms of the GNU General Public License version 2 as 7 7 * published by the Free Software Foundation. 8 8 */ 9 - 10 9 #include <dt-bindings/clock/stih407-clks.h> 10 + #include <dt-bindings/gpio/gpio.h> 11 11 #include <dt-bindings/media/c8sectpfe.h> 12 12 / { 13 13 soc { ··· 131 131 tsin-num = <0>; 132 132 serial-not-parallel; 133 133 i2c-bus = <&ssc2>; 134 - rst-gpio = <&pio15 4 GPIO_ACTIVE_HIGH>; 134 + reset-gpios = <&pio15 4 GPIO_ACTIVE_HIGH>; 135 135 dvb-card = <STV0367_TDA18212_NIMA_1>; 136 136 }; 137 137 };
+1 -1
drivers/media/platform/sti/c8sectpfe/c8sectpfe-core.c
··· 823 823 } 824 824 of_node_put(i2c_bus); 825 825 826 - tsin->rst_gpio = of_get_named_gpio(child, "rst-gpio", 0); 826 + tsin->rst_gpio = of_get_named_gpio(child, "reset-gpios", 0); 827 827 828 828 ret = gpio_is_valid(tsin->rst_gpio); 829 829 if (!ret) {