aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorSam Ravnborg <sam@ravnborg.org>2012-05-19 16:02:47 -0400
committerDavid S. Miller <davem@davemloft.net>2012-05-20 02:27:37 -0400
commit123521e41481d5e26d61c60deb9a32ce47dc0060 (patch)
tree32c65ae7f5955e5e4a309d41a2a553694a32ef0e /arch
parent28b7723b3958818ad936a9d5d5579ce537df340f (diff)
sparc32,leon: remove duplicate UART register definitions
The registers are defined in leon_amba too. Signed-off-by: Sam Ravnborg <sam@ravnborg.org> Cc: Konrad Eisele <konrad@gaisler.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch')
-rw-r--r--arch/sparc/include/asm/leon.h25
1 files changed, 0 insertions, 25 deletions
diff --git a/arch/sparc/include/asm/leon.h b/arch/sparc/include/asm/leon.h
index ce76f402b5bf..7a66bd9d5051 100644
--- a/arch/sparc/include/asm/leon.h
+++ b/arch/sparc/include/asm/leon.h
@@ -44,29 +44,6 @@
44#define LEON_IRQMASK_R 0x0000fffe /* bit 15- 1 of lregs.irqmask */ 44#define LEON_IRQMASK_R 0x0000fffe /* bit 15- 1 of lregs.irqmask */
45#define LEON_IRQPRIO_R 0xfffe0000 /* bit 31-17 of lregs.irqmask */ 45#define LEON_IRQPRIO_R 0xfffe0000 /* bit 31-17 of lregs.irqmask */
46 46
47/* leon uart register definitions */
48#define LEON_OFF_UDATA 0x0
49#define LEON_OFF_USTAT 0x4
50#define LEON_OFF_UCTRL 0x8
51#define LEON_OFF_USCAL 0xc
52
53#define LEON_UCTRL_RE 0x01
54#define LEON_UCTRL_TE 0x02
55#define LEON_UCTRL_RI 0x04
56#define LEON_UCTRL_TI 0x08
57#define LEON_UCTRL_PS 0x10
58#define LEON_UCTRL_PE 0x20
59#define LEON_UCTRL_FL 0x40
60#define LEON_UCTRL_LB 0x80
61
62#define LEON_USTAT_DR 0x01
63#define LEON_USTAT_TS 0x02
64#define LEON_USTAT_TH 0x04
65#define LEON_USTAT_BR 0x08
66#define LEON_USTAT_OV 0x10
67#define LEON_USTAT_PE 0x20
68#define LEON_USTAT_FE 0x40
69
70#define LEON_MCFG2_SRAMDIS 0x00002000 47#define LEON_MCFG2_SRAMDIS 0x00002000
71#define LEON_MCFG2_SDRAMEN 0x00004000 48#define LEON_MCFG2_SDRAMEN 0x00004000
72#define LEON_MCFG2_SRAMBANKSZ 0x00001e00 /* [12-9] */ 49#define LEON_MCFG2_SRAMBANKSZ 0x00001e00 /* [12-9] */
@@ -76,8 +53,6 @@
76 53
77#define LEON_TCNT0_MASK 0x7fffff 54#define LEON_TCNT0_MASK 0x7fffff
78 55
79#define LEON_USTAT_ERROR (LEON_USTAT_OV | LEON_USTAT_PE | LEON_USTAT_FE)
80/* no break yet */
81 56
82#define ASI_LEON3_SYSCTRL 0x02 57#define ASI_LEON3_SYSCTRL 0x02
83#define ASI_LEON3_SYSCTRL_ICFG 0x08 58#define ASI_LEON3_SYSCTRL_ICFG 0x08