diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-07-18 16:00:54 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-07-18 16:00:54 -0400 |
commit | bb2c018b09b681d43f5e08124b83e362647ea82b (patch) | |
tree | d794902c78f9fdd04ed88a4b8d451ed6f9292ec0 /arch/ppc/platforms/4xx/redwood6.c | |
parent | 82638844d9a8581bbf33201cc209a14876eca167 (diff) | |
parent | 5b664cb235e97afbf34db9c4d77f08ebd725335e (diff) |
Merge branch 'linus' into cpus4096
Conflicts:
drivers/acpi/processor_throttling.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/ppc/platforms/4xx/redwood6.c')
-rw-r--r-- | arch/ppc/platforms/4xx/redwood6.c | 156 |
1 files changed, 0 insertions, 156 deletions
diff --git a/arch/ppc/platforms/4xx/redwood6.c b/arch/ppc/platforms/4xx/redwood6.c deleted file mode 100644 index 006e29f83a1a..000000000000 --- a/arch/ppc/platforms/4xx/redwood6.c +++ /dev/null | |||
@@ -1,156 +0,0 @@ | |||
1 | /* | ||
2 | * Author: Armin Kuster <akuster@mvista.com> | ||
3 | * | ||
4 | * 2002 (c) MontaVista, Software, Inc. This file is licensed under | ||
5 | * the terms of the GNU General Public License version 2. This program | ||
6 | * is licensed "as is" without any warranty of any kind, whether express | ||
7 | * or implied. | ||
8 | */ | ||
9 | |||
10 | #include <linux/init.h> | ||
11 | #include <linux/pagemap.h> | ||
12 | #include <linux/platform_device.h> | ||
13 | #include <linux/ioport.h> | ||
14 | #include <asm/io.h> | ||
15 | #include <asm/ppc4xx_pic.h> | ||
16 | #include <linux/delay.h> | ||
17 | #include <asm/machdep.h> | ||
18 | |||
19 | /* | ||
20 | * Define external IRQ senses and polarities. | ||
21 | */ | ||
22 | unsigned char ppc4xx_uic_ext_irq_cfg[] __initdata = { | ||
23 | (IRQ_SENSE_LEVEL | IRQ_POLARITY_NEGATIVE), /* Ext Int 7 */ | ||
24 | (IRQ_SENSE_LEVEL | IRQ_POLARITY_NEGATIVE), /* Ext Int 8 */ | ||
25 | (IRQ_SENSE_LEVEL | IRQ_POLARITY_NEGATIVE), /* Ext Int 9 */ | ||
26 | (IRQ_SENSE_LEVEL | IRQ_POLARITY_NEGATIVE), /* Ext Int 0 */ | ||
27 | (IRQ_SENSE_LEVEL | IRQ_POLARITY_NEGATIVE), /* Ext Int 1 */ | ||
28 | (IRQ_SENSE_LEVEL | IRQ_POLARITY_NEGATIVE), /* Ext Int 2 */ | ||
29 | (IRQ_SENSE_LEVEL | IRQ_POLARITY_NEGATIVE), /* Ext Int 3 */ | ||
30 | (IRQ_SENSE_LEVEL | IRQ_POLARITY_NEGATIVE), /* Ext Int 4 */ | ||
31 | (IRQ_SENSE_LEVEL | IRQ_POLARITY_NEGATIVE), /* Ext Int 5 */ | ||
32 | (IRQ_SENSE_LEVEL | IRQ_POLARITY_NEGATIVE), /* Ext Int 6 */ | ||
33 | }; | ||
34 | |||
35 | static struct resource smc91x_resources[] = { | ||
36 | [0] = { | ||
37 | .start = SMC91111_BASE_ADDR, | ||
38 | .end = SMC91111_BASE_ADDR + SMC91111_REG_SIZE - 1, | ||
39 | .flags = IORESOURCE_MEM, | ||
40 | }, | ||
41 | [1] = { | ||
42 | .start = SMC91111_IRQ, | ||
43 | .end = SMC91111_IRQ, | ||
44 | .flags = IORESOURCE_IRQ, | ||
45 | }, | ||
46 | }; | ||
47 | |||
48 | static struct platform_device smc91x_device = { | ||
49 | .name = "smc91x", | ||
50 | .id = 0, | ||
51 | .num_resources = ARRAY_SIZE(smc91x_resources), | ||
52 | .resource = smc91x_resources, | ||
53 | }; | ||
54 | |||
55 | static struct platform_device *redwood6_devs[] __initdata = { | ||
56 | &smc91x_device, | ||
57 | }; | ||
58 | |||
59 | static int __init | ||
60 | redwood6_platform_add_devices(void) | ||
61 | { | ||
62 | return platform_add_devices(redwood6_devs, ARRAY_SIZE(redwood6_devs)); | ||
63 | } | ||
64 | |||
65 | |||
66 | void __init | ||
67 | redwood6_setup_arch(void) | ||
68 | { | ||
69 | #ifdef CONFIG_IDE | ||
70 | void *xilinx, *xilinx_1, *xilinx_2; | ||
71 | unsigned short us_reg5; | ||
72 | #endif | ||
73 | |||
74 | ppc4xx_setup_arch(); | ||
75 | |||
76 | #ifdef CONFIG_IDE | ||
77 | xilinx = (unsigned long) ioremap(IDE_XLINUX_MUX_BASE, 0x10); | ||
78 | /* init xilinx control registers - enable ide mux, clear reset bit */ | ||
79 | if (!xilinx) { | ||
80 | printk(KERN_CRIT | ||
81 | "redwood6_setup_arch() xilinxi ioremap failed\n"); | ||
82 | return; | ||
83 | } | ||
84 | xilinx_1 = xilinx + 0xa; | ||
85 | xilinx_2 = xilinx + 0xe; | ||
86 | |||
87 | us_reg5 = readb(xilinx_1); | ||
88 | writeb(0x01d1, xilinx_1); | ||
89 | writeb(0x0008, xilinx_2); | ||
90 | |||
91 | udelay(10 * 1000); | ||
92 | |||
93 | writeb(0x01d1, xilinx_1); | ||
94 | writeb(0x0008, xilinx_2); | ||
95 | #endif | ||
96 | |||
97 | #ifdef DEBUG_BRINGUP | ||
98 | bd_t *bip = (bd_t *) __res; | ||
99 | printk("\n"); | ||
100 | printk("machine\t: %s\n", PPC4xx_MACHINE_NAME); | ||
101 | printk("\n"); | ||
102 | printk("bi_s_version\t %s\n", bip->bi_s_version); | ||
103 | printk("bi_r_version\t %s\n", bip->bi_r_version); | ||
104 | printk("bi_memsize\t 0x%8.8x\t %dMBytes\n", bip->bi_memsize, | ||
105 | bip->bi_memsize / (1024 * 1000)); | ||
106 | printk("bi_enetaddr %d\t %2.2x%2.2x%2.2x-%2.2x%2.2x%2.2x\n", 0, | ||
107 | bip->bi_enetaddr[0], bip->bi_enetaddr[1], bip->bi_enetaddr[2], | ||
108 | bip->bi_enetaddr[3], bip->bi_enetaddr[4], bip->bi_enetaddr[5]); | ||
109 | |||
110 | printk("bi_intfreq\t 0x%8.8x\t clock:\t %dMhz\n", | ||
111 | bip->bi_intfreq, bip->bi_intfreq / 1000000); | ||
112 | |||
113 | printk("bi_busfreq\t 0x%8.8x\t plb bus clock:\t %dMHz\n", | ||
114 | bip->bi_busfreq, bip->bi_busfreq / 1000000); | ||
115 | printk("bi_tbfreq\t 0x%8.8x\t TB freq:\t %dMHz\n", | ||
116 | bip->bi_tbfreq, bip->bi_tbfreq / 1000000); | ||
117 | |||
118 | printk("\n"); | ||
119 | #endif | ||
120 | |||
121 | /* Identify the system */ | ||
122 | printk(KERN_INFO "IBM Redwood6 (STBx25XX) Platform\n"); | ||
123 | printk(KERN_INFO | ||
124 | "Port by MontaVista Software, Inc. (source@mvista.com)\n"); | ||
125 | |||
126 | device_initcall(redwood6_platform_add_devices); | ||
127 | } | ||
128 | |||
129 | void __init | ||
130 | redwood6_map_io(void) | ||
131 | { | ||
132 | int i; | ||
133 | |||
134 | ppc4xx_map_io(); | ||
135 | for (i = 0; i < 16; i++) { | ||
136 | unsigned long v, p; | ||
137 | |||
138 | /* 0x400x0000 -> 0xe00x0000 */ | ||
139 | p = 0x40000000 | (i << 16); | ||
140 | v = STBx25xx_IO_BASE | (i << 16); | ||
141 | |||
142 | io_block_mapping(v, p, PAGE_SIZE, | ||
143 | _PAGE_NO_CACHE | pgprot_val(PAGE_KERNEL) | | ||
144 | _PAGE_GUARDED); | ||
145 | } | ||
146 | } | ||
147 | |||
148 | void __init | ||
149 | platform_init(unsigned long r3, unsigned long r4, unsigned long r5, | ||
150 | unsigned long r6, unsigned long r7) | ||
151 | { | ||
152 | ppc4xx_init(r3, r4, r5, r6, r7); | ||
153 | |||
154 | ppc_md.setup_arch = redwood6_setup_arch; | ||
155 | ppc_md.setup_io_mappings = redwood6_map_io; | ||
156 | } | ||