[PATCH v6 1/2] video: ARM CLCD: Move registers to a separate header.

2017-04-12 Thread Eric Anholt 
We'd like to reuse these register definitions for the DRM CLCD driver,
but there's a bunch of fbdev-specific code in the current header.

v2: Add #ifndef guard.

Signed-off-by: Eric Anholt 
---
 include/linux/amba/clcd-regs.h | 81 ++
 include/linux/amba/clcd.h  | 68 +--
 2 files changed, 82 insertions(+), 67 deletions(-)
 create mode 100644 include/linux/amba/clcd-regs.h

diff --git a/include/linux/amba/clcd-regs.h b/include/linux/amba/clcd-regs.h
new file mode 100644
index ..69c0e2143003
--- /dev/null
+++ b/include/linux/amba/clcd-regs.h
@@ -0,0 +1,81 @@
+/*
+ * David A Rusling
+ *
+ * Copyright (C) 2001 ARM Limited
+ *
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file COPYING in the main directory of this archive
+ * for more details.
+ */
+
+#ifndef AMBA_CLCD_REGS_H
+#define AMBA_CLCD_REGS_H
+
+/*
+ * CLCD Controller Internal Register addresses
+ */
+#define CLCD_TIM0  0x
+#define CLCD_TIM1  0x0004
+#define CLCD_TIM2  0x0008
+#define CLCD_TIM3  0x000c
+#define CLCD_UBAS  0x0010
+#define CLCD_LBAS  0x0014
+
+#define CLCD_PL110_IENB0x0018
+#define CLCD_PL110_CNTL0x001c
+#define CLCD_PL110_STAT0x0020
+#define CLCD_PL110_INTR0x0024
+#define CLCD_PL110_UCUR0x0028
+#define CLCD_PL110_LCUR0x002C
+
+#define CLCD_PL111_CNTL0x0018
+#define CLCD_PL111_IENB0x001c
+#define CLCD_PL111_RIS 0x0020
+#define CLCD_PL111_MIS 0x0024
+#define CLCD_PL111_ICR 0x0028
+#define CLCD_PL111_UCUR0x002c
+#define CLCD_PL111_LCUR0x0030
+
+#define CLCD_PALL  0x0200
+#define CLCD_PALETTE   0x0200
+
+#define TIM2_CLKSEL(1 << 5)
+#define TIM2_IVS   (1 << 11)
+#define TIM2_IHS   (1 << 12)
+#define TIM2_IPC   (1 << 13)
+#define TIM2_IOE   (1 << 14)
+#define TIM2_BCD   (1 << 26)
+
+#define CNTL_LCDEN (1 << 0)
+#define CNTL_LCDBPP1   (0 << 1)
+#define CNTL_LCDBPP2   (1 << 1)
+#define CNTL_LCDBPP4   (2 << 1)
+#define CNTL_LCDBPP8   (3 << 1)
+#define CNTL_LCDBPP16  (4 << 1)
+#define CNTL_LCDBPP16_565  (6 << 1)
+#define CNTL_LCDBPP16_444  (7 << 1)
+#define CNTL_LCDBPP24  (5 << 1)
+#define CNTL_LCDBW (1 << 4)
+#define CNTL_LCDTFT(1 << 5)
+#define CNTL_LCDMONO8  (1 << 6)
+#define CNTL_LCDDUAL   (1 << 7)
+#define CNTL_BGR   (1 << 8)
+#define CNTL_BEBO  (1 << 9)
+#define CNTL_BEPO  (1 << 10)
+#define CNTL_LCDPWR(1 << 11)
+#define CNTL_LCDVCOMP(x)   ((x) << 12)
+#define CNTL_LDMAFIFOTIME  (1 << 15)
+#define CNTL_WATERMARK (1 << 16)
+
+/* ST Microelectronics variant bits */
+#define CNTL_ST_1XBPP_444  0x0
+#define CNTL_ST_1XBPP_5551 (1 << 17)
+#define CNTL_ST_1XBPP_565  (1 << 18)
+#define CNTL_ST_CDWID_12   0x0
+#define CNTL_ST_CDWID_16   (1 << 19)
+#define CNTL_ST_CDWID_18   (1 << 20)
+#define CNTL_ST_CDWID_24   ((1 << 19)|(1 << 20))
+#define CNTL_ST_CEAEN  (1 << 21)
+#define CNTL_ST_LCDBPP24_PACKED(6 << 1)
+
+#endif /* AMBA_CLCD_REGS_H */
diff --git a/include/linux/amba/clcd.h b/include/linux/amba/clcd.h
index 1035879b322c..d0c3be77c18e 100644
--- a/include/linux/amba/clcd.h
+++ b/include/linux/amba/clcd.h
@@ -10,73 +10,7 @@
  * for more details.
  */
 #include 
-
-/*
- * CLCD Controller Internal Register addresses
- */
-#define CLCD_TIM0  0x
-#define CLCD_TIM1  0x0004
-#define CLCD_TIM2  0x0008
-#define CLCD_TIM3  0x000c
-#define CLCD_UBAS  0x0010
-#define CLCD_LBAS  0x0014
-
-#define CLCD_PL110_IENB0x0018
-#define CLCD_PL110_CNTL0x001c
-#define CLCD_PL110_STAT0x0020
-#define CLCD_PL110_INTR0x0024
-#define CLCD_PL110_UCUR0x0028
-#define CLCD_PL110_LCUR0x002C
-
-#define CLCD_PL111_CNTL0x0018
-#define CLCD_PL111_IENB0x001c
-#define CLCD_PL111_RIS 0x0020
-#define CLCD_PL111_MIS 0x0024
-#define CLCD_PL111_ICR 0x0028
-#define CLCD_PL111_UCUR0x002c
-#define CLCD_PL111_LCUR0x0030
-
-#define CLCD_PALL  0x0200
-#define CLCD_PALETTE   0x0200
-
-#define TIM2_CLKSEL(1 << 5)
-#define TIM2_IVS   (1 << 11)
-#define TIM2_IHS   (1 << 12)
-#define TIM2_IPC   (1 << 13)
-#define

[PATCH v6 1/2] video: ARM CLCD: Move registers to a separate header.

2017-04-12 Thread Eric Anholt 
We'd like to reuse these register definitions for the DRM CLCD driver,
but there's a bunch of fbdev-specific code in the current header.

v2: Add #ifndef guard.

Signed-off-by: Eric Anholt 
---
 include/linux/amba/clcd-regs.h | 81 ++
 include/linux/amba/clcd.h  | 68 +--
 2 files changed, 82 insertions(+), 67 deletions(-)
 create mode 100644 include/linux/amba/clcd-regs.h

diff --git a/include/linux/amba/clcd-regs.h b/include/linux/amba/clcd-regs.h
new file mode 100644
index ..69c0e2143003
--- /dev/null
+++ b/include/linux/amba/clcd-regs.h
@@ -0,0 +1,81 @@
+/*
+ * David A Rusling
+ *
+ * Copyright (C) 2001 ARM Limited
+ *
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file COPYING in the main directory of this archive
+ * for more details.
+ */
+
+#ifndef AMBA_CLCD_REGS_H
+#define AMBA_CLCD_REGS_H
+
+/*
+ * CLCD Controller Internal Register addresses
+ */
+#define CLCD_TIM0  0x
+#define CLCD_TIM1  0x0004
+#define CLCD_TIM2  0x0008
+#define CLCD_TIM3  0x000c
+#define CLCD_UBAS  0x0010
+#define CLCD_LBAS  0x0014
+
+#define CLCD_PL110_IENB0x0018
+#define CLCD_PL110_CNTL0x001c
+#define CLCD_PL110_STAT0x0020
+#define CLCD_PL110_INTR0x0024
+#define CLCD_PL110_UCUR0x0028
+#define CLCD_PL110_LCUR0x002C
+
+#define CLCD_PL111_CNTL0x0018
+#define CLCD_PL111_IENB0x001c
+#define CLCD_PL111_RIS 0x0020
+#define CLCD_PL111_MIS 0x0024
+#define CLCD_PL111_ICR 0x0028
+#define CLCD_PL111_UCUR0x002c
+#define CLCD_PL111_LCUR0x0030
+
+#define CLCD_PALL  0x0200
+#define CLCD_PALETTE   0x0200
+
+#define TIM2_CLKSEL(1 << 5)
+#define TIM2_IVS   (1 << 11)
+#define TIM2_IHS   (1 << 12)
+#define TIM2_IPC   (1 << 13)
+#define TIM2_IOE   (1 << 14)
+#define TIM2_BCD   (1 << 26)
+
+#define CNTL_LCDEN (1 << 0)
+#define CNTL_LCDBPP1   (0 << 1)
+#define CNTL_LCDBPP2   (1 << 1)
+#define CNTL_LCDBPP4   (2 << 1)
+#define CNTL_LCDBPP8   (3 << 1)
+#define CNTL_LCDBPP16  (4 << 1)
+#define CNTL_LCDBPP16_565  (6 << 1)
+#define CNTL_LCDBPP16_444  (7 << 1)
+#define CNTL_LCDBPP24  (5 << 1)
+#define CNTL_LCDBW (1 << 4)
+#define CNTL_LCDTFT(1 << 5)
+#define CNTL_LCDMONO8  (1 << 6)
+#define CNTL_LCDDUAL   (1 << 7)
+#define CNTL_BGR   (1 << 8)
+#define CNTL_BEBO  (1 << 9)
+#define CNTL_BEPO  (1 << 10)
+#define CNTL_LCDPWR(1 << 11)
+#define CNTL_LCDVCOMP(x)   ((x) << 12)
+#define CNTL_LDMAFIFOTIME  (1 << 15)
+#define CNTL_WATERMARK (1 << 16)
+
+/* ST Microelectronics variant bits */
+#define CNTL_ST_1XBPP_444  0x0
+#define CNTL_ST_1XBPP_5551 (1 << 17)
+#define CNTL_ST_1XBPP_565  (1 << 18)
+#define CNTL_ST_CDWID_12   0x0
+#define CNTL_ST_CDWID_16   (1 << 19)
+#define CNTL_ST_CDWID_18   (1 << 20)
+#define CNTL_ST_CDWID_24   ((1 << 19)|(1 << 20))
+#define CNTL_ST_CEAEN  (1 << 21)
+#define CNTL_ST_LCDBPP24_PACKED(6 << 1)
+
+#endif /* AMBA_CLCD_REGS_H */
diff --git a/include/linux/amba/clcd.h b/include/linux/amba/clcd.h
index 1035879b322c..d0c3be77c18e 100644
--- a/include/linux/amba/clcd.h
+++ b/include/linux/amba/clcd.h
@@ -10,73 +10,7 @@
  * for more details.
  */
 #include 
-
-/*
- * CLCD Controller Internal Register addresses
- */
-#define CLCD_TIM0  0x
-#define CLCD_TIM1  0x0004
-#define CLCD_TIM2  0x0008
-#define CLCD_TIM3  0x000c
-#define CLCD_UBAS  0x0010
-#define CLCD_LBAS  0x0014
-
-#define CLCD_PL110_IENB0x0018
-#define CLCD_PL110_CNTL0x001c
-#define CLCD_PL110_STAT0x0020
-#define CLCD_PL110_INTR0x0024
-#define CLCD_PL110_UCUR0x0028
-#define CLCD_PL110_LCUR0x002C
-
-#define CLCD_PL111_CNTL0x0018
-#define CLCD_PL111_IENB0x001c
-#define CLCD_PL111_RIS 0x0020
-#define CLCD_PL111_MIS 0x0024
-#define CLCD_PL111_ICR 0x0028
-#define CLCD_PL111_UCUR0x002c
-#define CLCD_PL111_LCUR0x0030
-
-#define CLCD_PALL  0x0200
-#define CLCD_PALETTE   0x0200
-
-#define TIM2_CLKSEL(1 << 5)
-#define TIM2_IVS   (1 << 11)
-#define TIM2_IHS   (1 << 12)
-#define TIM2_IPC   (1 << 13)
-#define TIM2_IOE