lkml.org 
[lkml]   [2017]   [Mar]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v3 1/3] video: ARM CLCD: Move registers to a separate header.
    Date
    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.

    Signed-off-by: Eric Anholt <eric@anholt.net>
    ---
    include/linux/amba/clcd-regs.h | 76 ++++++++++++++++++++++++++++++++++++++++++
    include/linux/amba/clcd.h | 68 +------------------------------------
    2 files changed, 77 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 000000000000..1b924c4a63ab
    --- /dev/null
    +++ b/include/linux/amba/clcd-regs.h
    @@ -0,0 +1,76 @@
    +/*
    + * 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.
    + */
    +
    +/*
    + * CLCD Controller Internal Register addresses
    + */
    +#define CLCD_TIM0 0x00000000
    +#define CLCD_TIM1 0x00000004
    +#define CLCD_TIM2 0x00000008
    +#define CLCD_TIM3 0x0000000c
    +#define CLCD_UBAS 0x00000010
    +#define CLCD_LBAS 0x00000014
    +
    +#define CLCD_PL110_IENB 0x00000018
    +#define CLCD_PL110_CNTL 0x0000001c
    +#define CLCD_PL110_STAT 0x00000020
    +#define CLCD_PL110_INTR 0x00000024
    +#define CLCD_PL110_UCUR 0x00000028
    +#define CLCD_PL110_LCUR 0x0000002C
    +
    +#define CLCD_PL111_CNTL 0x00000018
    +#define CLCD_PL111_IENB 0x0000001c
    +#define CLCD_PL111_RIS 0x00000020
    +#define CLCD_PL111_MIS 0x00000024
    +#define CLCD_PL111_ICR 0x00000028
    +#define CLCD_PL111_UCUR 0x0000002c
    +#define CLCD_PL111_LCUR 0x00000030
    +
    +#define CLCD_PALL 0x00000200
    +#define CLCD_PALETTE 0x00000200
    +
    +#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)
    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 <linux/fb.h>
    -
    -/*
    - * CLCD Controller Internal Register addresses
    - */
    -#define CLCD_TIM0 0x00000000
    -#define CLCD_TIM1 0x00000004
    -#define CLCD_TIM2 0x00000008
    -#define CLCD_TIM3 0x0000000c
    -#define CLCD_UBAS 0x00000010
    -#define CLCD_LBAS 0x00000014
    -
    -#define CLCD_PL110_IENB 0x00000018
    -#define CLCD_PL110_CNTL 0x0000001c
    -#define CLCD_PL110_STAT 0x00000020
    -#define CLCD_PL110_INTR 0x00000024
    -#define CLCD_PL110_UCUR 0x00000028
    -#define CLCD_PL110_LCUR 0x0000002C
    -
    -#define CLCD_PL111_CNTL 0x00000018
    -#define CLCD_PL111_IENB 0x0000001c
    -#define CLCD_PL111_RIS 0x00000020
    -#define CLCD_PL111_MIS 0x00000024
    -#define CLCD_PL111_ICR 0x00000028
    -#define CLCD_PL111_UCUR 0x0000002c
    -#define CLCD_PL111_LCUR 0x00000030
    -
    -#define CLCD_PALL 0x00000200
    -#define CLCD_PALETTE 0x00000200
    -
    -#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)
    +#include <linux/amba/clcd-regs.h>

    enum {
    /* individual formats */
    --
    2.11.0
    \
     
     \ /
      Last update: 2017-03-21 00:37    [W:3.559 / U:0.032 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site