diff options
author | Atsushi Nemoto <anemo@mba.ocn.ne.jp> | 2008-07-23 11:25:19 -0400 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2008-07-30 16:54:39 -0400 |
commit | f6727fb889c664be094fa041a0fdf0f1a1caefb6 (patch) | |
tree | 176b220f4cc39168f982eb90ab1fe7bba7a64da5 | |
parent | 683147254ef7e69ebbbe55280ba6a3c5ae2325d8 (diff) |
[MIPS] TXx9: Make tx3927-specific code more independent
Make some TX3927 SoC specific code independent from board specific code.
Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
-rw-r--r-- | arch/mips/txx9/generic/Makefile | 1 | ||||
-rw-r--r-- | arch/mips/txx9/generic/irq_tx3927.c | 25 | ||||
-rw-r--r-- | arch/mips/txx9/generic/setup_tx3927.c | 141 | ||||
-rw-r--r-- | arch/mips/txx9/jmr3927/irq.c | 43 | ||||
-rw-r--r-- | arch/mips/txx9/jmr3927/setup.c | 136 | ||||
-rw-r--r-- | include/asm-mips/txx9/jmr3927.h | 2 | ||||
-rw-r--r-- | include/asm-mips/txx9/tx3927.h | 12 |
7 files changed, 207 insertions, 153 deletions
diff --git a/arch/mips/txx9/generic/Makefile b/arch/mips/txx9/generic/Makefile index 9c120771e65f..57ed07bf030d 100644 --- a/arch/mips/txx9/generic/Makefile +++ b/arch/mips/txx9/generic/Makefile | |||
@@ -4,6 +4,7 @@ | |||
4 | 4 | ||
5 | obj-y += setup.o | 5 | obj-y += setup.o |
6 | obj-$(CONFIG_PCI) += pci.o | 6 | obj-$(CONFIG_PCI) += pci.o |
7 | obj-$(CONFIG_SOC_TX3927) += setup_tx3927.o irq_tx3927.o | ||
7 | obj-$(CONFIG_SOC_TX4927) += mem_tx4927.o setup_tx4927.o irq_tx4927.o | 8 | obj-$(CONFIG_SOC_TX4927) += mem_tx4927.o setup_tx4927.o irq_tx4927.o |
8 | obj-$(CONFIG_SOC_TX4938) += mem_tx4927.o setup_tx4938.o irq_tx4938.o | 9 | obj-$(CONFIG_SOC_TX4938) += mem_tx4927.o setup_tx4938.o irq_tx4938.o |
9 | obj-$(CONFIG_TOSHIBA_FPCIB0) += smsc_fdc37m81x.o | 10 | obj-$(CONFIG_TOSHIBA_FPCIB0) += smsc_fdc37m81x.o |
diff --git a/arch/mips/txx9/generic/irq_tx3927.c b/arch/mips/txx9/generic/irq_tx3927.c new file mode 100644 index 000000000000..c683f593eda2 --- /dev/null +++ b/arch/mips/txx9/generic/irq_tx3927.c | |||
@@ -0,0 +1,25 @@ | |||
1 | /* | ||
2 | * Common tx3927 irq handler | ||
3 | * | ||
4 | * This file is subject to the terms and conditions of the GNU General Public | ||
5 | * License. See the file "COPYING" in the main directory of this archive | ||
6 | * for more details. | ||
7 | * | ||
8 | * Copyright 2001 MontaVista Software Inc. | ||
9 | * Copyright (C) 2000-2001 Toshiba Corporation | ||
10 | */ | ||
11 | #include <linux/init.h> | ||
12 | #include <asm/txx9irq.h> | ||
13 | #include <asm/txx9/tx3927.h> | ||
14 | |||
15 | void __init tx3927_irq_init(void) | ||
16 | { | ||
17 | int i; | ||
18 | |||
19 | txx9_irq_init(TX3927_IRC_REG); | ||
20 | /* raise priority for timers, sio */ | ||
21 | for (i = 0; i < TX3927_NR_TMR; i++) | ||
22 | txx9_irq_set_pri(TX3927_IR_TMR(i), 6); | ||
23 | for (i = 0; i < TX3927_NR_SIO; i++) | ||
24 | txx9_irq_set_pri(TX3927_IR_SIO(i), 7); | ||
25 | } | ||
diff --git a/arch/mips/txx9/generic/setup_tx3927.c b/arch/mips/txx9/generic/setup_tx3927.c new file mode 100644 index 000000000000..0d09a0ff71e3 --- /dev/null +++ b/arch/mips/txx9/generic/setup_tx3927.c | |||
@@ -0,0 +1,141 @@ | |||
1 | /* | ||
2 | * TX3927 setup routines | ||
3 | * Based on linux/arch/mips/txx9/jmr3927/setup.c | ||
4 | * | ||
5 | * Copyright 2001 MontaVista Software Inc. | ||
6 | * Copyright (C) 2000-2001 Toshiba Corporation | ||
7 | * Copyright (C) 2007 Ralf Baechle (ralf@linux-mips.org) | ||
8 | * | ||
9 | * This file is subject to the terms and conditions of the GNU General Public | ||
10 | * License. See the file "COPYING" in the main directory of this archive | ||
11 | * for more details. | ||
12 | */ | ||
13 | #include <linux/init.h> | ||
14 | #include <linux/ioport.h> | ||
15 | #include <linux/delay.h> | ||
16 | #include <linux/serial_core.h> | ||
17 | #include <linux/param.h> | ||
18 | #include <asm/mipsregs.h> | ||
19 | #include <asm/txx9irq.h> | ||
20 | #include <asm/txx9tmr.h> | ||
21 | #include <asm/txx9pio.h> | ||
22 | #include <asm/txx9/generic.h> | ||
23 | #include <asm/txx9/tx3927.h> | ||
24 | |||
25 | void __init tx3927_wdt_init(void) | ||
26 | { | ||
27 | txx9_wdt_init(TX3927_TMR_REG(2)); | ||
28 | } | ||
29 | |||
30 | void __init tx3927_setup(void) | ||
31 | { | ||
32 | int i; | ||
33 | unsigned int conf; | ||
34 | |||
35 | /* don't enable - see errata */ | ||
36 | txx9_ccfg_toeon = 0; | ||
37 | if (strstr(prom_getcmdline(), "toeon") != NULL) | ||
38 | txx9_ccfg_toeon = 1; | ||
39 | |||
40 | txx9_reg_res_init(TX3927_REV_PCODE(), TX3927_REG_BASE, | ||
41 | TX3927_REG_SIZE); | ||
42 | |||
43 | /* SDRAMC,ROMC are configured by PROM */ | ||
44 | for (i = 0; i < 8; i++) { | ||
45 | if (!(tx3927_romcptr->cr[i] & 0x8)) | ||
46 | continue; /* disabled */ | ||
47 | txx9_ce_res[i].start = (unsigned long)TX3927_ROMC_BA(i); | ||
48 | txx9_ce_res[i].end = | ||
49 | txx9_ce_res[i].start + TX3927_ROMC_SIZE(i) - 1; | ||
50 | request_resource(&iomem_resource, &txx9_ce_res[i]); | ||
51 | } | ||
52 | |||
53 | /* clocks */ | ||
54 | txx9_gbus_clock = txx9_cpu_clock / 2; | ||
55 | /* change default value to udelay/mdelay take reasonable time */ | ||
56 | loops_per_jiffy = txx9_cpu_clock / HZ / 2; | ||
57 | |||
58 | /* CCFG */ | ||
59 | /* enable Timeout BusError */ | ||
60 | if (txx9_ccfg_toeon) | ||
61 | tx3927_ccfgptr->ccfg |= TX3927_CCFG_TOE; | ||
62 | |||
63 | /* clear BusErrorOnWrite flag */ | ||
64 | tx3927_ccfgptr->ccfg &= ~TX3927_CCFG_BEOW; | ||
65 | if (read_c0_conf() & TX39_CONF_WBON) | ||
66 | /* Disable PCI snoop */ | ||
67 | tx3927_ccfgptr->ccfg &= ~TX3927_CCFG_PSNP; | ||
68 | else | ||
69 | /* Enable PCI SNOOP - with write through only */ | ||
70 | tx3927_ccfgptr->ccfg |= TX3927_CCFG_PSNP; | ||
71 | /* do reset on watchdog */ | ||
72 | tx3927_ccfgptr->ccfg |= TX3927_CCFG_WR; | ||
73 | |||
74 | printk(KERN_INFO "TX3927 -- CRIR:%08lx CCFG:%08lx PCFG:%08lx\n", | ||
75 | tx3927_ccfgptr->crir, | ||
76 | tx3927_ccfgptr->ccfg, tx3927_ccfgptr->pcfg); | ||
77 | |||
78 | /* TMR */ | ||
79 | for (i = 0; i < TX3927_NR_TMR; i++) | ||
80 | txx9_tmr_init(TX3927_TMR_REG(i)); | ||
81 | |||
82 | /* DMA */ | ||
83 | tx3927_dmaptr->mcr = 0; | ||
84 | for (i = 0; i < ARRAY_SIZE(tx3927_dmaptr->ch); i++) { | ||
85 | /* reset channel */ | ||
86 | tx3927_dmaptr->ch[i].ccr = TX3927_DMA_CCR_CHRST; | ||
87 | tx3927_dmaptr->ch[i].ccr = 0; | ||
88 | } | ||
89 | /* enable DMA */ | ||
90 | #ifdef __BIG_ENDIAN | ||
91 | tx3927_dmaptr->mcr = TX3927_DMA_MCR_MSTEN; | ||
92 | #else | ||
93 | tx3927_dmaptr->mcr = TX3927_DMA_MCR_MSTEN | TX3927_DMA_MCR_LE; | ||
94 | #endif | ||
95 | |||
96 | /* PIO */ | ||
97 | __raw_writel(0, &tx3927_pioptr->maskcpu); | ||
98 | __raw_writel(0, &tx3927_pioptr->maskext); | ||
99 | txx9_gpio_init(TX3927_PIO_REG, 0, 16); | ||
100 | |||
101 | conf = read_c0_conf(); | ||
102 | if (!(conf & TX39_CONF_ICE)) | ||
103 | printk(KERN_INFO "TX3927 I-Cache disabled.\n"); | ||
104 | if (!(conf & TX39_CONF_DCE)) | ||
105 | printk(KERN_INFO "TX3927 D-Cache disabled.\n"); | ||
106 | else if (!(conf & TX39_CONF_WBON)) | ||
107 | printk(KERN_INFO "TX3927 D-Cache WriteThrough.\n"); | ||
108 | else if (!(conf & TX39_CONF_CWFON)) | ||
109 | printk(KERN_INFO "TX3927 D-Cache WriteBack.\n"); | ||
110 | else | ||
111 | printk(KERN_INFO "TX3927 D-Cache WriteBack (CWF) .\n"); | ||
112 | } | ||
113 | |||
114 | void __init tx3927_time_init(unsigned int evt_tmrnr, unsigned int src_tmrnr) | ||
115 | { | ||
116 | txx9_clockevent_init(TX3927_TMR_REG(evt_tmrnr), | ||
117 | TXX9_IRQ_BASE + TX3927_IR_TMR(evt_tmrnr), | ||
118 | TXX9_IMCLK); | ||
119 | txx9_clocksource_init(TX3927_TMR_REG(src_tmrnr), TXX9_IMCLK); | ||
120 | } | ||
121 | |||
122 | void __init tx3927_setup_serial(unsigned int cts_mask) | ||
123 | { | ||
124 | #ifdef CONFIG_SERIAL_TXX9 | ||
125 | int i; | ||
126 | struct uart_port req; | ||
127 | |||
128 | for (i = 0; i < 2; i++) { | ||
129 | memset(&req, 0, sizeof(req)); | ||
130 | req.line = i; | ||
131 | req.iotype = UPIO_MEM; | ||
132 | req.membase = (unsigned char __iomem *)TX3927_SIO_REG(i); | ||
133 | req.mapbase = TX3927_SIO_REG(i); | ||
134 | req.irq = TXX9_IRQ_BASE + TX3927_IR_SIO(i); | ||
135 | if (!((1 << i) & cts_mask)) | ||
136 | req.flags |= UPF_BUGGY_UART /*HAVE_CTS_LINE*/; | ||
137 | req.uartclk = TXX9_IMCLK; | ||
138 | early_serial_txx9_setup(&req); | ||
139 | } | ||
140 | #endif /* CONFIG_SERIAL_TXX9 */ | ||
141 | } | ||
diff --git a/arch/mips/txx9/jmr3927/irq.c b/arch/mips/txx9/jmr3927/irq.c index f3b60233e99d..68f74368ddec 100644 --- a/arch/mips/txx9/jmr3927/irq.c +++ b/arch/mips/txx9/jmr3927/irq.c | |||
@@ -46,13 +46,6 @@ | |||
46 | #error JMR3927_IRQ_END > NR_IRQS | 46 | #error JMR3927_IRQ_END > NR_IRQS |
47 | #endif | 47 | #endif |
48 | 48 | ||
49 | static unsigned char irc_level[TX3927_NUM_IR] = { | ||
50 | 5, 5, 5, 5, 5, 5, /* INT[5:0] */ | ||
51 | 7, 7, /* SIO */ | ||
52 | 5, 5, 5, 0, 0, /* DMA, PIO, PCI */ | ||
53 | 6, 6, 6 /* TMR */ | ||
54 | }; | ||
55 | |||
56 | /* | 49 | /* |
57 | * CP0_STATUS is a thread's resource (saved/restored on context switch). | 50 | * CP0_STATUS is a thread's resource (saved/restored on context switch). |
58 | * So disable_irq/enable_irq MUST handle IOC/IRC registers. | 51 | * So disable_irq/enable_irq MUST handle IOC/IRC registers. |
@@ -103,10 +96,18 @@ static int jmr3927_irq_dispatch(int pending) | |||
103 | return irq; | 96 | return irq; |
104 | } | 97 | } |
105 | 98 | ||
106 | static void __init jmr3927_irq_init(void); | 99 | static struct irq_chip jmr3927_irq_ioc = { |
100 | .name = "jmr3927_ioc", | ||
101 | .ack = mask_irq_ioc, | ||
102 | .mask = mask_irq_ioc, | ||
103 | .mask_ack = mask_irq_ioc, | ||
104 | .unmask = unmask_irq_ioc, | ||
105 | }; | ||
107 | 106 | ||
108 | void __init jmr3927_irq_setup(void) | 107 | void __init jmr3927_irq_setup(void) |
109 | { | 108 | { |
109 | int i; | ||
110 | |||
110 | txx9_irq_dispatch = jmr3927_irq_dispatch; | 111 | txx9_irq_dispatch = jmr3927_irq_dispatch; |
111 | /* Now, interrupt control disabled, */ | 112 | /* Now, interrupt control disabled, */ |
112 | /* all IRC interrupts are masked, */ | 113 | /* all IRC interrupts are masked, */ |
@@ -122,30 +123,10 @@ void __init jmr3927_irq_setup(void) | |||
122 | /* clear PCI Reset interrupts */ | 123 | /* clear PCI Reset interrupts */ |
123 | jmr3927_ioc_reg_out(0, JMR3927_IOC_RESET_ADDR); | 124 | jmr3927_ioc_reg_out(0, JMR3927_IOC_RESET_ADDR); |
124 | 125 | ||
125 | jmr3927_irq_init(); | 126 | tx3927_irq_init(); |
127 | for (i = JMR3927_IRQ_IOC; i < JMR3927_IRQ_IOC + JMR3927_NR_IRQ_IOC; i++) | ||
128 | set_irq_chip_and_handler(i, &jmr3927_irq_ioc, handle_level_irq); | ||
126 | 129 | ||
127 | /* setup IOC interrupt 1 (PCI, MODEM) */ | 130 | /* setup IOC interrupt 1 (PCI, MODEM) */ |
128 | set_irq_chained_handler(JMR3927_IRQ_IOCINT, handle_simple_irq); | 131 | set_irq_chained_handler(JMR3927_IRQ_IOCINT, handle_simple_irq); |
129 | |||
130 | /* enable all CPU interrupt bits. */ | ||
131 | set_c0_status(ST0_IM); /* IE bit is still 0. */ | ||
132 | } | ||
133 | |||
134 | static struct irq_chip jmr3927_irq_ioc = { | ||
135 | .name = "jmr3927_ioc", | ||
136 | .ack = mask_irq_ioc, | ||
137 | .mask = mask_irq_ioc, | ||
138 | .mask_ack = mask_irq_ioc, | ||
139 | .unmask = unmask_irq_ioc, | ||
140 | }; | ||
141 | |||
142 | static void __init jmr3927_irq_init(void) | ||
143 | { | ||
144 | u32 i; | ||
145 | |||
146 | txx9_irq_init(TX3927_IRC_REG); | ||
147 | for (i = 0; i < TXx9_MAX_IR; i++) | ||
148 | txx9_irq_set_pri(i, irc_level[i]); | ||
149 | for (i = JMR3927_IRQ_IOC; i < JMR3927_IRQ_IOC + JMR3927_NR_IRQ_IOC; i++) | ||
150 | set_irq_chip_and_handler(i, &jmr3927_irq_ioc, handle_level_irq); | ||
151 | } | 132 | } |
diff --git a/arch/mips/txx9/jmr3927/setup.c b/arch/mips/txx9/jmr3927/setup.c index ae34e9a4a8ac..7378a835d4e3 100644 --- a/arch/mips/txx9/jmr3927/setup.c +++ b/arch/mips/txx9/jmr3927/setup.c | |||
@@ -34,20 +34,13 @@ | |||
34 | #include <linux/delay.h> | 34 | #include <linux/delay.h> |
35 | #include <linux/platform_device.h> | 35 | #include <linux/platform_device.h> |
36 | #include <linux/gpio.h> | 36 | #include <linux/gpio.h> |
37 | #ifdef CONFIG_SERIAL_TXX9 | ||
38 | #include <linux/serial_core.h> | ||
39 | #endif | ||
40 | #include <asm/txx9tmr.h> | ||
41 | #include <asm/txx9pio.h> | ||
42 | #include <asm/reboot.h> | 37 | #include <asm/reboot.h> |
38 | #include <asm/txx9pio.h> | ||
43 | #include <asm/txx9/generic.h> | 39 | #include <asm/txx9/generic.h> |
44 | #include <asm/txx9/pci.h> | 40 | #include <asm/txx9/pci.h> |
45 | #include <asm/txx9/jmr3927.h> | 41 | #include <asm/txx9/jmr3927.h> |
46 | #include <asm/mipsregs.h> | 42 | #include <asm/mipsregs.h> |
47 | 43 | ||
48 | /* don't enable - see errata */ | ||
49 | static int jmr3927_ccfg_toeon; | ||
50 | |||
51 | static void jmr3927_machine_restart(char *command) | 44 | static void jmr3927_machine_restart(char *command) |
52 | { | 45 | { |
53 | local_irq_disable(); | 46 | local_irq_disable(); |
@@ -65,10 +58,7 @@ static void jmr3927_machine_restart(char *command) | |||
65 | 58 | ||
66 | static void __init jmr3927_time_init(void) | 59 | static void __init jmr3927_time_init(void) |
67 | { | 60 | { |
68 | txx9_clockevent_init(TX3927_TMR_REG(0), | 61 | tx3927_time_init(0, 1); |
69 | JMR3927_IRQ_IRC_TMR(0), | ||
70 | JMR3927_IMCLK); | ||
71 | txx9_clocksource_init(TX3927_TMR_REG(1), JMR3927_IMCLK); | ||
72 | } | 62 | } |
73 | 63 | ||
74 | #define DO_WRITE_THROUGH | 64 | #define DO_WRITE_THROUGH |
@@ -118,34 +108,12 @@ static void __init jmr3927_mem_setup(void) | |||
118 | jmr3927_board_init(); | 108 | jmr3927_board_init(); |
119 | 109 | ||
120 | argptr = prom_getcmdline(); | 110 | argptr = prom_getcmdline(); |
121 | |||
122 | if ((argptr = strstr(argptr, "toeon")) != NULL) | ||
123 | jmr3927_ccfg_toeon = 1; | ||
124 | argptr = prom_getcmdline(); | ||
125 | if ((argptr = strstr(argptr, "ip=")) == NULL) { | 111 | if ((argptr = strstr(argptr, "ip=")) == NULL) { |
126 | argptr = prom_getcmdline(); | 112 | argptr = prom_getcmdline(); |
127 | strcat(argptr, " ip=bootp"); | 113 | strcat(argptr, " ip=bootp"); |
128 | } | 114 | } |
129 | 115 | ||
130 | #ifdef CONFIG_SERIAL_TXX9 | 116 | tx3927_setup_serial(1 << 1); /* ch1: noCTS */ |
131 | { | ||
132 | extern int early_serial_txx9_setup(struct uart_port *port); | ||
133 | int i; | ||
134 | struct uart_port req; | ||
135 | for(i = 0; i < 2; i++) { | ||
136 | memset(&req, 0, sizeof(req)); | ||
137 | req.line = i; | ||
138 | req.iotype = UPIO_MEM; | ||
139 | req.membase = (unsigned char __iomem *)TX3927_SIO_REG(i); | ||
140 | req.mapbase = TX3927_SIO_REG(i); | ||
141 | req.irq = i == 0 ? | ||
142 | JMR3927_IRQ_IRC_SIO0 : JMR3927_IRQ_IRC_SIO1; | ||
143 | if (i == 0) | ||
144 | req.flags |= UPF_BUGGY_UART /*HAVE_CTS_LINE*/; | ||
145 | req.uartclk = JMR3927_IMCLK; | ||
146 | early_serial_txx9_setup(&req); | ||
147 | } | ||
148 | } | ||
149 | #ifdef CONFIG_SERIAL_TXX9_CONSOLE | 117 | #ifdef CONFIG_SERIAL_TXX9_CONSOLE |
150 | argptr = prom_getcmdline(); | 118 | argptr = prom_getcmdline(); |
151 | if ((argptr = strstr(argptr, "console=")) == NULL) { | 119 | if ((argptr = strstr(argptr, "console=")) == NULL) { |
@@ -153,11 +121,8 @@ static void __init jmr3927_mem_setup(void) | |||
153 | strcat(argptr, " console=ttyS1,115200"); | 121 | strcat(argptr, " console=ttyS1,115200"); |
154 | } | 122 | } |
155 | #endif | 123 | #endif |
156 | #endif | ||
157 | } | 124 | } |
158 | 125 | ||
159 | static void tx3927_setup(void); | ||
160 | |||
161 | static void __init jmr3927_pci_setup(void) | 126 | static void __init jmr3927_pci_setup(void) |
162 | { | 127 | { |
163 | #ifdef CONFIG_PCI | 128 | #ifdef CONFIG_PCI |
@@ -184,27 +149,7 @@ static void __init jmr3927_pci_setup(void) | |||
184 | 149 | ||
185 | static void __init jmr3927_board_init(void) | 150 | static void __init jmr3927_board_init(void) |
186 | { | 151 | { |
187 | tx3927_setup(); | ||
188 | jmr3927_pci_setup(); | ||
189 | |||
190 | /* SIO0 DTR on */ | ||
191 | jmr3927_ioc_reg_out(0, JMR3927_IOC_DTR_ADDR); | ||
192 | |||
193 | jmr3927_led_set(0); | ||
194 | |||
195 | printk("JMR-TX3927 (Rev %d) --- IOC(Rev %d) DIPSW:%d,%d,%d,%d\n", | ||
196 | jmr3927_ioc_reg_in(JMR3927_IOC_BREV_ADDR) & JMR3927_REV_MASK, | ||
197 | jmr3927_ioc_reg_in(JMR3927_IOC_REV_ADDR) & JMR3927_REV_MASK, | ||
198 | jmr3927_dipsw1(), jmr3927_dipsw2(), | ||
199 | jmr3927_dipsw3(), jmr3927_dipsw4()); | ||
200 | } | ||
201 | |||
202 | static void __init tx3927_setup(void) | ||
203 | { | ||
204 | int i; | ||
205 | |||
206 | txx9_cpu_clock = JMR3927_CORECLK; | 152 | txx9_cpu_clock = JMR3927_CORECLK; |
207 | txx9_gbus_clock = JMR3927_GBUSCLK; | ||
208 | /* SDRAMC are configured by PROM */ | 153 | /* SDRAMC are configured by PROM */ |
209 | 154 | ||
210 | /* ROMC */ | 155 | /* ROMC */ |
@@ -213,74 +158,32 @@ static void __init tx3927_setup(void) | |||
213 | tx3927_romcptr->cr[3] = JMR3927_ROMCE3 | 0x0003f698; | 158 | tx3927_romcptr->cr[3] = JMR3927_ROMCE3 | 0x0003f698; |
214 | tx3927_romcptr->cr[5] = JMR3927_ROMCE5 | 0x0000f218; | 159 | tx3927_romcptr->cr[5] = JMR3927_ROMCE5 | 0x0000f218; |
215 | 160 | ||
216 | /* CCFG */ | ||
217 | /* enable Timeout BusError */ | ||
218 | if (jmr3927_ccfg_toeon) | ||
219 | tx3927_ccfgptr->ccfg |= TX3927_CCFG_TOE; | ||
220 | |||
221 | /* clear BusErrorOnWrite flag */ | ||
222 | tx3927_ccfgptr->ccfg &= ~TX3927_CCFG_BEOW; | ||
223 | /* Disable PCI snoop */ | ||
224 | tx3927_ccfgptr->ccfg &= ~TX3927_CCFG_PSNP; | ||
225 | /* do reset on watchdog */ | ||
226 | tx3927_ccfgptr->ccfg |= TX3927_CCFG_WR; | ||
227 | |||
228 | #ifdef DO_WRITE_THROUGH | ||
229 | /* Enable PCI SNOOP - with write through only */ | ||
230 | tx3927_ccfgptr->ccfg |= TX3927_CCFG_PSNP; | ||
231 | #endif | ||
232 | |||
233 | /* Pin selection */ | 161 | /* Pin selection */ |
234 | tx3927_ccfgptr->pcfg &= ~TX3927_PCFG_SELALL; | 162 | tx3927_ccfgptr->pcfg &= ~TX3927_PCFG_SELALL; |
235 | tx3927_ccfgptr->pcfg |= | 163 | tx3927_ccfgptr->pcfg |= |
236 | TX3927_PCFG_SELSIOC(0) | TX3927_PCFG_SELSIO_ALL | | 164 | TX3927_PCFG_SELSIOC(0) | TX3927_PCFG_SELSIO_ALL | |
237 | (TX3927_PCFG_SELDMA_ALL & ~TX3927_PCFG_SELDMA(1)); | 165 | (TX3927_PCFG_SELDMA_ALL & ~TX3927_PCFG_SELDMA(1)); |
238 | 166 | ||
239 | printk("TX3927 -- CRIR:%08lx CCFG:%08lx PCFG:%08lx\n", | 167 | tx3927_setup(); |
240 | tx3927_ccfgptr->crir, | ||
241 | tx3927_ccfgptr->ccfg, tx3927_ccfgptr->pcfg); | ||
242 | |||
243 | /* TMR */ | ||
244 | for (i = 0; i < TX3927_NR_TMR; i++) | ||
245 | txx9_tmr_init(TX3927_TMR_REG(i)); | ||
246 | |||
247 | /* DMA */ | ||
248 | tx3927_dmaptr->mcr = 0; | ||
249 | for (i = 0; i < ARRAY_SIZE(tx3927_dmaptr->ch); i++) { | ||
250 | /* reset channel */ | ||
251 | tx3927_dmaptr->ch[i].ccr = TX3927_DMA_CCR_CHRST; | ||
252 | tx3927_dmaptr->ch[i].ccr = 0; | ||
253 | } | ||
254 | /* enable DMA */ | ||
255 | #ifdef __BIG_ENDIAN | ||
256 | tx3927_dmaptr->mcr = TX3927_DMA_MCR_MSTEN; | ||
257 | #else | ||
258 | tx3927_dmaptr->mcr = TX3927_DMA_MCR_MSTEN | TX3927_DMA_MCR_LE; | ||
259 | #endif | ||
260 | 168 | ||
261 | /* PIO */ | ||
262 | /* PIO[15:12] connected to LEDs */ | 169 | /* PIO[15:12] connected to LEDs */ |
263 | __raw_writel(0x0000f000, &tx3927_pioptr->dir); | 170 | __raw_writel(0x0000f000, &tx3927_pioptr->dir); |
264 | __raw_writel(0, &tx3927_pioptr->maskcpu); | ||
265 | __raw_writel(0, &tx3927_pioptr->maskext); | ||
266 | txx9_gpio_init(TX3927_PIO_REG, 0, 16); | ||
267 | gpio_request(11, "dipsw1"); | 171 | gpio_request(11, "dipsw1"); |
268 | gpio_request(10, "dipsw2"); | 172 | gpio_request(10, "dipsw2"); |
269 | { | ||
270 | unsigned int conf; | ||
271 | 173 | ||
272 | conf = read_c0_conf(); | 174 | jmr3927_pci_setup(); |
273 | if (!(conf & TX39_CONF_ICE)) | 175 | |
274 | printk("TX3927 I-Cache disabled.\n"); | 176 | /* SIO0 DTR on */ |
275 | if (!(conf & TX39_CONF_DCE)) | 177 | jmr3927_ioc_reg_out(0, JMR3927_IOC_DTR_ADDR); |
276 | printk("TX3927 D-Cache disabled.\n"); | 178 | |
277 | else if (!(conf & TX39_CONF_WBON)) | 179 | jmr3927_led_set(0); |
278 | printk("TX3927 D-Cache WriteThrough.\n"); | 180 | |
279 | else if (!(conf & TX39_CONF_CWFON)) | 181 | printk(KERN_INFO |
280 | printk("TX3927 D-Cache WriteBack.\n"); | 182 | "JMR-TX3927 (Rev %d) --- IOC(Rev %d) DIPSW:%d,%d,%d,%d\n", |
281 | else | 183 | jmr3927_ioc_reg_in(JMR3927_IOC_BREV_ADDR) & JMR3927_REV_MASK, |
282 | printk("TX3927 D-Cache WriteBack (CWF) .\n"); | 184 | jmr3927_ioc_reg_in(JMR3927_IOC_REV_ADDR) & JMR3927_REV_MASK, |
283 | } | 185 | jmr3927_dipsw1(), jmr3927_dipsw2(), |
186 | jmr3927_dipsw3(), jmr3927_dipsw4()); | ||
284 | } | 187 | } |
285 | 188 | ||
286 | /* This trick makes rtc-ds1742 driver usable as is. */ | 189 | /* This trick makes rtc-ds1742 driver usable as is. */ |
@@ -308,11 +211,6 @@ static int __init jmr3927_rtc_init(void) | |||
308 | return IS_ERR(dev) ? PTR_ERR(dev) : 0; | 211 | return IS_ERR(dev) ? PTR_ERR(dev) : 0; |
309 | } | 212 | } |
310 | 213 | ||
311 | static void __init tx3927_wdt_init(void) | ||
312 | { | ||
313 | txx9_wdt_init(TX3927_TMR_REG(2)); | ||
314 | } | ||
315 | |||
316 | static void __init jmr3927_device_init(void) | 214 | static void __init jmr3927_device_init(void) |
317 | { | 215 | { |
318 | __swizzle_addr_b = jmr3927_swizzle_addr_b; | 216 | __swizzle_addr_b = jmr3927_swizzle_addr_b; |
diff --git a/include/asm-mips/txx9/jmr3927.h b/include/asm-mips/txx9/jmr3927.h index d6eb1b6a54eb..a409c446bf18 100644 --- a/include/asm-mips/txx9/jmr3927.h +++ b/include/asm-mips/txx9/jmr3927.h | |||
@@ -149,8 +149,6 @@ | |||
149 | 149 | ||
150 | /* Clocks */ | 150 | /* Clocks */ |
151 | #define JMR3927_CORECLK 132710400 /* 132.7MHz */ | 151 | #define JMR3927_CORECLK 132710400 /* 132.7MHz */ |
152 | #define JMR3927_GBUSCLK (JMR3927_CORECLK / 2) /* 66.35MHz */ | ||
153 | #define JMR3927_IMCLK (JMR3927_CORECLK / 4) /* 33.17MHz */ | ||
154 | 152 | ||
155 | /* | 153 | /* |
156 | * TX3927 Pin Configuration: | 154 | * TX3927 Pin Configuration: |
diff --git a/include/asm-mips/txx9/tx3927.h b/include/asm-mips/txx9/tx3927.h index 8d62b1ba2c14..0bac37f758ec 100644 --- a/include/asm-mips/txx9/tx3927.h +++ b/include/asm-mips/txx9/tx3927.h | |||
@@ -11,6 +11,7 @@ | |||
11 | #include <asm/txx9/txx927.h> | 11 | #include <asm/txx9/txx927.h> |
12 | 12 | ||
13 | #define TX3927_REG_BASE 0xfffe0000UL | 13 | #define TX3927_REG_BASE 0xfffe0000UL |
14 | #define TX3927_REG_SIZE 0x00010000 | ||
14 | #define TX3927_SDRAMC_REG (TX3927_REG_BASE + 0x8000) | 15 | #define TX3927_SDRAMC_REG (TX3927_REG_BASE + 0x8000) |
15 | #define TX3927_ROMC_REG (TX3927_REG_BASE + 0x9000) | 16 | #define TX3927_ROMC_REG (TX3927_REG_BASE + 0x9000) |
16 | #define TX3927_DMA_REG (TX3927_REG_BASE + 0xb000) | 17 | #define TX3927_DMA_REG (TX3927_REG_BASE + 0xb000) |
@@ -319,13 +320,22 @@ struct tx3927_ccfg_reg { | |||
319 | #define tx3927_dmaptr ((struct tx3927_dma_reg *)TX3927_DMA_REG) | 320 | #define tx3927_dmaptr ((struct tx3927_dma_reg *)TX3927_DMA_REG) |
320 | #define tx3927_pcicptr ((struct tx3927_pcic_reg *)TX3927_PCIC_REG) | 321 | #define tx3927_pcicptr ((struct tx3927_pcic_reg *)TX3927_PCIC_REG) |
321 | #define tx3927_ccfgptr ((struct tx3927_ccfg_reg *)TX3927_CCFG_REG) | 322 | #define tx3927_ccfgptr ((struct tx3927_ccfg_reg *)TX3927_CCFG_REG) |
322 | #define tx3927_tmrptr(ch) ((struct txx927_tmr_reg *)TX3927_TMR_REG(ch)) | ||
323 | #define tx3927_sioptr(ch) ((struct txx927_sio_reg *)TX3927_SIO_REG(ch)) | 323 | #define tx3927_sioptr(ch) ((struct txx927_sio_reg *)TX3927_SIO_REG(ch)) |
324 | #define tx3927_pioptr ((struct txx9_pio_reg __iomem *)TX3927_PIO_REG) | 324 | #define tx3927_pioptr ((struct txx9_pio_reg __iomem *)TX3927_PIO_REG) |
325 | 325 | ||
326 | #define TX3927_REV_PCODE() (tx3927_ccfgptr->crir >> 16) | ||
327 | #define TX3927_ROMC_BA(ch) (tx3927_romcptr->cr[(ch)] & 0xfff00000) | ||
328 | #define TX3927_ROMC_SIZE(ch) \ | ||
329 | (0x00100000 << ((tx3927_romcptr->cr[(ch)] >> 8) & 0xf)) | ||
330 | |||
331 | void tx3927_wdt_init(void); | ||
332 | void tx3927_setup(void); | ||
333 | void tx3927_time_init(unsigned int evt_tmrnr, unsigned int src_tmrnr); | ||
334 | void tx3927_setup_serial(unsigned int cts_mask); | ||
326 | struct pci_controller; | 335 | struct pci_controller; |
327 | void __init tx3927_pcic_setup(struct pci_controller *channel, | 336 | void __init tx3927_pcic_setup(struct pci_controller *channel, |
328 | unsigned long sdram_size, int extarb); | 337 | unsigned long sdram_size, int extarb); |
329 | void tx3927_setup_pcierr_irq(void); | 338 | void tx3927_setup_pcierr_irq(void); |
339 | void tx3927_irq_init(void); | ||
330 | 340 | ||
331 | #endif /* __ASM_TXX9_TX3927_H */ | 341 | #endif /* __ASM_TXX9_TX3927_H */ |