diff options
Diffstat (limited to 'arch')
-rw-r--r-- | arch/mips/Makefile | 6 | ||||
-rw-r--r-- | arch/mips/pci/Makefile | 1 | ||||
-rw-r--r-- | arch/mips/pci/fixup-vr4133.c | 194 | ||||
-rw-r--r-- | arch/mips/vr41xx/Kconfig | 17 | ||||
-rw-r--r-- | arch/mips/vr41xx/nec-cmbvr4133/Makefile | 8 | ||||
-rw-r--r-- | arch/mips/vr41xx/nec-cmbvr4133/init.c | 65 | ||||
-rw-r--r-- | arch/mips/vr41xx/nec-cmbvr4133/irq.c | 46 | ||||
-rw-r--r-- | arch/mips/vr41xx/nec-cmbvr4133/m1535plus.c | 249 | ||||
-rw-r--r-- | arch/mips/vr41xx/nec-cmbvr4133/setup.c | 89 |
9 files changed, 0 insertions, 675 deletions
diff --git a/arch/mips/Makefile b/arch/mips/Makefile index d319cd624135..c4a3098a58c6 100644 --- a/arch/mips/Makefile +++ b/arch/mips/Makefile | |||
@@ -355,12 +355,6 @@ core-$(CONFIG_MACH_VR41XX) += arch/mips/vr41xx/common/ | |||
355 | cflags-$(CONFIG_MACH_VR41XX) += -Iinclude/asm-mips/mach-vr41xx | 355 | cflags-$(CONFIG_MACH_VR41XX) += -Iinclude/asm-mips/mach-vr41xx |
356 | 356 | ||
357 | # | 357 | # |
358 | # NEC VR4133 | ||
359 | # | ||
360 | core-$(CONFIG_NEC_CMBVR4133) += arch/mips/vr41xx/nec-cmbvr4133/ | ||
361 | load-$(CONFIG_NEC_CMBVR4133) += 0xffffffff80100000 | ||
362 | |||
363 | # | ||
364 | # ZAO Networks Capcella (VR4131) | 358 | # ZAO Networks Capcella (VR4131) |
365 | # | 359 | # |
366 | load-$(CONFIG_ZAO_CAPCELLA) += 0xffffffff80000000 | 360 | load-$(CONFIG_ZAO_CAPCELLA) += 0xffffffff80000000 |
diff --git a/arch/mips/pci/Makefile b/arch/mips/pci/Makefile index 875b643438c0..57e34cafa497 100644 --- a/arch/mips/pci/Makefile +++ b/arch/mips/pci/Makefile | |||
@@ -13,7 +13,6 @@ obj-$(CONFIG_MIPS_MSC) += ops-msc.o | |||
13 | obj-$(CONFIG_MIPS_NILE4) += ops-nile4.o | 13 | obj-$(CONFIG_MIPS_NILE4) += ops-nile4.o |
14 | obj-$(CONFIG_SOC_TX3927) += ops-tx3927.o | 14 | obj-$(CONFIG_SOC_TX3927) += ops-tx3927.o |
15 | obj-$(CONFIG_PCI_VR41XX) += ops-vr41xx.o pci-vr41xx.o | 15 | obj-$(CONFIG_PCI_VR41XX) += ops-vr41xx.o pci-vr41xx.o |
16 | obj-$(CONFIG_NEC_CMBVR4133) += fixup-vr4133.o | ||
17 | obj-$(CONFIG_MARKEINS) += ops-emma2rh.o pci-emma2rh.o fixup-emma2rh.o | 16 | obj-$(CONFIG_MARKEINS) += ops-emma2rh.o pci-emma2rh.o fixup-emma2rh.o |
18 | obj-$(CONFIG_PCI_TX4927) += ops-tx4927.o | 17 | obj-$(CONFIG_PCI_TX4927) += ops-tx4927.o |
19 | 18 | ||
diff --git a/arch/mips/pci/fixup-vr4133.c b/arch/mips/pci/fixup-vr4133.c deleted file mode 100644 index 34e651bd2b5e..000000000000 --- a/arch/mips/pci/fixup-vr4133.c +++ /dev/null | |||
@@ -1,194 +0,0 @@ | |||
1 | /* | ||
2 | * arch/mips/pci/fixup-vr4133.c | ||
3 | * | ||
4 | * The NEC CMB-VR4133 Board specific PCI fixups. | ||
5 | * | ||
6 | * Author: Yoichi Yuasa <yyuasa@mvista.com, or source@mvista.com> and | ||
7 | * Alex Sapkov <asapkov@ru.mvista.com> | ||
8 | * | ||
9 | * 2003-2004 (c) MontaVista, Software, Inc. This file is licensed under | ||
10 | * the terms of the GNU General Public License version 2. This program | ||
11 | * is licensed "as is" without any warranty of any kind, whether express | ||
12 | * or implied. | ||
13 | * | ||
14 | * Modified for support in 2.6 | ||
15 | * Author: Manish Lachwani (mlachwani@mvista.com) | ||
16 | * | ||
17 | */ | ||
18 | #include <linux/init.h> | ||
19 | #include <linux/pci.h> | ||
20 | #include <linux/kernel.h> | ||
21 | |||
22 | #include <asm/io.h> | ||
23 | #include <asm/i8259.h> | ||
24 | #include <asm/vr41xx/cmbvr4133.h> | ||
25 | |||
26 | extern int vr4133_rockhopper; | ||
27 | extern void ali_m1535plus_init(struct pci_dev *dev); | ||
28 | extern void ali_m5229_init(struct pci_dev *dev); | ||
29 | |||
30 | /* Do platform specific device initialization at pci_enable_device() time */ | ||
31 | int pcibios_plat_dev_init(struct pci_dev *dev) | ||
32 | { | ||
33 | /* | ||
34 | * We have to reset AMD PCnet adapter on Rockhopper since | ||
35 | * PMON leaves it enabled and generating interrupts. This leads | ||
36 | * to a lock if some PCI device driver later enables the IRQ line | ||
37 | * shared with PCnet and there is no AMD PCnet driver to catch its | ||
38 | * interrupts. | ||
39 | */ | ||
40 | #ifdef CONFIG_ROCKHOPPER | ||
41 | if (dev->vendor == PCI_VENDOR_ID_AMD && | ||
42 | dev->device == PCI_DEVICE_ID_AMD_LANCE) { | ||
43 | inl(pci_resource_start(dev, 0) + 0x18); | ||
44 | } | ||
45 | #endif | ||
46 | |||
47 | /* | ||
48 | * we have to open the bridges' windows down to 0 because otherwise | ||
49 | * we cannot access ISA south bridge I/O registers that get mapped from | ||
50 | * 0. for example, 8259 PIC would be unaccessible without that | ||
51 | */ | ||
52 | if(dev->vendor == PCI_VENDOR_ID_INTEL && dev->device == PCI_DEVICE_ID_INTEL_S21152BB) { | ||
53 | pci_write_config_byte(dev, PCI_IO_BASE, 0); | ||
54 | if(dev->bus->number == 0) { | ||
55 | pci_write_config_word(dev, PCI_IO_BASE_UPPER16, 0); | ||
56 | } else { | ||
57 | pci_write_config_word(dev, PCI_IO_BASE_UPPER16, 1); | ||
58 | } | ||
59 | } | ||
60 | |||
61 | return 0; | ||
62 | } | ||
63 | |||
64 | /* | ||
65 | * M1535 IRQ mapping | ||
66 | * Feel free to change this, although it shouldn't be needed | ||
67 | */ | ||
68 | #define M1535_IRQ_INTA 7 | ||
69 | #define M1535_IRQ_INTB 9 | ||
70 | #define M1535_IRQ_INTC 10 | ||
71 | #define M1535_IRQ_INTD 11 | ||
72 | |||
73 | #define M1535_IRQ_USB 9 | ||
74 | #define M1535_IRQ_IDE 14 | ||
75 | #define M1535_IRQ_IDE2 15 | ||
76 | #define M1535_IRQ_PS2 12 | ||
77 | #define M1535_IRQ_RTC 8 | ||
78 | #define M1535_IRQ_FDC 6 | ||
79 | #define M1535_IRQ_AUDIO 5 | ||
80 | #define M1535_IRQ_COM1 4 | ||
81 | #define M1535_IRQ_COM2 4 | ||
82 | #define M1535_IRQ_IRDA 3 | ||
83 | #define M1535_IRQ_KBD 1 | ||
84 | #define M1535_IRQ_TMR 0 | ||
85 | |||
86 | /* Rockhopper "slots" assignment; this is hard-coded ... */ | ||
87 | #define ROCKHOPPER_M5451_SLOT 1 | ||
88 | #define ROCKHOPPER_M1535_SLOT 2 | ||
89 | #define ROCKHOPPER_M5229_SLOT 11 | ||
90 | #define ROCKHOPPER_M5237_SLOT 15 | ||
91 | #define ROCKHOPPER_PMU_SLOT 12 | ||
92 | /* ... and hard-wired. */ | ||
93 | #define ROCKHOPPER_PCI1_SLOT 3 | ||
94 | #define ROCKHOPPER_PCI2_SLOT 4 | ||
95 | #define ROCKHOPPER_PCI3_SLOT 5 | ||
96 | #define ROCKHOPPER_PCI4_SLOT 6 | ||
97 | #define ROCKHOPPER_PCNET_SLOT 1 | ||
98 | |||
99 | #define M1535_IRQ_MASK(n) (1 << (n)) | ||
100 | |||
101 | #define M1535_IRQ_EDGE (M1535_IRQ_MASK(M1535_IRQ_TMR) | \ | ||
102 | M1535_IRQ_MASK(M1535_IRQ_KBD) | \ | ||
103 | M1535_IRQ_MASK(M1535_IRQ_COM1) | \ | ||
104 | M1535_IRQ_MASK(M1535_IRQ_COM2) | \ | ||
105 | M1535_IRQ_MASK(M1535_IRQ_IRDA) | \ | ||
106 | M1535_IRQ_MASK(M1535_IRQ_RTC) | \ | ||
107 | M1535_IRQ_MASK(M1535_IRQ_FDC) | \ | ||
108 | M1535_IRQ_MASK(M1535_IRQ_PS2)) | ||
109 | |||
110 | #define M1535_IRQ_LEVEL (M1535_IRQ_MASK(M1535_IRQ_IDE) | \ | ||
111 | M1535_IRQ_MASK(M1535_IRQ_USB) | \ | ||
112 | M1535_IRQ_MASK(M1535_IRQ_INTA) | \ | ||
113 | M1535_IRQ_MASK(M1535_IRQ_INTB) | \ | ||
114 | M1535_IRQ_MASK(M1535_IRQ_INTC) | \ | ||
115 | M1535_IRQ_MASK(M1535_IRQ_INTD)) | ||
116 | |||
117 | struct irq_map_entry { | ||
118 | u16 bus; | ||
119 | u8 slot; | ||
120 | u8 irq; | ||
121 | }; | ||
122 | static struct irq_map_entry int_map[] = { | ||
123 | {1, ROCKHOPPER_M5451_SLOT, M1535_IRQ_AUDIO}, /* Audio controller */ | ||
124 | {1, ROCKHOPPER_PCI1_SLOT, M1535_IRQ_INTD}, /* PCI slot #1 */ | ||
125 | {1, ROCKHOPPER_PCI2_SLOT, M1535_IRQ_INTC}, /* PCI slot #2 */ | ||
126 | {1, ROCKHOPPER_M5237_SLOT, M1535_IRQ_USB}, /* USB host controller */ | ||
127 | {1, ROCKHOPPER_M5229_SLOT, IDE_PRIMARY_IRQ}, /* IDE controller */ | ||
128 | {2, ROCKHOPPER_PCNET_SLOT, M1535_IRQ_INTD}, /* AMD Am79c973 on-board | ||
129 | ethernet */ | ||
130 | {2, ROCKHOPPER_PCI3_SLOT, M1535_IRQ_INTB}, /* PCI slot #3 */ | ||
131 | {2, ROCKHOPPER_PCI4_SLOT, M1535_IRQ_INTC} /* PCI slot #4 */ | ||
132 | }; | ||
133 | |||
134 | static int pci_intlines[] = | ||
135 | { M1535_IRQ_INTA, M1535_IRQ_INTB, M1535_IRQ_INTC, M1535_IRQ_INTD }; | ||
136 | |||
137 | /* Determine the Rockhopper IRQ line number for the PCI device */ | ||
138 | int rockhopper_get_irq(struct pci_dev *dev, u8 pin, u8 slot) | ||
139 | { | ||
140 | struct pci_bus *bus; | ||
141 | int i; | ||
142 | |||
143 | bus = dev->bus; | ||
144 | if (bus == NULL) | ||
145 | return -1; | ||
146 | |||
147 | for (i = 0; i < ARRAY_SIZE(int_map); i++) { | ||
148 | if (int_map[i].bus == bus->number && int_map[i].slot == slot) { | ||
149 | int line; | ||
150 | for (line = 0; line < 4; line++) | ||
151 | if (pci_intlines[line] == int_map[i].irq) | ||
152 | break; | ||
153 | if (line < 4) | ||
154 | return pci_intlines[(line + (pin - 1)) % 4]; | ||
155 | else | ||
156 | return int_map[i].irq; | ||
157 | } | ||
158 | } | ||
159 | return -1; | ||
160 | } | ||
161 | |||
162 | #ifdef CONFIG_ROCKHOPPER | ||
163 | void i8259_init(void) | ||
164 | { | ||
165 | init_i8259_irqs(); | ||
166 | |||
167 | outb(0x00, 0x4d0); | ||
168 | outb(0x02, 0x4d1); /* USB IRQ9 is level */ | ||
169 | } | ||
170 | #endif | ||
171 | |||
172 | int __init pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) | ||
173 | { | ||
174 | pci_probe_only = 1; | ||
175 | |||
176 | #ifdef CONFIG_ROCKHOPPER | ||
177 | if( dev->bus->number == 1 && vr4133_rockhopper ) { | ||
178 | if(slot == ROCKHOPPER_PCI1_SLOT || slot == ROCKHOPPER_PCI2_SLOT) | ||
179 | dev->irq = CMBVR41XX_INTA_IRQ; | ||
180 | else | ||
181 | dev->irq = rockhopper_get_irq(dev, pin, slot); | ||
182 | } else | ||
183 | dev->irq = CMBVR41XX_INTA_IRQ; | ||
184 | #else | ||
185 | dev->irq = CMBVR41XX_INTA_IRQ; | ||
186 | #endif | ||
187 | |||
188 | return dev->irq; | ||
189 | } | ||
190 | |||
191 | DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_AL, PCI_DEVICE_ID_AL_M1533, ali_m1535plus_init); | ||
192 | DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_AL, PCI_DEVICE_ID_AL_M5229, ali_m5229_init); | ||
193 | |||
194 | |||
diff --git a/arch/mips/vr41xx/Kconfig b/arch/mips/vr41xx/Kconfig index 559acc09c819..c1be6b37fb2a 100644 --- a/arch/mips/vr41xx/Kconfig +++ b/arch/mips/vr41xx/Kconfig | |||
@@ -23,16 +23,6 @@ config IBM_WORKPAD | |||
23 | select SYS_SUPPORTS_32BIT_KERNEL | 23 | select SYS_SUPPORTS_32BIT_KERNEL |
24 | select SYS_SUPPORTS_LITTLE_ENDIAN | 24 | select SYS_SUPPORTS_LITTLE_ENDIAN |
25 | 25 | ||
26 | config NEC_CMBVR4133 | ||
27 | bool "NEC CMB-VR4133" | ||
28 | select CEVT_R4K | ||
29 | select CSRC_R4K | ||
30 | select DMA_NONCOHERENT | ||
31 | select IRQ_CPU | ||
32 | select HW_HAS_PCI | ||
33 | select SYS_SUPPORTS_32BIT_KERNEL | ||
34 | select SYS_SUPPORTS_LITTLE_ENDIAN | ||
35 | |||
36 | config TANBAC_TB022X | 26 | config TANBAC_TB022X |
37 | bool "TANBAC VR4131 multichip module and TANBAC VR4131DIMM" | 27 | bool "TANBAC VR4131 multichip module and TANBAC VR4131DIMM" |
38 | select CEVT_R4K | 28 | select CEVT_R4K |
@@ -73,13 +63,6 @@ config ZAO_CAPCELLA | |||
73 | 63 | ||
74 | endchoice | 64 | endchoice |
75 | 65 | ||
76 | config ROCKHOPPER | ||
77 | bool "Support for Rockhopper base board" | ||
78 | depends on NEC_CMBVR4133 | ||
79 | select PCI_VR41XX | ||
80 | select I8259 | ||
81 | select HAVE_STD_PC_SERIAL_PORT | ||
82 | |||
83 | choice | 66 | choice |
84 | prompt "Base board type" | 67 | prompt "Base board type" |
85 | depends on TANBAC_TB022X | 68 | depends on TANBAC_TB022X |
diff --git a/arch/mips/vr41xx/nec-cmbvr4133/Makefile b/arch/mips/vr41xx/nec-cmbvr4133/Makefile deleted file mode 100644 index 5835cae54aca..000000000000 --- a/arch/mips/vr41xx/nec-cmbvr4133/Makefile +++ /dev/null | |||
@@ -1,8 +0,0 @@ | |||
1 | # | ||
2 | # Makefile for the NEC-CMBVR4133 | ||
3 | # | ||
4 | |||
5 | obj-y := init.o setup.o | ||
6 | |||
7 | obj-$(CONFIG_PCI) += m1535plus.o | ||
8 | obj-$(CONFIG_ROCKHOPPER) += irq.o | ||
diff --git a/arch/mips/vr41xx/nec-cmbvr4133/init.c b/arch/mips/vr41xx/nec-cmbvr4133/init.c deleted file mode 100644 index 7c5e18ee2231..000000000000 --- a/arch/mips/vr41xx/nec-cmbvr4133/init.c +++ /dev/null | |||
@@ -1,65 +0,0 @@ | |||
1 | /* | ||
2 | * arch/mips/vr41xx/nec-cmbvr4133/init.c | ||
3 | * | ||
4 | * PROM library initialisation code for NEC CMB-VR4133 board. | ||
5 | * | ||
6 | * Author: Yoichi Yuasa <yyuasa@mvista.com, or source@mvista.com> and | ||
7 | * Jun Sun <jsun@mvista.com, or source@mvista.com> and | ||
8 | * Alex Sapkov <asapkov@ru.mvista.com> | ||
9 | * | ||
10 | * 2001-2004 (c) MontaVista, Software, Inc. This file is licensed under | ||
11 | * the terms of the GNU General Public License version 2. This program | ||
12 | * is licensed "as is" without any warranty of any kind, whether express | ||
13 | * or implied. | ||
14 | * | ||
15 | * Support for NEC-CMBVR4133 in 2.6 | ||
16 | * Manish Lachwani (mlachwani@mvista.com) | ||
17 | */ | ||
18 | |||
19 | #ifdef CONFIG_ROCKHOPPER | ||
20 | #include <asm/io.h> | ||
21 | #include <linux/pci.h> | ||
22 | |||
23 | #define PCICONFDREG 0xaf000c14 | ||
24 | #define PCICONFAREG 0xaf000c18 | ||
25 | |||
26 | void disable_pcnet(void) | ||
27 | { | ||
28 | u32 data; | ||
29 | |||
30 | /* | ||
31 | * Workaround for the bug in PMON on VR4133. PMON leaves | ||
32 | * AMD PCNet controller (on Rockhopper) initialized and running in | ||
33 | * bus master mode. We have do disable it before doing any | ||
34 | * further initialization. Or we get problems with PCI bus 2 | ||
35 | * and random lockups and crashes. | ||
36 | */ | ||
37 | |||
38 | writel((2 << 16) | | ||
39 | (PCI_DEVFN(1, 0) << 8) | | ||
40 | (0 & 0xfc) | | ||
41 | 1UL, | ||
42 | PCICONFAREG); | ||
43 | |||
44 | data = readl(PCICONFDREG); | ||
45 | |||
46 | writel((2 << 16) | | ||
47 | (PCI_DEVFN(1, 0) << 8) | | ||
48 | (4 & 0xfc) | | ||
49 | 1UL, | ||
50 | PCICONFAREG); | ||
51 | |||
52 | data = readl(PCICONFDREG); | ||
53 | |||
54 | writel((2 << 16) | | ||
55 | (PCI_DEVFN(1, 0) << 8) | | ||
56 | (4 & 0xfc) | | ||
57 | 1UL, | ||
58 | PCICONFAREG); | ||
59 | |||
60 | data &= ~4; | ||
61 | |||
62 | writel(data, PCICONFDREG); | ||
63 | } | ||
64 | #endif | ||
65 | |||
diff --git a/arch/mips/vr41xx/nec-cmbvr4133/irq.c b/arch/mips/vr41xx/nec-cmbvr4133/irq.c deleted file mode 100644 index 7d2d076b0f54..000000000000 --- a/arch/mips/vr41xx/nec-cmbvr4133/irq.c +++ /dev/null | |||
@@ -1,46 +0,0 @@ | |||
1 | /* | ||
2 | * arch/mips/vr41xx/nec-cmbvr4133/irq.c | ||
3 | * | ||
4 | * Interrupt routines for the NEC CMB-VR4133 board. | ||
5 | * | ||
6 | * Author: Yoichi Yuasa <yyuasa@mvista.com, or source@mvista.com> and | ||
7 | * Alex Sapkov <asapkov@ru.mvista.com> | ||
8 | * | ||
9 | * 2003-2004 (c) MontaVista, Software, Inc. This file is licensed under | ||
10 | * the terms of the GNU General Public License version 2. This program | ||
11 | * is licensed "as is" without any warranty of any kind, whether express | ||
12 | * or implied. | ||
13 | * | ||
14 | * Support for NEC-CMBVR4133 in 2.6 | ||
15 | * Manish Lachwani (mlachwani@mvista.com) | ||
16 | */ | ||
17 | #include <linux/bitops.h> | ||
18 | #include <linux/errno.h> | ||
19 | #include <linux/init.h> | ||
20 | #include <linux/ioport.h> | ||
21 | #include <linux/interrupt.h> | ||
22 | |||
23 | #include <asm/io.h> | ||
24 | #include <asm/i8259.h> | ||
25 | #include <asm/vr41xx/cmbvr4133.h> | ||
26 | |||
27 | extern int vr4133_rockhopper; | ||
28 | |||
29 | static int i8259_get_irq_number(int irq) | ||
30 | { | ||
31 | return i8259_irq(); | ||
32 | } | ||
33 | |||
34 | void __init rockhopper_init_irq(void) | ||
35 | { | ||
36 | int i; | ||
37 | |||
38 | if(!vr4133_rockhopper) { | ||
39 | printk(KERN_ERR "Not a Rockhopper Board \n"); | ||
40 | return; | ||
41 | } | ||
42 | |||
43 | vr41xx_set_irq_trigger(CMBVR41XX_INTC_PIN, TRIGGER_LEVEL, SIGNAL_THROUGH); | ||
44 | vr41xx_set_irq_level(CMBVR41XX_INTC_PIN, LEVEL_HIGH); | ||
45 | vr41xx_cascade_irq(CMBVR41XX_INTC_IRQ, i8259_get_irq_number); | ||
46 | } | ||
diff --git a/arch/mips/vr41xx/nec-cmbvr4133/m1535plus.c b/arch/mips/vr41xx/nec-cmbvr4133/m1535plus.c deleted file mode 100644 index 1341f3287d04..000000000000 --- a/arch/mips/vr41xx/nec-cmbvr4133/m1535plus.c +++ /dev/null | |||
@@ -1,249 +0,0 @@ | |||
1 | /* | ||
2 | * arch/mips/vr41xx/nec-cmbvr4133/m1535plus.c | ||
3 | * | ||
4 | * Initialize for ALi M1535+(included M5229 and M5237). | ||
5 | * | ||
6 | * Author: Yoichi Yuasa <yyuasa@mvista.com, or source@mvista.com> and | ||
7 | * Alex Sapkov <asapkov@ru.mvista.com> | ||
8 | * | ||
9 | * 2003-2004 (c) MontaVista, Software, Inc. This file is licensed under | ||
10 | * the terms of the GNU General Public License version 2. This program | ||
11 | * is licensed "as is" without any warranty of any kind, whether express | ||
12 | * or implied. | ||
13 | * | ||
14 | * Support for NEC-CMBVR4133 in 2.6 | ||
15 | * Author: Manish Lachwani (mlachwani@mvista.com) | ||
16 | */ | ||
17 | #include <linux/init.h> | ||
18 | #include <linux/types.h> | ||
19 | #include <linux/serial.h> | ||
20 | |||
21 | #include <asm/vr41xx/cmbvr4133.h> | ||
22 | #include <linux/pci.h> | ||
23 | #include <asm/io.h> | ||
24 | |||
25 | #define CONFIG_PORT(port) ((port) ? 0x3f0 : 0x370) | ||
26 | #define DATA_PORT(port) ((port) ? 0x3f1 : 0x371) | ||
27 | #define INDEX_PORT(port) CONFIG_PORT(port) | ||
28 | |||
29 | #define ENTER_CONFIG_MODE(port) \ | ||
30 | do { \ | ||
31 | outb_p(0x51, CONFIG_PORT(port)); \ | ||
32 | outb_p(0x23, CONFIG_PORT(port)); \ | ||
33 | } while(0) | ||
34 | |||
35 | #define SELECT_LOGICAL_DEVICE(port, dev_no) \ | ||
36 | do { \ | ||
37 | outb_p(0x07, INDEX_PORT(port)); \ | ||
38 | outb_p((dev_no), DATA_PORT(port)); \ | ||
39 | } while(0) | ||
40 | |||
41 | #define WRITE_CONFIG_DATA(port, index, data) \ | ||
42 | do { \ | ||
43 | outb_p((index), INDEX_PORT(port)); \ | ||
44 | outb_p((data), DATA_PORT(port)); \ | ||
45 | } while(0) | ||
46 | |||
47 | #define EXIT_CONFIG_MODE(port) outb(0xbb, CONFIG_PORT(port)) | ||
48 | |||
49 | #define PCI_CONFIG_ADDR KSEG1ADDR(0x0f000c18) | ||
50 | #define PCI_CONFIG_DATA KSEG1ADDR(0x0f000c14) | ||
51 | |||
52 | #ifdef CONFIG_BLK_DEV_FD | ||
53 | |||
54 | void __devinit ali_m1535plus_fdc_init(int port) | ||
55 | { | ||
56 | ENTER_CONFIG_MODE(port); | ||
57 | SELECT_LOGICAL_DEVICE(port, 0); /* FDC */ | ||
58 | WRITE_CONFIG_DATA(port, 0x30, 0x01); /* FDC: enable */ | ||
59 | WRITE_CONFIG_DATA(port, 0x60, 0x03); /* I/O port base: 0x3f0 */ | ||
60 | WRITE_CONFIG_DATA(port, 0x61, 0xf0); | ||
61 | WRITE_CONFIG_DATA(port, 0x70, 0x06); /* IRQ: 6 */ | ||
62 | WRITE_CONFIG_DATA(port, 0x74, 0x02); /* DMA: channel 2 */ | ||
63 | WRITE_CONFIG_DATA(port, 0xf0, 0x08); | ||
64 | WRITE_CONFIG_DATA(port, 0xf1, 0x00); | ||
65 | WRITE_CONFIG_DATA(port, 0xf2, 0xff); | ||
66 | WRITE_CONFIG_DATA(port, 0xf4, 0x00); | ||
67 | EXIT_CONFIG_MODE(port); | ||
68 | } | ||
69 | |||
70 | #endif | ||
71 | |||
72 | void __devinit ali_m1535plus_parport_init(int port) | ||
73 | { | ||
74 | ENTER_CONFIG_MODE(port); | ||
75 | SELECT_LOGICAL_DEVICE(port, 3); /* Parallel Port */ | ||
76 | WRITE_CONFIG_DATA(port, 0x30, 0x01); | ||
77 | WRITE_CONFIG_DATA(port, 0x60, 0x03); /* I/O port base: 0x378 */ | ||
78 | WRITE_CONFIG_DATA(port, 0x61, 0x78); | ||
79 | WRITE_CONFIG_DATA(port, 0x70, 0x07); /* IRQ: 7 */ | ||
80 | WRITE_CONFIG_DATA(port, 0x74, 0x04); /* DMA: None */ | ||
81 | WRITE_CONFIG_DATA(port, 0xf0, 0x8c); /* IRQ polarity: Active Low */ | ||
82 | WRITE_CONFIG_DATA(port, 0xf1, 0xc5); | ||
83 | EXIT_CONFIG_MODE(port); | ||
84 | } | ||
85 | |||
86 | void __devinit ali_m1535plus_keyboard_init(int port) | ||
87 | { | ||
88 | ENTER_CONFIG_MODE(port); | ||
89 | SELECT_LOGICAL_DEVICE(port, 7); /* KEYBOARD */ | ||
90 | WRITE_CONFIG_DATA(port, 0x30, 0x01); /* KEYBOARD: eable */ | ||
91 | WRITE_CONFIG_DATA(port, 0x70, 0x01); /* IRQ: 1 */ | ||
92 | WRITE_CONFIG_DATA(port, 0x72, 0x0c); /* PS/2 Mouse IRQ: 12 */ | ||
93 | WRITE_CONFIG_DATA(port, 0xf0, 0x00); | ||
94 | EXIT_CONFIG_MODE(port); | ||
95 | } | ||
96 | |||
97 | void __devinit ali_m1535plus_hotkey_init(int port) | ||
98 | { | ||
99 | ENTER_CONFIG_MODE(port); | ||
100 | SELECT_LOGICAL_DEVICE(port, 0xc); /* HOTKEY */ | ||
101 | WRITE_CONFIG_DATA(port, 0x30, 0x00); | ||
102 | WRITE_CONFIG_DATA(port, 0xf0, 0x35); | ||
103 | WRITE_CONFIG_DATA(port, 0xf1, 0x14); | ||
104 | WRITE_CONFIG_DATA(port, 0xf2, 0x11); | ||
105 | WRITE_CONFIG_DATA(port, 0xf3, 0x71); | ||
106 | WRITE_CONFIG_DATA(port, 0xf5, 0x05); | ||
107 | EXIT_CONFIG_MODE(port); | ||
108 | } | ||
109 | |||
110 | void ali_m1535plus_init(struct pci_dev *dev) | ||
111 | { | ||
112 | pci_write_config_byte(dev, 0x40, 0x18); /* PCI Interface Control */ | ||
113 | pci_write_config_byte(dev, 0x41, 0xc0); /* PS2 keyb & mouse enable */ | ||
114 | pci_write_config_byte(dev, 0x42, 0x41); /* ISA bus cycle control */ | ||
115 | pci_write_config_byte(dev, 0x43, 0x00); /* ISA bus cycle control 2 */ | ||
116 | pci_write_config_byte(dev, 0x44, 0x5d); /* IDE enable & IRQ 14 */ | ||
117 | pci_write_config_byte(dev, 0x45, 0x0b); /* PCI int polling mode */ | ||
118 | pci_write_config_byte(dev, 0x47, 0x00); /* BIOS chip select control */ | ||
119 | |||
120 | /* IRQ routing */ | ||
121 | pci_write_config_byte(dev, 0x48, 0x03); /* INTA IRQ10, INTB disable */ | ||
122 | pci_write_config_byte(dev, 0x49, 0x00); /* INTC and INTD disable */ | ||
123 | pci_write_config_byte(dev, 0x4a, 0x00); /* INTE and INTF disable */ | ||
124 | pci_write_config_byte(dev, 0x4b, 0x90); /* Audio IRQ11, Modem disable */ | ||
125 | |||
126 | pci_write_config_word(dev, 0x50, 0x4000); /* Parity check IDE enable */ | ||
127 | pci_write_config_word(dev, 0x52, 0x0000); /* USB & RTC disable */ | ||
128 | pci_write_config_word(dev, 0x54, 0x0002); /* ??? no info */ | ||
129 | pci_write_config_word(dev, 0x56, 0x0002); /* PCS1J signal disable */ | ||
130 | |||
131 | pci_write_config_byte(dev, 0x59, 0x00); /* PCSDS */ | ||
132 | pci_write_config_byte(dev, 0x5a, 0x00); | ||
133 | pci_write_config_byte(dev, 0x5b, 0x00); | ||
134 | pci_write_config_word(dev, 0x5c, 0x0000); | ||
135 | pci_write_config_byte(dev, 0x5e, 0x00); | ||
136 | pci_write_config_byte(dev, 0x5f, 0x00); | ||
137 | pci_write_config_word(dev, 0x60, 0x0000); | ||
138 | |||
139 | pci_write_config_byte(dev, 0x6c, 0x00); | ||
140 | pci_write_config_byte(dev, 0x6d, 0x48); /* ROM address mapping */ | ||
141 | pci_write_config_byte(dev, 0x6e, 0x00); /* ??? what for? */ | ||
142 | |||
143 | pci_write_config_byte(dev, 0x70, 0x12); /* Serial IRQ control */ | ||
144 | pci_write_config_byte(dev, 0x71, 0xEF); /* DMA channel select */ | ||
145 | pci_write_config_byte(dev, 0x72, 0x03); /* USB IDSEL */ | ||
146 | pci_write_config_byte(dev, 0x73, 0x00); /* ??? no info */ | ||
147 | |||
148 | /* | ||
149 | * IRQ setup ALi M5237 USB Host Controller | ||
150 | * IRQ: 9 | ||
151 | */ | ||
152 | pci_write_config_byte(dev, 0x74, 0x01); /* USB IRQ9 */ | ||
153 | |||
154 | pci_write_config_byte(dev, 0x75, 0x1f); /* IDE2 IRQ 15 */ | ||
155 | pci_write_config_byte(dev, 0x76, 0x80); /* ACPI disable */ | ||
156 | pci_write_config_byte(dev, 0x77, 0x40); /* Modem disable */ | ||
157 | pci_write_config_dword(dev, 0x78, 0x20000000); /* Pin select 2 */ | ||
158 | pci_write_config_byte(dev, 0x7c, 0x00); /* Pin select 3 */ | ||
159 | pci_write_config_byte(dev, 0x81, 0x00); /* ID read/write control */ | ||
160 | pci_write_config_byte(dev, 0x90, 0x00); /* PCI PM block control */ | ||
161 | pci_write_config_word(dev, 0xa4, 0x0000); /* PMSCR */ | ||
162 | |||
163 | #ifdef CONFIG_BLK_DEV_FD | ||
164 | ali_m1535plus_fdc_init(1); | ||
165 | #endif | ||
166 | |||
167 | ali_m1535plus_keyboard_init(1); | ||
168 | ali_m1535plus_hotkey_init(1); | ||
169 | } | ||
170 | |||
171 | static inline void ali_config_writeb(u8 reg, u8 val, int devfn) | ||
172 | { | ||
173 | u32 data; | ||
174 | int shift; | ||
175 | |||
176 | writel((1 << 16) | (devfn << 8) | (reg & 0xfc) | 1UL, PCI_CONFIG_ADDR); | ||
177 | data = readl(PCI_CONFIG_DATA); | ||
178 | |||
179 | shift = (reg & 3) << 3; | ||
180 | data &= ~(0xff << shift); | ||
181 | data |= (((u32)val) << shift); | ||
182 | |||
183 | writel(data, PCI_CONFIG_DATA); | ||
184 | } | ||
185 | |||
186 | static inline u8 ali_config_readb(u8 reg, int devfn) | ||
187 | { | ||
188 | u32 data; | ||
189 | |||
190 | writel((1 << 16) | (devfn << 8) | (reg & 0xfc) | 1UL, PCI_CONFIG_ADDR); | ||
191 | data = readl(PCI_CONFIG_DATA); | ||
192 | |||
193 | return (u8)(data >> ((reg & 3) << 3)); | ||
194 | } | ||
195 | |||
196 | static inline u16 ali_config_readw(u8 reg, int devfn) | ||
197 | { | ||
198 | u32 data; | ||
199 | |||
200 | writel((1 << 16) | (devfn << 8) | (reg & 0xfc) | 1UL, PCI_CONFIG_ADDR); | ||
201 | data = readl(PCI_CONFIG_DATA); | ||
202 | |||
203 | return (u16)(data >> ((reg & 2) << 3)); | ||
204 | } | ||
205 | |||
206 | int vr4133_rockhopper = 0; | ||
207 | void __init ali_m5229_preinit(void) | ||
208 | { | ||
209 | if (ali_config_readw(PCI_VENDOR_ID, 16) == PCI_VENDOR_ID_AL && | ||
210 | ali_config_readw(PCI_DEVICE_ID, 16) == PCI_DEVICE_ID_AL_M1533) { | ||
211 | printk(KERN_INFO "Found an NEC Rockhopper \n"); | ||
212 | vr4133_rockhopper = 1; | ||
213 | /* | ||
214 | * Enable ALi M5229 IDE Controller (both channels) | ||
215 | * IDSEL: A27 | ||
216 | */ | ||
217 | ali_config_writeb(0x58, 0x4c, 16); | ||
218 | } | ||
219 | } | ||
220 | |||
221 | void __init ali_m5229_init(struct pci_dev *dev) | ||
222 | { | ||
223 | /* | ||
224 | * Enable Primary/Secondary Channel Cable Detect 40-Pin | ||
225 | */ | ||
226 | pci_write_config_word(dev, 0x4a, 0xc023); | ||
227 | |||
228 | /* | ||
229 | * Set only the 3rd byteis for the master IDE's cycle and | ||
230 | * enable Internal IDE Function | ||
231 | */ | ||
232 | pci_write_config_byte(dev, 0x50, 0x23); /* Class code attr register */ | ||
233 | |||
234 | pci_write_config_byte(dev, 0x09, 0xff); /* Set native mode & stuff */ | ||
235 | pci_write_config_byte(dev, 0x52, 0x00); /* use timing registers */ | ||
236 | pci_write_config_byte(dev, 0x58, 0x02); /* Primary addr setup timing */ | ||
237 | pci_write_config_byte(dev, 0x59, 0x22); /* Primary cmd block timing */ | ||
238 | pci_write_config_byte(dev, 0x5a, 0x22); /* Pr drv 0 R/W timing */ | ||
239 | pci_write_config_byte(dev, 0x5b, 0x22); /* Pr drv 1 R/W timing */ | ||
240 | pci_write_config_byte(dev, 0x5c, 0x02); /* Sec addr setup timing */ | ||
241 | pci_write_config_byte(dev, 0x5d, 0x22); /* Sec cmd block timing */ | ||
242 | pci_write_config_byte(dev, 0x5e, 0x22); /* Sec drv 0 R/W timing */ | ||
243 | pci_write_config_byte(dev, 0x5f, 0x22); /* Sec drv 1 R/W timing */ | ||
244 | pci_write_config_byte(dev, PCI_LATENCY_TIMER, 0x20); | ||
245 | pci_write_config_word(dev, PCI_COMMAND, | ||
246 | PCI_COMMAND_PARITY | PCI_COMMAND_MASTER | | ||
247 | PCI_COMMAND_IO); | ||
248 | } | ||
249 | |||
diff --git a/arch/mips/vr41xx/nec-cmbvr4133/setup.c b/arch/mips/vr41xx/nec-cmbvr4133/setup.c deleted file mode 100644 index 7723d2011b08..000000000000 --- a/arch/mips/vr41xx/nec-cmbvr4133/setup.c +++ /dev/null | |||
@@ -1,89 +0,0 @@ | |||
1 | /* | ||
2 | * arch/mips/vr41xx/nec-cmbvr4133/setup.c | ||
3 | * | ||
4 | * Setup for the NEC CMB-VR4133. | ||
5 | * | ||
6 | * Author: Yoichi Yuasa <yyuasa@mvista.com, or source@mvista.com> and | ||
7 | * Alex Sapkov <asapkov@ru.mvista.com> | ||
8 | * | ||
9 | * 2001-2004 (c) MontaVista, Software, Inc. This file is licensed under | ||
10 | * the terms of the GNU General Public License version 2. This program | ||
11 | * is licensed "as is" without any warranty of any kind, whether express | ||
12 | * or implied. | ||
13 | * | ||
14 | * Support for CMBVR4133 board in 2.6 | ||
15 | * Author: Manish Lachwani (mlachwani@mvista.com) | ||
16 | */ | ||
17 | #include <linux/init.h> | ||
18 | #include <linux/ide.h> | ||
19 | #include <linux/ioport.h> | ||
20 | |||
21 | #include <asm/reboot.h> | ||
22 | #include <asm/time.h> | ||
23 | #include <asm/vr41xx/cmbvr4133.h> | ||
24 | #include <asm/bootinfo.h> | ||
25 | |||
26 | #ifdef CONFIG_MTD | ||
27 | #include <linux/mtd/physmap.h> | ||
28 | #include <linux/mtd/partitions.h> | ||
29 | #include <linux/mtd/mtd.h> | ||
30 | #include <linux/mtd/map.h> | ||
31 | |||
32 | static struct mtd_partition cmbvr4133_mtd_parts[] = { | ||
33 | { | ||
34 | .name = "User FS", | ||
35 | .size = 0x1be0000, | ||
36 | .offset = 0, | ||
37 | .mask_flags = 0, | ||
38 | }, | ||
39 | { | ||
40 | .name = "PMON", | ||
41 | .size = 0x140000, | ||
42 | .offset = MTDPART_OFS_APPEND, | ||
43 | .mask_flags = MTD_WRITEABLE, /* force read-only */ | ||
44 | }, | ||
45 | { | ||
46 | .name = "User FS2", | ||
47 | .size = MTDPART_SIZ_FULL, | ||
48 | .offset = MTDPART_OFS_APPEND, | ||
49 | .mask_flags = 0, | ||
50 | } | ||
51 | }; | ||
52 | |||
53 | #define number_partitions ARRAY_SIZE(cmbvr4133_mtd_parts) | ||
54 | #endif | ||
55 | |||
56 | extern void i8259_init(void); | ||
57 | |||
58 | static void __init nec_cmbvr4133_setup(void) | ||
59 | { | ||
60 | #ifdef CONFIG_ROCKHOPPER | ||
61 | extern void disable_pcnet(void); | ||
62 | |||
63 | disable_pcnet(); | ||
64 | #endif | ||
65 | set_io_port_base(KSEG1ADDR(0x16000000)); | ||
66 | |||
67 | #ifdef CONFIG_PCI | ||
68 | #ifdef CONFIG_ROCKHOPPER | ||
69 | ali_m5229_preinit(); | ||
70 | #endif | ||
71 | #endif | ||
72 | |||
73 | #ifdef CONFIG_ROCKHOPPER | ||
74 | rockhopper_init_irq(); | ||
75 | #endif | ||
76 | |||
77 | #ifdef CONFIG_MTD | ||
78 | /* we use generic physmap mapping driver and we use partitions */ | ||
79 | physmap_configure(0x1C000000, 0x02000000, 4, NULL); | ||
80 | physmap_set_partitions(cmbvr4133_mtd_parts, number_partitions); | ||
81 | #endif | ||
82 | |||
83 | /* 128 MB memory support */ | ||
84 | add_memory_region(0, 0x08000000, BOOT_MEM_RAM); | ||
85 | |||
86 | #ifdef CONFIG_ROCKHOPPER | ||
87 | i8259_init(); | ||
88 | #endif | ||
89 | } | ||