diff mbox

sh-pfc: R8A7779: add VIN pin groups

Message ID 201304120251.38652.sergei.shtylyov@cogentembedded.com (mailing list archive)
State Superseded
Headers show

Commit Message

Sergei Shtylyov April 11, 2013, 10:51 p.m. UTC 
From: Vladimir Barinov <vladimir.barinov@cogentembedded.com>

Add VIN DATAx/CLK/HSYNC/VSYNC pin groups in R8A7779 PFC.

Signed-off-by: Vladimir Barinov <vladimir.barinov@cogentembedded.com>
Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>

---
These pins will be needed by the upcoming R-Car VIN driver...
The patch is atop of Simon's 'renesas.git' tree, 'renesas-next-20130411v2' tag.

 drivers/pinctrl/sh-pfc/pfc-r8a7779.c |  139 ++++++++++++++++++++++++++++++++++-
 1 file changed, 138 insertions(+), 1 deletion(-)

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

Comments

Kuninori Morimoto April 12, 2013, 4:33 a.m. UTC | #1 
Hi Sergei

Thank you for your patch

> +/* - VIN0 ------------------------------------------------------------------- */
> +static const unsigned int vin0_data8_pins[] = {
> +	/* D[0:7] */
> +	70, 71, 72, 73, 74, 75, 76, 77,
> +};

Can you use RCAR_GP_PIN() macro on this patch ?

0bd898b16cdc0a4512d0b1af2fbe1174d217dd2d
(gpio-rcar: Add RCAR_GP_PIN macro)

Best regards
---
Kuninori Morimoto
--
To unsubscribe from this list: send the line "unsubscribe linux-sh" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Simon Horman April 12, 2013, 6:40 a.m. UTC | #2 
On ?,  4? 11, 2013 at 09:33:56?? -0700, Kuninori Morimoto wrote:
> 
> Hi Sergei
> 
> Thank you for your patch
> 
> > +/* - VIN0 ------------------------------------------------------------------- */
> > +static const unsigned int vin0_data8_pins[] = {
> > +	/* D[0:7] */
> > +	70, 71, 72, 73, 74, 75, 76, 77,
> > +};
> 
> Can you use RCAR_GP_PIN() macro on this patch ?
> 
> 0bd898b16cdc0a4512d0b1af2fbe1174d217dd2d
> (gpio-rcar: Add RCAR_GP_PIN macro)

I would be happy to accept that change as an incremental patch
if there are no other changes outstanding to this patch.

Laurent, I wonder if you could review this patch.
--
To unsubscribe from this list: send the line "unsubscribe linux-sh" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Laurent Pinchart April 12, 2013, 8:15 a.m. UTC | #3 
Hi Sergei,

Thank you for the patch.

Beside Morimoto-san's request to use the RCAR_GP_PIN() macro, please see below 
for a small comment.

On Friday 12 April 2013 02:51:38 Sergei Shtylyov wrote:
> From: Vladimir Barinov <vladimir.barinov@cogentembedded.com>
> 
> Add VIN DATAx/CLK/HSYNC/VSYNC pin groups in R8A7779 PFC.
> 
> Signed-off-by: Vladimir Barinov <vladimir.barinov@cogentembedded.com>
> Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
> 
> ---
> These pins will be needed by the upcoming R-Car VIN driver...
> The patch is atop of Simon's 'renesas.git' tree, 'renesas-next-20130411v2'
> tag.
> 
>  drivers/pinctrl/sh-pfc/pfc-r8a7779.c |  139 ++++++++++++++++++++++++++++++-
>  1 file changed, 138 insertions(+), 1 deletion(-)
> 
> Index: renesas/drivers/pinctrl/sh-pfc/pfc-r8a7779.c
> ===================================================================
> --- renesas.orig/drivers/pinctrl/sh-pfc/pfc-r8a7779.c
> +++ renesas/drivers/pinctrl/sh-pfc/pfc-r8a7779.c

[snip]

> @@ -2413,6 +2414,102 @@ static const unsigned int usb2_pins[] =
>  static const unsigned int usb2_mux[] = {
>  	USB_OVC2_MARK, USB_PENC2_MARK,
>  };
> +/* - VIN0
> ------------------------------------------------------------------- */
> +static const unsigned int vin0_data8_pins[] = {
> +	/* D[0:7] */
> +	70, 71, 72, 73, 74, 75, 76, 77,
> +};
> +static const unsigned int vin0_data8_mux[] = {
> +	VI0_DATA0_VI0_B0_MARK, VI0_DATA1_VI0_B1_MARK, VI0_DATA2_VI0_B2_MARK,
> +	VI0_DATA3_VI0_B3_MARK, VI0_DATA4_VI0_B4_MARK, VI0_DATA5_VI0_B5_MARK,
> +	VI0_DATA6_VI0_B6_MARK, VI0_DATA7_VI0_B7_MARK,
> +};

Won't you also need to support the other input data formats ?
Sergei Shtylyov April 12, 2013, 2:24 p.m. UTC | #4 
Hello.

On 12-04-2013 12:15, Laurent Pinchart wrote:

> Thank you for the patch.

    Thanks to Vladimir, actually.

> Beside Morimoto-san's request to use the RCAR_GP_PIN() macro, please see below
> for a small comment.

    See the reply below.

> On Friday 12 April 2013 02:51:38 Sergei Shtylyov wrote:
>> From: Vladimir Barinov <vladimir.barinov@cogentembedded.com>

>> Add VIN DATAx/CLK/HSYNC/VSYNC pin groups in R8A7779 PFC.

>> Signed-off-by: Vladimir Barinov <vladimir.barinov@cogentembedded.com>
>> Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>

>> ---
>> These pins will be needed by the upcoming R-Car VIN driver...
>> The patch is atop of Simon's 'renesas.git' tree, 'renesas-next-20130411v2'
>> tag.

>>   drivers/pinctrl/sh-pfc/pfc-r8a7779.c |  139 ++++++++++++++++++++++++++++++-
>>   1 file changed, 138 insertions(+), 1 deletion(-)

>> Index: renesas/drivers/pinctrl/sh-pfc/pfc-r8a7779.c
>> ===================================================================
>> --- renesas.orig/drivers/pinctrl/sh-pfc/pfc-r8a7779.c
>> +++ renesas/drivers/pinctrl/sh-pfc/pfc-r8a7779.c

> [snip]

>> @@ -2413,6 +2414,102 @@ static const unsigned int usb2_pins[] =
>>   static const unsigned int usb2_mux[] = {
>>   	USB_OVC2_MARK, USB_PENC2_MARK,
>>   };
>> +/* - VIN0
>> ------------------------------------------------------------------- */
>> +static const unsigned int vin0_data8_pins[] = {
>> +	/* D[0:7] */
>> +	70, 71, 72, 73, 74, 75, 76, 77,
>> +};
>> +static const unsigned int vin0_data8_mux[] = {
>> +	VI0_DATA0_VI0_B0_MARK, VI0_DATA1_VI0_B1_MARK, VI0_DATA2_VI0_B2_MARK,
>> +	VI0_DATA3_VI0_B3_MARK, VI0_DATA4_VI0_B4_MARK, VI0_DATA5_VI0_B5_MARK,
>> +	VI0_DATA6_VI0_B6_MARK, VI0_DATA7_VI0_B7_MARK,
>> +};

> Won't you also need to support the other input data formats ?

    Currently we do not need other pins.
    Once we have the chance to test other formats than 8-bit BT.656 (this is 
the only one interface used on the Marzen board) we can add the other pins.
We are curently working with the BOCK-W board but it also has 8-bit BT.656 
data interface on one channel and 8-bit BT.601 on another.
    Once we need more control pins like FIELD, then we can easily add them and 
add wider data bus like vin0_data16_mux[] and vin0_data24_mux[] with 16 and 24 
entries correspondingly.

WBR, Sergei

--
To unsubscribe from this list: send the line "unsubscribe linux-sh" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Sergei Shtylyov April 12, 2013, 2:26 p.m. UTC | #5 
Hello.

On 12-04-2013 8:33, Kuninori Morimoto wrote:

> Thank you for your patch

    It's not mine. :-)

>> +/* - VIN0 ------------------------------------------------------------------- */
>> +static const unsigned int vin0_data8_pins[] = {
>> +	/* D[0:7] */
>> +	70, 71, 72, 73, 74, 75, 76, 77,
>> +};

> Can you use RCAR_GP_PIN() macro on this patch ?

> 0bd898b16cdc0a4512d0b1af2fbe1174d217dd2d
> (gpio-rcar: Add RCAR_GP_PIN macro)

    I think there should be a wholesale conversion patch for all this file.

> Best regards
> ---
> Kuninori Morimoto

WBR, Sergei

--
To unsubscribe from this list: send the line "unsubscribe linux-sh" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Laurent Pinchart April 16, 2013, 9:09 a.m. UTC | #6 
Hi Sergei,

On Friday 12 April 2013 18:26:20 Sergei Shtylyov wrote:
> On 12-04-2013 8:33, Kuninori Morimoto wrote:
> > Thank you for your patch
> 
>     It's not mine. :-)
> 
> >> +/* - VIN0
> >> ------------------------------------------------------------------- */
> >> +static const unsigned int vin0_data8_pins[] = {
> >> +	/* D[0:7] */
> >> +	70, 71, 72, 73, 74, 75, 76, 77,
> >> +};
> > 
> > Can you use RCAR_GP_PIN() macro on this patch ?
> > 
> > 0bd898b16cdc0a4512d0b1af2fbe1174d217dd2d
> > (gpio-rcar: Add RCAR_GP_PIN macro)
> 
>     I think there should be a wholesale conversion patch for all this file.

The whole file has been converted already in tags/renesas-next-20130416. Could 
you please rebase this patch on top of that tag and resubmit, with the 
hardcoded pin numbers replaced with the RCAR_GP_PIN() macro ?
Sergei Shtylyov April 16, 2013, 2:02 p.m. UTC | #7 
Hello.

On 16-04-2013 13:09, Laurent Pinchart wrote:

>>>> +/* - VIN0
>>>> ------------------------------------------------------------------- */
>>>> +static const unsigned int vin0_data8_pins[] = {
>>>> +	/* D[0:7] */
>>>> +	70, 71, 72, 73, 74, 75, 76, 77,
>>>> +};

>>> Can you use RCAR_GP_PIN() macro on this patch ?

>>> 0bd898b16cdc0a4512d0b1af2fbe1174d217dd2d
>>> (gpio-rcar: Add RCAR_GP_PIN macro)

>>      I think there should be a wholesale conversion patch for all this file.

> The whole file has been converted already in tags/renesas-next-20130416. Could
> you please rebase this patch on top of that tag and resubmit, with the
> hardcoded pin numbers replaced with the RCAR_GP_PIN() macro ?

   OK, done. Will post it soon...

WBR, Sergei

--
To unsubscribe from this list: send the line "unsubscribe linux-sh" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

Index: renesas/drivers/pinctrl/sh-pfc/pfc-r8a7779.c
===================================================================
--- renesas.orig/drivers/pinctrl/sh-pfc/pfc-r8a7779.c
+++ renesas/drivers/pinctrl/sh-pfc/pfc-r8a7779.c
@@ -1,8 +1,9 @@ 
 /*
  * r8a7779 processor support - PFC hardware block
  *
- * Copyright (C) 2011  Renesas Solutions Corp.
+ * Copyright (C) 2011, 2013  Renesas Solutions Corp.
  * Copyright (C) 2011  Magnus Damm
+ * Copyright (C) 2013  Cogent Embedded, Inc.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -2413,6 +2414,102 @@  static const unsigned int usb2_pins[] = 
 static const unsigned int usb2_mux[] = {
 	USB_OVC2_MARK, USB_PENC2_MARK,
 };
+/* - VIN0 ------------------------------------------------------------------- */
+static const unsigned int vin0_data8_pins[] = {
+	/* D[0:7] */
+	70, 71, 72, 73, 74, 75, 76, 77,
+};
+static const unsigned int vin0_data8_mux[] = {
+	VI0_DATA0_VI0_B0_MARK, VI0_DATA1_VI0_B1_MARK, VI0_DATA2_VI0_B2_MARK,
+	VI0_DATA3_VI0_B3_MARK, VI0_DATA4_VI0_B4_MARK, VI0_DATA5_VI0_B5_MARK,
+	VI0_DATA6_VI0_B6_MARK, VI0_DATA7_VI0_B7_MARK,
+};
+static const unsigned int vin0_clk_pins[] = {
+	/* CLK */
+	65,
+};
+static const unsigned int vin0_clk_mux[] = {
+	VI0_CLK_MARK,
+};
+static const unsigned int vin0_sync_pins[] = {
+	/* HSYNC, VSYNC */
+	68, 69,
+};
+static const unsigned int vin0_sync_mux[] = {
+	VI0_HSYNC_MARK, VI0_VSYNC_MARK,
+};
+/* - VIN1 ------------------------------------------------------------------- */
+static const unsigned int vin1_data8_pins[] = {
+	/* D[0:7] */
+	97, 98, 99, 100, 101, 102, 103, 104,
+};
+static const unsigned int vin1_data8_mux[] = {
+	VI1_DATA0_VI1_B0_MARK, VI1_DATA1_VI1_B1_MARK, VI1_DATA2_VI1_B2_MARK,
+	VI1_DATA3_VI1_B3_MARK, VI1_DATA4_VI1_B4_MARK, VI1_DATA5_VI1_B5_MARK,
+	VI1_DATA6_VI1_B6_MARK, VI1_DATA7_VI1_B7_MARK,
+};
+static const unsigned int vin1_clk_pins[] = {
+	/* CLK */
+	94,
+};
+static const unsigned int vin1_clk_mux[] = {
+	VI1_CLK_MARK,
+};
+static const unsigned int vin1_sync_pins[] = {
+	/* HSYNC, VSYNC */
+	95, 96,
+};
+static const unsigned int vin1_sync_mux[] = {
+	VI1_HSYNC_MARK, VI1_VSYNC_MARK,
+};
+/* - VIN2 ------------------------------------------------------------------- */
+static const unsigned int vin2_data8_pins[] = {
+	/* D[0:7] */
+	34, 35, 42, 43, 50, 51, 63, 64,
+};
+static const unsigned int vin2_data8_mux[] = {
+	VI2_DATA0_VI2_B0_MARK, VI2_DATA1_VI2_B1_MARK, VI2_DATA2_VI2_B2_MARK,
+	VI2_DATA3_VI2_B3_MARK, VI2_DATA4_VI2_B4_MARK, VI2_DATA5_VI2_B5_MARK,
+	VI2_DATA6_VI2_B6_MARK, VI2_DATA7_VI2_B7_MARK,
+};
+static const unsigned int vin2_clk_pins[] = {
+	/* CLK */
+	62,
+};
+static const unsigned int vin2_clk_mux[] = {
+	VI2_CLK_MARK,
+};
+static const unsigned int vin2_sync_pins[] = {
+	/* HSYNC, VSYNC */
+	60, 61,
+};
+static const unsigned int vin2_sync_mux[] = {
+	VI2_HSYNC_MARK, VI2_VSYNC_MARK,
+};
+/* - VIN3 ------------------------------------------------------------------- */
+static const unsigned int vin3_data8_pins[] = {
+	/* D[0:7] */
+	105, 106, 107, 108, 109, 110, 111, 112,
+};
+static const unsigned int vin3_data8_mux[] = {
+	VI3_DATA0_MARK, VI3_DATA1_MARK, VI3_DATA2_MARK,
+	VI3_DATA3_MARK, VI3_DATA4_MARK, VI3_DATA5_MARK,
+	VI3_DATA6_MARK, VI3_DATA7_MARK,
+};
+static const unsigned int vin3_clk_pins[] = {
+	/* CLK */
+	95,
+};
+static const unsigned int vin3_clk_mux[] = {
+	VI3_CLK_MARK,
+};
+static const unsigned int vin3_sync_pins[] = {
+	/* HSYNC, VSYNC */
+	60, 61,
+};
+static const unsigned int vin3_sync_mux[] = {
+	VI3_HSYNC_MARK, VI3_VSYNC_MARK,
+};
 
 static const struct sh_pfc_pin_group pinmux_groups[] = {
 	SH_PFC_PIN_GROUP(du0_rgb666),
@@ -2537,6 +2634,18 @@  static const struct sh_pfc_pin_group pin
 	SH_PFC_PIN_GROUP(usb0),
 	SH_PFC_PIN_GROUP(usb1),
 	SH_PFC_PIN_GROUP(usb2),
+	SH_PFC_PIN_GROUP(vin0_data8),
+	SH_PFC_PIN_GROUP(vin0_clk),
+	SH_PFC_PIN_GROUP(vin0_sync),
+	SH_PFC_PIN_GROUP(vin1_data8),
+	SH_PFC_PIN_GROUP(vin1_clk),
+	SH_PFC_PIN_GROUP(vin1_sync),
+	SH_PFC_PIN_GROUP(vin2_data8),
+	SH_PFC_PIN_GROUP(vin2_clk),
+	SH_PFC_PIN_GROUP(vin2_sync),
+	SH_PFC_PIN_GROUP(vin3_data8),
+	SH_PFC_PIN_GROUP(vin3_clk),
+	SH_PFC_PIN_GROUP(vin3_sync),
 };
 
 static const char * const du0_groups[] = {
@@ -2727,6 +2836,30 @@  static const char * const usb2_groups[] 
 	"usb2",
 };
 
+static const char * const vin0_groups[] = {
+	"vin0_data8",
+	"vin0_clk",
+	"vin0_sync",
+};
+
+static const char * const vin1_groups[] = {
+	"vin1_data8",
+	"vin1_clk",
+	"vin1_sync",
+};
+
+static const char * const vin2_groups[] = {
+	"vin2_data8",
+	"vin2_clk",
+	"vin2_sync",
+};
+
+static const char * const vin3_groups[] = {
+	"vin3_data8",
+	"vin3_clk",
+	"vin3_sync",
+};
+
 static const struct sh_pfc_function pinmux_functions[] = {
 	SH_PFC_FUNCTION(du0),
 	SH_PFC_FUNCTION(du1),
@@ -2750,6 +2883,10 @@  static const struct sh_pfc_function pinm
 	SH_PFC_FUNCTION(usb0),
 	SH_PFC_FUNCTION(usb1),
 	SH_PFC_FUNCTION(usb2),
+	SH_PFC_FUNCTION(vin0),
+	SH_PFC_FUNCTION(vin1),
+	SH_PFC_FUNCTION(vin2),
+	SH_PFC_FUNCTION(vin3),
 };
 
 static const struct pinmux_cfg_reg pinmux_config_regs[] = {