rcar-du: add/rename DEFR6 TCON bits
authorSergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Fri, 22 Apr 2016 22:56:07 +0000 (01:56 +0300)
committerLaurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Mon, 20 Jun 2016 19:31:26 +0000 (22:31 +0300)
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 <andrey.gusakov@cogentembedded.com>.

Signed-off-by: Andrey Gusakov <andrey.gusakov@cogentembedded.com>
Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
drivers/gpu/drm/rcar-du/rcar_du_regs.h

index d2f66068e52c01c49d798a29c42c752163f15b18..fedb0161e2344d17c3f6f743a016bf853d09c281 100644 (file)
 #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