aboutsummaryrefslogtreecommitdiffstats
path: root/arch/mips/include
diff options
context:
space:
mode:
authorManuel Lauss <manuel.lauss@googlemail.com>2011-05-08 04:42:16 -0400
committerRalf Baechle <ralf@linux-mips.org>2011-05-19 04:55:45 -0400
commitadcb86279f1e4d7a1a9f267b49441aecf4a5110a (patch)
tree833234004a932e48ddbd2094965b3498b0276d36 /arch/mips/include
parent4b5c82b5e57ac6cb919e7e74984e28b312bdf10c (diff)
MIPS: Alchemy: Convert dbdma.c to syscore_ops
Convert the PM sysdev to syscore_ops and clean up the ddma addresses a bit. Signed-off-by: Manuel Lauss <manuel.lauss@googlemail.com> To: Linux-MIPS <linux-mips@linux-mips.org> Cc: Florian Fainelli <florian@openwrt.org> Cc: Wolfgang Grandegger <wg@grandegger.com> Patchwork: https://patchwork.linux-mips.org/patch/2351/ Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/include')
-rw-r--r--arch/mips/include/asm/mach-au1x00/au1000.h4
-rw-r--r--arch/mips/include/asm/mach-au1x00/au1xxx_dbdma.h8
2 files changed, 2 insertions, 10 deletions
diff --git a/arch/mips/include/asm/mach-au1x00/au1000.h b/arch/mips/include/asm/mach-au1x00/au1000.h
index 66cfcdc75e4f..eb8f1034e1ef 100644
--- a/arch/mips/include/asm/mach-au1x00/au1000.h
+++ b/arch/mips/include/asm/mach-au1x00/au1000.h
@@ -635,6 +635,8 @@ enum soc_au1200_ints {
635 635
636#define AU1000_IC0_PHYS_ADDR 0x10400000 /* 01234 */ 636#define AU1000_IC0_PHYS_ADDR 0x10400000 /* 01234 */
637#define AU1000_IC1_PHYS_ADDR 0x11800000 /* 01234 */ 637#define AU1000_IC1_PHYS_ADDR 0x11800000 /* 01234 */
638#define AU1550_DBDMA_PHYS_ADDR 0x14002000 /* 34 */
639#define AU1550_DBDMA_CONF_PHYS_ADDR 0x14003000 /* 34 */
638 640
639 641
640#ifdef CONFIG_SOC_AU1000 642#ifdef CONFIG_SOC_AU1000
@@ -761,7 +763,6 @@ enum soc_au1200_ints {
761#define UART3_PHYS_ADDR 0x11400000 763#define UART3_PHYS_ADDR 0x11400000
762#define GPIO2_PHYS_ADDR 0x11700000 764#define GPIO2_PHYS_ADDR 0x11700000
763#define SYS_PHYS_ADDR 0x11900000 765#define SYS_PHYS_ADDR 0x11900000
764#define DDMA_PHYS_ADDR 0x14002000
765#define PE_PHYS_ADDR 0x14008000 766#define PE_PHYS_ADDR 0x14008000
766#define PSC0_PHYS_ADDR 0x11A00000 767#define PSC0_PHYS_ADDR 0x11A00000
767#define PSC1_PHYS_ADDR 0x11B00000 768#define PSC1_PHYS_ADDR 0x11B00000
@@ -789,7 +790,6 @@ enum soc_au1200_ints {
789#define UART1_PHYS_ADDR 0x11200000 790#define UART1_PHYS_ADDR 0x11200000
790#define GPIO2_PHYS_ADDR 0x11700000 791#define GPIO2_PHYS_ADDR 0x11700000
791#define SYS_PHYS_ADDR 0x11900000 792#define SYS_PHYS_ADDR 0x11900000
792#define DDMA_PHYS_ADDR 0x14002000
793#define PSC0_PHYS_ADDR 0x11A00000 793#define PSC0_PHYS_ADDR 0x11A00000
794#define PSC1_PHYS_ADDR 0x11B00000 794#define PSC1_PHYS_ADDR 0x11B00000
795#define SD0_PHYS_ADDR 0x10600000 795#define SD0_PHYS_ADDR 0x10600000
diff --git a/arch/mips/include/asm/mach-au1x00/au1xxx_dbdma.h b/arch/mips/include/asm/mach-au1x00/au1xxx_dbdma.h
index c8a553a36ba4..2fdacfe85e23 100644
--- a/arch/mips/include/asm/mach-au1x00/au1xxx_dbdma.h
+++ b/arch/mips/include/asm/mach-au1x00/au1xxx_dbdma.h
@@ -37,14 +37,6 @@
37 37
38#ifndef _LANGUAGE_ASSEMBLY 38#ifndef _LANGUAGE_ASSEMBLY
39 39
40/*
41 * The DMA base addresses.
42 * The channels are every 256 bytes (0x0100) from the channel 0 base.
43 * Interrupt status/enable is bits 15:0 for channels 15 to zero.
44 */
45#define DDMA_GLOBAL_BASE 0xb4003000
46#define DDMA_CHANNEL_BASE 0xb4002000
47
48typedef volatile struct dbdma_global { 40typedef volatile struct dbdma_global {
49 u32 ddma_config; 41 u32 ddma_config;
50 u32 ddma_intstat; 42 u32 ddma_intstat;