[PATCH] rcar-du: add/rename DEFR6 TCON bits

[Laurent Pinchart]

Hi Sergei,

Thank you for the patch.

On Saturday 23 Apr 2016 01:56:07 Sergei Shtylyov wrote:
> The  TCNE2 bit  of the DEFR6 register was renamed to TCNE1 in the R-Car gen2
> manuals -- which makes more  sense as that bit controls whether DU1, not
> DU2 is connected to TCON.
> 
> While at it, add the TCNE0 bit which controls whether DU0 is connected to
> TCON.
> 
> Based on the large patch by Andrey Gusakov
> .
> 
> Signed-off-by: Andrey Gusakov 
> Signed-off-by: Sergei Shtylyov 

Acked-by: Laurent Pinchart 

and applied to my tree.

> ---
> The patch is against David Airlie's 'linux.git' repo's 'drm-next' branch.
> 
>  drivers/gpu/drm/rcar-du/rcar_du_regs.h |5 +++--
>  1 file changed, 3 insertions(+), 2 deletions(-)
> 
> Index: linux/drivers/gpu/drm/rcar-du/rcar_du_regs.h
> ===
> --- linux.orig/drivers/gpu/drm/rcar-du/rcar_du_regs.h
> +++ linux/drivers/gpu/drm/rcar-du/rcar_du_regs.h
> @@ -195,9 +195,10 @@
>  #define DEFR6_ODPM12_DISP(2 << 8)
>  #define DEFR6_ODPM12_CDE (3 << 8)
>  #define DEFR6_ODPM12_MASK(3 << 8)
> -#define DEFR6_TCNE2  (1 << 6)
> +#define DEFR6_TCNE1  (1 << 6)
> +#define DEFR6_TCNE0  (1 << 4)
>  #define DEFR6_MLOS1  (1 << 2)
> -#define DEFR6_DEFAULT(DEFR6_CODE | DEFR6_TCNE2)
> +#define DEFR6_DEFAULT(DEFR6_CODE | DEFR6_TCNE1)
> 
>  /* 
>   * R8A7790-only Control Registers

-- 
Regards,

Laurent Pinchart

[PATCH] rcar-du: add/rename DEFR6 TCON bits

[Laurent Pinchart]

Hi Geert,

On Monday 25 Apr 2016 09:25:30 Geert Uytterhoeven wrote:
> On Sat, Apr 23, 2016 at 12:56 AM, Sergei Shtylyov wrote:
> > The  TCNE2 bit  of the DEFR6 register was renamed to TCNE1 in the R-Car
> > gen2 manuals -- which makes more  sense as that bit controls whether DU1,
> > not DU2 is connected to TCON.
> > 
> > While at it, add the TCNE0 bit which controls whether DU0 is connected to
> > TCON.
> > 
> > Based on the large patch by Andrey Gusakov
> > .
> > 
> > Signed-off-by: Andrey Gusakov 
> > Signed-off-by: Sergei Shtylyov 
> 
> I hard a hard time finding this register, as it's actually called "DEF6R"...
> Care to update /DEFRx/DEFxR/ as well?

Inconsistent information between datasheet versions I'm afraid, and even 
between different registers in a single datasheet. We have DEFR0, DEFR1, and 
then DEFxR. I wonder if it's worth renaming the registers.

> Regardless:
> Reviewed-by: Geert Uytterhoeven 
> 
> > ---
> > The patch is against David Airlie's 'linux.git' repo's 'drm-next' branch.
> > 
> >  drivers/gpu/drm/rcar-du/rcar_du_regs.h |5 +++--
> >  1 file changed, 3 insertions(+), 2 deletions(-)
> > 
> > Index: linux/drivers/gpu/drm/rcar-du/rcar_du_regs.h
> > ===
> > --- linux.orig/drivers/gpu/drm/rcar-du/rcar_du_regs.h
> > +++ linux/drivers/gpu/drm/rcar-du/rcar_du_regs.h
> > @@ -195,9 +195,10 @@
> > 
> >  #define DEFR6_ODPM12_DISP  (2 << 8)
> >  #define DEFR6_ODPM12_CDE   (3 << 8)
> >  #define DEFR6_ODPM12_MASK  (3 << 8)
> > 
> > -#define DEFR6_TCNE2(1 << 6)
> > +#define DEFR6_TCNE1(1 << 6)
> > +#define DEFR6_TCNE0(1 << 4)
> > 
> >  #define DEFR6_MLOS1(1 << 2)
> > 
> > -#define DEFR6_DEFAULT  (DEFR6_CODE | DEFR6_TCNE2)
> > +#define DEFR6_DEFAULT  (DEFR6_CODE | DEFR6_TCNE1)

-- 
Regards,

Laurent Pinchart

[PATCH] rcar-du: add/rename DEFR6 TCON bits

[Sergei Shtylyov]

On 4/25/2016 10:25 AM, Geert Uytterhoeven wrote:

>> The  TCNE2 bit  of the DEFR6 register was renamed to TCNE1 in the R-Car gen2
>> manuals -- which makes more  sense as that bit controls whether DU1, not DU2
>> is connected to TCON.
>>
>> While at it, add the TCNE0 bit which controls whether DU0 is connected to
>> TCON.
>>
>> Based on the large patch by Andrey Gusakov > cogentembedded.com>.
>>
>> Signed-off-by: Andrey Gusakov 
>> Signed-off-by: Sergei Shtylyov 
>
> I hard a hard time finding this register, as it's actually called "DEF6R"...

Well, the R-Car M1A manual named it this way, hence is this name in the 
driver, I guess.

> Care to update /DEFRx/DEFxR/ as well?

No. :-)

> Regardless:
> Reviewed-by: Geert Uytterhoeven 

Thank you.

[...]

MBR, Sergei

[PATCH] rcar-du: add/rename DEFR6 TCON bits

[Geert Uytterhoeven]

Hi Sergei,

On Sat, Apr 23, 2016 at 12:56 AM, Sergei Shtylyov
 wrote:
> The  TCNE2 bit  of the DEFR6 register was renamed to TCNE1 in the R-Car gen2
> manuals -- which makes more  sense as that bit controls whether DU1, not DU2
> is connected to TCON.
>
> While at it, add the TCNE0 bit which controls whether DU0 is connected to
> TCON.
>
> Based on the large patch by Andrey Gusakov  cogentembedded.com>.
>
> Signed-off-by: Andrey Gusakov 
> Signed-off-by: Sergei Shtylyov 

I hard a hard time finding this register, as it's actually called "DEF6R"...
Care to update /DEFRx/DEFxR/ as well?

Regardless:
Reviewed-by: Geert Uytterhoeven 

> ---
> The patch is against David Airlie's 'linux.git' repo's 'drm-next' branch.
>
>  drivers/gpu/drm/rcar-du/rcar_du_regs.h |5 +++--
>  1 file changed, 3 insertions(+), 2 deletions(-)
>
> Index: linux/drivers/gpu/drm/rcar-du/rcar_du_regs.h
> ===
> --- linux.orig/drivers/gpu/drm/rcar-du/rcar_du_regs.h
> +++ linux/drivers/gpu/drm/rcar-du/rcar_du_regs.h
> @@ -195,9 +195,10 @@
>  #define DEFR6_ODPM12_DISP  (2 << 8)
>  #define DEFR6_ODPM12_CDE   (3 << 8)
>  #define DEFR6_ODPM12_MASK  (3 << 8)
> -#define DEFR6_TCNE2(1 << 6)
> +#define DEFR6_TCNE1(1 << 6)
> +#define DEFR6_TCNE0(1 << 4)
>  #define DEFR6_MLOS1(1 << 2)
> -#define DEFR6_DEFAULT  (DEFR6_CODE | DEFR6_TCNE2)
> +#define DEFR6_DEFAULT  (DEFR6_CODE | DEFR6_TCNE1)

Gr{oetje,eeting}s,

Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert at 
linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds

[PATCH] rcar-du: add/rename DEFR6 TCON bits

[Sergei Shtylyov]

The  TCNE2 bit  of the DEFR6 register was renamed to TCNE1 in the R-Car gen2
manuals -- which makes more  sense as that bit controls whether DU1, not DU2
is connected to TCON.

While at it, add the TCNE0 bit which controls whether DU0 is connected to
TCON.

Based on the large patch by Andrey Gusakov .

Signed-off-by: Andrey Gusakov 
Signed-off-by: Sergei Shtylyov 

---
The patch is against David Airlie's 'linux.git' repo's 'drm-next' branch.

 drivers/gpu/drm/rcar-du/rcar_du_regs.h |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

Index: linux/drivers/gpu/drm/rcar-du/rcar_du_regs.h
===
--- linux.orig/drivers/gpu/drm/rcar-du/rcar_du_regs.h
+++ linux/drivers/gpu/drm/rcar-du/rcar_du_regs.h
@@ -195,9 +195,10 @@
 #define DEFR6_ODPM12_DISP  (2 << 8)
 #define DEFR6_ODPM12_CDE   (3 << 8)
 #define DEFR6_ODPM12_MASK  (3 << 8)
-#define DEFR6_TCNE2(1 << 6)
+#define DEFR6_TCNE1(1 << 6)
+#define DEFR6_TCNE0(1 << 4)
 #define DEFR6_MLOS1(1 << 2)
-#define DEFR6_DEFAULT  (DEFR6_CODE | DEFR6_TCNE2)
+#define DEFR6_DEFAULT  (DEFR6_CODE | DEFR6_TCNE1)

 /* 
-
  * R8A7790-only Control Registers