Commit 84c493d8 authored by Arnaud Giersch's avatar Arnaud Giersch Committed by Ralf Baechle

[MIPS] IP32 Fix and complete IP32 parport definitions

    
Fix, complete, and indent IP32 parport definitions.
Definition were wrong for CTXINUSE and DMACTIVE (1-bit shift).
Add macros DATA_BOUND, DATALEN_SHIFT, and CTRSHIFT.
Signed-off-by: default avatarArnaud Giersch <arnaud.giersch@free.fr>
Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent 19ce1cfb
...@@ -150,24 +150,34 @@ struct mace_audio { ...@@ -150,24 +150,34 @@ struct mace_audio {
/* register definitions for parallel port DMA */ /* register definitions for parallel port DMA */
struct mace_parport { struct mace_parport {
/* 0 - do nothing, 1 - pulse terminal count to the device after buffer is drained */ /* 0 - do nothing,
#define MACEPAR_CONTEXT_LASTFLAG BIT(63) * 1 - pulse terminal count to the device after buffer is drained */
/* Should not cross 4K page boundary */ #define MACEPAR_CONTEXT_LASTFLAG BIT(63)
#define MACEPAR_CONTEXT_DATALEN_MASK 0xfff00000000 /* Should not cross 4K page boundary */
/* Can be arbitrarily aligned on any byte boundary on output, 64 byte aligned on input */ #define MACEPAR_CONTEXT_DATA_BOUND 0x0000000000001000UL
#define MACEPAR_CONTEXT_BASEADDR_MASK 0xffffffff #define MACEPAR_CONTEXT_DATALEN_MASK 0x00000fff00000000UL
#define MACEPAR_CONTEXT_DATALEN_SHIFT 32
/* Can be arbitrarily aligned on any byte boundary on output,
* 64 byte aligned on input */
#define MACEPAR_CONTEXT_BASEADDR_MASK 0x00000000ffffffffUL
volatile u64 context_a; volatile u64 context_a;
volatile u64 context_b; volatile u64 context_b;
#define MACEPAR_CTLSTAT_DIRECTION BIT(0) /* 0 - mem->device, 1 - device->mem */ /* 0 - mem->device, 1 - device->mem */
#define MACEPAR_CTLSTAT_ENABLE BIT(1) /* 0 - channel frozen, 1 - channel enabled */ #define MACEPAR_CTLSTAT_DIRECTION BIT(0)
#define MACEPAR_CTLSTAT_RESET BIT(2) /* 0 - channel active, 1 - complete channel reset */ /* 0 - channel frozen, 1 - channel enabled */
#define MACEPAR_CTLSTAT_CTXB_VALID BIT(3) #define MACEPAR_CTLSTAT_ENABLE BIT(1)
#define MACEPAR_CTLSTAT_CTXA_VALID BIT(4) /* 0 - channel active, 1 - complete channel reset */
volatile u64 cntlstat; /* Control/Status register */ #define MACEPAR_CTLSTAT_RESET BIT(2)
#define MACEPAR_DIAG_CTXINUSE BIT(1) #define MACEPAR_CTLSTAT_CTXB_VALID BIT(3)
#define MACEPAR_DIAG_DMACTIVE BIT(2) /* 1 - Dma engine is enabled and processing something */ #define MACEPAR_CTLSTAT_CTXA_VALID BIT(4)
#define MACEPAR_DIAG_CTRMASK 0x3ffc /* Counter of bytes left */ volatile u64 cntlstat; /* Control/Status register */
volatile u64 diagnostic; /* RO: diagnostic register */ #define MACEPAR_DIAG_CTXINUSE BIT(0)
/* 1 - Dma engine is enabled and processing something */
#define MACEPAR_DIAG_DMACTIVE BIT(1)
/* Counter of bytes left */
#define MACEPAR_DIAG_CTRMASK 0x0000000000003ffcUL
#define MACEPAR_DIAG_CTRSHIFT 2
volatile u64 diagnostic; /* RO: diagnostic register */
}; };
/* ISA Control and DMA registers */ /* ISA Control and DMA registers */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment