diff options
Diffstat (limited to 'arch/mips/rb532')
-rw-r--r-- | arch/mips/rb532/irq.c | 2 | ||||
-rw-r--r-- | arch/mips/rb532/serial.c | 6 | ||||
-rw-r--r-- | arch/mips/rb532/setup.c | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/arch/mips/rb532/irq.c b/arch/mips/rb532/irq.c index c0d0f950caf2..549b46d2fcee 100644 --- a/arch/mips/rb532/irq.c +++ b/arch/mips/rb532/irq.c | |||
@@ -45,7 +45,7 @@ | |||
45 | #include <asm/mipsregs.h> | 45 | #include <asm/mipsregs.h> |
46 | #include <asm/system.h> | 46 | #include <asm/system.h> |
47 | 47 | ||
48 | #include <asm/mach-rc32434/rc32434.h> | 48 | #include <asm/mach-rc32434/irq.h> |
49 | 49 | ||
50 | struct intr_group { | 50 | struct intr_group { |
51 | u32 mask; /* mask of valid bits in pending/mask registers */ | 51 | u32 mask; /* mask of valid bits in pending/mask registers */ |
diff --git a/arch/mips/rb532/serial.c b/arch/mips/rb532/serial.c index 1a05b5ddee09..3e0d7ec3a579 100644 --- a/arch/mips/rb532/serial.c +++ b/arch/mips/rb532/serial.c | |||
@@ -31,16 +31,16 @@ | |||
31 | #include <linux/serial_8250.h> | 31 | #include <linux/serial_8250.h> |
32 | 32 | ||
33 | #include <asm/serial.h> | 33 | #include <asm/serial.h> |
34 | #include <asm/mach-rc32434/rc32434.h> | 34 | #include <asm/mach-rc32434/rb.h> |
35 | 35 | ||
36 | extern unsigned int idt_cpu_freq; | 36 | extern unsigned int idt_cpu_freq; |
37 | 37 | ||
38 | static struct uart_port rb532_uart = { | 38 | static struct uart_port rb532_uart = { |
39 | .type = PORT_16550A, | 39 | .type = PORT_16550A, |
40 | .line = 0, | 40 | .line = 0, |
41 | .irq = RC32434_UART0_IRQ, | 41 | .irq = UART0_IRQ, |
42 | .iotype = UPIO_MEM, | 42 | .iotype = UPIO_MEM, |
43 | .membase = (char *)KSEG1ADDR(RC32434_UART0_BASE), | 43 | .membase = (char *)KSEG1ADDR(REGBASE + UART0BASE), |
44 | .regshift = 2 | 44 | .regshift = 2 |
45 | }; | 45 | }; |
46 | 46 | ||
diff --git a/arch/mips/rb532/setup.c b/arch/mips/rb532/setup.c index 7aafa95ac20b..50f530f5b602 100644 --- a/arch/mips/rb532/setup.c +++ b/arch/mips/rb532/setup.c | |||
@@ -9,7 +9,7 @@ | |||
9 | #include <asm/time.h> | 9 | #include <asm/time.h> |
10 | #include <linux/ioport.h> | 10 | #include <linux/ioport.h> |
11 | 11 | ||
12 | #include <asm/mach-rc32434/rc32434.h> | 12 | #include <asm/mach-rc32434/rb.h> |
13 | #include <asm/mach-rc32434/pci.h> | 13 | #include <asm/mach-rc32434/pci.h> |
14 | 14 | ||
15 | struct pci_reg __iomem *pci_reg; | 15 | struct pci_reg __iomem *pci_reg; |
@@ -27,7 +27,7 @@ static struct resource pci0_res[] = { | |||
27 | static void rb_machine_restart(char *command) | 27 | static void rb_machine_restart(char *command) |
28 | { | 28 | { |
29 | /* just jump to the reset vector */ | 29 | /* just jump to the reset vector */ |
30 | writel(0x80000001, (void *)KSEG1ADDR(RC32434_REG_BASE + RC32434_RST)); | 30 | writel(0x80000001, IDT434_REG_BASE + RST); |
31 | ((void (*)(void)) KSEG1ADDR(0x1FC00000u))(); | 31 | ((void (*)(void)) KSEG1ADDR(0x1FC00000u))(); |
32 | } | 32 | } |
33 | 33 | ||