diff options
author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2011-12-15 19:24:25 -0500 |
---|---|---|
committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2011-12-15 19:24:25 -0500 |
commit | 1e7342e7789fa2ca9202701467428726cbcfd649 (patch) | |
tree | e0ad000924e9875bd2ea17bd0e04382491765a09 /arch/powerpc/boot | |
parent | 78c5c68a4cf4329d17abfa469345ddf323d4fd62 (diff) | |
parent | 228d55053397e6d5325ca179c7ffe331de2846d3 (diff) |
Merge remote-tracking branch 'jwb/next' into next
Conflicts:
arch/powerpc/platforms/40x/ppc40x_simple.c
Diffstat (limited to 'arch/powerpc/boot')
-rw-r--r-- | arch/powerpc/boot/Makefile | 5 | ||||
-rw-r--r-- | arch/powerpc/boot/dcr.h | 6 | ||||
-rw-r--r-- | arch/powerpc/boot/div64.S | 52 | ||||
-rw-r--r-- | arch/powerpc/boot/dts/currituck.dts | 237 | ||||
-rw-r--r-- | arch/powerpc/boot/dts/klondike.dts | 227 | ||||
-rw-r--r-- | arch/powerpc/boot/treeboot-currituck.c | 119 | ||||
-rwxr-xr-x | arch/powerpc/boot/wrapper | 3 |
7 files changed, 648 insertions, 1 deletions
diff --git a/arch/powerpc/boot/Makefile b/arch/powerpc/boot/Makefile index 80c133c88565..15986e70799c 100644 --- a/arch/powerpc/boot/Makefile +++ b/arch/powerpc/boot/Makefile | |||
@@ -45,6 +45,7 @@ $(obj)/cuboot-katmai.o: BOOTCFLAGS += -mcpu=405 | |||
45 | $(obj)/cuboot-acadia.o: BOOTCFLAGS += -mcpu=405 | 45 | $(obj)/cuboot-acadia.o: BOOTCFLAGS += -mcpu=405 |
46 | $(obj)/treeboot-walnut.o: BOOTCFLAGS += -mcpu=405 | 46 | $(obj)/treeboot-walnut.o: BOOTCFLAGS += -mcpu=405 |
47 | $(obj)/treeboot-iss4xx.o: BOOTCFLAGS += -mcpu=405 | 47 | $(obj)/treeboot-iss4xx.o: BOOTCFLAGS += -mcpu=405 |
48 | $(obj)/treeboot-currituck.o: BOOTCFLAGS += -mcpu=405 | ||
48 | $(obj)/virtex405-head.o: BOOTAFLAGS += -mcpu=405 | 49 | $(obj)/virtex405-head.o: BOOTAFLAGS += -mcpu=405 |
49 | 50 | ||
50 | 51 | ||
@@ -79,7 +80,8 @@ src-plat := of.c cuboot-52xx.c cuboot-824x.c cuboot-83xx.c cuboot-85xx.c holly.c | |||
79 | cuboot-warp.c cuboot-85xx-cpm2.c cuboot-yosemite.c simpleboot.c \ | 80 | cuboot-warp.c cuboot-85xx-cpm2.c cuboot-yosemite.c simpleboot.c \ |
80 | virtex405-head.S virtex.c redboot-83xx.c cuboot-sam440ep.c \ | 81 | virtex405-head.S virtex.c redboot-83xx.c cuboot-sam440ep.c \ |
81 | cuboot-acadia.c cuboot-amigaone.c cuboot-kilauea.c \ | 82 | cuboot-acadia.c cuboot-amigaone.c cuboot-kilauea.c \ |
82 | gamecube-head.S gamecube.c wii-head.S wii.c treeboot-iss4xx.c | 83 | gamecube-head.S gamecube.c wii-head.S wii.c treeboot-iss4xx.c \ |
84 | treeboot-currituck.c | ||
83 | src-boot := $(src-wlib) $(src-plat) empty.c | 85 | src-boot := $(src-wlib) $(src-plat) empty.c |
84 | 86 | ||
85 | src-boot := $(addprefix $(obj)/, $(src-boot)) | 87 | src-boot := $(addprefix $(obj)/, $(src-boot)) |
@@ -213,6 +215,7 @@ image-$(CONFIG_WARP) += cuImage.warp | |||
213 | image-$(CONFIG_YOSEMITE) += cuImage.yosemite | 215 | image-$(CONFIG_YOSEMITE) += cuImage.yosemite |
214 | image-$(CONFIG_ISS4xx) += treeImage.iss4xx \ | 216 | image-$(CONFIG_ISS4xx) += treeImage.iss4xx \ |
215 | treeImage.iss4xx-mpic | 217 | treeImage.iss4xx-mpic |
218 | image-$(CONFIG_CURRITUCK) += treeImage.currituck | ||
216 | 219 | ||
217 | # Board ports in arch/powerpc/platform/8xx/Kconfig | 220 | # Board ports in arch/powerpc/platform/8xx/Kconfig |
218 | image-$(CONFIG_MPC86XADS) += cuImage.mpc866ads | 221 | image-$(CONFIG_MPC86XADS) += cuImage.mpc866ads |
diff --git a/arch/powerpc/boot/dcr.h b/arch/powerpc/boot/dcr.h index 645a7c964e5f..cc73f7a95e26 100644 --- a/arch/powerpc/boot/dcr.h +++ b/arch/powerpc/boot/dcr.h | |||
@@ -9,6 +9,12 @@ | |||
9 | }) | 9 | }) |
10 | #define mtdcr(rn, val) \ | 10 | #define mtdcr(rn, val) \ |
11 | asm volatile("mtdcr %0,%1" : : "i"(rn), "r"(val)) | 11 | asm volatile("mtdcr %0,%1" : : "i"(rn), "r"(val)) |
12 | #define mfdcrx(rn) \ | ||
13 | ({ \ | ||
14 | unsigned long rval; \ | ||
15 | asm volatile("mfdcrx %0,%1" : "=r"(rval) : "r"(rn)); \ | ||
16 | rval; \ | ||
17 | }) | ||
12 | 18 | ||
13 | /* 440GP/440GX SDRAM controller DCRs */ | 19 | /* 440GP/440GX SDRAM controller DCRs */ |
14 | #define DCRN_SDRAM0_CFGADDR 0x010 | 20 | #define DCRN_SDRAM0_CFGADDR 0x010 |
diff --git a/arch/powerpc/boot/div64.S b/arch/powerpc/boot/div64.S index d271ab542673..bbcb8a4cc121 100644 --- a/arch/powerpc/boot/div64.S +++ b/arch/powerpc/boot/div64.S | |||
@@ -57,3 +57,55 @@ __div64_32: | |||
57 | stw r8,4(r3) | 57 | stw r8,4(r3) |
58 | mr r3,r6 # return the remainder in r3 | 58 | mr r3,r6 # return the remainder in r3 |
59 | blr | 59 | blr |
60 | |||
61 | /* | ||
62 | * Extended precision shifts. | ||
63 | * | ||
64 | * Updated to be valid for shift counts from 0 to 63 inclusive. | ||
65 | * -- Gabriel | ||
66 | * | ||
67 | * R3/R4 has 64 bit value | ||
68 | * R5 has shift count | ||
69 | * result in R3/R4 | ||
70 | * | ||
71 | * ashrdi3: arithmetic right shift (sign propagation) | ||
72 | * lshrdi3: logical right shift | ||
73 | * ashldi3: left shift | ||
74 | */ | ||
75 | .globl __ashrdi3 | ||
76 | __ashrdi3: | ||
77 | subfic r6,r5,32 | ||
78 | srw r4,r4,r5 # LSW = count > 31 ? 0 : LSW >> count | ||
79 | addi r7,r5,32 # could be xori, or addi with -32 | ||
80 | slw r6,r3,r6 # t1 = count > 31 ? 0 : MSW << (32-count) | ||
81 | rlwinm r8,r7,0,32 # t3 = (count < 32) ? 32 : 0 | ||
82 | sraw r7,r3,r7 # t2 = MSW >> (count-32) | ||
83 | or r4,r4,r6 # LSW |= t1 | ||
84 | slw r7,r7,r8 # t2 = (count < 32) ? 0 : t2 | ||
85 | sraw r3,r3,r5 # MSW = MSW >> count | ||
86 | or r4,r4,r7 # LSW |= t2 | ||
87 | blr | ||
88 | |||
89 | .globl __ashldi3 | ||
90 | __ashldi3: | ||
91 | subfic r6,r5,32 | ||
92 | slw r3,r3,r5 # MSW = count > 31 ? 0 : MSW << count | ||
93 | addi r7,r5,32 # could be xori, or addi with -32 | ||
94 | srw r6,r4,r6 # t1 = count > 31 ? 0 : LSW >> (32-count) | ||
95 | slw r7,r4,r7 # t2 = count < 32 ? 0 : LSW << (count-32) | ||
96 | or r3,r3,r6 # MSW |= t1 | ||
97 | slw r4,r4,r5 # LSW = LSW << count | ||
98 | or r3,r3,r7 # MSW |= t2 | ||
99 | blr | ||
100 | |||
101 | .globl __lshrdi3 | ||
102 | __lshrdi3: | ||
103 | subfic r6,r5,32 | ||
104 | srw r4,r4,r5 # LSW = count > 31 ? 0 : LSW >> count | ||
105 | addi r7,r5,32 # could be xori, or addi with -32 | ||
106 | slw r6,r3,r6 # t1 = count > 31 ? 0 : MSW << (32-count) | ||
107 | srw r7,r3,r7 # t2 = count < 32 ? 0 : MSW >> (count-32) | ||
108 | or r4,r4,r6 # LSW |= t1 | ||
109 | srw r3,r3,r5 # MSW = MSW >> count | ||
110 | or r4,r4,r7 # LSW |= t2 | ||
111 | blr | ||
diff --git a/arch/powerpc/boot/dts/currituck.dts b/arch/powerpc/boot/dts/currituck.dts new file mode 100644 index 000000000000..b801dd06e573 --- /dev/null +++ b/arch/powerpc/boot/dts/currituck.dts | |||
@@ -0,0 +1,237 @@ | |||
1 | /* | ||
2 | * Device Tree Source for IBM Embedded PPC 476 Platform | ||
3 | * | ||
4 | * Copyright © 2011 Tony Breeds IBM Corporation | ||
5 | * | ||
6 | * This file is licensed under the terms of the GNU General Public | ||
7 | * License version 2. This program is licensed "as is" without | ||
8 | * any warranty of any kind, whether express or implied. | ||
9 | */ | ||
10 | |||
11 | /dts-v1/; | ||
12 | |||
13 | /memreserve/ 0x01f00000 0x00100000; // spin table | ||
14 | |||
15 | / { | ||
16 | #address-cells = <2>; | ||
17 | #size-cells = <2>; | ||
18 | model = "ibm,currituck"; | ||
19 | compatible = "ibm,currituck"; | ||
20 | dcr-parent = <&{/cpus/cpu@0}>; | ||
21 | |||
22 | aliases { | ||
23 | serial0 = &UART0; | ||
24 | }; | ||
25 | |||
26 | cpus { | ||
27 | #address-cells = <1>; | ||
28 | #size-cells = <0>; | ||
29 | |||
30 | cpu@0 { | ||
31 | device_type = "cpu"; | ||
32 | model = "PowerPC,476"; | ||
33 | reg = <0>; | ||
34 | clock-frequency = <1600000000>; // 1.6 GHz | ||
35 | timebase-frequency = <100000000>; // 100Mhz | ||
36 | i-cache-line-size = <32>; | ||
37 | d-cache-line-size = <32>; | ||
38 | i-cache-size = <32768>; | ||
39 | d-cache-size = <32768>; | ||
40 | dcr-controller; | ||
41 | dcr-access-method = "native"; | ||
42 | status = "ok"; | ||
43 | }; | ||
44 | cpu@1 { | ||
45 | device_type = "cpu"; | ||
46 | model = "PowerPC,476"; | ||
47 | reg = <1>; | ||
48 | clock-frequency = <1600000000>; // 1.6 GHz | ||
49 | timebase-frequency = <100000000>; // 100Mhz | ||
50 | i-cache-line-size = <32>; | ||
51 | d-cache-line-size = <32>; | ||
52 | i-cache-size = <32768>; | ||
53 | d-cache-size = <32768>; | ||
54 | dcr-controller; | ||
55 | dcr-access-method = "native"; | ||
56 | status = "disabled"; | ||
57 | enable-method = "spin-table"; | ||
58 | cpu-release-addr = <0x0 0x01f00000>; | ||
59 | }; | ||
60 | }; | ||
61 | |||
62 | memory { | ||
63 | device_type = "memory"; | ||
64 | reg = <0x0 0x0 0x0 0x0>; // filled in by zImage | ||
65 | }; | ||
66 | |||
67 | MPIC: interrupt-controller { | ||
68 | compatible = "chrp,open-pic"; | ||
69 | interrupt-controller; | ||
70 | dcr-reg = <0xffc00000 0x00040000>; | ||
71 | #address-cells = <0>; | ||
72 | #size-cells = <0>; | ||
73 | #interrupt-cells = <2>; | ||
74 | |||
75 | }; | ||
76 | |||
77 | plb { | ||
78 | compatible = "ibm,plb6"; | ||
79 | #address-cells = <2>; | ||
80 | #size-cells = <2>; | ||
81 | ranges; | ||
82 | clock-frequency = <200000000>; // 200Mhz | ||
83 | |||
84 | POB0: opb { | ||
85 | compatible = "ibm,opb-4xx", "ibm,opb"; | ||
86 | #address-cells = <1>; | ||
87 | #size-cells = <1>; | ||
88 | /* Wish there was a nicer way of specifying a full | ||
89 | * 32-bit range | ||
90 | */ | ||
91 | ranges = <0x00000000 0x00000200 0x00000000 0x80000000 | ||
92 | 0x80000000 0x00000200 0x80000000 0x80000000>; | ||
93 | clock-frequency = <100000000>; | ||
94 | |||
95 | UART0: serial@10000000 { | ||
96 | device_type = "serial"; | ||
97 | compatible = "ns16750", "ns16550"; | ||
98 | reg = <0x10000000 0x00000008>; | ||
99 | virtual-reg = <0xe1000000>; | ||
100 | clock-frequency = <1851851>; // PCIe refclk/MCGC0_CTL[UART] | ||
101 | current-speed = <115200>; | ||
102 | interrupt-parent = <&MPIC>; | ||
103 | interrupts = <34 2>; | ||
104 | }; | ||
105 | |||
106 | IIC0: i2c@00000000 { | ||
107 | compatible = "ibm,iic-currituck", "ibm,iic"; | ||
108 | reg = <0x0 0x00000014>; | ||
109 | interrupt-parent = <&MPIC>; | ||
110 | interrupts = <79 2>; | ||
111 | #address-cells = <1>; | ||
112 | #size-cells = <0>; | ||
113 | rtc@68 { | ||
114 | compatible = "stm,m41t80", "m41st85"; | ||
115 | reg = <0x68>; | ||
116 | }; | ||
117 | }; | ||
118 | }; | ||
119 | |||
120 | PCIE0: pciex@10100000000 { // 4xGBIF1 | ||
121 | device_type = "pci"; | ||
122 | #interrupt-cells = <1>; | ||
123 | #size-cells = <2>; | ||
124 | #address-cells = <3>; | ||
125 | compatible = "ibm,plb-pciex-476fpe", "ibm,plb-pciex"; | ||
126 | primary; | ||
127 | port = <0x0>; /* port number */ | ||
128 | reg = <0x00000101 0x00000000 0x0 0x10000000 /* Config space access */ | ||
129 | 0x00000100 0x00000000 0x0 0x00001000>; /* UTL Registers space access */ | ||
130 | dcr-reg = <0x80 0x20>; | ||
131 | |||
132 | // pci_space < pci_addr > < cpu_addr > < size > | ||
133 | ranges = <0x02000000 0x00000000 0x80000000 0x00000110 0x80000000 0x0 0x80000000 | ||
134 | 0x01000000 0x0 0x0 0x00000140 0x0 0x0 0x00010000>; | ||
135 | |||
136 | /* Inbound starting at 0 to memsize filled in by zImage */ | ||
137 | dma-ranges = <0x42000000 0x0 0x0 0x0 0x0 0x0 0x0>; | ||
138 | |||
139 | /* This drives busses 0 to 0xf */ | ||
140 | bus-range = <0x0 0xf>; | ||
141 | |||
142 | /* Legacy interrupts (note the weird polarity, the bridge seems | ||
143 | * to invert PCIe legacy interrupts). | ||
144 | * We are de-swizzling here because the numbers are actually for | ||
145 | * port of the root complex virtual P2P bridge. But I want | ||
146 | * to avoid putting a node for it in the tree, so the numbers | ||
147 | * below are basically de-swizzled numbers. | ||
148 | * The real slot is on idsel 0, so the swizzling is 1:1 | ||
149 | */ | ||
150 | interrupt-map-mask = <0x0 0x0 0x0 0x7>; | ||
151 | interrupt-map = < | ||
152 | 0x0 0x0 0x0 0x1 &MPIC 46 0x2 /* int A */ | ||
153 | 0x0 0x0 0x0 0x2 &MPIC 47 0x2 /* int B */ | ||
154 | 0x0 0x0 0x0 0x3 &MPIC 48 0x2 /* int C */ | ||
155 | 0x0 0x0 0x0 0x4 &MPIC 49 0x2 /* int D */>; | ||
156 | }; | ||
157 | |||
158 | PCIE1: pciex@30100000000 { // 4xGBIF0 | ||
159 | device_type = "pci"; | ||
160 | #interrupt-cells = <1>; | ||
161 | #size-cells = <2>; | ||
162 | #address-cells = <3>; | ||
163 | compatible = "ibm,plb-pciex-476fpe", "ibm,plb-pciex"; | ||
164 | primary; | ||
165 | port = <0x1>; /* port number */ | ||
166 | reg = <0x00000301 0x00000000 0x0 0x10000000 /* Config space access */ | ||
167 | 0x00000300 0x00000000 0x0 0x00001000>; /* UTL Registers space access */ | ||
168 | dcr-reg = <0x60 0x20>; | ||
169 | |||
170 | ranges = <0x02000000 0x00000000 0x80000000 0x00000310 0x80000000 0x0 0x80000000 | ||
171 | 0x01000000 0x0 0x0 0x00000340 0x0 0x0 0x00010000>; | ||
172 | |||
173 | /* Inbound starting at 0 to memsize filled in by zImage */ | ||
174 | dma-ranges = <0x42000000 0x0 0x0 0x0 0x0 0x0 0x0>; | ||
175 | |||
176 | /* This drives busses 0 to 0xf */ | ||
177 | bus-range = <0x0 0xf>; | ||
178 | |||
179 | /* Legacy interrupts (note the weird polarity, the bridge seems | ||
180 | * to invert PCIe legacy interrupts). | ||
181 | * We are de-swizzling here because the numbers are actually for | ||
182 | * port of the root complex virtual P2P bridge. But I want | ||
183 | * to avoid putting a node for it in the tree, so the numbers | ||
184 | * below are basically de-swizzled numbers. | ||
185 | * The real slot is on idsel 0, so the swizzling is 1:1 | ||
186 | */ | ||
187 | interrupt-map-mask = <0x0 0x0 0x0 0x7>; | ||
188 | interrupt-map = < | ||
189 | 0x0 0x0 0x0 0x1 &MPIC 38 0x2 /* int A */ | ||
190 | 0x0 0x0 0x0 0x2 &MPIC 39 0x2 /* int B */ | ||
191 | 0x0 0x0 0x0 0x3 &MPIC 40 0x2 /* int C */ | ||
192 | 0x0 0x0 0x0 0x4 &MPIC 41 0x2 /* int D */>; | ||
193 | }; | ||
194 | |||
195 | PCIE2: pciex@38100000000 { // 2xGBIF0 | ||
196 | device_type = "pci"; | ||
197 | #interrupt-cells = <1>; | ||
198 | #size-cells = <2>; | ||
199 | #address-cells = <3>; | ||
200 | compatible = "ibm,plb-pciex-476fpe", "ibm,plb-pciex"; | ||
201 | primary; | ||
202 | port = <0x2>; /* port number */ | ||
203 | reg = <0x00000381 0x00000000 0x0 0x10000000 /* Config space access */ | ||
204 | 0x00000380 0x00000000 0x0 0x00001000>; /* UTL Registers space access */ | ||
205 | dcr-reg = <0xA0 0x20>; | ||
206 | |||
207 | ranges = <0x02000000 0x00000000 0x80000000 0x00000390 0x80000000 0x0 0x80000000 | ||
208 | 0x01000000 0x0 0x0 0x000003C0 0x0 0x0 0x00010000>; | ||
209 | |||
210 | /* Inbound starting at 0 to memsize filled in by zImage */ | ||
211 | dma-ranges = <0x42000000 0x0 0x0 0x0 0x0 0x0 0x0>; | ||
212 | |||
213 | /* This drives busses 0 to 0xf */ | ||
214 | bus-range = <0x0 0xf>; | ||
215 | |||
216 | /* Legacy interrupts (note the weird polarity, the bridge seems | ||
217 | * to invert PCIe legacy interrupts). | ||
218 | * We are de-swizzling here because the numbers are actually for | ||
219 | * port of the root complex virtual P2P bridge. But I want | ||
220 | * to avoid putting a node for it in the tree, so the numbers | ||
221 | * below are basically de-swizzled numbers. | ||
222 | * The real slot is on idsel 0, so the swizzling is 1:1 | ||
223 | */ | ||
224 | interrupt-map-mask = <0x0 0x0 0x0 0x7>; | ||
225 | interrupt-map = < | ||
226 | 0x0 0x0 0x0 0x1 &MPIC 54 0x2 /* int A */ | ||
227 | 0x0 0x0 0x0 0x2 &MPIC 55 0x2 /* int B */ | ||
228 | 0x0 0x0 0x0 0x3 &MPIC 56 0x2 /* int C */ | ||
229 | 0x0 0x0 0x0 0x4 &MPIC 57 0x2 /* int D */>; | ||
230 | }; | ||
231 | |||
232 | }; | ||
233 | |||
234 | chosen { | ||
235 | linux,stdout-path = &UART0; | ||
236 | }; | ||
237 | }; | ||
diff --git a/arch/powerpc/boot/dts/klondike.dts b/arch/powerpc/boot/dts/klondike.dts new file mode 100644 index 000000000000..8c9429033618 --- /dev/null +++ b/arch/powerpc/boot/dts/klondike.dts | |||
@@ -0,0 +1,227 @@ | |||
1 | /* | ||
2 | * Device Tree for Klondike (APM8018X) board. | ||
3 | * | ||
4 | * Copyright (c) 2010, Applied Micro Circuits Corporation | ||
5 | * Author: Tanmay Inamdar <tinamdar@apm.com> | ||
6 | * | ||
7 | * This program is free software; you can redistribute it and/or | ||
8 | * modify it under the terms of the GNU General Public License as | ||
9 | * published by the Free Software Foundation; either version 2 of | ||
10 | * the License, or (at your option) any later version. | ||
11 | * | ||
12 | * This program is distributed in the hope that it will be useful, | ||
13 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
14 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
15 | * GNU General Public License for more details. | ||
16 | * | ||
17 | * You should have received a copy of the GNU General Public License | ||
18 | * along with this program; if not, write to the Free Software | ||
19 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, | ||
20 | * MA 02111-1307 USA | ||
21 | * | ||
22 | */ | ||
23 | |||
24 | /dts-v1/; | ||
25 | |||
26 | / { | ||
27 | #address-cells = <1>; | ||
28 | #size-cells = <1>; | ||
29 | model = "apm,klondike"; | ||
30 | compatible = "apm,klondike"; | ||
31 | dcr-parent = <&{/cpus/cpu@0}>; | ||
32 | |||
33 | aliases { | ||
34 | ethernet0 = &EMAC0; | ||
35 | ethernet1 = &EMAC1; | ||
36 | }; | ||
37 | |||
38 | cpus { | ||
39 | #address-cells = <1>; | ||
40 | #size-cells = <0>; | ||
41 | |||
42 | cpu@0 { | ||
43 | device_type = "cpu"; | ||
44 | model = "PowerPC,apm8018x"; | ||
45 | reg = <0x00000000>; | ||
46 | clock-frequency = <300000000>; /* Filled in by U-Boot */ | ||
47 | timebase-frequency = <300000000>; /* Filled in by U-Boot */ | ||
48 | i-cache-line-size = <32>; | ||
49 | d-cache-line-size = <32>; | ||
50 | i-cache-size = <16384>; /* 16 kB */ | ||
51 | d-cache-size = <16384>; /* 16 kB */ | ||
52 | dcr-controller; | ||
53 | dcr-access-method = "native"; | ||
54 | }; | ||
55 | }; | ||
56 | |||
57 | memory { | ||
58 | device_type = "memory"; | ||
59 | reg = <0x00000000 0x20000000>; /* Filled in by U-Boot */ | ||
60 | }; | ||
61 | |||
62 | UIC0: interrupt-controller { | ||
63 | compatible = "ibm,uic"; | ||
64 | interrupt-controller; | ||
65 | cell-index = <0>; | ||
66 | dcr-reg = <0x0c0 0x010>; | ||
67 | #address-cells = <0>; | ||
68 | #size-cells = <0>; | ||
69 | #interrupt-cells = <2>; | ||
70 | }; | ||
71 | |||
72 | UIC1: interrupt-controller1 { | ||
73 | compatible = "ibm,uic"; | ||
74 | interrupt-controller; | ||
75 | cell-index = <1>; | ||
76 | dcr-reg = <0x0d0 0x010>; | ||
77 | #address-cells = <0>; | ||
78 | #size-cells = <0>; | ||
79 | #interrupt-cells = <2>; | ||
80 | interrupts = <0x1e 0x4 0x1f 0x4>; /* cascade */ | ||
81 | interrupt-parent = <&UIC0>; | ||
82 | }; | ||
83 | |||
84 | UIC2: interrupt-controller2 { | ||
85 | compatible = "ibm,uic"; | ||
86 | interrupt-controller; | ||
87 | cell-index = <2>; | ||
88 | dcr-reg = <0x0e0 0x010>; | ||
89 | #address-cells = <0>; | ||
90 | #size-cells = <0>; | ||
91 | #interrupt-cells = <2>; | ||
92 | interrupts = <0x0a 0x4 0x0b 0x4>; /* cascade */ | ||
93 | interrupt-parent = <&UIC0>; | ||
94 | }; | ||
95 | |||
96 | UIC3: interrupt-controller3 { | ||
97 | compatible = "ibm,uic"; | ||
98 | interrupt-controller; | ||
99 | cell-index = <3>; | ||
100 | dcr-reg = <0x0f0 0x010>; | ||
101 | #address-cells = <0>; | ||
102 | #size-cells = <0>; | ||
103 | #interrupt-cells = <2>; | ||
104 | interrupts = <0x10 0x4 0x11 0x4>; /* cascade */ | ||
105 | interrupt-parent = <&UIC0>; | ||
106 | }; | ||
107 | |||
108 | plb { | ||
109 | compatible = "ibm,plb4"; | ||
110 | #address-cells = <1>; | ||
111 | #size-cells = <1>; | ||
112 | ranges; | ||
113 | clock-frequency = <0>; /* Filled in by U-Boot */ | ||
114 | |||
115 | SDRAM0: memory-controller { | ||
116 | compatible = "ibm,sdram-apm8018x"; | ||
117 | dcr-reg = <0x010 0x002>; | ||
118 | }; | ||
119 | |||
120 | MAL0: mcmal { | ||
121 | compatible = "ibm,mcmal2"; | ||
122 | dcr-reg = <0x180 0x062>; | ||
123 | num-tx-chans = <2>; | ||
124 | num-rx-chans = <16>; | ||
125 | #address-cells = <0>; | ||
126 | #size-cells = <0>; | ||
127 | interrupt-parent = <&UIC1>; | ||
128 | interrupts = </*TXEOB*/ 0x6 0x4 | ||
129 | /*RXEOB*/ 0x7 0x4 | ||
130 | /*SERR*/ 0x1 0x4 | ||
131 | /*TXDE*/ 0x2 0x4 | ||
132 | /*RXDE*/ 0x3 0x4>; | ||
133 | }; | ||
134 | |||
135 | POB0: opb { | ||
136 | compatible = "ibm,opb"; | ||
137 | #address-cells = <1>; | ||
138 | #size-cells = <1>; | ||
139 | ranges = <0x20000000 0x20000000 0x30000000 | ||
140 | 0x50000000 0x50000000 0x10000000 | ||
141 | 0x60000000 0x60000000 0x10000000 | ||
142 | 0xFE000000 0xFE000000 0x00010000>; | ||
143 | dcr-reg = <0x100 0x020>; | ||
144 | clock-frequency = <300000000>; /* Filled in by U-Boot */ | ||
145 | |||
146 | RGMII0: emac-rgmii@400a2000 { | ||
147 | compatible = "ibm,rgmii"; | ||
148 | reg = <0x400a2000 0x00000010>; | ||
149 | has-mdio; | ||
150 | }; | ||
151 | |||
152 | TAH0: emac-tah@400a3000 { | ||
153 | compatible = "ibm,tah"; | ||
154 | reg = <0x400a3000 0x100>; | ||
155 | }; | ||
156 | |||
157 | TAH1: emac-tah@400a4000 { | ||
158 | compatible = "ibm,tah"; | ||
159 | reg = <0x400a4000 0x100>; | ||
160 | }; | ||
161 | |||
162 | EMAC0: ethernet@400a0000 { | ||
163 | compatible = "ibm,emac4", "ibm-emac4sync"; | ||
164 | interrupt-parent = <&EMAC0>; | ||
165 | interrupts = <0x0>; | ||
166 | #interrupt-cells = <1>; | ||
167 | #address-cells = <0>; | ||
168 | #size-cells = <0>; | ||
169 | interrupt-map = </*Status*/ 0x0 &UIC0 0x13 0x4>; | ||
170 | reg = <0x400a0000 0x00000100>; | ||
171 | local-mac-address = [000000000000]; /* Filled in by U-Boot */ | ||
172 | mal-device = <&MAL0>; | ||
173 | mal-tx-channel = <0x0>; | ||
174 | mal-rx-channel = <0x0>; | ||
175 | cell-index = <0>; | ||
176 | max-frame-size = <9000>; | ||
177 | rx-fifo-size = <4096>; | ||
178 | tx-fifo-size = <2048>; | ||
179 | phy-mode = "rgmii"; | ||
180 | phy-address = <0x2>; | ||
181 | turbo = "no"; | ||
182 | phy-map = <0x00000000>; | ||
183 | rgmii-device = <&RGMII0>; | ||
184 | rgmii-channel = <0>; | ||
185 | tah-device = <&TAH0>; | ||
186 | tah-channel = <0>; | ||
187 | has-inverted-stacr-oc; | ||
188 | has-new-stacr-staopc; | ||
189 | }; | ||
190 | |||
191 | EMAC1: ethernet@400a1000 { | ||
192 | compatible = "ibm,emac4", "ibm-emac4sync"; | ||
193 | status = "disabled"; | ||
194 | interrupt-parent = <&EMAC1>; | ||
195 | interrupts = <0x0>; | ||
196 | #interrupt-cells = <1>; | ||
197 | #address-cells = <0>; | ||
198 | #size-cells = <0>; | ||
199 | interrupt-map = </*Status*/ 0x0 &UIC0 0x14 0x4>; | ||
200 | reg = <0x400a1000 0x00000100>; | ||
201 | local-mac-address = [000000000000]; /* Filled in by U-Boot */ | ||
202 | mal-device = <&MAL0>; | ||
203 | mal-tx-channel = <1>; | ||
204 | mal-rx-channel = <8>; | ||
205 | cell-index = <1>; | ||
206 | max-frame-size = <9000>; | ||
207 | rx-fifo-size = <4096>; | ||
208 | tx-fifo-size = <2048>; | ||
209 | phy-mode = "rgmii"; | ||
210 | phy-address = <0x3>; | ||
211 | turbo = "no"; | ||
212 | phy-map = <0x00000000>; | ||
213 | rgmii-device = <&RGMII0>; | ||
214 | rgmii-channel = <1>; | ||
215 | tah-device = <&TAH1>; | ||
216 | tah-channel = <0>; | ||
217 | has-inverted-stacr-oc; | ||
218 | has-new-stacr-staopc; | ||
219 | mdio-device = <&EMAC0>; | ||
220 | }; | ||
221 | }; | ||
222 | }; | ||
223 | |||
224 | chosen { | ||
225 | linux,stdout-path = "/plb/opb/serial@50001000"; | ||
226 | }; | ||
227 | }; | ||
diff --git a/arch/powerpc/boot/treeboot-currituck.c b/arch/powerpc/boot/treeboot-currituck.c new file mode 100644 index 000000000000..925ae43b7467 --- /dev/null +++ b/arch/powerpc/boot/treeboot-currituck.c | |||
@@ -0,0 +1,119 @@ | |||
1 | /* | ||
2 | * Copyright © 2011 Tony Breeds IBM Corporation | ||
3 | * | ||
4 | * Based on earlier code: | ||
5 | * Copyright (C) Paul Mackerras 1997. | ||
6 | * | ||
7 | * Matt Porter <mporter@kernel.crashing.org> | ||
8 | * Copyright 2002-2005 MontaVista Software Inc. | ||
9 | * | ||
10 | * Eugene Surovegin <eugene.surovegin@zultys.com> or <ebs@ebshome.net> | ||
11 | * Copyright (c) 2003, 2004 Zultys Technologies | ||
12 | * | ||
13 | * Copyright 2007 David Gibson, IBM Corporation. | ||
14 | * Copyright 2010 Ben. Herrenschmidt, IBM Corporation. | ||
15 | * Copyright © 2011 David Kleikamp IBM Corporation | ||
16 | * | ||
17 | * This program is free software; you can redistribute it and/or | ||
18 | * modify it under the terms of the GNU General Public License | ||
19 | * as published by the Free Software Foundation; either version | ||
20 | * 2 of the License, or (at your option) any later version. | ||
21 | */ | ||
22 | #include <stdarg.h> | ||
23 | #include <stddef.h> | ||
24 | #include "types.h" | ||
25 | #include "elf.h" | ||
26 | #include "string.h" | ||
27 | #include "stdio.h" | ||
28 | #include "page.h" | ||
29 | #include "ops.h" | ||
30 | #include "reg.h" | ||
31 | #include "io.h" | ||
32 | #include "dcr.h" | ||
33 | #include "4xx.h" | ||
34 | #include "44x.h" | ||
35 | #include "libfdt.h" | ||
36 | |||
37 | BSS_STACK(4096); | ||
38 | |||
39 | #define MAX_RANKS 0x4 | ||
40 | #define DDR3_MR0CF 0x80010011U | ||
41 | |||
42 | static unsigned long long ibm_currituck_memsize; | ||
43 | static unsigned long long ibm_currituck_detect_memsize(void) | ||
44 | { | ||
45 | u32 reg; | ||
46 | unsigned i; | ||
47 | unsigned long long memsize = 0; | ||
48 | |||
49 | for(i = 0; i < MAX_RANKS; i++){ | ||
50 | reg = mfdcrx(DDR3_MR0CF + i); | ||
51 | |||
52 | if (!(reg & 1)) | ||
53 | continue; | ||
54 | |||
55 | reg &= 0x0000f000; | ||
56 | reg >>= 12; | ||
57 | memsize += (0x800000ULL << reg); | ||
58 | } | ||
59 | |||
60 | return memsize; | ||
61 | } | ||
62 | |||
63 | static void ibm_currituck_fixups(void) | ||
64 | { | ||
65 | void *devp = finddevice("/"); | ||
66 | u32 dma_ranges[7]; | ||
67 | |||
68 | dt_fixup_memory(0x0ULL, ibm_currituck_memsize); | ||
69 | |||
70 | while ((devp = find_node_by_devtype(devp, "pci"))) { | ||
71 | if (getprop(devp, "dma-ranges", dma_ranges, sizeof(dma_ranges)) < 0) { | ||
72 | printf("%s: Failed to get dma-ranges\r\n", __func__); | ||
73 | continue; | ||
74 | } | ||
75 | |||
76 | dma_ranges[5] = ibm_currituck_memsize >> 32; | ||
77 | dma_ranges[6] = ibm_currituck_memsize & 0xffffffffUL; | ||
78 | |||
79 | setprop(devp, "dma-ranges", dma_ranges, sizeof(dma_ranges)); | ||
80 | } | ||
81 | } | ||
82 | |||
83 | #define SPRN_PIR 0x11E /* Processor Indentification Register */ | ||
84 | void platform_init(void) | ||
85 | { | ||
86 | unsigned long end_of_ram, avail_ram; | ||
87 | u32 pir_reg; | ||
88 | int node, size; | ||
89 | const u32 *timebase; | ||
90 | |||
91 | ibm_currituck_memsize = ibm_currituck_detect_memsize(); | ||
92 | if (ibm_currituck_memsize >> 32) | ||
93 | end_of_ram = ~0UL; | ||
94 | else | ||
95 | end_of_ram = ibm_currituck_memsize; | ||
96 | avail_ram = end_of_ram - (unsigned long)_end; | ||
97 | |||
98 | simple_alloc_init(_end, avail_ram, 128, 64); | ||
99 | platform_ops.fixups = ibm_currituck_fixups; | ||
100 | platform_ops.exit = ibm44x_dbcr_reset; | ||
101 | pir_reg = mfspr(SPRN_PIR); | ||
102 | |||
103 | /* Make sure FDT blob is sane */ | ||
104 | if (fdt_check_header(_dtb_start) != 0) | ||
105 | fatal("Invalid device tree blob\n"); | ||
106 | |||
107 | node = fdt_node_offset_by_prop_value(_dtb_start, -1, "device_type", | ||
108 | "cpu", sizeof("cpu")); | ||
109 | if (!node) | ||
110 | fatal("Cannot find cpu node\n"); | ||
111 | timebase = fdt_getprop(_dtb_start, node, "timebase-frequency", &size); | ||
112 | if (timebase && (size == 4)) | ||
113 | timebase_period_ns = 1000000000 / *timebase; | ||
114 | |||
115 | fdt_set_boot_cpuid_phys(_dtb_start, pir_reg); | ||
116 | fdt_init(_dtb_start); | ||
117 | |||
118 | serial_console_init(); | ||
119 | } | ||
diff --git a/arch/powerpc/boot/wrapper b/arch/powerpc/boot/wrapper index 14cd4bca8b8a..eb78e437ec1b 100755 --- a/arch/powerpc/boot/wrapper +++ b/arch/powerpc/boot/wrapper | |||
@@ -244,6 +244,9 @@ gamecube|wii) | |||
244 | link_address='0x600000' | 244 | link_address='0x600000' |
245 | platformo="$object/$platform-head.o $object/$platform.o" | 245 | platformo="$object/$platform-head.o $object/$platform.o" |
246 | ;; | 246 | ;; |
247 | treeboot-currituck) | ||
248 | link_address='0x1000000' | ||
249 | ;; | ||
247 | treeboot-iss4xx-mpic) | 250 | treeboot-iss4xx-mpic) |
248 | platformo="$object/treeboot-iss4xx.o" | 251 | platformo="$object/treeboot-iss4xx.o" |
249 | ;; | 252 | ;; |