[PATCH v2 0/5] [media] c8sectpfe: Various fixups

[PATCH v2 0/5] [media] c8sectpfe: Various fixups

[Peter Griffin]

Hi Mauro,

This series includes a couple of fixes for the c8sectpfe Linux dvb driver.

One was caused by omitting a patch from the original c8sectpfe series which
defined the ssc2 and ssc3 dt nodes, which was then used by the later DT patch.

This patch is included, along with the original patch which you reverted.

Also Valentin Rothberg spotted LIBELF32 Kconfig symbol I was selecting in the
Kconfig, this isn't required upstream and is left over legacy so I've removed
it.

Sorry for the delay in sending these fixes, I've been on holiday for the last
3 weeks.

Changes since v1:
 - Various formating patches to DT node
 - Update to reset-gpios
 - Use GPIO_ACTIVE_HIGH, GIC_SPI and IRQ_TYPE_NONE defines

kind regards,

Peter.

Peter Griffin (5):
  ARM: DT: STi: stihxxx-b2120: Add pulse-width properties to ssc2 & ssc3
  ARM: DT: STi: STiH407: Add c8sectpfe LinuxDVB DT node.
  [media] c8sectpfe: Remove select on undefined LIBELF_32
  [media] c8sectpfe: Update binding to reset-gpios
  [media] c8sectpfe: Update DT binding doc with some minor fixes

 .../bindings/media/stih407-c8sectpfe.txt           | 22 +++++------
 arch/arm/boot/dts/stihxxx-b2120.dtsi               | 44 +++++++++++++++++++++-
 drivers/media/platform/sti/c8sectpfe/Kconfig       |  1 -
 .../media/platform/sti/c8sectpfe/c8sectpfe-core.c  |  2 +-
 4 files changed, 53 insertions(+), 16 deletions(-)

-- 
1.9.1

[PATCH v2 1/5] ARM: DT: STi: stihxxx-b2120: Add pulse-width properties to ssc2 & ssc3

[Peter Griffin]

Adding these properties makes the I2C bus to the demodulators much
more reliable, and we no longer suffer from I2C errors when tuning.

Signed-off-by: Peter Griffin <peter.griffin@linaro.org>
---
 arch/arm/boot/dts/stihxxx-b2120.dtsi | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/arch/arm/boot/dts/stihxxx-b2120.dtsi b/arch/arm/boot/dts/stihxxx-b2120.dtsi
index f589fe4..62994ae 100644
--- a/arch/arm/boot/dts/stihxxx-b2120.dtsi
+++ b/arch/arm/boot/dts/stihxxx-b2120.dtsi
@@ -27,12 +27,18 @@
 			};
 		};
 
-		i2c@9842000 {
+		ssc2: i2c@9842000 {
 			status = "okay";
+			clock-frequency = <100000>;
+			st,i2c-min-scl-pulse-width-us = <0>;
+			st,i2c-min-sda-pulse-width-us = <5>;
 		};
 
-		i2c@9843000 {
+		ssc3: i2c@9843000 {
 			status = "okay";
+			clock-frequency = <100000>;
+			st,i2c-min-scl-pulse-width-us = <0>;
+			st,i2c-min-sda-pulse-width-us = <5>;
 		};
 
 		i2c@9844000 {
-- 
1.9.1

Re: [PATCH v2 1/5] ARM: DT: STi: stihxxx-b2120: Add pulse-width properties to ssc2 & ssc3

[Lee Jones]

On Thu, 27 Aug 2015, Peter Griffin wrote:

> Adding these properties makes the I2C bus to the demodulators much
> more reliable, and we no longer suffer from I2C errors when tuning.
> 
> Signed-off-by: Peter Griffin <peter.griffin@linaro.org>
> ---
>  arch/arm/boot/dts/stihxxx-b2120.dtsi | 10 ++++++++--
>  1 file changed, 8 insertions(+), 2 deletions(-)

Acked-by: Lee Jones <lee.jones@linaro.org>

> diff --git a/arch/arm/boot/dts/stihxxx-b2120.dtsi b/arch/arm/boot/dts/stihxxx-b2120.dtsi
> index f589fe4..62994ae 100644
> --- a/arch/arm/boot/dts/stihxxx-b2120.dtsi
> +++ b/arch/arm/boot/dts/stihxxx-b2120.dtsi
> @@ -27,12 +27,18 @@
>  			};
>  		};
>  
> -		i2c@9842000 {
> +		ssc2: i2c@9842000 {
>  			status = "okay";
> +			clock-frequency = <100000>;
> +			st,i2c-min-scl-pulse-width-us = <0>;
> +			st,i2c-min-sda-pulse-width-us = <5>;
>  		};
>  
> -		i2c@9843000 {
> +		ssc3: i2c@9843000 {
>  			status = "okay";
> +			clock-frequency = <100000>;
> +			st,i2c-min-scl-pulse-width-us = <0>;
> +			st,i2c-min-sda-pulse-width-us = <5>;
>  		};
>  
>  		i2c@9844000 {

-- 
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog

[PATCH v2 2/5] ARM: DT: STi: STiH407: Add c8sectpfe LinuxDVB DT node.

[Peter Griffin]

This patch adds in the required DT node for the c8sectpfe
Linux DVB demux driver which allows the tsin channels
to be used on an upstream kernel.

Signed-off-by: Peter Griffin <peter.griffin@linaro.org>
---
 arch/arm/boot/dts/stihxxx-b2120.dtsi | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/arch/arm/boot/dts/stihxxx-b2120.dtsi b/arch/arm/boot/dts/stihxxx-b2120.dtsi
index 62994ae..c014173 100644
--- a/arch/arm/boot/dts/stihxxx-b2120.dtsi
+++ b/arch/arm/boot/dts/stihxxx-b2120.dtsi
@@ -6,6 +6,9 @@
  * 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/media/c8sectpfe.h>
 / {
 	soc {
 		sbc_serial0: serial@9530000 {
@@ -85,5 +88,36 @@
 			status = "okay";
 		};
 
+		demux@08a20000 {
+			compatible	= "st,stih407-c8sectpfe";
+			status		= "okay";
+			reg		= <0x08a20000 0x10000>,
+					  <0x08a00000 0x4000>;
+			reg-names	= "c8sectpfe", "c8sectpfe-ram";
+			interrupts	= <GIC_SPI 34 IRQ_TYPE_NONE>,
+					  <GIC_SPI 35 IRQ_TYPE_NONE>;
+			interrupt-names	= "c8sectpfe-error-irq",
+					  "c8sectpfe-idle-irq";
+			pinctrl-names	= "tsin0-serial",
+					  "tsin0-parallel",
+					  "tsin3-serial",
+					  "tsin4-serial",
+					  "tsin5-serial";
+			pinctrl-0	= <&pinctrl_tsin0_serial>;
+			pinctrl-1	= <&pinctrl_tsin0_parallel>;
+			pinctrl-2	= <&pinctrl_tsin3_serial>;
+			pinctrl-3	= <&pinctrl_tsin4_serial_alt3>;
+			pinctrl-4	= <&pinctrl_tsin5_serial_alt1>;
+			clock-names	= "c8sectpfe";
+			clocks		= <&clk_s_c0_flexgen CLK_PROC_STFE>;
+			/* tsin0 is TSA on NIMA */
+			tsin0: port@0 {
+				tsin-num	= <0>;
+				serial-not-parallel;
+				i2c-bus		= <&ssc2>;
+				rst-gpio	= <&pio15 4 0>;
+				dvb-card	= <STV0367_TDA18212_NIMA_1>;
+			};
+		};
 	};
 };
-- 
1.9.1

Re: [PATCH v2 2/5] ARM: DT: STi: STiH407: Add c8sectpfe LinuxDVB DT node.

[Lee Jones]

On Thu, 27 Aug 2015, Peter Griffin wrote:

> This patch adds in the required DT node for the c8sectpfe
> Linux DVB demux driver which allows the tsin channels
> to be used on an upstream kernel.
> 
> Signed-off-by: Peter Griffin <peter.griffin@linaro.org>
> ---
>  arch/arm/boot/dts/stihxxx-b2120.dtsi | 34 ++++++++++++++++++++++++++++++++++
>  1 file changed, 34 insertions(+)
> 
> diff --git a/arch/arm/boot/dts/stihxxx-b2120.dtsi b/arch/arm/boot/dts/stihxxx-b2120.dtsi
> index 62994ae..c014173 100644
> --- a/arch/arm/boot/dts/stihxxx-b2120.dtsi
> +++ b/arch/arm/boot/dts/stihxxx-b2120.dtsi
> @@ -6,6 +6,9 @@
>   * 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/media/c8sectpfe.h>
>  / {
>  	soc {
>  		sbc_serial0: serial@9530000 {
> @@ -85,5 +88,36 @@
>  			status = "okay";
>  		};
>  
> +		demux@08a20000 {
> +			compatible	= "st,stih407-c8sectpfe";
> +			status		= "okay";
> +			reg		= <0x08a20000 0x10000>,
> +					  <0x08a00000 0x4000>;

These look like they're the wrong way round.

> +			reg-names	= "c8sectpfe", "c8sectpfe-ram";
> +			interrupts	= <GIC_SPI 34 IRQ_TYPE_NONE>,
> +					  <GIC_SPI 35 IRQ_TYPE_NONE>;
> +			interrupt-names	= "c8sectpfe-error-irq",
> +					  "c8sectpfe-idle-irq";
> +			pinctrl-names	= "tsin0-serial",
> +					  "tsin0-parallel",
> +					  "tsin3-serial",
> +					  "tsin4-serial",
> +					  "tsin5-serial";
> +			pinctrl-0	= <&pinctrl_tsin0_serial>;
> +			pinctrl-1	= <&pinctrl_tsin0_parallel>;
> +			pinctrl-2	= <&pinctrl_tsin3_serial>;
> +			pinctrl-3	= <&pinctrl_tsin4_serial_alt3>;
> +			pinctrl-4	= <&pinctrl_tsin5_serial_alt1>;
> +			clock-names	= "c8sectpfe";
> +			clocks		= <&clk_s_c0_flexgen CLK_PROC_STFE>;

Personal preferenc is that the *-names properties should come *after*
the ones they reference.

> +			/* tsin0 is TSA on NIMA */
> +			tsin0: port@0 {
> +				tsin-num	= <0>;
> +				serial-not-parallel;
> +				i2c-bus		= <&ssc2>;
> +				rst-gpio	= <&pio15 4 0>;

"reset-gpios"?

Use the GPIO DEFINES.

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

-- 
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog

Re: [PATCH v2 2/5] ARM: DT: STi: STiH407: Add c8sectpfe LinuxDVB DT node.

[Peter Griffin]

Hi Lee,

On Fri, 28 Aug 2015, Lee Jones wrote:

> On Thu, 27 Aug 2015, Peter Griffin wrote:
> 
> > This patch adds in the required DT node for the c8sectpfe
> > Linux DVB demux driver which allows the tsin channels
> > to be used on an upstream kernel.
> > 
> > Signed-off-by: Peter Griffin <peter.griffin@linaro.org>
> > ---
> >  arch/arm/boot/dts/stihxxx-b2120.dtsi | 34 ++++++++++++++++++++++++++++++++++
> >  1 file changed, 34 insertions(+)
> > 
> > diff --git a/arch/arm/boot/dts/stihxxx-b2120.dtsi b/arch/arm/boot/dts/stihxxx-b2120.dtsi
> > index 62994ae..c014173 100644
> > --- a/arch/arm/boot/dts/stihxxx-b2120.dtsi
> > +++ b/arch/arm/boot/dts/stihxxx-b2120.dtsi
> > @@ -6,6 +6,9 @@
> >   * 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/media/c8sectpfe.h>
> >  / {
> >  	soc {
> >  		sbc_serial0: serial@9530000 {
> > @@ -85,5 +88,36 @@
> >  			status = "okay";
> >  		};
> >  
> > +		demux@08a20000 {
> > +			compatible	= "st,stih407-c8sectpfe";
> > +			status		= "okay";
> > +			reg		= <0x08a20000 0x10000>,
> > +					  <0x08a00000 0x4000>;
> 
> These look like they're the wrong way round.

No, it isn't the wrong way round.

> 
> > +			reg-names	= "c8sectpfe", "c8sectpfe-ram";
> > +			interrupts	= <GIC_SPI 34 IRQ_TYPE_NONE>,
> > +					  <GIC_SPI 35 IRQ_TYPE_NONE>;
> > +			interrupt-names	= "c8sectpfe-error-irq",
> > +					  "c8sectpfe-idle-irq";
> > +			pinctrl-names	= "tsin0-serial",
> > +					  "tsin0-parallel",
> > +					  "tsin3-serial",
> > +					  "tsin4-serial",
> > +					  "tsin5-serial";
> > +			pinctrl-0	= <&pinctrl_tsin0_serial>;
> > +			pinctrl-1	= <&pinctrl_tsin0_parallel>;
> > +			pinctrl-2	= <&pinctrl_tsin3_serial>;
> > +			pinctrl-3	= <&pinctrl_tsin4_serial_alt3>;
> > +			pinctrl-4	= <&pinctrl_tsin5_serial_alt1>;
> > +			clock-names	= "c8sectpfe";
> > +			clocks		= <&clk_s_c0_flexgen CLK_PROC_STFE>;
> 
> Personal preferenc is that the *-names properties should come *after*
> the ones they reference.

Ok, will fix this in v3.

> 
> > +			/* tsin0 is TSA on NIMA */
> > +			tsin0: port@0 {
> > +				tsin-num	= <0>;
> > +				serial-not-parallel;
> > +				i2c-bus		= <&ssc2>;
> > +				rst-gpio	= <&pio15 4 0>;
> 
> "reset-gpios"?
> 
> Use the GPIO DEFINES.

This change is done in patch 4/5 as one atomic commit
(code, dt doc, and dt node).

I could have used the GPIO_DEFINE in this patch and
updated the dt binding in 4/5.

I'll do that in v3.

regards,

Peter.

[PATCH v2 3/5] [media] c8sectpfe: Remove select on undefined LIBELF_32

[Peter Griffin]

LIBELF_32 is not defined in Kconfig, and is left over legacy
which is not required in the upstream driver, so remove it.

Signed-off-by: Peter Griffin <peter.griffin-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
Suggested-by: Valentin Rothberg <valentinrothberg-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
---
 drivers/media/platform/sti/c8sectpfe/Kconfig | 1 -
 1 file changed, 1 deletion(-)

diff --git a/drivers/media/platform/sti/c8sectpfe/Kconfig b/drivers/media/platform/sti/c8sectpfe/Kconfig
index d1bfd4c..b9ec667 100644
--- a/drivers/media/platform/sti/c8sectpfe/Kconfig
+++ b/drivers/media/platform/sti/c8sectpfe/Kconfig
@@ -1,7 +1,6 @@
 config DVB_C8SECTPFE
 	tristate "STMicroelectronics C8SECTPFE DVB support"
 	depends on DVB_CORE && I2C && (ARCH_STI || ARCH_MULTIPLATFORM)
-	select LIBELF_32
 	select FW_LOADER
 	select FW_LOADER_USER_HELPER_FALLBACK
 	select DEBUG_FS
-- 
1.9.1

--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH v2 3/5] [media] c8sectpfe: Remove select on undefined LIBELF_32

[Lee Jones]

On Thu, 27 Aug 2015, Peter Griffin wrote:

> LIBELF_32 is not defined in Kconfig, and is left over legacy
> which is not required in the upstream driver, so remove it.
> 
> Signed-off-by: Peter Griffin <peter.griffin@linaro.org>
> Suggested-by: Valentin Rothberg <valentinrothberg@gmail.com>

These are the wrong way round, they should be in chronological order.

> ---
>  drivers/media/platform/sti/c8sectpfe/Kconfig | 1 -
>  1 file changed, 1 deletion(-)

Acked-by: Lee Jones <lee.jones@linaro.org>

> diff --git a/drivers/media/platform/sti/c8sectpfe/Kconfig b/drivers/media/platform/sti/c8sectpfe/Kconfig
> index d1bfd4c..b9ec667 100644
> --- a/drivers/media/platform/sti/c8sectpfe/Kconfig
> +++ b/drivers/media/platform/sti/c8sectpfe/Kconfig
> @@ -1,7 +1,6 @@
>  config DVB_C8SECTPFE
>  	tristate "STMicroelectronics C8SECTPFE DVB support"
>  	depends on DVB_CORE && I2C && (ARCH_STI || ARCH_MULTIPLATFORM)
> -	select LIBELF_32
>  	select FW_LOADER
>  	select FW_LOADER_USER_HELPER_FALLBACK
>  	select DEBUG_FS

-- 
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog

Re: [PATCH v2 3/5] [media] c8sectpfe: Remove select on undefined LIBELF_32

[Peter Griffin]

Hi Lee,

On Fri, 28 Aug 2015, Lee Jones wrote:

> On Thu, 27 Aug 2015, Peter Griffin wrote:
> 
> > LIBELF_32 is not defined in Kconfig, and is left over legacy
> > which is not required in the upstream driver, so remove it.
> > 
> > Signed-off-by: Peter Griffin <peter.griffin-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
> > Suggested-by: Valentin Rothberg <valentinrothberg-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
> 
> These are the wrong way round, they should be in chronological order.

Ok will fix in v3.

regards,

Peter.
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH v2 4/5] [media] c8sectpfe: Update binding to reset-gpios

[Peter Griffin]

gpio.txt documents that GPIO properties should be named
"[<name>-]gpios", with <name> being the purpose of this
GPIO for the device.

This change has been done as one atomic commit.

Signed-off-by: Peter Griffin <peter.griffin@linaro.org>
---
 Documentation/devicetree/bindings/media/stih407-c8sectpfe.txt | 6 +++---
 arch/arm/boot/dts/stihxxx-b2120.dtsi                          | 4 ++--
 drivers/media/platform/sti/c8sectpfe/c8sectpfe-core.c         | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Documentation/devicetree/bindings/media/stih407-c8sectpfe.txt b/Documentation/devicetree/bindings/media/stih407-c8sectpfe.txt
index d4def76..e70d840 100644
--- 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.
-- 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>;
 		};
 	};
diff --git a/arch/arm/boot/dts/stihxxx-b2120.dtsi b/arch/arm/boot/dts/stihxxx-b2120.dtsi
index c014173..f932bfd 100644
--- 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.
  */
-
 #include <dt-bindings/clock/stih407-clks.h>
+#include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/media/c8sectpfe.h>
 / {
 	soc {
@@ -115,7 +115,7 @@
 				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>;
 			};
 		};
diff --git a/drivers/media/platform/sti/c8sectpfe/c8sectpfe-core.c b/drivers/media/platform/sti/c8sectpfe/c8sectpfe-core.c
index 3a91093..c691e13 100644
--- a/drivers/media/platform/sti/c8sectpfe/c8sectpfe-core.c
+++ b/drivers/media/platform/sti/c8sectpfe/c8sectpfe-core.c
@@ -822,7 +822,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) {
-- 
1.9.1

Re: [PATCH v2 4/5] [media] c8sectpfe: Update binding to reset-gpios

[Lee Jones]

On Thu, 27 Aug 2015, Peter Griffin wrote:

> gpio.txt documents that GPIO properties should be named
> "[<name>-]gpios", with <name> being the purpose of this
> GPIO for the device.
> 
> This change has been done as one atomic commit.
> 
> Signed-off-by: Peter Griffin <peter.griffin@linaro.org>
> ---
>  Documentation/devicetree/bindings/media/stih407-c8sectpfe.txt | 6 +++---
>  arch/arm/boot/dts/stihxxx-b2120.dtsi                          | 4 ++--
>  drivers/media/platform/sti/c8sectpfe/c8sectpfe-core.c         | 2 +-
>  3 files changed, 6 insertions(+), 6 deletions(-)

Acked-by: Lee Jones <lee.jones@linaro.org>

> diff --git a/Documentation/devicetree/bindings/media/stih407-c8sectpfe.txt b/Documentation/devicetree/bindings/media/stih407-c8sectpfe.txt
> index d4def76..e70d840 100644
> --- 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.
> -- 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>;
>  		};
>  	};
> diff --git a/arch/arm/boot/dts/stihxxx-b2120.dtsi b/arch/arm/boot/dts/stihxxx-b2120.dtsi
> index c014173..f932bfd 100644
> --- 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.
>   */
> -
>  #include <dt-bindings/clock/stih407-clks.h>
> +#include <dt-bindings/gpio/gpio.h>
>  #include <dt-bindings/media/c8sectpfe.h>
>  / {
>  	soc {
> @@ -115,7 +115,7 @@
>  				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>;
>  			};
>  		};
> diff --git a/drivers/media/platform/sti/c8sectpfe/c8sectpfe-core.c b/drivers/media/platform/sti/c8sectpfe/c8sectpfe-core.c
> index 3a91093..c691e13 100644
> --- a/drivers/media/platform/sti/c8sectpfe/c8sectpfe-core.c
> +++ b/drivers/media/platform/sti/c8sectpfe/c8sectpfe-core.c
> @@ -822,7 +822,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) {

-- 
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog

[PATCH v2 5/5] [media] c8sectpfe: Update DT binding doc with some minor fixes

[Peter Griffin]

Signed-off-by: Peter Griffin <peter.griffin@linaro.org>
---
 .../devicetree/bindings/media/stih407-c8sectpfe.txt      | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/Documentation/devicetree/bindings/media/stih407-c8sectpfe.txt b/Documentation/devicetree/bindings/media/stih407-c8sectpfe.txt
index e70d840..5d6438c 100644
--- a/Documentation/devicetree/bindings/media/stih407-c8sectpfe.txt
+++ b/Documentation/devicetree/bindings/media/stih407-c8sectpfe.txt
@@ -55,21 +55,20 @@ Example:
 		status = "okay";
 		reg = <0x08a20000 0x10000>, <0x08a00000 0x4000>;
 		reg-names = "stfe", "stfe-ram";
-		interrupts = <0 34 0>, <0 35 0>;
+		interrupts = <GIC_SPI 34 IRQ_TYPE_NONE>, <GIC_SPI 35 IRQ_TYPE_NONE>;
 		interrupt-names = "stfe-error-irq", "stfe-idle-irq";
-
-		pinctrl-names	= "tsin0-serial", "tsin0-parallel", "tsin3-serial",
-				"tsin4-serial", "tsin5-serial";
-
+		pinctrl-names	= "tsin0-serial",
+				  "tsin0-parallel",
+				  "tsin3-serial",
+				  "tsin4-serial",
+				  "tsin5-serial";
 		pinctrl-0	= <&pinctrl_tsin0_serial>;
 		pinctrl-1	= <&pinctrl_tsin0_parallel>;
 		pinctrl-2	= <&pinctrl_tsin3_serial>;
 		pinctrl-3	= <&pinctrl_tsin4_serial_alt3>;
 		pinctrl-4	= <&pinctrl_tsin5_serial_alt1>;
-
 		clocks = <&clk_s_c0_flexgen CLK_PROC_STFE>;
-		clock-names = "stfe";
-
+		clock-names = "c8sectpfe";
 		/* tsin0 is TSA on NIMA */
 		tsin0: port@0 {
 			tsin-num		= <0>;
@@ -78,7 +77,6 @@ Example:
 			reset-gpios		= <&pio15 4 GPIO_ACTIVE_HIGH>;
 			dvb-card		= <STV0367_TDA18212_NIMA_1>;
 		};
-
 		tsin3: port@3 {
 			tsin-num		= <3>;
 			serial-not-parallel;
-- 
1.9.1

Re: [PATCH v2 5/5] [media] c8sectpfe: Update DT binding doc with some minor fixes

[Lee Jones]

On Thu, 27 Aug 2015, Peter Griffin wrote:

> Signed-off-by: Peter Griffin <peter.griffin@linaro.org>
> ---
>  .../devicetree/bindings/media/stih407-c8sectpfe.txt      | 16 +++++++---------
>  1 file changed, 7 insertions(+), 9 deletions(-)
> 
> diff --git a/Documentation/devicetree/bindings/media/stih407-c8sectpfe.txt b/Documentation/devicetree/bindings/media/stih407-c8sectpfe.txt
> index e70d840..5d6438c 100644
> --- a/Documentation/devicetree/bindings/media/stih407-c8sectpfe.txt
> +++ b/Documentation/devicetree/bindings/media/stih407-c8sectpfe.txt
> @@ -55,21 +55,20 @@ Example:
>  		status = "okay";
>  		reg = <0x08a20000 0x10000>, <0x08a00000 0x4000>;
>  		reg-names = "stfe", "stfe-ram";
> -		interrupts = <0 34 0>, <0 35 0>;
> +		interrupts = <GIC_SPI 34 IRQ_TYPE_NONE>, <GIC_SPI 35 IRQ_TYPE_NONE>;
>  		interrupt-names = "stfe-error-irq", "stfe-idle-irq";
> -
> -		pinctrl-names	= "tsin0-serial", "tsin0-parallel", "tsin3-serial",
> -				"tsin4-serial", "tsin5-serial";
> -
> +		pinctrl-names	= "tsin0-serial",
> +				  "tsin0-parallel",
> +				  "tsin3-serial",
> +				  "tsin4-serial",
> +				  "tsin5-serial";
>  		pinctrl-0	= <&pinctrl_tsin0_serial>;
>  		pinctrl-1	= <&pinctrl_tsin0_parallel>;
>  		pinctrl-2	= <&pinctrl_tsin3_serial>;
>  		pinctrl-3	= <&pinctrl_tsin4_serial_alt3>;
>  		pinctrl-4	= <&pinctrl_tsin5_serial_alt1>;
> -
>  		clocks = <&clk_s_c0_flexgen CLK_PROC_STFE>;
> -		clock-names = "stfe";
> -
> +		clock-names = "c8sectpfe";

Are you sure you even need this property?  I'm thinking that *-names
properties are *usually* only required if there are more than one in a
single property.

>  		/* tsin0 is TSA on NIMA */
>  		tsin0: port@0 {
>  			tsin-num		= <0>;
> @@ -78,7 +77,6 @@ Example:
>  			reset-gpios		= <&pio15 4 GPIO_ACTIVE_HIGH>;
>  			dvb-card		= <STV0367_TDA18212_NIMA_1>;
>  		};
> -

My personal preference is to have a '\n' between nodes.

>  		tsin3: port@3 {
>  			tsin-num		= <3>;
>  			serial-not-parallel;

But these comments are pretty trivial, so agree or not, or fix-up or
not, it's that big of a deal.

Either way,
  Acked-by: Lee Jones <lee.jones@linaro.org>

-- 
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog

Re: [PATCH v2 5/5] [media] c8sectpfe: Update DT binding doc with some minor fixes

[Peter Griffin]

Hi Lee,

On Fri, 28 Aug 2015, Lee Jones wrote:

> On Thu, 27 Aug 2015, Peter Griffin wrote:
> 
> > Signed-off-by: Peter Griffin <peter.griffin@linaro.org>
> > ---
> >  .../devicetree/bindings/media/stih407-c8sectpfe.txt      | 16 +++++++---------
> >  1 file changed, 7 insertions(+), 9 deletions(-)
> > 
> > diff --git a/Documentation/devicetree/bindings/media/stih407-c8sectpfe.txt b/Documentation/devicetree/bindings/media/stih407-c8sectpfe.txt
> > index e70d840..5d6438c 100644
> > --- a/Documentation/devicetree/bindings/media/stih407-c8sectpfe.txt
> > +++ b/Documentation/devicetree/bindings/media/stih407-c8sectpfe.txt
> > @@ -55,21 +55,20 @@ Example:
> >  		status = "okay";
> >  		reg = <0x08a20000 0x10000>, <0x08a00000 0x4000>;
> >  		reg-names = "stfe", "stfe-ram";
> > -		interrupts = <0 34 0>, <0 35 0>;
> > +		interrupts = <GIC_SPI 34 IRQ_TYPE_NONE>, <GIC_SPI 35 IRQ_TYPE_NONE>;
> >  		interrupt-names = "stfe-error-irq", "stfe-idle-irq";
> > -
> > -		pinctrl-names	= "tsin0-serial", "tsin0-parallel", "tsin3-serial",
> > -				"tsin4-serial", "tsin5-serial";
> > -
> > +		pinctrl-names	= "tsin0-serial",
> > +				  "tsin0-parallel",
> > +				  "tsin3-serial",
> > +				  "tsin4-serial",
> > +				  "tsin5-serial";
> >  		pinctrl-0	= <&pinctrl_tsin0_serial>;
> >  		pinctrl-1	= <&pinctrl_tsin0_parallel>;
> >  		pinctrl-2	= <&pinctrl_tsin3_serial>;
> >  		pinctrl-3	= <&pinctrl_tsin4_serial_alt3>;
> >  		pinctrl-4	= <&pinctrl_tsin5_serial_alt1>;
> > -
> >  		clocks = <&clk_s_c0_flexgen CLK_PROC_STFE>;
> > -		clock-names = "stfe";
> > -
> > +		clock-names = "c8sectpfe";
> 
> Are you sure you even need this property?  I'm thinking that *-names
> properties are *usually* only required if there are more than one in a
> single property.

Yes that is true, but for tsout and merged input stream
functionality the driver will require additional clocks. As I
mentioned in a previous email I hope to add support for this in the
near future.

> 
> >  		/* tsin0 is TSA on NIMA */
> >  		tsin0: port@0 {
> >  			tsin-num		= <0>;
> > @@ -78,7 +77,6 @@ Example:
> >  			reset-gpios		= <&pio15 4 GPIO_ACTIVE_HIGH>;
> >  			dvb-card		= <STV0367_TDA18212_NIMA_1>;
> >  		};
> > -
> 
> My personal preference is to have a '\n' between nodes.

Yes mine as well, I removed it due to your earlier comment about "superflous \n".
I will add it back in again in v3.

> 
> >  		tsin3: port@3 {
> >  			tsin-num		= <3>;
> >  			serial-not-parallel;
> 
> But these comments are pretty trivial, so agree or not, or fix-up or
> not, it's that big of a deal.

I agree all trivial, but will fixup in v3.
> 
> Either way,
>   Acked-by: Lee Jones <lee.jones@linaro.org>

Thanks & regards,

Peter.