Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

[POWERPC] Convert remaining dts-v0 files to v1

At the moment we have a mixture of left-over version 0 and new-format
version 1 files in arch/powerpc/boot/dts. This is potentially
confusing to people new to the dts format attempting to figure it out.

So, this patch converts all the as-yet unconverted dts v0 files and
converts them to v1. They're mechanically-converted, and not hand
tweaked so in some cases they're not 100% in keeping with usual v1
style, but the convertor program does have some heuristics so the
discrepancies aren't too bad.

I have checked that this patch produces no changes to the resulting
dtb binaries.

Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Acked-by: Josh Boyer <jwboyer@linux.vnet.ibm.com>
Acked-by: Geoff Levand <geoffrey.levand@am.sony.com>
Signed-off-by: Josh Boyer <jwboyer@linux.vnet.ibm.com>

authored by

David Gibson and committed by
Josh Boyer
71f34979 b786af11

+1341 -1307
+72 -70
arch/powerpc/boot/dts/bamboo.dts
··· 11 11 * any warranty of any kind, whether express or implied. 12 12 */ 13 13 14 + /dts-v1/; 15 + 14 16 / { 15 17 #address-cells = <2>; 16 18 #size-cells = <1>; 17 19 model = "amcc,bamboo"; 18 20 compatible = "amcc,bamboo"; 19 - dcr-parent = <&/cpus/cpu@0>; 21 + dcr-parent = <&{/cpus/cpu@0}>; 20 22 21 23 aliases { 22 24 ethernet0 = &EMAC0; ··· 36 34 cpu@0 { 37 35 device_type = "cpu"; 38 36 model = "PowerPC,440EP"; 39 - reg = <0>; 37 + reg = <0x00000000>; 40 38 clock-frequency = <0>; /* Filled in by zImage */ 41 39 timebase-frequency = <0>; /* Filled in by zImage */ 42 - i-cache-line-size = <20>; 43 - d-cache-line-size = <20>; 44 - i-cache-size = <8000>; 45 - d-cache-size = <8000>; 40 + i-cache-line-size = <32>; 41 + d-cache-line-size = <32>; 42 + i-cache-size = <32768>; 43 + d-cache-size = <32768>; 46 44 dcr-controller; 47 45 dcr-access-method = "native"; 48 46 }; ··· 50 48 51 49 memory { 52 50 device_type = "memory"; 53 - reg = <0 0 0>; /* Filled in by zImage */ 51 + reg = <0x00000000 0x00000000 0x00000000>; /* Filled in by zImage */ 54 52 }; 55 53 56 54 UIC0: interrupt-controller0 { 57 55 compatible = "ibm,uic-440ep","ibm,uic"; 58 56 interrupt-controller; 59 57 cell-index = <0>; 60 - dcr-reg = <0c0 009>; 58 + dcr-reg = <0x0c0 0x009>; 61 59 #address-cells = <0>; 62 60 #size-cells = <0>; 63 61 #interrupt-cells = <2>; ··· 67 65 compatible = "ibm,uic-440ep","ibm,uic"; 68 66 interrupt-controller; 69 67 cell-index = <1>; 70 - dcr-reg = <0d0 009>; 68 + dcr-reg = <0x0d0 0x009>; 71 69 #address-cells = <0>; 72 70 #size-cells = <0>; 73 71 #interrupt-cells = <2>; 74 - interrupts = <1e 4 1f 4>; /* cascade */ 72 + interrupts = <0x1e 0x4 0x1f 0x4>; /* cascade */ 75 73 interrupt-parent = <&UIC0>; 76 74 }; 77 75 78 76 SDR0: sdr { 79 77 compatible = "ibm,sdr-440ep"; 80 - dcr-reg = <00e 002>; 78 + dcr-reg = <0x00e 0x002>; 81 79 }; 82 80 83 81 CPR0: cpr { 84 82 compatible = "ibm,cpr-440ep"; 85 - dcr-reg = <00c 002>; 83 + dcr-reg = <0x00c 0x002>; 86 84 }; 87 85 88 86 plb { ··· 94 92 95 93 SDRAM0: sdram { 96 94 compatible = "ibm,sdram-440ep", "ibm,sdram-405gp"; 97 - dcr-reg = <010 2>; 95 + dcr-reg = <0x010 0x002>; 98 96 }; 99 97 100 98 DMA0: dma { 101 99 compatible = "ibm,dma-440ep", "ibm,dma-440gp"; 102 - dcr-reg = <100 027>; 100 + dcr-reg = <0x100 0x027>; 103 101 }; 104 102 105 103 MAL0: mcmal { 106 104 compatible = "ibm,mcmal-440ep", "ibm,mcmal-440gp", "ibm,mcmal"; 107 - dcr-reg = <180 62>; 105 + dcr-reg = <0x180 0x062>; 108 106 num-tx-chans = <4>; 109 107 num-rx-chans = <2>; 110 108 interrupt-parent = <&MAL0>; 111 - interrupts = <0 1 2 3 4>; 109 + interrupts = <0x0 0x1 0x2 0x3 0x4>; 112 110 #interrupt-cells = <1>; 113 111 #address-cells = <0>; 114 112 #size-cells = <0>; 115 - interrupt-map = </*TXEOB*/ 0 &UIC0 a 4 116 - /*RXEOB*/ 1 &UIC0 b 4 117 - /*SERR*/ 2 &UIC1 0 4 118 - /*TXDE*/ 3 &UIC1 1 4 119 - /*RXDE*/ 4 &UIC1 2 4>; 113 + interrupt-map = </*TXEOB*/ 0x0 &UIC0 0xa 0x4 114 + /*RXEOB*/ 0x1 &UIC0 0xb 0x4 115 + /*SERR*/ 0x2 &UIC1 0x0 0x4 116 + /*TXDE*/ 0x3 &UIC1 0x1 0x4 117 + /*RXDE*/ 0x4 &UIC1 0x2 0x4>; 120 118 }; 121 119 122 120 POB0: opb { ··· 126 124 /* Bamboo is oddball in the 44x world and doesn't use the ERPN 127 125 * bits. 128 126 */ 129 - ranges = <00000000 0 00000000 80000000 130 - 80000000 0 80000000 80000000>; 127 + ranges = <0x00000000 0x00000000 0x00000000 0x80000000 128 + 0x80000000 0x00000000 0x80000000 0x80000000>; 131 129 interrupt-parent = <&UIC1>; 132 - interrupts = <7 4>; 130 + interrupts = <0x7 0x4>; 133 131 clock-frequency = <0>; /* Filled in by zImage */ 134 132 135 133 EBC0: ebc { 136 134 compatible = "ibm,ebc-440ep", "ibm,ebc-440gp", "ibm,ebc"; 137 - dcr-reg = <012 2>; 135 + dcr-reg = <0x012 0x002>; 138 136 #address-cells = <2>; 139 137 #size-cells = <1>; 140 138 clock-frequency = <0>; /* Filled in by zImage */ 141 - interrupts = <5 1>; 139 + interrupts = <0x5 0x1>; 142 140 interrupt-parent = <&UIC1>; 143 141 }; 144 142 145 143 UART0: serial@ef600300 { 146 144 device_type = "serial"; 147 145 compatible = "ns16550"; 148 - reg = <ef600300 8>; 149 - virtual-reg = <ef600300>; 146 + reg = <0xef600300 0x00000008>; 147 + virtual-reg = <0xef600300>; 150 148 clock-frequency = <0>; /* Filled in by zImage */ 151 - current-speed = <1c200>; 149 + current-speed = <115200>; 152 150 interrupt-parent = <&UIC0>; 153 - interrupts = <0 4>; 151 + interrupts = <0x0 0x4>; 154 152 }; 155 153 156 154 UART1: serial@ef600400 { 157 155 device_type = "serial"; 158 156 compatible = "ns16550"; 159 - reg = <ef600400 8>; 160 - virtual-reg = <ef600400>; 157 + reg = <0xef600400 0x00000008>; 158 + virtual-reg = <0xef600400>; 161 159 clock-frequency = <0>; 162 160 current-speed = <0>; 163 161 interrupt-parent = <&UIC0>; 164 - interrupts = <1 4>; 162 + interrupts = <0x1 0x4>; 165 163 }; 166 164 167 165 UART2: serial@ef600500 { 168 166 device_type = "serial"; 169 167 compatible = "ns16550"; 170 - reg = <ef600500 8>; 171 - virtual-reg = <ef600500>; 168 + reg = <0xef600500 0x00000008>; 169 + virtual-reg = <0xef600500>; 172 170 clock-frequency = <0>; 173 171 current-speed = <0>; 174 172 interrupt-parent = <&UIC0>; 175 - interrupts = <3 4>; 173 + interrupts = <0x3 0x4>; 176 174 }; 177 175 178 176 UART3: serial@ef600600 { 179 177 device_type = "serial"; 180 178 compatible = "ns16550"; 181 - reg = <ef600600 8>; 182 - virtual-reg = <ef600600>; 179 + reg = <0xef600600 0x00000008>; 180 + virtual-reg = <0xef600600>; 183 181 clock-frequency = <0>; 184 182 current-speed = <0>; 185 183 interrupt-parent = <&UIC0>; 186 - interrupts = <4 4>; 184 + interrupts = <0x4 0x4>; 187 185 }; 188 186 189 187 IIC0: i2c@ef600700 { 190 188 compatible = "ibm,iic-440ep", "ibm,iic-440gp", "ibm,iic"; 191 - reg = <ef600700 14>; 189 + reg = <0xef600700 0x00000014>; 192 190 interrupt-parent = <&UIC0>; 193 - interrupts = <2 4>; 191 + interrupts = <0x2 0x4>; 194 192 }; 195 193 196 194 IIC1: i2c@ef600800 { 197 195 compatible = "ibm,iic-440ep", "ibm,iic-440gp", "ibm,iic"; 198 - reg = <ef600800 14>; 196 + reg = <0xef600800 0x00000014>; 199 197 interrupt-parent = <&UIC0>; 200 - interrupts = <7 4>; 198 + interrupts = <0x7 0x4>; 201 199 }; 202 200 203 201 ZMII0: emac-zmii@ef600d00 { 204 202 compatible = "ibm,zmii-440ep", "ibm,zmii-440gp", "ibm,zmii"; 205 - reg = <ef600d00 c>; 203 + reg = <0xef600d00 0x0000000c>; 206 204 }; 207 205 208 206 EMAC0: ethernet@ef600e00 { 209 207 device_type = "network"; 210 208 compatible = "ibm,emac-440ep", "ibm,emac-440gp", "ibm,emac"; 211 209 interrupt-parent = <&UIC1>; 212 - interrupts = <1c 4 1d 4>; 213 - reg = <ef600e00 70>; 210 + interrupts = <0x1c 0x4 0x1d 0x4>; 211 + reg = <0xef600e00 0x00000070>; 214 212 local-mac-address = [000000000000]; 215 213 mal-device = <&MAL0>; 216 214 mal-tx-channel = <0 1>; 217 215 mal-rx-channel = <0>; 218 216 cell-index = <0>; 219 - max-frame-size = <5dc>; 220 - rx-fifo-size = <1000>; 221 - tx-fifo-size = <800>; 217 + max-frame-size = <1500>; 218 + rx-fifo-size = <4096>; 219 + tx-fifo-size = <2048>; 222 220 phy-mode = "rmii"; 223 - phy-map = <00000000>; 221 + phy-map = <0x00000000>; 224 222 zmii-device = <&ZMII0>; 225 223 zmii-channel = <0>; 226 224 }; ··· 229 227 device_type = "network"; 230 228 compatible = "ibm,emac-440ep", "ibm,emac-440gp", "ibm,emac"; 231 229 interrupt-parent = <&UIC1>; 232 - interrupts = <1e 4 1f 4>; 233 - reg = <ef600f00 70>; 230 + interrupts = <0x1e 0x4 0x1f 0x4>; 231 + reg = <0xef600f00 0x00000070>; 234 232 local-mac-address = [000000000000]; 235 233 mal-device = <&MAL0>; 236 234 mal-tx-channel = <2 3>; 237 235 mal-rx-channel = <1>; 238 236 cell-index = <1>; 239 - max-frame-size = <5dc>; 240 - rx-fifo-size = <1000>; 241 - tx-fifo-size = <800>; 237 + max-frame-size = <1500>; 238 + rx-fifo-size = <4096>; 239 + tx-fifo-size = <2048>; 242 240 phy-mode = "rmii"; 243 - phy-map = <00000000>; 241 + phy-map = <0x00000000>; 244 242 zmii-device = <&ZMII0>; 245 243 zmii-channel = <1>; 246 244 }; 247 245 248 246 usb@ef601000 { 249 247 compatible = "ohci-be"; 250 - reg = <ef601000 80>; 251 - interrupts = <8 1 9 1>; 248 + reg = <0xef601000 0x00000080>; 249 + interrupts = <0x8 0x1 0x9 0x1>; 252 250 interrupt-parent = < &UIC1 >; 253 251 }; 254 252 }; ··· 260 258 #address-cells = <3>; 261 259 compatible = "ibm,plb440ep-pci", "ibm,plb-pci"; 262 260 primary; 263 - reg = <0 eec00000 8 /* Config space access */ 264 - 0 eed00000 4 /* IACK */ 265 - 0 eed00000 4 /* Special cycle */ 266 - 0 ef400000 40>; /* Internal registers */ 261 + reg = <0x00000000 0xeec00000 0x00000008 /* Config space access */ 262 + 0x00000000 0xeed00000 0x00000004 /* IACK */ 263 + 0x00000000 0xeed00000 0x00000004 /* Special cycle */ 264 + 0x00000000 0xef400000 0x00000040>; /* Internal registers */ 267 265 268 266 /* Outbound ranges, one memory and one IO, 269 267 * later cannot be changed. Chip supports a second 270 268 * IO range but we don't use it for now 271 269 */ 272 - ranges = <02000000 0 a0000000 0 a0000000 0 20000000 273 - 01000000 0 00000000 0 e8000000 0 00010000>; 270 + ranges = <0x02000000 0x00000000 0xa0000000 0x00000000 0xa0000000 0x00000000 0x20000000 271 + 0x01000000 0x00000000 0x00000000 0x00000000 0xe8000000 0x00000000 0x00010000>; 274 272 275 273 /* Inbound 2GB range starting at 0 */ 276 - dma-ranges = <42000000 0 0 0 0 0 80000000>; 274 + dma-ranges = <0x42000000 0x0 0x0 0x0 0x0 0x0 0x80000000>; 277 275 278 276 /* Bamboo has all 4 IRQ pins tied together per slot */ 279 - interrupt-map-mask = <f800 0 0 0>; 277 + interrupt-map-mask = <0xf800 0x0 0x0 0x0>; 280 278 interrupt-map = < 281 279 /* IDSEL 1 */ 282 - 0800 0 0 0 &UIC0 1c 8 280 + 0x800 0x0 0x0 0x0 &UIC0 0x1c 0x8 283 281 284 282 /* IDSEL 2 */ 285 - 1000 0 0 0 &UIC0 1b 8 283 + 0x1000 0x0 0x0 0x0 &UIC0 0x1b 0x8 286 284 287 285 /* IDSEL 3 */ 288 - 1800 0 0 0 &UIC0 1a 8 286 + 0x1800 0x0 0x0 0x0 &UIC0 0x1a 0x8 289 287 290 288 /* IDSEL 4 */ 291 - 2000 0 0 0 &UIC0 19 8 289 + 0x2000 0x0 0x0 0x0 &UIC0 0x19 0x8 292 290 >; 293 291 }; 294 292 };
+112 -110
arch/powerpc/boot/dts/canyonlands.dts
··· 8 8 * any warranty of any kind, whether express or implied. 9 9 */ 10 10 11 + /dts-v1/; 12 + 11 13 / { 12 14 #address-cells = <2>; 13 15 #size-cells = <1>; 14 16 model = "amcc,canyonlands"; 15 17 compatible = "amcc,canyonlands"; 16 - dcr-parent = <&/cpus/cpu@0>; 18 + dcr-parent = <&{/cpus/cpu@0}>; 17 19 18 20 aliases { 19 21 ethernet0 = &EMAC0; ··· 31 29 cpu@0 { 32 30 device_type = "cpu"; 33 31 model = "PowerPC,460EX"; 34 - reg = <0>; 32 + reg = <0x00000000>; 35 33 clock-frequency = <0>; /* Filled in by U-Boot */ 36 34 timebase-frequency = <0>; /* Filled in by U-Boot */ 37 - i-cache-line-size = <20>; 38 - d-cache-line-size = <20>; 39 - i-cache-size = <8000>; 40 - d-cache-size = <8000>; 35 + i-cache-line-size = <32>; 36 + d-cache-line-size = <32>; 37 + i-cache-size = <32768>; 38 + d-cache-size = <32768>; 41 39 dcr-controller; 42 40 dcr-access-method = "native"; 43 41 }; ··· 45 43 46 44 memory { 47 45 device_type = "memory"; 48 - reg = <0 0 0>; /* Filled in by U-Boot */ 46 + reg = <0x00000000 0x00000000 0x00000000>; /* Filled in by U-Boot */ 49 47 }; 50 48 51 49 UIC0: interrupt-controller0 { 52 50 compatible = "ibm,uic-460ex","ibm,uic"; 53 51 interrupt-controller; 54 52 cell-index = <0>; 55 - dcr-reg = <0c0 009>; 53 + dcr-reg = <0x0c0 0x009>; 56 54 #address-cells = <0>; 57 55 #size-cells = <0>; 58 56 #interrupt-cells = <2>; ··· 62 60 compatible = "ibm,uic-460ex","ibm,uic"; 63 61 interrupt-controller; 64 62 cell-index = <1>; 65 - dcr-reg = <0d0 009>; 63 + dcr-reg = <0x0d0 0x009>; 66 64 #address-cells = <0>; 67 65 #size-cells = <0>; 68 66 #interrupt-cells = <2>; 69 - interrupts = <1e 4 1f 4>; /* cascade */ 67 + interrupts = <0x1e 0x4 0x1f 0x4>; /* cascade */ 70 68 interrupt-parent = <&UIC0>; 71 69 }; 72 70 ··· 74 72 compatible = "ibm,uic-460ex","ibm,uic"; 75 73 interrupt-controller; 76 74 cell-index = <2>; 77 - dcr-reg = <0e0 009>; 75 + dcr-reg = <0x0e0 0x009>; 78 76 #address-cells = <0>; 79 77 #size-cells = <0>; 80 78 #interrupt-cells = <2>; 81 - interrupts = <a 4 b 4>; /* cascade */ 79 + interrupts = <0xa 0x4 0xb 0x4>; /* cascade */ 82 80 interrupt-parent = <&UIC0>; 83 81 }; 84 82 ··· 86 84 compatible = "ibm,uic-460ex","ibm,uic"; 87 85 interrupt-controller; 88 86 cell-index = <3>; 89 - dcr-reg = <0f0 009>; 87 + dcr-reg = <0x0f0 0x009>; 90 88 #address-cells = <0>; 91 89 #size-cells = <0>; 92 90 #interrupt-cells = <2>; 93 - interrupts = <10 4 11 4>; /* cascade */ 91 + interrupts = <0x10 0x4 0x11 0x4>; /* cascade */ 94 92 interrupt-parent = <&UIC0>; 95 93 }; 96 94 97 95 SDR0: sdr { 98 96 compatible = "ibm,sdr-460ex"; 99 - dcr-reg = <00e 002>; 97 + dcr-reg = <0x00e 0x002>; 100 98 }; 101 99 102 100 CPR0: cpr { 103 101 compatible = "ibm,cpr-460ex"; 104 - dcr-reg = <00c 002>; 102 + dcr-reg = <0x00c 0x002>; 105 103 }; 106 104 107 105 plb { ··· 113 111 114 112 SDRAM0: sdram { 115 113 compatible = "ibm,sdram-460ex", "ibm,sdram-405gp"; 116 - dcr-reg = <010 2>; 114 + dcr-reg = <0x010 0x002>; 117 115 }; 118 116 119 117 MAL0: mcmal { 120 118 compatible = "ibm,mcmal-460ex", "ibm,mcmal2"; 121 - dcr-reg = <180 62>; 119 + dcr-reg = <0x180 0x062>; 122 120 num-tx-chans = <2>; 123 - num-rx-chans = <10>; 121 + num-rx-chans = <16>; 124 122 #address-cells = <0>; 125 123 #size-cells = <0>; 126 124 interrupt-parent = <&UIC2>; 127 - interrupts = < /*TXEOB*/ 6 4 128 - /*RXEOB*/ 7 4 129 - /*SERR*/ 3 4 130 - /*TXDE*/ 4 4 131 - /*RXDE*/ 5 4>; 125 + interrupts = < /*TXEOB*/ 0x6 0x4 126 + /*RXEOB*/ 0x7 0x4 127 + /*SERR*/ 0x3 0x4 128 + /*TXDE*/ 0x4 0x4 129 + /*RXDE*/ 0x5 0x4>; 132 130 }; 133 131 134 132 POB0: opb { 135 133 compatible = "ibm,opb-460ex", "ibm,opb"; 136 134 #address-cells = <1>; 137 135 #size-cells = <1>; 138 - ranges = <b0000000 4 b0000000 50000000>; 136 + ranges = <0xb0000000 0x00000004 0xb0000000 0x50000000>; 139 137 clock-frequency = <0>; /* Filled in by U-Boot */ 140 138 141 139 EBC0: ebc { 142 140 compatible = "ibm,ebc-460ex", "ibm,ebc"; 143 - dcr-reg = <012 2>; 141 + dcr-reg = <0x012 0x002>; 144 142 #address-cells = <2>; 145 143 #size-cells = <1>; 146 144 clock-frequency = <0>; /* Filled in by U-Boot */ 147 145 /* ranges property is supplied by U-Boot */ 148 - interrupts = <6 4>; 146 + interrupts = <0x6 0x4>; 149 147 interrupt-parent = <&UIC1>; 150 148 151 149 nor_flash@0,0 { 152 150 compatible = "amd,s29gl512n", "cfi-flash"; 153 151 bank-width = <2>; 154 - reg = <0 000000 4000000>; 152 + reg = <0x00000000 0x00000000 0x04000000>; 155 153 #address-cells = <1>; 156 154 #size-cells = <1>; 157 155 partition@0 { 158 156 label = "kernel"; 159 - reg = <0 1e0000>; 157 + reg = <0x00000000 0x001e0000>; 160 158 }; 161 159 partition@1e0000 { 162 160 label = "dtb"; 163 - reg = <1e0000 20000>; 161 + reg = <0x001e0000 0x00020000>; 164 162 }; 165 163 partition@200000 { 166 164 label = "ramdisk"; 167 - reg = <200000 1400000>; 165 + reg = <0x00200000 0x01400000>; 168 166 }; 169 167 partition@1600000 { 170 168 label = "jffs2"; 171 - reg = <1600000 400000>; 169 + reg = <0x01600000 0x00400000>; 172 170 }; 173 171 partition@1a00000 { 174 172 label = "user"; 175 - reg = <1a00000 2560000>; 173 + reg = <0x01a00000 0x02560000>; 176 174 }; 177 175 partition@3f60000 { 178 176 label = "env"; 179 - reg = <3f60000 40000>; 177 + reg = <0x03f60000 0x00040000>; 180 178 }; 181 179 partition@3fa0000 { 182 180 label = "u-boot"; 183 - reg = <3fa0000 60000>; 181 + reg = <0x03fa0000 0x00060000>; 184 182 }; 185 183 }; 186 184 }; ··· 188 186 UART0: serial@ef600300 { 189 187 device_type = "serial"; 190 188 compatible = "ns16550"; 191 - reg = <ef600300 8>; 192 - virtual-reg = <ef600300>; 189 + reg = <0xef600300 0x00000008>; 190 + virtual-reg = <0xef600300>; 193 191 clock-frequency = <0>; /* Filled in by U-Boot */ 194 192 current-speed = <0>; /* Filled in by U-Boot */ 195 193 interrupt-parent = <&UIC1>; 196 - interrupts = <1 4>; 194 + interrupts = <0x1 0x4>; 197 195 }; 198 196 199 197 UART1: serial@ef600400 { 200 198 device_type = "serial"; 201 199 compatible = "ns16550"; 202 - reg = <ef600400 8>; 203 - virtual-reg = <ef600400>; 200 + reg = <0xef600400 0x00000008>; 201 + virtual-reg = <0xef600400>; 204 202 clock-frequency = <0>; /* Filled in by U-Boot */ 205 203 current-speed = <0>; /* Filled in by U-Boot */ 206 204 interrupt-parent = <&UIC0>; 207 - interrupts = <1 4>; 205 + interrupts = <0x1 0x4>; 208 206 }; 209 207 210 208 UART2: serial@ef600500 { 211 209 device_type = "serial"; 212 210 compatible = "ns16550"; 213 - reg = <ef600500 8>; 214 - virtual-reg = <ef600500>; 211 + reg = <0xef600500 0x00000008>; 212 + virtual-reg = <0xef600500>; 215 213 clock-frequency = <0>; /* Filled in by U-Boot */ 216 214 current-speed = <0>; /* Filled in by U-Boot */ 217 215 interrupt-parent = <&UIC1>; 218 - interrupts = <1d 4>; 216 + interrupts = <0x1d 0x4>; 219 217 }; 220 218 221 219 UART3: serial@ef600600 { 222 220 device_type = "serial"; 223 221 compatible = "ns16550"; 224 - reg = <ef600600 8>; 225 - virtual-reg = <ef600600>; 222 + reg = <0xef600600 0x00000008>; 223 + virtual-reg = <0xef600600>; 226 224 clock-frequency = <0>; /* Filled in by U-Boot */ 227 225 current-speed = <0>; /* Filled in by U-Boot */ 228 226 interrupt-parent = <&UIC1>; 229 - interrupts = <1e 4>; 227 + interrupts = <0x1e 0x4>; 230 228 }; 231 229 232 230 IIC0: i2c@ef600700 { 233 231 compatible = "ibm,iic-460ex", "ibm,iic"; 234 - reg = <ef600700 14>; 232 + reg = <0xef600700 0x00000014>; 235 233 interrupt-parent = <&UIC0>; 236 - interrupts = <2 4>; 234 + interrupts = <0x2 0x4>; 237 235 }; 238 236 239 237 IIC1: i2c@ef600800 { 240 238 compatible = "ibm,iic-460ex", "ibm,iic"; 241 - reg = <ef600800 14>; 239 + reg = <0xef600800 0x00000014>; 242 240 interrupt-parent = <&UIC0>; 243 - interrupts = <3 4>; 241 + interrupts = <0x3 0x4>; 244 242 }; 245 243 246 244 ZMII0: emac-zmii@ef600d00 { 247 245 compatible = "ibm,zmii-460ex", "ibm,zmii"; 248 - reg = <ef600d00 c>; 246 + reg = <0xef600d00 0x0000000c>; 249 247 }; 250 248 251 249 RGMII0: emac-rgmii@ef601500 { 252 250 compatible = "ibm,rgmii-460ex", "ibm,rgmii"; 253 - reg = <ef601500 8>; 251 + reg = <0xef601500 0x00000008>; 254 252 has-mdio; 255 253 }; 256 254 257 255 TAH0: emac-tah@ef601350 { 258 256 compatible = "ibm,tah-460ex", "ibm,tah"; 259 - reg = <ef601350 30>; 257 + reg = <0xef601350 0x00000030>; 260 258 }; 261 259 262 260 TAH1: emac-tah@ef601450 { 263 261 compatible = "ibm,tah-460ex", "ibm,tah"; 264 - reg = <ef601450 30>; 262 + reg = <0xef601450 0x00000030>; 265 263 }; 266 264 267 265 EMAC0: ethernet@ef600e00 { 268 266 device_type = "network"; 269 267 compatible = "ibm,emac-460ex", "ibm,emac4"; 270 268 interrupt-parent = <&EMAC0>; 271 - interrupts = <0 1>; 269 + interrupts = <0x0 0x1>; 272 270 #interrupt-cells = <1>; 273 271 #address-cells = <0>; 274 272 #size-cells = <0>; 275 - interrupt-map = </*Status*/ 0 &UIC2 10 4 276 - /*Wake*/ 1 &UIC2 14 4>; 277 - reg = <ef600e00 70>; 273 + interrupt-map = </*Status*/ 0x0 &UIC2 0x10 0x4 274 + /*Wake*/ 0x1 &UIC2 0x14 0x4>; 275 + reg = <0xef600e00 0x00000070>; 278 276 local-mac-address = [000000000000]; /* Filled in by U-Boot */ 279 277 mal-device = <&MAL0>; 280 278 mal-tx-channel = <0>; 281 279 mal-rx-channel = <0>; 282 280 cell-index = <0>; 283 - max-frame-size = <2328>; 284 - rx-fifo-size = <1000>; 285 - tx-fifo-size = <800>; 281 + max-frame-size = <9000>; 282 + rx-fifo-size = <4096>; 283 + tx-fifo-size = <2048>; 286 284 phy-mode = "rgmii"; 287 - phy-map = <00000000>; 285 + phy-map = <0x00000000>; 288 286 rgmii-device = <&RGMII0>; 289 287 rgmii-channel = <0>; 290 288 tah-device = <&TAH0>; ··· 297 295 device_type = "network"; 298 296 compatible = "ibm,emac-460ex", "ibm,emac4"; 299 297 interrupt-parent = <&EMAC1>; 300 - interrupts = <0 1>; 298 + interrupts = <0x0 0x1>; 301 299 #interrupt-cells = <1>; 302 300 #address-cells = <0>; 303 301 #size-cells = <0>; 304 - interrupt-map = </*Status*/ 0 &UIC2 11 4 305 - /*Wake*/ 1 &UIC2 15 4>; 306 - reg = <ef600f00 70>; 302 + interrupt-map = </*Status*/ 0x0 &UIC2 0x11 0x4 303 + /*Wake*/ 0x1 &UIC2 0x15 0x4>; 304 + reg = <0xef600f00 0x00000070>; 307 305 local-mac-address = [000000000000]; /* Filled in by U-Boot */ 308 306 mal-device = <&MAL0>; 309 307 mal-tx-channel = <1>; 310 308 mal-rx-channel = <8>; 311 309 cell-index = <1>; 312 - max-frame-size = <2328>; 313 - rx-fifo-size = <1000>; 314 - tx-fifo-size = <800>; 310 + max-frame-size = <9000>; 311 + rx-fifo-size = <4096>; 312 + tx-fifo-size = <2048>; 315 313 phy-mode = "rgmii"; 316 - phy-map = <00000000>; 314 + phy-map = <0x00000000>; 317 315 rgmii-device = <&RGMII0>; 318 316 rgmii-channel = <1>; 319 317 tah-device = <&TAH1>; ··· 333 331 primary; 334 332 large-inbound-windows; 335 333 enable-msi-hole; 336 - reg = <c 0ec00000 8 /* Config space access */ 337 - 0 0 0 /* no IACK cycles */ 338 - c 0ed00000 4 /* Special cycles */ 339 - c 0ec80000 100 /* Internal registers */ 340 - c 0ec80100 fc>; /* Internal messaging registers */ 334 + reg = <0x0000000c 0x0ec00000 0x00000008 /* Config space access */ 335 + 0x00000000 0x00000000 0x00000000 /* no IACK cycles */ 336 + 0x0000000c 0x0ed00000 0x00000004 /* Special cycles */ 337 + 0x0000000c 0x0ec80000 0x00000100 /* Internal registers */ 338 + 0x0000000c 0x0ec80100 0x000000fc>; /* Internal messaging registers */ 341 339 342 340 /* Outbound ranges, one memory and one IO, 343 341 * later cannot be changed 344 342 */ 345 - ranges = <02000000 0 80000000 0000000d 80000000 0 80000000 346 - 01000000 0 00000000 0000000c 08000000 0 00010000>; 343 + ranges = <0x02000000 0x00000000 0x80000000 0x0000000d 0x80000000 0x00000000 0x80000000 344 + 0x01000000 0x00000000 0x00000000 0x0000000c 0x08000000 0x00000000 0x00010000>; 347 345 348 346 /* Inbound 2GB range starting at 0 */ 349 - dma-ranges = <42000000 0 0 0 0 0 80000000>; 347 + dma-ranges = <0x42000000 0x0 0x0 0x0 0x0 0x0 0x80000000>; 350 348 351 349 /* This drives busses 0 to 0x3f */ 352 - bus-range = <0 3f>; 350 + bus-range = <0x0 0x3f>; 353 351 354 352 /* All PCI interrupts are routed to ext IRQ 2 -> UIC1-0 */ 355 - interrupt-map-mask = <0000 0 0 0>; 356 - interrupt-map = < 0000 0 0 0 &UIC1 0 8 >; 353 + interrupt-map-mask = <0x0 0x0 0x0 0x0>; 354 + interrupt-map = < 0x0 0x0 0x0 0x0 &UIC1 0x0 0x8 >; 357 355 }; 358 356 359 357 PCIE0: pciex@d00000000 { ··· 363 361 #address-cells = <3>; 364 362 compatible = "ibm,plb-pciex-460ex", "ibm,plb-pciex"; 365 363 primary; 366 - port = <0>; /* port number */ 367 - reg = <d 00000000 20000000 /* Config space access */ 368 - c 08010000 00001000>; /* Registers */ 369 - dcr-reg = <100 020>; 370 - sdr-base = <300>; 364 + port = <0x0>; /* port number */ 365 + reg = <0x0000000d 0x00000000 0x20000000 /* Config space access */ 366 + 0x0000000c 0x08010000 0x00001000>; /* Registers */ 367 + dcr-reg = <0x100 0x020>; 368 + sdr-base = <0x300>; 371 369 372 370 /* Outbound ranges, one memory and one IO, 373 371 * later cannot be changed 374 372 */ 375 - ranges = <02000000 0 80000000 0000000e 00000000 0 80000000 376 - 01000000 0 00000000 0000000f 80000000 0 00010000>; 373 + ranges = <0x02000000 0x00000000 0x80000000 0x0000000e 0x00000000 0x00000000 0x80000000 374 + 0x01000000 0x00000000 0x00000000 0x0000000f 0x80000000 0x00000000 0x00010000>; 377 375 378 376 /* Inbound 2GB range starting at 0 */ 379 - dma-ranges = <42000000 0 0 0 0 0 80000000>; 377 + dma-ranges = <0x42000000 0x0 0x0 0x0 0x0 0x0 0x80000000>; 380 378 381 379 /* This drives busses 40 to 0x7f */ 382 - bus-range = <40 7f>; 380 + bus-range = <0x40 0x7f>; 383 381 384 382 /* Legacy interrupts (note the weird polarity, the bridge seems 385 383 * to invert PCIe legacy interrupts). ··· 389 387 * below are basically de-swizzled numbers. 390 388 * The real slot is on idsel 0, so the swizzling is 1:1 391 389 */ 392 - interrupt-map-mask = <0000 0 0 7>; 390 + interrupt-map-mask = <0x0 0x0 0x0 0x7>; 393 391 interrupt-map = < 394 - 0000 0 0 1 &UIC3 c 4 /* swizzled int A */ 395 - 0000 0 0 2 &UIC3 d 4 /* swizzled int B */ 396 - 0000 0 0 3 &UIC3 e 4 /* swizzled int C */ 397 - 0000 0 0 4 &UIC3 f 4 /* swizzled int D */>; 392 + 0x0 0x0 0x0 0x1 &UIC3 0xc 0x4 /* swizzled int A */ 393 + 0x0 0x0 0x0 0x2 &UIC3 0xd 0x4 /* swizzled int B */ 394 + 0x0 0x0 0x0 0x3 &UIC3 0xe 0x4 /* swizzled int C */ 395 + 0x0 0x0 0x0 0x4 &UIC3 0xf 0x4 /* swizzled int D */>; 398 396 }; 399 397 400 398 PCIE1: pciex@d20000000 { ··· 404 402 #address-cells = <3>; 405 403 compatible = "ibm,plb-pciex-460ex", "ibm,plb-pciex"; 406 404 primary; 407 - port = <1>; /* port number */ 408 - reg = <d 20000000 20000000 /* Config space access */ 409 - c 08011000 00001000>; /* Registers */ 410 - dcr-reg = <120 020>; 411 - sdr-base = <340>; 405 + port = <0x1>; /* port number */ 406 + reg = <0x0000000d 0x20000000 0x20000000 /* Config space access */ 407 + 0x0000000c 0x08011000 0x00001000>; /* Registers */ 408 + dcr-reg = <0x120 0x020>; 409 + sdr-base = <0x340>; 412 410 413 411 /* Outbound ranges, one memory and one IO, 414 412 * later cannot be changed 415 413 */ 416 - ranges = <02000000 0 80000000 0000000e 80000000 0 80000000 417 - 01000000 0 00000000 0000000f 80010000 0 00010000>; 414 + ranges = <0x02000000 0x00000000 0x80000000 0x0000000e 0x80000000 0x00000000 0x80000000 415 + 0x01000000 0x00000000 0x00000000 0x0000000f 0x80010000 0x00000000 0x00010000>; 418 416 419 417 /* Inbound 2GB range starting at 0 */ 420 - dma-ranges = <42000000 0 0 0 0 0 80000000>; 418 + dma-ranges = <0x42000000 0x0 0x0 0x0 0x0 0x0 0x80000000>; 421 419 422 420 /* This drives busses 80 to 0xbf */ 423 - bus-range = <80 bf>; 421 + bus-range = <0x80 0xbf>; 424 422 425 423 /* Legacy interrupts (note the weird polarity, the bridge seems 426 424 * to invert PCIe legacy interrupts). ··· 430 428 * below are basically de-swizzled numbers. 431 429 * The real slot is on idsel 0, so the swizzling is 1:1 432 430 */ 433 - interrupt-map-mask = <0000 0 0 7>; 431 + interrupt-map-mask = <0x0 0x0 0x0 0x7>; 434 432 interrupt-map = < 435 - 0000 0 0 1 &UIC3 10 4 /* swizzled int A */ 436 - 0000 0 0 2 &UIC3 11 4 /* swizzled int B */ 437 - 0000 0 0 3 &UIC3 12 4 /* swizzled int C */ 438 - 0000 0 0 4 &UIC3 13 4 /* swizzled int D */>; 433 + 0x0 0x0 0x0 0x1 &UIC3 0x10 0x4 /* swizzled int A */ 434 + 0x0 0x0 0x0 0x2 &UIC3 0x11 0x4 /* swizzled int B */ 435 + 0x0 0x0 0x0 0x3 &UIC3 0x12 0x4 /* swizzled int C */ 436 + 0x0 0x0 0x0 0x4 &UIC3 0x13 0x4 /* swizzled int D */>; 439 437 }; 440 438 }; 441 439 };
+83 -81
arch/powerpc/boot/dts/ebony.dts
··· 11 11 * any warranty of any kind, whether express or implied. 12 12 */ 13 13 14 + /dts-v1/; 15 + 14 16 / { 15 17 #address-cells = <2>; 16 18 #size-cells = <1>; 17 19 model = "ibm,ebony"; 18 20 compatible = "ibm,ebony"; 19 - dcr-parent = <&/cpus/cpu@0>; 21 + dcr-parent = <&{/cpus/cpu@0}>; 20 22 21 23 aliases { 22 24 ethernet0 = &EMAC0; ··· 34 32 cpu@0 { 35 33 device_type = "cpu"; 36 34 model = "PowerPC,440GP"; 37 - reg = <0>; 35 + reg = <0x00000000>; 38 36 clock-frequency = <0>; // Filled in by zImage 39 37 timebase-frequency = <0>; // Filled in by zImage 40 - i-cache-line-size = <20>; 41 - d-cache-line-size = <20>; 42 - i-cache-size = <8000>; /* 32 kB */ 43 - d-cache-size = <8000>; /* 32 kB */ 38 + i-cache-line-size = <32>; 39 + d-cache-line-size = <32>; 40 + i-cache-size = <32768>; /* 32 kB */ 41 + d-cache-size = <32768>; /* 32 kB */ 44 42 dcr-controller; 45 43 dcr-access-method = "native"; 46 44 }; ··· 48 46 49 47 memory { 50 48 device_type = "memory"; 51 - reg = <0 0 0>; // Filled in by zImage 49 + reg = <0x00000000 0x00000000 0x00000000>; // Filled in by zImage 52 50 }; 53 51 54 52 UIC0: interrupt-controller0 { 55 53 compatible = "ibm,uic-440gp", "ibm,uic"; 56 54 interrupt-controller; 57 55 cell-index = <0>; 58 - dcr-reg = <0c0 009>; 56 + dcr-reg = <0x0c0 0x009>; 59 57 #address-cells = <0>; 60 58 #size-cells = <0>; 61 59 #interrupt-cells = <2>; ··· 66 64 compatible = "ibm,uic-440gp", "ibm,uic"; 67 65 interrupt-controller; 68 66 cell-index = <1>; 69 - dcr-reg = <0d0 009>; 67 + dcr-reg = <0x0d0 0x009>; 70 68 #address-cells = <0>; 71 69 #size-cells = <0>; 72 70 #interrupt-cells = <2>; 73 - interrupts = <1e 4 1f 4>; /* cascade */ 71 + interrupts = <0x1e 0x4 0x1f 0x4>; /* cascade */ 74 72 interrupt-parent = <&UIC0>; 75 73 }; 76 74 77 75 CPC0: cpc { 78 76 compatible = "ibm,cpc-440gp"; 79 - dcr-reg = <0b0 003 0e0 010>; 77 + dcr-reg = <0x0b0 0x003 0x0e0 0x010>; 80 78 // FIXME: anything else? 81 79 }; 82 80 ··· 89 87 90 88 SDRAM0: memory-controller { 91 89 compatible = "ibm,sdram-440gp"; 92 - dcr-reg = <010 2>; 90 + dcr-reg = <0x010 0x002>; 93 91 // FIXME: anything else? 94 92 }; 95 93 96 94 SRAM0: sram { 97 95 compatible = "ibm,sram-440gp"; 98 - dcr-reg = <020 8 00a 1>; 96 + dcr-reg = <0x020 0x008 0x00a 0x001>; 99 97 }; 100 98 101 99 DMA0: dma { 102 100 // FIXME: ??? 103 101 compatible = "ibm,dma-440gp"; 104 - dcr-reg = <100 027>; 102 + dcr-reg = <0x100 0x027>; 105 103 }; 106 104 107 105 MAL0: mcmal { 108 106 compatible = "ibm,mcmal-440gp", "ibm,mcmal"; 109 - dcr-reg = <180 62>; 107 + dcr-reg = <0x180 0x062>; 110 108 num-tx-chans = <4>; 111 109 num-rx-chans = <4>; 112 110 interrupt-parent = <&MAL0>; 113 - interrupts = <0 1 2 3 4>; 111 + interrupts = <0x0 0x1 0x2 0x3 0x4>; 114 112 #interrupt-cells = <1>; 115 113 #address-cells = <0>; 116 114 #size-cells = <0>; 117 - interrupt-map = </*TXEOB*/ 0 &UIC0 a 4 118 - /*RXEOB*/ 1 &UIC0 b 4 119 - /*SERR*/ 2 &UIC1 0 4 120 - /*TXDE*/ 3 &UIC1 1 4 121 - /*RXDE*/ 4 &UIC1 2 4>; 122 - interrupt-map-mask = <ffffffff>; 115 + interrupt-map = </*TXEOB*/ 0x0 &UIC0 0xa 0x4 116 + /*RXEOB*/ 0x1 &UIC0 0xb 0x4 117 + /*SERR*/ 0x2 &UIC1 0x0 0x4 118 + /*TXDE*/ 0x3 &UIC1 0x1 0x4 119 + /*RXDE*/ 0x4 &UIC1 0x2 0x4>; 120 + interrupt-map-mask = <0xffffffff>; 123 121 }; 124 122 125 123 POB0: opb { ··· 128 126 #size-cells = <1>; 129 127 /* Wish there was a nicer way of specifying a full 32-bit 130 128 range */ 131 - ranges = <00000000 1 00000000 80000000 132 - 80000000 1 80000000 80000000>; 133 - dcr-reg = <090 00b>; 129 + ranges = <0x00000000 0x00000001 0x00000000 0x80000000 130 + 0x80000000 0x00000001 0x80000000 0x80000000>; 131 + dcr-reg = <0x090 0x00b>; 134 132 interrupt-parent = <&UIC1>; 135 - interrupts = <7 4>; 133 + interrupts = <0x7 0x4>; 136 134 clock-frequency = <0>; // Filled in by zImage 137 135 138 136 EBC0: ebc { 139 137 compatible = "ibm,ebc-440gp", "ibm,ebc"; 140 - dcr-reg = <012 2>; 138 + dcr-reg = <0x012 0x002>; 141 139 #address-cells = <2>; 142 140 #size-cells = <1>; 143 141 clock-frequency = <0>; // Filled in by zImage 144 142 // ranges property is supplied by zImage 145 143 // based on firmware's configuration of the 146 144 // EBC bridge 147 - interrupts = <5 4>; 145 + interrupts = <0x5 0x4>; 148 146 interrupt-parent = <&UIC1>; 149 147 150 148 small-flash@0,80000 { 151 149 compatible = "jedec-flash"; 152 150 bank-width = <1>; 153 - reg = <0 80000 80000>; 151 + reg = <0x00000000 0x00080000 0x00080000>; 154 152 #address-cells = <1>; 155 153 #size-cells = <1>; 156 154 partition@0 { 157 155 label = "OpenBIOS"; 158 - reg = <0 80000>; 156 + reg = <0x00000000 0x00080000>; 159 157 read-only; 160 158 }; 161 159 }; ··· 163 161 nvram@1,0 { 164 162 /* NVRAM & RTC */ 165 163 compatible = "ds1743-nvram"; 166 - #bytes = <2000>; 167 - reg = <1 0 2000>; 164 + #bytes = <0x2000>; 165 + reg = <0x00000001 0x00000000 0x00002000>; 168 166 }; 169 167 170 168 large-flash@2,0 { 171 169 compatible = "jedec-flash"; 172 170 bank-width = <1>; 173 - reg = <2 0 400000>; 171 + reg = <0x00000002 0x00000000 0x00400000>; 174 172 #address-cells = <1>; 175 173 #size-cells = <1>; 176 174 partition@0 { 177 175 label = "fs"; 178 - reg = <0 380000>; 176 + reg = <0x00000000 0x00380000>; 179 177 }; 180 178 partition@380000 { 181 179 label = "firmware"; 182 - reg = <380000 80000>; 180 + reg = <0x00380000 0x00080000>; 183 181 }; 184 182 }; 185 183 186 184 ir@3,0 { 187 - reg = <3 0 10>; 185 + reg = <0x00000003 0x00000000 0x00000010>; 188 186 }; 189 187 190 188 fpga@7,0 { 191 189 compatible = "Ebony-FPGA"; 192 - reg = <7 0 10>; 193 - virtual-reg = <e8300000>; 190 + reg = <0x00000007 0x00000000 0x00000010>; 191 + virtual-reg = <0xe8300000>; 194 192 }; 195 193 }; 196 194 197 195 UART0: serial@40000200 { 198 196 device_type = "serial"; 199 197 compatible = "ns16550"; 200 - reg = <40000200 8>; 201 - virtual-reg = <e0000200>; 202 - clock-frequency = <A8C000>; 203 - current-speed = <2580>; 198 + reg = <0x40000200 0x00000008>; 199 + virtual-reg = <0xe0000200>; 200 + clock-frequency = <11059200>; 201 + current-speed = <9600>; 204 202 interrupt-parent = <&UIC0>; 205 - interrupts = <0 4>; 203 + interrupts = <0x0 0x4>; 206 204 }; 207 205 208 206 UART1: serial@40000300 { 209 207 device_type = "serial"; 210 208 compatible = "ns16550"; 211 - reg = <40000300 8>; 212 - virtual-reg = <e0000300>; 213 - clock-frequency = <A8C000>; 214 - current-speed = <2580>; 209 + reg = <0x40000300 0x00000008>; 210 + virtual-reg = <0xe0000300>; 211 + clock-frequency = <11059200>; 212 + current-speed = <9600>; 215 213 interrupt-parent = <&UIC0>; 216 - interrupts = <1 4>; 214 + interrupts = <0x1 0x4>; 217 215 }; 218 216 219 217 IIC0: i2c@40000400 { 220 218 /* FIXME */ 221 219 compatible = "ibm,iic-440gp", "ibm,iic"; 222 - reg = <40000400 14>; 220 + reg = <0x40000400 0x00000014>; 223 221 interrupt-parent = <&UIC0>; 224 - interrupts = <2 4>; 222 + interrupts = <0x2 0x4>; 225 223 }; 226 224 IIC1: i2c@40000500 { 227 225 /* FIXME */ 228 226 compatible = "ibm,iic-440gp", "ibm,iic"; 229 - reg = <40000500 14>; 227 + reg = <0x40000500 0x00000014>; 230 228 interrupt-parent = <&UIC0>; 231 - interrupts = <3 4>; 229 + interrupts = <0x3 0x4>; 232 230 }; 233 231 234 232 GPIO0: gpio@40000700 { 235 233 /* FIXME */ 236 234 compatible = "ibm,gpio-440gp"; 237 - reg = <40000700 20>; 235 + reg = <0x40000700 0x00000020>; 238 236 }; 239 237 240 238 ZMII0: emac-zmii@40000780 { 241 239 compatible = "ibm,zmii-440gp", "ibm,zmii"; 242 - reg = <40000780 c>; 240 + reg = <0x40000780 0x0000000c>; 243 241 }; 244 242 245 243 EMAC0: ethernet@40000800 { 246 244 device_type = "network"; 247 245 compatible = "ibm,emac-440gp", "ibm,emac"; 248 246 interrupt-parent = <&UIC1>; 249 - interrupts = <1c 4 1d 4>; 250 - reg = <40000800 70>; 247 + interrupts = <0x1c 0x4 0x1d 0x4>; 248 + reg = <0x40000800 0x00000070>; 251 249 local-mac-address = [000000000000]; // Filled in by zImage 252 250 mal-device = <&MAL0>; 253 251 mal-tx-channel = <0 1>; 254 252 mal-rx-channel = <0>; 255 253 cell-index = <0>; 256 - max-frame-size = <5dc>; 257 - rx-fifo-size = <1000>; 258 - tx-fifo-size = <800>; 254 + max-frame-size = <1500>; 255 + rx-fifo-size = <4096>; 256 + tx-fifo-size = <2048>; 259 257 phy-mode = "rmii"; 260 - phy-map = <00000001>; 258 + phy-map = <0x00000001>; 261 259 zmii-device = <&ZMII0>; 262 260 zmii-channel = <0>; 263 261 }; ··· 265 263 device_type = "network"; 266 264 compatible = "ibm,emac-440gp", "ibm,emac"; 267 265 interrupt-parent = <&UIC1>; 268 - interrupts = <1e 4 1f 4>; 269 - reg = <40000900 70>; 266 + interrupts = <0x1e 0x4 0x1f 0x4>; 267 + reg = <0x40000900 0x00000070>; 270 268 local-mac-address = [000000000000]; // Filled in by zImage 271 269 mal-device = <&MAL0>; 272 270 mal-tx-channel = <2 3>; 273 271 mal-rx-channel = <1>; 274 272 cell-index = <1>; 275 - max-frame-size = <5dc>; 276 - rx-fifo-size = <1000>; 277 - tx-fifo-size = <800>; 273 + max-frame-size = <1500>; 274 + rx-fifo-size = <4096>; 275 + tx-fifo-size = <2048>; 278 276 phy-mode = "rmii"; 279 - phy-map = <00000001>; 277 + phy-map = <0x00000001>; 280 278 zmii-device = <&ZMII0>; 281 279 zmii-channel = <1>; 282 280 }; ··· 284 282 285 283 GPT0: gpt@40000a00 { 286 284 /* FIXME */ 287 - reg = <40000a00 d4>; 285 + reg = <0x40000a00 0x000000d4>; 288 286 interrupt-parent = <&UIC0>; 289 - interrupts = <12 4 13 4 14 4 15 4 16 4>; 287 + interrupts = <0x12 0x4 0x13 0x4 0x14 0x4 0x15 0x4 0x16 0x4>; 290 288 }; 291 289 292 290 }; ··· 298 296 #address-cells = <3>; 299 297 compatible = "ibm,plb440gp-pcix", "ibm,plb-pcix"; 300 298 primary; 301 - reg = <2 0ec00000 8 /* Config space access */ 302 - 0 0 0 /* no IACK cycles */ 303 - 2 0ed00000 4 /* Special cycles */ 304 - 2 0ec80000 f0 /* Internal registers */ 305 - 2 0ec80100 fc>; /* Internal messaging registers */ 299 + reg = <0x00000002 0x0ec00000 0x00000008 /* Config space access */ 300 + 0x00000000 0x00000000 0x00000000 /* no IACK cycles */ 301 + 0x00000002 0x0ed00000 0x00000004 /* Special cycles */ 302 + 0x00000002 0x0ec80000 0x000000f0 /* Internal registers */ 303 + 0x00000002 0x0ec80100 0x000000fc>; /* Internal messaging registers */ 306 304 307 305 /* Outbound ranges, one memory and one IO, 308 306 * later cannot be changed 309 307 */ 310 - ranges = <02000000 0 80000000 00000003 80000000 0 80000000 311 - 01000000 0 00000000 00000002 08000000 0 00010000>; 308 + ranges = <0x02000000 0x00000000 0x80000000 0x00000003 0x80000000 0x00000000 0x80000000 309 + 0x01000000 0x00000000 0x00000000 0x00000002 0x08000000 0x00000000 0x00010000>; 312 310 313 311 /* Inbound 2GB range starting at 0 */ 314 - dma-ranges = <42000000 0 0 0 0 0 80000000>; 312 + dma-ranges = <0x42000000 0x0 0x0 0x0 0x0 0x0 0x80000000>; 315 313 316 314 /* Ebony has all 4 IRQ pins tied together per slot */ 317 - interrupt-map-mask = <f800 0 0 0>; 315 + interrupt-map-mask = <0xf800 0x0 0x0 0x0>; 318 316 interrupt-map = < 319 317 /* IDSEL 1 */ 320 - 0800 0 0 0 &UIC0 17 8 318 + 0x800 0x0 0x0 0x0 &UIC0 0x17 0x8 321 319 322 320 /* IDSEL 2 */ 323 - 1000 0 0 0 &UIC0 18 8 321 + 0x1000 0x0 0x0 0x0 &UIC0 0x18 0x8 324 322 325 323 /* IDSEL 3 */ 326 - 1800 0 0 0 &UIC0 19 8 324 + 0x1800 0x0 0x0 0x0 &UIC0 0x19 0x8 327 325 328 326 /* IDSEL 4 */ 329 - 2000 0 0 0 &UIC0 1a 8 327 + 0x2000 0x0 0x0 0x0 &UIC0 0x1a 0x8 330 328 >; 331 329 }; 332 330 };
+51 -49
arch/powerpc/boot/dts/ep405.dts
··· 9 9 * any warranty of any kind, whether express or implied. 10 10 */ 11 11 12 + /dts-v1/; 13 + 12 14 / { 13 15 #address-cells = <1>; 14 16 #size-cells = <1>; 15 17 model = "ep405"; 16 18 compatible = "ep405"; 17 - dcr-parent = <&/cpus/cpu@0>; 19 + dcr-parent = <&{/cpus/cpu@0}>; 18 20 19 21 aliases { 20 22 ethernet0 = &EMAC; ··· 31 29 cpu@0 { 32 30 device_type = "cpu"; 33 31 model = "PowerPC,405GP"; 34 - reg = <0>; 35 - clock-frequency = <bebc200>; /* Filled in by zImage */ 32 + reg = <0x00000000>; 33 + clock-frequency = <200000000>; /* Filled in by zImage */ 36 34 timebase-frequency = <0>; /* Filled in by zImage */ 37 - i-cache-line-size = <20>; 38 - d-cache-line-size = <20>; 39 - i-cache-size = <4000>; 40 - d-cache-size = <4000>; 35 + i-cache-line-size = <32>; 36 + d-cache-line-size = <32>; 37 + i-cache-size = <16384>; 38 + d-cache-size = <16384>; 41 39 dcr-controller; 42 40 dcr-access-method = "native"; 43 41 }; ··· 45 43 46 44 memory { 47 45 device_type = "memory"; 48 - reg = <0 0>; /* Filled in by zImage */ 46 + reg = <0x00000000 0x00000000>; /* Filled in by zImage */ 49 47 }; 50 48 51 49 UIC0: interrupt-controller { 52 50 compatible = "ibm,uic"; 53 51 interrupt-controller; 54 52 cell-index = <0>; 55 - dcr-reg = <0c0 9>; 53 + dcr-reg = <0x0c0 0x009>; 56 54 #address-cells = <0>; 57 55 #size-cells = <0>; 58 56 #interrupt-cells = <2>; ··· 67 65 68 66 SDRAM0: memory-controller { 69 67 compatible = "ibm,sdram-405gp"; 70 - dcr-reg = <010 2>; 68 + dcr-reg = <0x010 0x002>; 71 69 }; 72 70 73 71 MAL: mcmal { 74 72 compatible = "ibm,mcmal-405gp", "ibm,mcmal"; 75 - dcr-reg = <180 62>; 73 + dcr-reg = <0x180 0x062>; 76 74 num-tx-chans = <1>; 77 75 num-rx-chans = <1>; 78 76 interrupt-parent = <&UIC0>; 79 77 interrupts = < 80 - b 4 /* TXEOB */ 81 - c 4 /* RXEOB */ 82 - a 4 /* SERR */ 83 - d 4 /* TXDE */ 84 - e 4 /* RXDE */>; 78 + 0xb 0x4 /* TXEOB */ 79 + 0xc 0x4 /* RXEOB */ 80 + 0xa 0x4 /* SERR */ 81 + 0xd 0x4 /* TXDE */ 82 + 0xe 0x4 /* RXDE */>; 85 83 }; 86 84 87 85 POB0: opb { 88 86 compatible = "ibm,opb-405gp", "ibm,opb"; 89 87 #address-cells = <1>; 90 88 #size-cells = <1>; 91 - ranges = <ef600000 ef600000 a00000>; 92 - dcr-reg = <0a0 5>; 89 + ranges = <0xef600000 0xef600000 0x00a00000>; 90 + dcr-reg = <0x0a0 0x005>; 93 91 clock-frequency = <0>; /* Filled in by zImage */ 94 92 95 93 UART0: serial@ef600300 { 96 94 device_type = "serial"; 97 95 compatible = "ns16550"; 98 - reg = <ef600300 8>; 99 - virtual-reg = <ef600300>; 96 + reg = <0xef600300 0x00000008>; 97 + virtual-reg = <0xef600300>; 100 98 clock-frequency = <0>; /* Filled in by zImage */ 101 - current-speed = <2580>; 99 + current-speed = <9600>; 102 100 interrupt-parent = <&UIC0>; 103 - interrupts = <0 4>; 101 + interrupts = <0x0 0x4>; 104 102 }; 105 103 106 104 UART1: serial@ef600400 { 107 105 device_type = "serial"; 108 106 compatible = "ns16550"; 109 - reg = <ef600400 8>; 110 - virtual-reg = <ef600400>; 107 + reg = <0xef600400 0x00000008>; 108 + virtual-reg = <0xef600400>; 111 109 clock-frequency = <0>; /* Filled in by zImage */ 112 - current-speed = <2580>; 110 + current-speed = <9600>; 113 111 interrupt-parent = <&UIC0>; 114 - interrupts = <1 4>; 112 + interrupts = <0x1 0x4>; 115 113 }; 116 114 117 115 IIC: i2c@ef600500 { 118 116 compatible = "ibm,iic-405gp", "ibm,iic"; 119 - reg = <ef600500 11>; 117 + reg = <0xef600500 0x00000011>; 120 118 interrupt-parent = <&UIC0>; 121 - interrupts = <2 4>; 119 + interrupts = <0x2 0x4>; 122 120 }; 123 121 124 122 GPIO: gpio@ef600700 { 125 123 compatible = "ibm,gpio-405gp"; 126 - reg = <ef600700 20>; 124 + reg = <0xef600700 0x00000020>; 127 125 }; 128 126 129 127 EMAC: ethernet@ef600800 { 130 - linux,network-index = <0>; 128 + linux,network-index = <0x0>; 131 129 device_type = "network"; 132 130 compatible = "ibm,emac-405gp", "ibm,emac"; 133 131 interrupt-parent = <&UIC0>; 134 132 interrupts = < 135 - f 4 /* Ethernet */ 136 - 9 4 /* Ethernet Wake Up */>; 133 + 0xf 0x4 /* Ethernet */ 134 + 0x9 0x4 /* Ethernet Wake Up */>; 137 135 local-mac-address = [000000000000]; /* Filled in by zImage */ 138 - reg = <ef600800 70>; 136 + reg = <0xef600800 0x00000070>; 139 137 mal-device = <&MAL>; 140 138 mal-tx-channel = <0>; 141 139 mal-rx-channel = <0>; 142 140 cell-index = <0>; 143 - max-frame-size = <5dc>; 144 - rx-fifo-size = <1000>; 145 - tx-fifo-size = <800>; 141 + max-frame-size = <1500>; 142 + rx-fifo-size = <4096>; 143 + tx-fifo-size = <2048>; 146 144 phy-mode = "rmii"; 147 - phy-map = <00000000>; 145 + phy-map = <0x00000000>; 148 146 }; 149 147 150 148 }; 151 149 152 150 EBC0: ebc { 153 151 compatible = "ibm,ebc-405gp", "ibm,ebc"; 154 - dcr-reg = <012 2>; 152 + dcr-reg = <0x012 0x002>; 155 153 #address-cells = <2>; 156 154 #size-cells = <1>; 157 155 ··· 165 163 /* NVRAM and RTC */ 166 164 nvrtc@4,200000 { 167 165 compatible = "ds1742"; 168 - reg = <4 200000 0>; /* size fixed up by zImage */ 166 + reg = <0x00000004 0x00200000 0x00000000>; /* size fixed up by zImage */ 169 167 }; 170 168 171 169 /* "BCSR" CPLD contains a PCI irq controller */ 172 170 bcsr@4,0 { 173 171 compatible = "ep405-bcsr"; 174 - reg = <4 0 10>; 172 + reg = <0x00000004 0x00000000 0x00000010>; 175 173 interrupt-controller; 176 174 /* Routing table */ 177 175 irq-routing = [ 00 /* SYSERR */ ··· 200 198 #address-cells = <3>; 201 199 compatible = "ibm,plb405gp-pci", "ibm,plb-pci"; 202 200 primary; 203 - reg = <eec00000 8 /* Config space access */ 204 - eed80000 4 /* IACK */ 205 - eed80000 4 /* Special cycle */ 206 - ef480000 40>; /* Internal registers */ 201 + reg = <0xeec00000 0x00000008 /* Config space access */ 202 + 0xeed80000 0x00000004 /* IACK */ 203 + 0xeed80000 0x00000004 /* Special cycle */ 204 + 0xef480000 0x00000040>; /* Internal registers */ 207 205 208 206 /* Outbound ranges, one memory and one IO, 209 207 * later cannot be changed. Chip supports a second 210 208 * IO range but we don't use it for now 211 209 */ 212 - ranges = <02000000 0 80000000 80000000 0 20000000 213 - 01000000 0 00000000 e8000000 0 00010000>; 210 + ranges = <0x02000000 0x00000000 0x80000000 0x80000000 0x00000000 0x20000000 211 + 0x01000000 0x00000000 0x00000000 0xe8000000 0x00000000 0x00010000>; 214 212 215 213 /* Inbound 2GB range starting at 0 */ 216 - dma-ranges = <42000000 0 0 0 0 80000000>; 214 + dma-ranges = <0x42000000 0x0 0x0 0x0 0x0 0x80000000>; 217 215 218 216 /* That's all I know about IRQs on that thing ... */ 219 - interrupt-map-mask = <f800 0 0 0>; 217 + interrupt-map-mask = <0xf800 0x0 0x0 0x0>; 220 218 interrupt-map = < 221 219 /* USB */ 222 - 7000 0 0 0 &UIC0 1e 8 /* IRQ5 */ 220 + 0x7000 0x0 0x0 0x0 &UIC0 0x1e 0x8 /* IRQ5 */ 223 221 >; 224 222 }; 225 223 };
+132 -130
arch/powerpc/boot/dts/glacier.dts
··· 8 8 * any warranty of any kind, whether express or implied. 9 9 */ 10 10 11 + /dts-v1/; 12 + 11 13 / { 12 14 #address-cells = <2>; 13 15 #size-cells = <1>; 14 16 model = "amcc,glacier"; 15 17 compatible = "amcc,glacier", "amcc,canyonlands"; 16 - dcr-parent = <&/cpus/cpu@0>; 18 + dcr-parent = <&{/cpus/cpu@0}>; 17 19 18 20 aliases { 19 21 ethernet0 = &EMAC0; ··· 33 31 cpu@0 { 34 32 device_type = "cpu"; 35 33 model = "PowerPC,460GT"; 36 - reg = <0>; 34 + reg = <0x00000000>; 37 35 clock-frequency = <0>; /* Filled in by U-Boot */ 38 36 timebase-frequency = <0>; /* Filled in by U-Boot */ 39 - i-cache-line-size = <20>; 40 - d-cache-line-size = <20>; 41 - i-cache-size = <8000>; 42 - d-cache-size = <8000>; 37 + i-cache-line-size = <32>; 38 + d-cache-line-size = <32>; 39 + i-cache-size = <32768>; 40 + d-cache-size = <32768>; 43 41 dcr-controller; 44 42 dcr-access-method = "native"; 45 43 }; ··· 47 45 48 46 memory { 49 47 device_type = "memory"; 50 - reg = <0 0 0>; /* Filled in by U-Boot */ 48 + reg = <0x00000000 0x00000000 0x00000000>; /* Filled in by U-Boot */ 51 49 }; 52 50 53 51 UIC0: interrupt-controller0 { 54 52 compatible = "ibm,uic-460gt","ibm,uic"; 55 53 interrupt-controller; 56 54 cell-index = <0>; 57 - dcr-reg = <0c0 009>; 55 + dcr-reg = <0x0c0 0x009>; 58 56 #address-cells = <0>; 59 57 #size-cells = <0>; 60 58 #interrupt-cells = <2>; ··· 64 62 compatible = "ibm,uic-460gt","ibm,uic"; 65 63 interrupt-controller; 66 64 cell-index = <1>; 67 - dcr-reg = <0d0 009>; 65 + dcr-reg = <0x0d0 0x009>; 68 66 #address-cells = <0>; 69 67 #size-cells = <0>; 70 68 #interrupt-cells = <2>; 71 - interrupts = <1e 4 1f 4>; /* cascade */ 69 + interrupts = <0x1e 0x4 0x1f 0x4>; /* cascade */ 72 70 interrupt-parent = <&UIC0>; 73 71 }; 74 72 ··· 76 74 compatible = "ibm,uic-460gt","ibm,uic"; 77 75 interrupt-controller; 78 76 cell-index = <2>; 79 - dcr-reg = <0e0 009>; 77 + dcr-reg = <0x0e0 0x009>; 80 78 #address-cells = <0>; 81 79 #size-cells = <0>; 82 80 #interrupt-cells = <2>; 83 - interrupts = <a 4 b 4>; /* cascade */ 81 + interrupts = <0xa 0x4 0xb 0x4>; /* cascade */ 84 82 interrupt-parent = <&UIC0>; 85 83 }; 86 84 ··· 88 86 compatible = "ibm,uic-460gt","ibm,uic"; 89 87 interrupt-controller; 90 88 cell-index = <3>; 91 - dcr-reg = <0f0 009>; 89 + dcr-reg = <0x0f0 0x009>; 92 90 #address-cells = <0>; 93 91 #size-cells = <0>; 94 92 #interrupt-cells = <2>; 95 - interrupts = <10 4 11 4>; /* cascade */ 93 + interrupts = <0x10 0x4 0x11 0x4>; /* cascade */ 96 94 interrupt-parent = <&UIC0>; 97 95 }; 98 96 99 97 SDR0: sdr { 100 98 compatible = "ibm,sdr-460gt"; 101 - dcr-reg = <00e 002>; 99 + dcr-reg = <0x00e 0x002>; 102 100 }; 103 101 104 102 CPR0: cpr { 105 103 compatible = "ibm,cpr-460gt"; 106 - dcr-reg = <00c 002>; 104 + dcr-reg = <0x00c 0x002>; 107 105 }; 108 106 109 107 plb { ··· 115 113 116 114 SDRAM0: sdram { 117 115 compatible = "ibm,sdram-460gt", "ibm,sdram-405gp"; 118 - dcr-reg = <010 2>; 116 + dcr-reg = <0x010 0x002>; 119 117 }; 120 118 121 119 MAL0: mcmal { 122 120 compatible = "ibm,mcmal-460gt", "ibm,mcmal2"; 123 - dcr-reg = <180 62>; 121 + dcr-reg = <0x180 0x062>; 124 122 num-tx-chans = <4>; 125 - num-rx-chans = <20>; 123 + num-rx-chans = <32>; 126 124 #address-cells = <0>; 127 125 #size-cells = <0>; 128 126 interrupt-parent = <&UIC2>; 129 - interrupts = < /*TXEOB*/ 6 4 130 - /*RXEOB*/ 7 4 131 - /*SERR*/ 3 4 132 - /*TXDE*/ 4 4 133 - /*RXDE*/ 5 4>; 134 - desc-base-addr-high = <8>; 127 + interrupts = < /*TXEOB*/ 0x6 0x4 128 + /*RXEOB*/ 0x7 0x4 129 + /*SERR*/ 0x3 0x4 130 + /*TXDE*/ 0x4 0x4 131 + /*RXDE*/ 0x5 0x4>; 132 + desc-base-addr-high = <0x8>; 135 133 }; 136 134 137 135 POB0: opb { 138 136 compatible = "ibm,opb-460gt", "ibm,opb"; 139 137 #address-cells = <1>; 140 138 #size-cells = <1>; 141 - ranges = <b0000000 4 b0000000 50000000>; 139 + ranges = <0xb0000000 0x00000004 0xb0000000 0x50000000>; 142 140 clock-frequency = <0>; /* Filled in by U-Boot */ 143 141 144 142 EBC0: ebc { 145 143 compatible = "ibm,ebc-460gt", "ibm,ebc"; 146 - dcr-reg = <012 2>; 144 + dcr-reg = <0x012 0x002>; 147 145 #address-cells = <2>; 148 146 #size-cells = <1>; 149 147 clock-frequency = <0>; /* Filled in by U-Boot */ 150 148 /* ranges property is supplied by U-Boot */ 151 - interrupts = <6 4>; 149 + interrupts = <0x6 0x4>; 152 150 interrupt-parent = <&UIC1>; 153 151 154 152 nor_flash@0,0 { 155 153 compatible = "amd,s29gl512n", "cfi-flash"; 156 154 bank-width = <2>; 157 - reg = <0 000000 4000000>; 155 + reg = <0x00000000 0x00000000 0x04000000>; 158 156 #address-cells = <1>; 159 157 #size-cells = <1>; 160 158 partition@0 { 161 159 label = "kernel"; 162 - reg = <0 1e0000>; 160 + reg = <0x00000000 0x001e0000>; 163 161 }; 164 162 partition@1e0000 { 165 163 label = "dtb"; 166 - reg = <1e0000 20000>; 164 + reg = <0x001e0000 0x00020000>; 167 165 }; 168 166 partition@200000 { 169 167 label = "ramdisk"; 170 - reg = <200000 1400000>; 168 + reg = <0x00200000 0x01400000>; 171 169 }; 172 170 partition@1600000 { 173 171 label = "jffs2"; 174 - reg = <1600000 400000>; 172 + reg = <0x01600000 0x00400000>; 175 173 }; 176 174 partition@1a00000 { 177 175 label = "user"; 178 - reg = <1a00000 2560000>; 176 + reg = <0x01a00000 0x02560000>; 179 177 }; 180 178 partition@3f60000 { 181 179 label = "env"; 182 - reg = <3f60000 40000>; 180 + reg = <0x03f60000 0x00040000>; 183 181 }; 184 182 partition@3fa0000 { 185 183 label = "u-boot"; 186 - reg = <3fa0000 60000>; 184 + reg = <0x03fa0000 0x00060000>; 187 185 }; 188 186 }; 189 187 }; ··· 191 189 UART0: serial@ef600300 { 192 190 device_type = "serial"; 193 191 compatible = "ns16550"; 194 - reg = <ef600300 8>; 195 - virtual-reg = <ef600300>; 192 + reg = <0xef600300 0x00000008>; 193 + virtual-reg = <0xef600300>; 196 194 clock-frequency = <0>; /* Filled in by U-Boot */ 197 195 current-speed = <0>; /* Filled in by U-Boot */ 198 196 interrupt-parent = <&UIC1>; 199 - interrupts = <1 4>; 197 + interrupts = <0x1 0x4>; 200 198 }; 201 199 202 200 UART1: serial@ef600400 { 203 201 device_type = "serial"; 204 202 compatible = "ns16550"; 205 - reg = <ef600400 8>; 206 - virtual-reg = <ef600400>; 203 + reg = <0xef600400 0x00000008>; 204 + virtual-reg = <0xef600400>; 207 205 clock-frequency = <0>; /* Filled in by U-Boot */ 208 206 current-speed = <0>; /* Filled in by U-Boot */ 209 207 interrupt-parent = <&UIC0>; 210 - interrupts = <1 4>; 208 + interrupts = <0x1 0x4>; 211 209 }; 212 210 213 211 UART2: serial@ef600500 { 214 212 device_type = "serial"; 215 213 compatible = "ns16550"; 216 - reg = <ef600500 8>; 217 - virtual-reg = <ef600500>; 214 + reg = <0xef600500 0x00000008>; 215 + virtual-reg = <0xef600500>; 218 216 clock-frequency = <0>; /* Filled in by U-Boot */ 219 217 current-speed = <0>; /* Filled in by U-Boot */ 220 218 interrupt-parent = <&UIC1>; 221 - interrupts = <1d 4>; 219 + interrupts = <0x1d 0x4>; 222 220 }; 223 221 224 222 UART3: serial@ef600600 { 225 223 device_type = "serial"; 226 224 compatible = "ns16550"; 227 - reg = <ef600600 8>; 228 - virtual-reg = <ef600600>; 225 + reg = <0xef600600 0x00000008>; 226 + virtual-reg = <0xef600600>; 229 227 clock-frequency = <0>; /* Filled in by U-Boot */ 230 228 current-speed = <0>; /* Filled in by U-Boot */ 231 229 interrupt-parent = <&UIC1>; 232 - interrupts = <1e 4>; 230 + interrupts = <0x1e 0x4>; 233 231 }; 234 232 235 233 IIC0: i2c@ef600700 { 236 234 compatible = "ibm,iic-460gt", "ibm,iic"; 237 - reg = <ef600700 14>; 235 + reg = <0xef600700 0x00000014>; 238 236 interrupt-parent = <&UIC0>; 239 - interrupts = <2 4>; 237 + interrupts = <0x2 0x4>; 240 238 }; 241 239 242 240 IIC1: i2c@ef600800 { 243 241 compatible = "ibm,iic-460gt", "ibm,iic"; 244 - reg = <ef600800 14>; 242 + reg = <0xef600800 0x00000014>; 245 243 interrupt-parent = <&UIC0>; 246 - interrupts = <3 4>; 244 + interrupts = <0x3 0x4>; 247 245 }; 248 246 249 247 ZMII0: emac-zmii@ef600d00 { 250 248 compatible = "ibm,zmii-460gt", "ibm,zmii"; 251 - reg = <ef600d00 c>; 249 + reg = <0xef600d00 0x0000000c>; 252 250 }; 253 251 254 252 RGMII0: emac-rgmii@ef601500 { 255 253 compatible = "ibm,rgmii-460gt", "ibm,rgmii"; 256 - reg = <ef601500 8>; 254 + reg = <0xef601500 0x00000008>; 257 255 has-mdio; 258 256 }; 259 257 260 258 RGMII1: emac-rgmii@ef601600 { 261 259 compatible = "ibm,rgmii-460gt", "ibm,rgmii"; 262 - reg = <ef601600 8>; 260 + reg = <0xef601600 0x00000008>; 263 261 has-mdio; 264 262 }; 265 263 266 264 TAH0: emac-tah@ef601350 { 267 265 compatible = "ibm,tah-460gt", "ibm,tah"; 268 - reg = <ef601350 30>; 266 + reg = <0xef601350 0x00000030>; 269 267 }; 270 268 271 269 TAH1: emac-tah@ef601450 { 272 270 compatible = "ibm,tah-460gt", "ibm,tah"; 273 - reg = <ef601450 30>; 271 + reg = <0xef601450 0x00000030>; 274 272 }; 275 273 276 274 EMAC0: ethernet@ef600e00 { 277 275 device_type = "network"; 278 276 compatible = "ibm,emac-460gt", "ibm,emac4"; 279 277 interrupt-parent = <&EMAC0>; 280 - interrupts = <0 1>; 278 + interrupts = <0x0 0x1>; 281 279 #interrupt-cells = <1>; 282 280 #address-cells = <0>; 283 281 #size-cells = <0>; 284 - interrupt-map = </*Status*/ 0 &UIC2 10 4 285 - /*Wake*/ 1 &UIC2 14 4>; 286 - reg = <ef600e00 70>; 282 + interrupt-map = </*Status*/ 0x0 &UIC2 0x10 0x4 283 + /*Wake*/ 0x1 &UIC2 0x14 0x4>; 284 + reg = <0xef600e00 0x00000070>; 287 285 local-mac-address = [000000000000]; /* Filled in by U-Boot */ 288 286 mal-device = <&MAL0>; 289 287 mal-tx-channel = <0>; 290 288 mal-rx-channel = <0>; 291 289 cell-index = <0>; 292 - max-frame-size = <2328>; 293 - rx-fifo-size = <1000>; 294 - tx-fifo-size = <800>; 290 + max-frame-size = <9000>; 291 + rx-fifo-size = <4096>; 292 + tx-fifo-size = <2048>; 295 293 phy-mode = "rgmii"; 296 - phy-map = <00000000>; 294 + phy-map = <0x00000000>; 297 295 rgmii-device = <&RGMII0>; 298 296 rgmii-channel = <0>; 299 297 tah-device = <&TAH0>; ··· 306 304 device_type = "network"; 307 305 compatible = "ibm,emac-460gt", "ibm,emac4"; 308 306 interrupt-parent = <&EMAC1>; 309 - interrupts = <0 1>; 307 + interrupts = <0x0 0x1>; 310 308 #interrupt-cells = <1>; 311 309 #address-cells = <0>; 312 310 #size-cells = <0>; 313 - interrupt-map = </*Status*/ 0 &UIC2 11 4 314 - /*Wake*/ 1 &UIC2 15 4>; 315 - reg = <ef600f00 70>; 311 + interrupt-map = </*Status*/ 0x0 &UIC2 0x11 0x4 312 + /*Wake*/ 0x1 &UIC2 0x15 0x4>; 313 + reg = <0xef600f00 0x00000070>; 316 314 local-mac-address = [000000000000]; /* Filled in by U-Boot */ 317 315 mal-device = <&MAL0>; 318 316 mal-tx-channel = <1>; 319 317 mal-rx-channel = <8>; 320 318 cell-index = <1>; 321 - max-frame-size = <2328>; 322 - rx-fifo-size = <1000>; 323 - tx-fifo-size = <800>; 319 + max-frame-size = <9000>; 320 + rx-fifo-size = <4096>; 321 + tx-fifo-size = <2048>; 324 322 phy-mode = "rgmii"; 325 - phy-map = <00000000>; 323 + phy-map = <0x00000000>; 326 324 rgmii-device = <&RGMII0>; 327 325 rgmii-channel = <1>; 328 326 tah-device = <&TAH1>; ··· 336 334 device_type = "network"; 337 335 compatible = "ibm,emac-460gt", "ibm,emac4"; 338 336 interrupt-parent = <&EMAC2>; 339 - interrupts = <0 1>; 337 + interrupts = <0x0 0x1>; 340 338 #interrupt-cells = <1>; 341 339 #address-cells = <0>; 342 340 #size-cells = <0>; 343 - interrupt-map = </*Status*/ 0 &UIC2 12 4 344 - /*Wake*/ 1 &UIC2 16 4>; 345 - reg = <ef601100 70>; 341 + interrupt-map = </*Status*/ 0x0 &UIC2 0x12 0x4 342 + /*Wake*/ 0x1 &UIC2 0x16 0x4>; 343 + reg = <0xef601100 0x00000070>; 346 344 local-mac-address = [000000000000]; /* Filled in by U-Boot */ 347 345 mal-device = <&MAL0>; 348 346 mal-tx-channel = <2>; 349 - mal-rx-channel = <10>; 347 + mal-rx-channel = <16>; 350 348 cell-index = <2>; 351 - max-frame-size = <2328>; 352 - rx-fifo-size = <1000>; 353 - tx-fifo-size = <800>; 349 + max-frame-size = <9000>; 350 + rx-fifo-size = <4096>; 351 + tx-fifo-size = <2048>; 354 352 phy-mode = "rgmii"; 355 - phy-map = <00000000>; 353 + phy-map = <0x00000000>; 356 354 rgmii-device = <&RGMII1>; 357 355 rgmii-channel = <0>; 358 356 has-inverted-stacr-oc; ··· 364 362 device_type = "network"; 365 363 compatible = "ibm,emac-460gt", "ibm,emac4"; 366 364 interrupt-parent = <&EMAC3>; 367 - interrupts = <0 1>; 365 + interrupts = <0x0 0x1>; 368 366 #interrupt-cells = <1>; 369 367 #address-cells = <0>; 370 368 #size-cells = <0>; 371 - interrupt-map = </*Status*/ 0 &UIC2 13 4 372 - /*Wake*/ 1 &UIC2 17 4>; 373 - reg = <ef601200 70>; 369 + interrupt-map = </*Status*/ 0x0 &UIC2 0x13 0x4 370 + /*Wake*/ 0x1 &UIC2 0x17 0x4>; 371 + reg = <0xef601200 0x00000070>; 374 372 local-mac-address = [000000000000]; /* Filled in by U-Boot */ 375 373 mal-device = <&MAL0>; 376 374 mal-tx-channel = <3>; 377 - mal-rx-channel = <18>; 375 + mal-rx-channel = <24>; 378 376 cell-index = <3>; 379 - max-frame-size = <2328>; 380 - rx-fifo-size = <1000>; 381 - tx-fifo-size = <800>; 377 + max-frame-size = <9000>; 378 + rx-fifo-size = <4096>; 379 + tx-fifo-size = <2048>; 382 380 phy-mode = "rgmii"; 383 - phy-map = <00000000>; 381 + phy-map = <0x00000000>; 384 382 rgmii-device = <&RGMII1>; 385 383 rgmii-channel = <1>; 386 384 has-inverted-stacr-oc; ··· 398 396 primary; 399 397 large-inbound-windows; 400 398 enable-msi-hole; 401 - reg = <c 0ec00000 8 /* Config space access */ 402 - 0 0 0 /* no IACK cycles */ 403 - c 0ed00000 4 /* Special cycles */ 404 - c 0ec80000 100 /* Internal registers */ 405 - c 0ec80100 fc>; /* Internal messaging registers */ 399 + reg = <0x0000000c 0x0ec00000 0x00000008 /* Config space access */ 400 + 0x00000000 0x00000000 0x00000000 /* no IACK cycles */ 401 + 0x0000000c 0x0ed00000 0x00000004 /* Special cycles */ 402 + 0x0000000c 0x0ec80000 0x00000100 /* Internal registers */ 403 + 0x0000000c 0x0ec80100 0x000000fc>; /* Internal messaging registers */ 406 404 407 405 /* Outbound ranges, one memory and one IO, 408 406 * later cannot be changed 409 407 */ 410 - ranges = <02000000 0 80000000 0000000d 80000000 0 80000000 411 - 01000000 0 00000000 0000000c 08000000 0 00010000>; 408 + ranges = <0x02000000 0x00000000 0x80000000 0x0000000d 0x80000000 0x00000000 0x80000000 409 + 0x01000000 0x00000000 0x00000000 0x0000000c 0x08000000 0x00000000 0x00010000>; 412 410 413 411 /* Inbound 2GB range starting at 0 */ 414 - dma-ranges = <42000000 0 0 0 0 0 80000000>; 412 + dma-ranges = <0x42000000 0x0 0x0 0x0 0x0 0x0 0x80000000>; 415 413 416 414 /* This drives busses 0 to 0x3f */ 417 - bus-range = <0 3f>; 415 + bus-range = <0x0 0x3f>; 418 416 419 417 /* All PCI interrupts are routed to ext IRQ 2 -> UIC1-0 */ 420 - interrupt-map-mask = <0000 0 0 0>; 421 - interrupt-map = < 0000 0 0 0 &UIC1 0 8 >; 418 + interrupt-map-mask = <0x0 0x0 0x0 0x0>; 419 + interrupt-map = < 0x0 0x0 0x0 0x0 &UIC1 0x0 0x8 >; 422 420 }; 423 421 424 422 PCIE0: pciex@d00000000 { ··· 428 426 #address-cells = <3>; 429 427 compatible = "ibm,plb-pciex-460ex", "ibm,plb-pciex"; 430 428 primary; 431 - port = <0>; /* port number */ 432 - reg = <d 00000000 20000000 /* Config space access */ 433 - c 08010000 00001000>; /* Registers */ 434 - dcr-reg = <100 020>; 435 - sdr-base = <300>; 429 + port = <0x0>; /* port number */ 430 + reg = <0x0000000d 0x00000000 0x20000000 /* Config space access */ 431 + 0x0000000c 0x08010000 0x00001000>; /* Registers */ 432 + dcr-reg = <0x100 0x020>; 433 + sdr-base = <0x300>; 436 434 437 435 /* Outbound ranges, one memory and one IO, 438 436 * later cannot be changed 439 437 */ 440 - ranges = <02000000 0 80000000 0000000e 00000000 0 80000000 441 - 01000000 0 00000000 0000000f 80000000 0 00010000>; 438 + ranges = <0x02000000 0x00000000 0x80000000 0x0000000e 0x00000000 0x00000000 0x80000000 439 + 0x01000000 0x00000000 0x00000000 0x0000000f 0x80000000 0x00000000 0x00010000>; 442 440 443 441 /* Inbound 2GB range starting at 0 */ 444 - dma-ranges = <42000000 0 0 0 0 0 80000000>; 442 + dma-ranges = <0x42000000 0x0 0x0 0x0 0x0 0x0 0x80000000>; 445 443 446 444 /* This drives busses 40 to 0x7f */ 447 - bus-range = <40 7f>; 445 + bus-range = <0x40 0x7f>; 448 446 449 447 /* Legacy interrupts (note the weird polarity, the bridge seems 450 448 * to invert PCIe legacy interrupts). ··· 454 452 * below are basically de-swizzled numbers. 455 453 * The real slot is on idsel 0, so the swizzling is 1:1 456 454 */ 457 - interrupt-map-mask = <0000 0 0 7>; 455 + interrupt-map-mask = <0x0 0x0 0x0 0x7>; 458 456 interrupt-map = < 459 - 0000 0 0 1 &UIC3 c 4 /* swizzled int A */ 460 - 0000 0 0 2 &UIC3 d 4 /* swizzled int B */ 461 - 0000 0 0 3 &UIC3 e 4 /* swizzled int C */ 462 - 0000 0 0 4 &UIC3 f 4 /* swizzled int D */>; 457 + 0x0 0x0 0x0 0x1 &UIC3 0xc 0x4 /* swizzled int A */ 458 + 0x0 0x0 0x0 0x2 &UIC3 0xd 0x4 /* swizzled int B */ 459 + 0x0 0x0 0x0 0x3 &UIC3 0xe 0x4 /* swizzled int C */ 460 + 0x0 0x0 0x0 0x4 &UIC3 0xf 0x4 /* swizzled int D */>; 463 461 }; 464 462 465 463 PCIE1: pciex@d20000000 { ··· 469 467 #address-cells = <3>; 470 468 compatible = "ibm,plb-pciex-460ex", "ibm,plb-pciex"; 471 469 primary; 472 - port = <1>; /* port number */ 473 - reg = <d 20000000 20000000 /* Config space access */ 474 - c 08011000 00001000>; /* Registers */ 475 - dcr-reg = <120 020>; 476 - sdr-base = <340>; 470 + port = <0x1>; /* port number */ 471 + reg = <0x0000000d 0x20000000 0x20000000 /* Config space access */ 472 + 0x0000000c 0x08011000 0x00001000>; /* Registers */ 473 + dcr-reg = <0x120 0x020>; 474 + sdr-base = <0x340>; 477 475 478 476 /* Outbound ranges, one memory and one IO, 479 477 * later cannot be changed 480 478 */ 481 - ranges = <02000000 0 80000000 0000000e 80000000 0 80000000 482 - 01000000 0 00000000 0000000f 80010000 0 00010000>; 479 + ranges = <0x02000000 0x00000000 0x80000000 0x0000000e 0x80000000 0x00000000 0x80000000 480 + 0x01000000 0x00000000 0x00000000 0x0000000f 0x80010000 0x00000000 0x00010000>; 483 481 484 482 /* Inbound 2GB range starting at 0 */ 485 - dma-ranges = <42000000 0 0 0 0 0 80000000>; 483 + dma-ranges = <0x42000000 0x0 0x0 0x0 0x0 0x0 0x80000000>; 486 484 487 485 /* This drives busses 80 to 0xbf */ 488 - bus-range = <80 bf>; 486 + bus-range = <0x80 0xbf>; 489 487 490 488 /* Legacy interrupts (note the weird polarity, the bridge seems 491 489 * to invert PCIe legacy interrupts). ··· 495 493 * below are basically de-swizzled numbers. 496 494 * The real slot is on idsel 0, so the swizzling is 1:1 497 495 */ 498 - interrupt-map-mask = <0000 0 0 7>; 496 + interrupt-map-mask = <0x0 0x0 0x0 0x7>; 499 497 interrupt-map = < 500 - 0000 0 0 1 &UIC3 10 4 /* swizzled int A */ 501 - 0000 0 0 2 &UIC3 11 4 /* swizzled int B */ 502 - 0000 0 0 3 &UIC3 12 4 /* swizzled int C */ 503 - 0000 0 0 4 &UIC3 13 4 /* swizzled int D */>; 498 + 0x0 0x0 0x0 0x1 &UIC3 0x10 0x4 /* swizzled int A */ 499 + 0x0 0x0 0x0 0x2 &UIC3 0x11 0x4 /* swizzled int B */ 500 + 0x0 0x0 0x0 0x3 &UIC3 0x12 0x4 /* swizzled int C */ 501 + 0x0 0x0 0x0 0x4 &UIC3 0x13 0x4 /* swizzled int D */>; 504 502 }; 505 503 }; 506 504 };
+69 -67
arch/powerpc/boot/dts/haleakala.dts
··· 8 8 * any warranty of any kind, whether express or implied. 9 9 */ 10 10 11 + /dts-v1/; 12 + 11 13 / { 12 14 #address-cells = <1>; 13 15 #size-cells = <1>; 14 16 model = "amcc,haleakala"; 15 17 compatible = "amcc,haleakala", "amcc,kilauea"; 16 - dcr-parent = <&/cpus/cpu@0>; 18 + dcr-parent = <&{/cpus/cpu@0}>; 17 19 18 20 aliases { 19 21 ethernet0 = &EMAC0; ··· 30 28 cpu@0 { 31 29 device_type = "cpu"; 32 30 model = "PowerPC,405EXr"; 33 - reg = <0>; 31 + reg = <0x00000000>; 34 32 clock-frequency = <0>; /* Filled in by U-Boot */ 35 33 timebase-frequency = <0>; /* Filled in by U-Boot */ 36 - i-cache-line-size = <20>; 37 - d-cache-line-size = <20>; 38 - i-cache-size = <4000>; /* 16 kB */ 39 - d-cache-size = <4000>; /* 16 kB */ 34 + i-cache-line-size = <32>; 35 + d-cache-line-size = <32>; 36 + i-cache-size = <16384>; /* 16 kB */ 37 + d-cache-size = <16384>; /* 16 kB */ 40 38 dcr-controller; 41 39 dcr-access-method = "native"; 42 40 }; ··· 44 42 45 43 memory { 46 44 device_type = "memory"; 47 - reg = <0 0>; /* Filled in by U-Boot */ 45 + reg = <0x00000000 0x00000000>; /* Filled in by U-Boot */ 48 46 }; 49 47 50 48 UIC0: interrupt-controller { 51 49 compatible = "ibm,uic-405exr", "ibm,uic"; 52 50 interrupt-controller; 53 51 cell-index = <0>; 54 - dcr-reg = <0c0 009>; 52 + dcr-reg = <0x0c0 0x009>; 55 53 #address-cells = <0>; 56 54 #size-cells = <0>; 57 55 #interrupt-cells = <2>; ··· 61 59 compatible = "ibm,uic-405exr","ibm,uic"; 62 60 interrupt-controller; 63 61 cell-index = <1>; 64 - dcr-reg = <0d0 009>; 62 + dcr-reg = <0x0d0 0x009>; 65 63 #address-cells = <0>; 66 64 #size-cells = <0>; 67 65 #interrupt-cells = <2>; 68 - interrupts = <1e 4 1f 4>; /* cascade */ 66 + interrupts = <0x1e 0x4 0x1f 0x4>; /* cascade */ 69 67 interrupt-parent = <&UIC0>; 70 68 }; 71 69 ··· 73 71 compatible = "ibm,uic-405exr","ibm,uic"; 74 72 interrupt-controller; 75 73 cell-index = <2>; 76 - dcr-reg = <0e0 009>; 74 + dcr-reg = <0x0e0 0x009>; 77 75 #address-cells = <0>; 78 76 #size-cells = <0>; 79 77 #interrupt-cells = <2>; 80 - interrupts = <1c 4 1d 4>; /* cascade */ 78 + interrupts = <0x1c 0x4 0x1d 0x4>; /* cascade */ 81 79 interrupt-parent = <&UIC0>; 82 80 }; 83 81 ··· 90 88 91 89 SDRAM0: memory-controller { 92 90 compatible = "ibm,sdram-405exr"; 93 - dcr-reg = <010 2>; 91 + dcr-reg = <0x010 0x002>; 94 92 }; 95 93 96 94 MAL0: mcmal { 97 95 compatible = "ibm,mcmal-405exr", "ibm,mcmal2"; 98 - dcr-reg = <180 62>; 96 + dcr-reg = <0x180 0x062>; 99 97 num-tx-chans = <2>; 100 98 num-rx-chans = <2>; 101 99 interrupt-parent = <&MAL0>; 102 - interrupts = <0 1 2 3 4>; 100 + interrupts = <0x0 0x1 0x2 0x3 0x4>; 103 101 #interrupt-cells = <1>; 104 102 #address-cells = <0>; 105 103 #size-cells = <0>; 106 - interrupt-map = </*TXEOB*/ 0 &UIC0 a 4 107 - /*RXEOB*/ 1 &UIC0 b 4 108 - /*SERR*/ 2 &UIC1 0 4 109 - /*TXDE*/ 3 &UIC1 1 4 110 - /*RXDE*/ 4 &UIC1 2 4>; 111 - interrupt-map-mask = <ffffffff>; 104 + interrupt-map = </*TXEOB*/ 0x0 &UIC0 0xa 0x4 105 + /*RXEOB*/ 0x1 &UIC0 0xb 0x4 106 + /*SERR*/ 0x2 &UIC1 0x0 0x4 107 + /*TXDE*/ 0x3 &UIC1 0x1 0x4 108 + /*RXDE*/ 0x4 &UIC1 0x2 0x4>; 109 + interrupt-map-mask = <0xffffffff>; 112 110 }; 113 111 114 112 POB0: opb { 115 113 compatible = "ibm,opb-405exr", "ibm,opb"; 116 114 #address-cells = <1>; 117 115 #size-cells = <1>; 118 - ranges = <80000000 80000000 10000000 119 - ef600000 ef600000 a00000 120 - f0000000 f0000000 10000000>; 121 - dcr-reg = <0a0 5>; 116 + ranges = <0x80000000 0x80000000 0x10000000 117 + 0xef600000 0xef600000 0x00a00000 118 + 0xf0000000 0xf0000000 0x10000000>; 119 + dcr-reg = <0x0a0 0x005>; 122 120 clock-frequency = <0>; /* Filled in by U-Boot */ 123 121 124 122 EBC0: ebc { 125 123 compatible = "ibm,ebc-405exr", "ibm,ebc"; 126 - dcr-reg = <012 2>; 124 + dcr-reg = <0x012 0x002>; 127 125 #address-cells = <2>; 128 126 #size-cells = <1>; 129 127 clock-frequency = <0>; /* Filled in by U-Boot */ 130 128 /* ranges property is supplied by U-Boot */ 131 - interrupts = <5 1>; 129 + interrupts = <0x5 0x1>; 132 130 interrupt-parent = <&UIC1>; 133 131 134 132 nor_flash@0,0 { 135 133 compatible = "amd,s29gl512n", "cfi-flash"; 136 134 bank-width = <2>; 137 - reg = <0 000000 4000000>; 135 + reg = <0x00000000 0x00000000 0x04000000>; 138 136 #address-cells = <1>; 139 137 #size-cells = <1>; 140 138 partition@0 { 141 139 label = "kernel"; 142 - reg = <0 200000>; 140 + reg = <0x00000000 0x00200000>; 143 141 }; 144 142 partition@200000 { 145 143 label = "root"; 146 - reg = <200000 200000>; 144 + reg = <0x00200000 0x00200000>; 147 145 }; 148 146 partition@400000 { 149 147 label = "user"; 150 - reg = <400000 3b60000>; 148 + reg = <0x00400000 0x03b60000>; 151 149 }; 152 150 partition@3f60000 { 153 151 label = "env"; 154 - reg = <3f60000 40000>; 152 + reg = <0x03f60000 0x00040000>; 155 153 }; 156 154 partition@3fa0000 { 157 155 label = "u-boot"; 158 - reg = <3fa0000 60000>; 156 + reg = <0x03fa0000 0x00060000>; 159 157 }; 160 158 }; 161 159 }; ··· 163 161 UART0: serial@ef600200 { 164 162 device_type = "serial"; 165 163 compatible = "ns16550"; 166 - reg = <ef600200 8>; 167 - virtual-reg = <ef600200>; 164 + reg = <0xef600200 0x00000008>; 165 + virtual-reg = <0xef600200>; 168 166 clock-frequency = <0>; /* Filled in by U-Boot */ 169 167 current-speed = <0>; 170 168 interrupt-parent = <&UIC0>; 171 - interrupts = <1a 4>; 169 + interrupts = <0x1a 0x4>; 172 170 }; 173 171 174 172 UART1: serial@ef600300 { 175 173 device_type = "serial"; 176 174 compatible = "ns16550"; 177 - reg = <ef600300 8>; 178 - virtual-reg = <ef600300>; 175 + reg = <0xef600300 0x00000008>; 176 + virtual-reg = <0xef600300>; 179 177 clock-frequency = <0>; /* Filled in by U-Boot */ 180 178 current-speed = <0>; 181 179 interrupt-parent = <&UIC0>; 182 - interrupts = <1 4>; 180 + interrupts = <0x1 0x4>; 183 181 }; 184 182 185 183 IIC0: i2c@ef600400 { 186 184 compatible = "ibm,iic-405exr", "ibm,iic"; 187 - reg = <ef600400 14>; 185 + reg = <0xef600400 0x00000014>; 188 186 interrupt-parent = <&UIC0>; 189 - interrupts = <2 4>; 187 + interrupts = <0x2 0x4>; 190 188 }; 191 189 192 190 IIC1: i2c@ef600500 { 193 191 compatible = "ibm,iic-405exr", "ibm,iic"; 194 - reg = <ef600500 14>; 192 + reg = <0xef600500 0x00000014>; 195 193 interrupt-parent = <&UIC0>; 196 - interrupts = <7 4>; 194 + interrupts = <0x7 0x4>; 197 195 }; 198 196 199 197 200 198 RGMII0: emac-rgmii@ef600b00 { 201 199 compatible = "ibm,rgmii-405exr", "ibm,rgmii"; 202 - reg = <ef600b00 104>; 200 + reg = <0xef600b00 0x00000104>; 203 201 has-mdio; 204 202 }; 205 203 206 204 EMAC0: ethernet@ef600900 { 207 - linux,network-index = <0>; 205 + linux,network-index = <0x0>; 208 206 device_type = "network"; 209 207 compatible = "ibm,emac-405exr", "ibm,emac4"; 210 208 interrupt-parent = <&EMAC0>; 211 - interrupts = <0 1>; 209 + interrupts = <0x0 0x1>; 212 210 #interrupt-cells = <1>; 213 211 #address-cells = <0>; 214 212 #size-cells = <0>; 215 - interrupt-map = </*Status*/ 0 &UIC0 18 4 216 - /*Wake*/ 1 &UIC1 1d 4>; 217 - reg = <ef600900 70>; 213 + interrupt-map = </*Status*/ 0x0 &UIC0 0x18 0x4 214 + /*Wake*/ 0x1 &UIC1 0x1d 0x4>; 215 + reg = <0xef600900 0x00000070>; 218 216 local-mac-address = [000000000000]; /* Filled in by U-Boot */ 219 217 mal-device = <&MAL0>; 220 218 mal-tx-channel = <0>; 221 219 mal-rx-channel = <0>; 222 220 cell-index = <0>; 223 - max-frame-size = <2328>; 224 - rx-fifo-size = <1000>; 225 - tx-fifo-size = <800>; 221 + max-frame-size = <9000>; 222 + rx-fifo-size = <4096>; 223 + tx-fifo-size = <2048>; 226 224 phy-mode = "rgmii"; 227 - phy-map = <00000000>; 225 + phy-map = <0x00000000>; 228 226 rgmii-device = <&RGMII0>; 229 227 rgmii-channel = <0>; 230 228 has-inverted-stacr-oc; ··· 239 237 #address-cells = <3>; 240 238 compatible = "ibm,plb-pciex-405ex", "ibm,plb-pciex"; 241 239 primary; 242 - port = <0>; /* port number */ 243 - reg = <a0000000 20000000 /* Config space access */ 244 - ef000000 00001000>; /* Registers */ 245 - dcr-reg = <040 020>; 246 - sdr-base = <400>; 240 + port = <0x0>; /* port number */ 241 + reg = <0xa0000000 0x20000000 /* Config space access */ 242 + 0xef000000 0x00001000>; /* Registers */ 243 + dcr-reg = <0x040 0x020>; 244 + sdr-base = <0x400>; 247 245 248 246 /* Outbound ranges, one memory and one IO, 249 247 * later cannot be changed 250 248 */ 251 - ranges = <02000000 0 80000000 90000000 0 08000000 252 - 01000000 0 00000000 e0000000 0 00010000>; 249 + ranges = <0x02000000 0x00000000 0x80000000 0x90000000 0x00000000 0x08000000 250 + 0x01000000 0x00000000 0x00000000 0xe0000000 0x00000000 0x00010000>; 253 251 254 252 /* Inbound 2GB range starting at 0 */ 255 - dma-ranges = <42000000 0 0 0 0 80000000>; 253 + dma-ranges = <0x42000000 0x0 0x0 0x0 0x0 0x80000000>; 256 254 257 255 /* This drives busses 0x00 to 0x3f */ 258 - bus-range = <00 3f>; 256 + bus-range = <0x0 0x3f>; 259 257 260 258 /* Legacy interrupts (note the weird polarity, the bridge seems 261 259 * to invert PCIe legacy interrupts). ··· 265 263 * below are basically de-swizzled numbers. 266 264 * The real slot is on idsel 0, so the swizzling is 1:1 267 265 */ 268 - interrupt-map-mask = <0000 0 0 7>; 266 + interrupt-map-mask = <0x0 0x0 0x0 0x7>; 269 267 interrupt-map = < 270 - 0000 0 0 1 &UIC2 0 4 /* swizzled int A */ 271 - 0000 0 0 2 &UIC2 1 4 /* swizzled int B */ 272 - 0000 0 0 3 &UIC2 2 4 /* swizzled int C */ 273 - 0000 0 0 4 &UIC2 3 4 /* swizzled int D */>; 268 + 0x0 0x0 0x0 0x1 &UIC2 0x0 0x4 /* swizzled int A */ 269 + 0x0 0x0 0x0 0x2 &UIC2 0x1 0x4 /* swizzled int B */ 270 + 0x0 0x0 0x0 0x3 &UIC2 0x2 0x4 /* swizzled int C */ 271 + 0x0 0x0 0x0 0x4 &UIC2 0x3 0x4 /* swizzled int D */>; 274 272 }; 275 273 }; 276 274 };
+59 -57
arch/powerpc/boot/dts/holly.dts
··· 10 10 * any warranty of any kind, whether express or implied. 11 11 */ 12 12 13 + /dts-v1/; 14 + 13 15 / { 14 16 model = "41K7339"; 15 17 compatible = "ibm,holly"; ··· 23 21 #size-cells =<0>; 24 22 PowerPC,750CL@0 { 25 23 device_type = "cpu"; 26 - reg = <0>; 27 - d-cache-line-size = <20>; 28 - i-cache-line-size = <20>; 29 - d-cache-size = <8000>; 30 - i-cache-size = <8000>; 31 - d-cache-sets = <80>; 32 - i-cache-sets = <80>; 33 - timebase-frequency = <2faf080>; 34 - clock-frequency = <23c34600>; 35 - bus-frequency = <bebc200>; 24 + reg = <0x00000000>; 25 + d-cache-line-size = <32>; 26 + i-cache-line-size = <32>; 27 + d-cache-size = <32768>; 28 + i-cache-size = <32768>; 29 + d-cache-sets = <128>; 30 + i-cache-sets = <128>; 31 + timebase-frequency = <50000000>; 32 + clock-frequency = <600000000>; 33 + bus-frequency = <200000000>; 36 34 }; 37 35 }; 38 36 39 37 memory@0 { 40 38 device_type = "memory"; 41 - reg = <00000000 20000000>; 39 + reg = <0x00000000 0x20000000>; 42 40 }; 43 41 44 42 tsi109@c0000000 { ··· 46 44 compatible = "tsi109-bridge", "tsi108-bridge"; 47 45 #address-cells = <1>; 48 46 #size-cells = <1>; 49 - ranges = <00000000 c0000000 00010000>; 50 - reg = <c0000000 00010000>; 47 + ranges = <0x00000000 0xc0000000 0x00010000>; 48 + reg = <0xc0000000 0x00010000>; 51 49 52 50 i2c@7000 { 53 51 device_type = "i2c"; 54 52 compatible = "tsi109-i2c", "tsi108-i2c"; 55 53 interrupt-parent = <&MPIC>; 56 - interrupts = <e 2>; 57 - reg = <7000 400>; 54 + interrupts = <0xe 0x2>; 55 + reg = <0x00007000 0x00000400>; 58 56 }; 59 57 60 58 MDIO: mdio@6000 { 61 59 device_type = "mdio"; 62 60 compatible = "tsi109-mdio", "tsi108-mdio"; 63 - reg = <6000 50>; 61 + reg = <0x00006000 0x00000050>; 64 62 #address-cells = <1>; 65 63 #size-cells = <0>; 66 64 67 65 PHY1: ethernet-phy@1 { 68 66 compatible = "bcm5461a"; 69 - reg = <1>; 67 + reg = <0x00000001>; 70 68 txc-rxc-delay-disable; 71 69 }; 72 70 73 71 PHY2: ethernet-phy@2 { 74 72 compatible = "bcm5461a"; 75 - reg = <2>; 73 + reg = <0x00000002>; 76 74 txc-rxc-delay-disable; 77 75 }; 78 76 }; ··· 82 80 compatible = "tsi109-ethernet", "tsi108-ethernet"; 83 81 #address-cells = <1>; 84 82 #size-cells = <0>; 85 - reg = <6000 200>; 83 + reg = <0x00006000 0x00000200>; 86 84 local-mac-address = [ 00 00 00 00 00 00 ]; 87 85 interrupt-parent = <&MPIC>; 88 - interrupts = <10 2>; 86 + interrupts = <0x10 0x2>; 89 87 mdio-handle = <&MDIO>; 90 88 phy-handle = <&PHY1>; 91 89 }; ··· 95 93 compatible = "tsi109-ethernet", "tsi108-ethernet"; 96 94 #address-cells = <1>; 97 95 #size-cells = <0>; 98 - reg = <6400 200>; 96 + reg = <0x00006400 0x00000200>; 99 97 local-mac-address = [ 00 00 00 00 00 00 ]; 100 98 interrupt-parent = <&MPIC>; 101 - interrupts = <11 2>; 99 + interrupts = <0x11 0x2>; 102 100 mdio-handle = <&MDIO>; 103 101 phy-handle = <&PHY2>; 104 102 }; ··· 106 104 serial@7808 { 107 105 device_type = "serial"; 108 106 compatible = "ns16550"; 109 - reg = <7808 200>; 110 - virtual-reg = <c0007808>; 111 - clock-frequency = <3F9C6000>; 112 - current-speed = <1c200>; 107 + reg = <0x00007808 0x00000200>; 108 + virtual-reg = <0xc0007808>; 109 + clock-frequency = <1067212800>; 110 + current-speed = <115200>; 113 111 interrupt-parent = <&MPIC>; 114 - interrupts = <c 2>; 112 + interrupts = <0xc 0x2>; 115 113 }; 116 114 117 115 serial@7c08 { 118 116 device_type = "serial"; 119 117 compatible = "ns16550"; 120 - reg = <7c08 200>; 121 - virtual-reg = <c0007c08>; 122 - clock-frequency = <3F9C6000>; 123 - current-speed = <1c200>; 118 + reg = <0x00007c08 0x00000200>; 119 + virtual-reg = <0xc0007c08>; 120 + clock-frequency = <1067212800>; 121 + current-speed = <115200>; 124 122 interrupt-parent = <&MPIC>; 125 - interrupts = <d 2>; 123 + interrupts = <0xd 0x2>; 126 124 }; 127 125 128 126 MPIC: pic@7400 { ··· 130 128 compatible = "chrp,open-pic"; 131 129 interrupt-controller; 132 130 #interrupt-cells = <2>; 133 - reg = <7400 400>; 131 + reg = <0x00007400 0x00000400>; 134 132 big-endian; 135 133 }; 136 134 ··· 140 138 #interrupt-cells = <1>; 141 139 #size-cells = <2>; 142 140 #address-cells = <3>; 143 - reg = <1000 1000>; 144 - bus-range = <0 0>; 141 + reg = <0x00001000 0x00001000>; 142 + bus-range = <0x0 0x0>; 145 143 /*----------------------------------------------------+ 146 144 | PCI memory range. 147 145 | 01 denotes I/O space 148 146 | 02 denotes 32-bit memory space 149 147 +----------------------------------------------------*/ 150 - ranges = <02000000 0 40000000 40000000 0 10000000 151 - 01000000 0 00000000 7e000000 0 00010000>; 152 - clock-frequency = <7f28154>; 148 + ranges = <0x02000000 0x00000000 0x40000000 0x40000000 0x00000000 0x10000000 149 + 0x01000000 0x00000000 0x00000000 0x7e000000 0x00000000 0x00010000>; 150 + clock-frequency = <133333332>; 153 151 interrupt-parent = <&MPIC>; 154 - interrupts = <17 2>; 155 - interrupt-map-mask = <f800 0 0 7>; 152 + interrupts = <0x17 0x2>; 153 + interrupt-map-mask = <0xf800 0x0 0x0 0x7>; 156 154 /*----------------------------------------------------+ 157 155 | The INTA, INTB, INTC, INTD are shared. 158 156 +----------------------------------------------------*/ 159 157 interrupt-map = < 160 - 0800 0 0 1 &RT0 24 0 161 - 0800 0 0 2 &RT0 25 0 162 - 0800 0 0 3 &RT0 26 0 163 - 0800 0 0 4 &RT0 27 0 158 + 0x800 0x0 0x0 0x1 &RT0 0x24 0x0 159 + 0x800 0x0 0x0 0x2 &RT0 0x25 0x0 160 + 0x800 0x0 0x0 0x3 &RT0 0x26 0x0 161 + 0x800 0x0 0x0 0x4 &RT0 0x27 0x0 164 162 165 - 1000 0 0 1 &RT0 25 0 166 - 1000 0 0 2 &RT0 26 0 167 - 1000 0 0 3 &RT0 27 0 168 - 1000 0 0 4 &RT0 24 0 163 + 0x1000 0x0 0x0 0x1 &RT0 0x25 0x0 164 + 0x1000 0x0 0x0 0x2 &RT0 0x26 0x0 165 + 0x1000 0x0 0x0 0x3 &RT0 0x27 0x0 166 + 0x1000 0x0 0x0 0x4 &RT0 0x24 0x0 169 167 170 - 1800 0 0 1 &RT0 26 0 171 - 1800 0 0 2 &RT0 27 0 172 - 1800 0 0 3 &RT0 24 0 173 - 1800 0 0 4 &RT0 25 0 168 + 0x1800 0x0 0x0 0x1 &RT0 0x26 0x0 169 + 0x1800 0x0 0x0 0x2 &RT0 0x27 0x0 170 + 0x1800 0x0 0x0 0x3 &RT0 0x24 0x0 171 + 0x1800 0x0 0x0 0x4 &RT0 0x25 0x0 174 172 175 - 2000 0 0 1 &RT0 27 0 176 - 2000 0 0 2 &RT0 24 0 177 - 2000 0 0 3 &RT0 25 0 178 - 2000 0 0 4 &RT0 26 0 173 + 0x2000 0x0 0x0 0x1 &RT0 0x27 0x0 174 + 0x2000 0x0 0x0 0x2 &RT0 0x24 0x0 175 + 0x2000 0x0 0x0 0x3 &RT0 0x25 0x0 176 + 0x2000 0x0 0x0 0x4 &RT0 0x26 0x0 179 177 >; 180 178 181 179 RT0: router@1180 { ··· 185 183 clock-frequency = <0>; 186 184 #address-cells = <0>; 187 185 #interrupt-cells = <2>; 188 - interrupts = <17 2>; 186 + interrupts = <0x17 0x2>; 189 187 interrupt-parent = <&MPIC>; 190 188 }; 191 189 };
+106 -104
arch/powerpc/boot/dts/katmai.dts
··· 12 12 * any warranty of any kind, whether express or implied. 13 13 */ 14 14 15 + /dts-v1/; 16 + 15 17 / { 16 18 #address-cells = <2>; 17 19 #size-cells = <1>; 18 20 model = "amcc,katmai"; 19 21 compatible = "amcc,katmai"; 20 - dcr-parent = <&/cpus/cpu@0>; 22 + dcr-parent = <&{/cpus/cpu@0}>; 21 23 22 24 aliases { 23 25 ethernet0 = &EMAC0; ··· 35 33 cpu@0 { 36 34 device_type = "cpu"; 37 35 model = "PowerPC,440SPe"; 38 - reg = <0>; 36 + reg = <0x00000000>; 39 37 clock-frequency = <0>; /* Filled in by zImage */ 40 38 timebase-frequency = <0>; /* Filled in by zImage */ 41 - i-cache-line-size = <20>; 42 - d-cache-line-size = <20>; 43 - i-cache-size = <8000>; 44 - d-cache-size = <8000>; 39 + i-cache-line-size = <32>; 40 + d-cache-line-size = <32>; 41 + i-cache-size = <32768>; 42 + d-cache-size = <32768>; 45 43 dcr-controller; 46 44 dcr-access-method = "native"; 47 45 }; ··· 49 47 50 48 memory { 51 49 device_type = "memory"; 52 - reg = <0 0 0>; /* Filled in by zImage */ 50 + reg = <0x00000000 0x00000000 0x00000000>; /* Filled in by zImage */ 53 51 }; 54 52 55 53 UIC0: interrupt-controller0 { 56 54 compatible = "ibm,uic-440spe","ibm,uic"; 57 55 interrupt-controller; 58 56 cell-index = <0>; 59 - dcr-reg = <0c0 009>; 57 + dcr-reg = <0x0c0 0x009>; 60 58 #address-cells = <0>; 61 59 #size-cells = <0>; 62 60 #interrupt-cells = <2>; ··· 66 64 compatible = "ibm,uic-440spe","ibm,uic"; 67 65 interrupt-controller; 68 66 cell-index = <1>; 69 - dcr-reg = <0d0 009>; 67 + dcr-reg = <0x0d0 0x009>; 70 68 #address-cells = <0>; 71 69 #size-cells = <0>; 72 70 #interrupt-cells = <2>; 73 - interrupts = <1e 4 1f 4>; /* cascade */ 71 + interrupts = <0x1e 0x4 0x1f 0x4>; /* cascade */ 74 72 interrupt-parent = <&UIC0>; 75 73 }; 76 74 ··· 78 76 compatible = "ibm,uic-440spe","ibm,uic"; 79 77 interrupt-controller; 80 78 cell-index = <2>; 81 - dcr-reg = <0e0 009>; 79 + dcr-reg = <0x0e0 0x009>; 82 80 #address-cells = <0>; 83 81 #size-cells = <0>; 84 82 #interrupt-cells = <2>; 85 - interrupts = <a 4 b 4>; /* cascade */ 83 + interrupts = <0xa 0x4 0xb 0x4>; /* cascade */ 86 84 interrupt-parent = <&UIC0>; 87 85 }; 88 86 ··· 90 88 compatible = "ibm,uic-440spe","ibm,uic"; 91 89 interrupt-controller; 92 90 cell-index = <3>; 93 - dcr-reg = <0f0 009>; 91 + dcr-reg = <0x0f0 0x009>; 94 92 #address-cells = <0>; 95 93 #size-cells = <0>; 96 94 #interrupt-cells = <2>; 97 - interrupts = <10 4 11 4>; /* cascade */ 95 + interrupts = <0x10 0x4 0x11 0x4>; /* cascade */ 98 96 interrupt-parent = <&UIC0>; 99 97 }; 100 98 101 99 SDR0: sdr { 102 100 compatible = "ibm,sdr-440spe"; 103 - dcr-reg = <00e 002>; 101 + dcr-reg = <0x00e 0x002>; 104 102 }; 105 103 106 104 CPR0: cpr { 107 105 compatible = "ibm,cpr-440spe"; 108 - dcr-reg = <00c 002>; 106 + dcr-reg = <0x00c 0x002>; 109 107 }; 110 108 111 109 plb { ··· 117 115 118 116 SDRAM0: sdram { 119 117 compatible = "ibm,sdram-440spe", "ibm,sdram-405gp"; 120 - dcr-reg = <010 2>; 118 + dcr-reg = <0x010 0x002>; 121 119 }; 122 120 123 121 MAL0: mcmal { 124 122 compatible = "ibm,mcmal-440spe", "ibm,mcmal2"; 125 - dcr-reg = <180 62>; 123 + dcr-reg = <0x180 0x062>; 126 124 num-tx-chans = <2>; 127 125 num-rx-chans = <1>; 128 126 interrupt-parent = <&MAL0>; 129 - interrupts = <0 1 2 3 4>; 127 + interrupts = <0x0 0x1 0x2 0x3 0x4>; 130 128 #interrupt-cells = <1>; 131 129 #address-cells = <0>; 132 130 #size-cells = <0>; 133 - interrupt-map = </*TXEOB*/ 0 &UIC1 6 4 134 - /*RXEOB*/ 1 &UIC1 7 4 135 - /*SERR*/ 2 &UIC1 1 4 136 - /*TXDE*/ 3 &UIC1 2 4 137 - /*RXDE*/ 4 &UIC1 3 4>; 131 + interrupt-map = </*TXEOB*/ 0x0 &UIC1 0x6 0x4 132 + /*RXEOB*/ 0x1 &UIC1 0x7 0x4 133 + /*SERR*/ 0x2 &UIC1 0x1 0x4 134 + /*TXDE*/ 0x3 &UIC1 0x2 0x4 135 + /*RXDE*/ 0x4 &UIC1 0x3 0x4>; 138 136 }; 139 137 140 138 POB0: opb { 141 139 compatible = "ibm,opb-440spe", "ibm,opb-440gp", "ibm,opb"; 142 140 #address-cells = <1>; 143 141 #size-cells = <1>; 144 - ranges = <00000000 4 e0000000 20000000>; 142 + ranges = <0x00000000 0x00000004 0xe0000000 0x20000000>; 145 143 clock-frequency = <0>; /* Filled in by zImage */ 146 144 147 145 EBC0: ebc { 148 146 compatible = "ibm,ebc-440spe", "ibm,ebc-440gp", "ibm,ebc"; 149 - dcr-reg = <012 2>; 147 + dcr-reg = <0x012 0x002>; 150 148 #address-cells = <2>; 151 149 #size-cells = <1>; 152 150 clock-frequency = <0>; /* Filled in by zImage */ 153 - interrupts = <5 1>; 151 + interrupts = <0x5 0x1>; 154 152 interrupt-parent = <&UIC1>; 155 153 }; 156 154 157 155 UART0: serial@10000200 { 158 156 device_type = "serial"; 159 157 compatible = "ns16550"; 160 - reg = <10000200 8>; 161 - virtual-reg = <a0000200>; 158 + reg = <0x10000200 0x00000008>; 159 + virtual-reg = <0xa0000200>; 162 160 clock-frequency = <0>; /* Filled in by zImage */ 163 - current-speed = <1c200>; 161 + current-speed = <115200>; 164 162 interrupt-parent = <&UIC0>; 165 - interrupts = <0 4>; 163 + interrupts = <0x0 0x4>; 166 164 }; 167 165 168 166 UART1: serial@10000300 { 169 167 device_type = "serial"; 170 168 compatible = "ns16550"; 171 - reg = <10000300 8>; 172 - virtual-reg = <a0000300>; 169 + reg = <0x10000300 0x00000008>; 170 + virtual-reg = <0xa0000300>; 173 171 clock-frequency = <0>; 174 172 current-speed = <0>; 175 173 interrupt-parent = <&UIC0>; 176 - interrupts = <1 4>; 174 + interrupts = <0x1 0x4>; 177 175 }; 178 176 179 177 180 178 UART2: serial@10000600 { 181 179 device_type = "serial"; 182 180 compatible = "ns16550"; 183 - reg = <10000600 8>; 184 - virtual-reg = <a0000600>; 181 + reg = <0x10000600 0x00000008>; 182 + virtual-reg = <0xa0000600>; 185 183 clock-frequency = <0>; 186 184 current-speed = <0>; 187 185 interrupt-parent = <&UIC1>; 188 - interrupts = <5 4>; 186 + interrupts = <0x5 0x4>; 189 187 }; 190 188 191 189 IIC0: i2c@10000400 { 192 190 compatible = "ibm,iic-440spe", "ibm,iic-440gp", "ibm,iic"; 193 - reg = <10000400 14>; 191 + reg = <0x10000400 0x00000014>; 194 192 interrupt-parent = <&UIC0>; 195 - interrupts = <2 4>; 193 + interrupts = <0x2 0x4>; 196 194 }; 197 195 198 196 IIC1: i2c@10000500 { 199 197 compatible = "ibm,iic-440spe", "ibm,iic-440gp", "ibm,iic"; 200 - reg = <10000500 14>; 198 + reg = <0x10000500 0x00000014>; 201 199 interrupt-parent = <&UIC0>; 202 - interrupts = <3 4>; 200 + interrupts = <0x3 0x4>; 203 201 }; 204 202 205 203 EMAC0: ethernet@10000800 { 206 - linux,network-index = <0>; 204 + linux,network-index = <0x0>; 207 205 device_type = "network"; 208 206 compatible = "ibm,emac-440spe", "ibm,emac4"; 209 207 interrupt-parent = <&UIC1>; 210 - interrupts = <1c 4 1d 4>; 211 - reg = <10000800 70>; 208 + interrupts = <0x1c 0x4 0x1d 0x4>; 209 + reg = <0x10000800 0x00000070>; 212 210 local-mac-address = [000000000000]; 213 211 mal-device = <&MAL0>; 214 212 mal-tx-channel = <0>; 215 213 mal-rx-channel = <0>; 216 214 cell-index = <0>; 217 - max-frame-size = <2328>; 218 - rx-fifo-size = <1000>; 219 - tx-fifo-size = <800>; 215 + max-frame-size = <9000>; 216 + rx-fifo-size = <4096>; 217 + tx-fifo-size = <2048>; 220 218 phy-mode = "gmii"; 221 - phy-map = <00000000>; 219 + phy-map = <0x00000000>; 222 220 has-inverted-stacr-oc; 223 221 has-new-stacr-staopc; 224 222 }; ··· 233 231 primary; 234 232 large-inbound-windows; 235 233 enable-msi-hole; 236 - reg = <c 0ec00000 8 /* Config space access */ 237 - 0 0 0 /* no IACK cycles */ 238 - c 0ed00000 4 /* Special cycles */ 239 - c 0ec80000 100 /* Internal registers */ 240 - c 0ec80100 fc>; /* Internal messaging registers */ 234 + reg = <0x0000000c 0x0ec00000 0x00000008 /* Config space access */ 235 + 0x00000000 0x00000000 0x00000000 /* no IACK cycles */ 236 + 0x0000000c 0x0ed00000 0x00000004 /* Special cycles */ 237 + 0x0000000c 0x0ec80000 0x00000100 /* Internal registers */ 238 + 0x0000000c 0x0ec80100 0x000000fc>; /* Internal messaging registers */ 241 239 242 240 /* Outbound ranges, one memory and one IO, 243 241 * later cannot be changed 244 242 */ 245 - ranges = <02000000 0 80000000 0000000d 80000000 0 80000000 246 - 01000000 0 00000000 0000000c 08000000 0 00010000>; 243 + ranges = <0x02000000 0x00000000 0x80000000 0x0000000d 0x80000000 0x00000000 0x80000000 244 + 0x01000000 0x00000000 0x00000000 0x0000000c 0x08000000 0x00000000 0x00010000>; 247 245 248 246 /* Inbound 2GB range starting at 0 */ 249 - dma-ranges = <42000000 0 0 0 0 0 80000000>; 247 + dma-ranges = <0x42000000 0x0 0x0 0x0 0x0 0x0 0x80000000>; 250 248 251 249 /* This drives busses 0 to 0xf */ 252 - bus-range = <0 f>; 250 + bus-range = <0x0 0xf>; 253 251 254 252 /* 255 253 * On Katmai, the following PCI-X interrupts signals ··· 260 258 * INTC: J2: 1-2 261 259 * INTD: J1: 1-2 262 260 */ 263 - interrupt-map-mask = <f800 0 0 7>; 261 + interrupt-map-mask = <0xf800 0x0 0x0 0x7>; 264 262 interrupt-map = < 265 263 /* IDSEL 1 */ 266 - 0800 0 0 1 &UIC1 14 8 267 - 0800 0 0 2 &UIC1 13 8 268 - 0800 0 0 3 &UIC1 12 8 269 - 0800 0 0 4 &UIC1 11 8 264 + 0x800 0x0 0x0 0x1 &UIC1 0x14 0x8 265 + 0x800 0x0 0x0 0x2 &UIC1 0x13 0x8 266 + 0x800 0x0 0x0 0x3 &UIC1 0x12 0x8 267 + 0x800 0x0 0x0 0x4 &UIC1 0x11 0x8 270 268 >; 271 269 }; 272 270 ··· 277 275 #address-cells = <3>; 278 276 compatible = "ibm,plb-pciex-440spe", "ibm,plb-pciex"; 279 277 primary; 280 - port = <0>; /* port number */ 281 - reg = <d 00000000 20000000 /* Config space access */ 282 - c 10000000 00001000>; /* Registers */ 283 - dcr-reg = <100 020>; 284 - sdr-base = <300>; 278 + port = <0x0>; /* port number */ 279 + reg = <0x0000000d 0x00000000 0x20000000 /* Config space access */ 280 + 0x0000000c 0x10000000 0x00001000>; /* Registers */ 281 + dcr-reg = <0x100 0x020>; 282 + sdr-base = <0x300>; 285 283 286 284 /* Outbound ranges, one memory and one IO, 287 285 * later cannot be changed 288 286 */ 289 - ranges = <02000000 0 80000000 0000000e 00000000 0 80000000 290 - 01000000 0 00000000 0000000f 80000000 0 00010000>; 287 + ranges = <0x02000000 0x00000000 0x80000000 0x0000000e 0x00000000 0x00000000 0x80000000 288 + 0x01000000 0x00000000 0x00000000 0x0000000f 0x80000000 0x00000000 0x00010000>; 291 289 292 290 /* Inbound 2GB range starting at 0 */ 293 - dma-ranges = <42000000 0 0 0 0 0 80000000>; 291 + dma-ranges = <0x42000000 0x0 0x0 0x0 0x0 0x0 0x80000000>; 294 292 295 293 /* This drives busses 10 to 0x1f */ 296 - bus-range = <10 1f>; 294 + bus-range = <0x10 0x1f>; 297 295 298 296 /* Legacy interrupts (note the weird polarity, the bridge seems 299 297 * to invert PCIe legacy interrupts). ··· 303 301 * below are basically de-swizzled numbers. 304 302 * The real slot is on idsel 0, so the swizzling is 1:1 305 303 */ 306 - interrupt-map-mask = <0000 0 0 7>; 304 + interrupt-map-mask = <0x0 0x0 0x0 0x7>; 307 305 interrupt-map = < 308 - 0000 0 0 1 &UIC3 0 4 /* swizzled int A */ 309 - 0000 0 0 2 &UIC3 1 4 /* swizzled int B */ 310 - 0000 0 0 3 &UIC3 2 4 /* swizzled int C */ 311 - 0000 0 0 4 &UIC3 3 4 /* swizzled int D */>; 306 + 0x0 0x0 0x0 0x1 &UIC3 0x0 0x4 /* swizzled int A */ 307 + 0x0 0x0 0x0 0x2 &UIC3 0x1 0x4 /* swizzled int B */ 308 + 0x0 0x0 0x0 0x3 &UIC3 0x2 0x4 /* swizzled int C */ 309 + 0x0 0x0 0x0 0x4 &UIC3 0x3 0x4 /* swizzled int D */>; 312 310 }; 313 311 314 312 PCIE1: pciex@d20000000 { ··· 318 316 #address-cells = <3>; 319 317 compatible = "ibm,plb-pciex-440spe", "ibm,plb-pciex"; 320 318 primary; 321 - port = <1>; /* port number */ 322 - reg = <d 20000000 20000000 /* Config space access */ 323 - c 10001000 00001000>; /* Registers */ 324 - dcr-reg = <120 020>; 325 - sdr-base = <340>; 319 + port = <0x1>; /* port number */ 320 + reg = <0x0000000d 0x20000000 0x20000000 /* Config space access */ 321 + 0x0000000c 0x10001000 0x00001000>; /* Registers */ 322 + dcr-reg = <0x120 0x020>; 323 + sdr-base = <0x340>; 326 324 327 325 /* Outbound ranges, one memory and one IO, 328 326 * later cannot be changed 329 327 */ 330 - ranges = <02000000 0 80000000 0000000e 80000000 0 80000000 331 - 01000000 0 00000000 0000000f 80010000 0 00010000>; 328 + ranges = <0x02000000 0x00000000 0x80000000 0x0000000e 0x80000000 0x00000000 0x80000000 329 + 0x01000000 0x00000000 0x00000000 0x0000000f 0x80010000 0x00000000 0x00010000>; 332 330 333 331 /* Inbound 2GB range starting at 0 */ 334 - dma-ranges = <42000000 0 0 0 0 0 80000000>; 332 + dma-ranges = <0x42000000 0x0 0x0 0x0 0x0 0x0 0x80000000>; 335 333 336 334 /* This drives busses 10 to 0x1f */ 337 - bus-range = <20 2f>; 335 + bus-range = <0x20 0x2f>; 338 336 339 337 /* Legacy interrupts (note the weird polarity, the bridge seems 340 338 * to invert PCIe legacy interrupts). ··· 344 342 * below are basically de-swizzled numbers. 345 343 * The real slot is on idsel 0, so the swizzling is 1:1 346 344 */ 347 - interrupt-map-mask = <0000 0 0 7>; 345 + interrupt-map-mask = <0x0 0x0 0x0 0x7>; 348 346 interrupt-map = < 349 - 0000 0 0 1 &UIC3 4 4 /* swizzled int A */ 350 - 0000 0 0 2 &UIC3 5 4 /* swizzled int B */ 351 - 0000 0 0 3 &UIC3 6 4 /* swizzled int C */ 352 - 0000 0 0 4 &UIC3 7 4 /* swizzled int D */>; 347 + 0x0 0x0 0x0 0x1 &UIC3 0x4 0x4 /* swizzled int A */ 348 + 0x0 0x0 0x0 0x2 &UIC3 0x5 0x4 /* swizzled int B */ 349 + 0x0 0x0 0x0 0x3 &UIC3 0x6 0x4 /* swizzled int C */ 350 + 0x0 0x0 0x0 0x4 &UIC3 0x7 0x4 /* swizzled int D */>; 353 351 }; 354 352 355 353 PCIE2: pciex@d40000000 { ··· 359 357 #address-cells = <3>; 360 358 compatible = "ibm,plb-pciex-440spe", "ibm,plb-pciex"; 361 359 primary; 362 - port = <2>; /* port number */ 363 - reg = <d 40000000 20000000 /* Config space access */ 364 - c 10002000 00001000>; /* Registers */ 365 - dcr-reg = <140 020>; 366 - sdr-base = <370>; 360 + port = <0x2>; /* port number */ 361 + reg = <0x0000000d 0x40000000 0x20000000 /* Config space access */ 362 + 0x0000000c 0x10002000 0x00001000>; /* Registers */ 363 + dcr-reg = <0x140 0x020>; 364 + sdr-base = <0x370>; 367 365 368 366 /* Outbound ranges, one memory and one IO, 369 367 * later cannot be changed 370 368 */ 371 - ranges = <02000000 0 80000000 0000000f 00000000 0 80000000 372 - 01000000 0 00000000 0000000f 80020000 0 00010000>; 369 + ranges = <0x02000000 0x00000000 0x80000000 0x0000000f 0x00000000 0x00000000 0x80000000 370 + 0x01000000 0x00000000 0x00000000 0x0000000f 0x80020000 0x00000000 0x00010000>; 373 371 374 372 /* Inbound 2GB range starting at 0 */ 375 - dma-ranges = <42000000 0 0 0 0 0 80000000>; 373 + dma-ranges = <0x42000000 0x0 0x0 0x0 0x0 0x0 0x80000000>; 376 374 377 375 /* This drives busses 10 to 0x1f */ 378 - bus-range = <30 3f>; 376 + bus-range = <0x30 0x3f>; 379 377 380 378 /* Legacy interrupts (note the weird polarity, the bridge seems 381 379 * to invert PCIe legacy interrupts). ··· 385 383 * below are basically de-swizzled numbers. 386 384 * The real slot is on idsel 0, so the swizzling is 1:1 387 385 */ 388 - interrupt-map-mask = <0000 0 0 7>; 386 + interrupt-map-mask = <0x0 0x0 0x0 0x7>; 389 387 interrupt-map = < 390 - 0000 0 0 1 &UIC3 8 4 /* swizzled int A */ 391 - 0000 0 0 2 &UIC3 9 4 /* swizzled int B */ 392 - 0000 0 0 3 &UIC3 a 4 /* swizzled int C */ 393 - 0000 0 0 4 &UIC3 b 4 /* swizzled int D */>; 388 + 0x0 0x0 0x0 0x1 &UIC3 0x8 0x4 /* swizzled int A */ 389 + 0x0 0x0 0x0 0x2 &UIC3 0x9 0x4 /* swizzled int B */ 390 + 0x0 0x0 0x0 0x3 &UIC3 0xa 0x4 /* swizzled int C */ 391 + 0x0 0x0 0x0 0x4 &UIC3 0xb 0x4 /* swizzled int D */>; 394 392 }; 395 393 }; 396 394
+92 -90
arch/powerpc/boot/dts/kilauea.dts
··· 8 8 * any warranty of any kind, whether express or implied. 9 9 */ 10 10 11 + /dts-v1/; 12 + 11 13 / { 12 14 #address-cells = <1>; 13 15 #size-cells = <1>; 14 16 model = "amcc,kilauea"; 15 17 compatible = "amcc,kilauea"; 16 - dcr-parent = <&/cpus/cpu@0>; 18 + dcr-parent = <&{/cpus/cpu@0}>; 17 19 18 20 aliases { 19 21 ethernet0 = &EMAC0; ··· 31 29 cpu@0 { 32 30 device_type = "cpu"; 33 31 model = "PowerPC,405EX"; 34 - reg = <0>; 32 + reg = <0x00000000>; 35 33 clock-frequency = <0>; /* Filled in by U-Boot */ 36 34 timebase-frequency = <0>; /* Filled in by U-Boot */ 37 - i-cache-line-size = <20>; 38 - d-cache-line-size = <20>; 39 - i-cache-size = <4000>; /* 16 kB */ 40 - d-cache-size = <4000>; /* 16 kB */ 35 + i-cache-line-size = <32>; 36 + d-cache-line-size = <32>; 37 + i-cache-size = <16384>; /* 16 kB */ 38 + d-cache-size = <16384>; /* 16 kB */ 41 39 dcr-controller; 42 40 dcr-access-method = "native"; 43 41 }; ··· 45 43 46 44 memory { 47 45 device_type = "memory"; 48 - reg = <0 0>; /* Filled in by U-Boot */ 46 + reg = <0x00000000 0x00000000>; /* Filled in by U-Boot */ 49 47 }; 50 48 51 49 UIC0: interrupt-controller { 52 50 compatible = "ibm,uic-405ex", "ibm,uic"; 53 51 interrupt-controller; 54 52 cell-index = <0>; 55 - dcr-reg = <0c0 009>; 53 + dcr-reg = <0x0c0 0x009>; 56 54 #address-cells = <0>; 57 55 #size-cells = <0>; 58 56 #interrupt-cells = <2>; ··· 62 60 compatible = "ibm,uic-405ex","ibm,uic"; 63 61 interrupt-controller; 64 62 cell-index = <1>; 65 - dcr-reg = <0d0 009>; 63 + dcr-reg = <0x0d0 0x009>; 66 64 #address-cells = <0>; 67 65 #size-cells = <0>; 68 66 #interrupt-cells = <2>; 69 - interrupts = <1e 4 1f 4>; /* cascade */ 67 + interrupts = <0x1e 0x4 0x1f 0x4>; /* cascade */ 70 68 interrupt-parent = <&UIC0>; 71 69 }; 72 70 ··· 74 72 compatible = "ibm,uic-405ex","ibm,uic"; 75 73 interrupt-controller; 76 74 cell-index = <2>; 77 - dcr-reg = <0e0 009>; 75 + dcr-reg = <0x0e0 0x009>; 78 76 #address-cells = <0>; 79 77 #size-cells = <0>; 80 78 #interrupt-cells = <2>; 81 - interrupts = <1c 4 1d 4>; /* cascade */ 79 + interrupts = <0x1c 0x4 0x1d 0x4>; /* cascade */ 82 80 interrupt-parent = <&UIC0>; 83 81 }; 84 82 ··· 91 89 92 90 SDRAM0: memory-controller { 93 91 compatible = "ibm,sdram-405ex"; 94 - dcr-reg = <010 2>; 92 + dcr-reg = <0x010 0x002>; 95 93 }; 96 94 97 95 MAL0: mcmal { 98 96 compatible = "ibm,mcmal-405ex", "ibm,mcmal2"; 99 - dcr-reg = <180 62>; 97 + dcr-reg = <0x180 0x062>; 100 98 num-tx-chans = <2>; 101 99 num-rx-chans = <2>; 102 100 interrupt-parent = <&MAL0>; 103 - interrupts = <0 1 2 3 4>; 101 + interrupts = <0x0 0x1 0x2 0x3 0x4>; 104 102 #interrupt-cells = <1>; 105 103 #address-cells = <0>; 106 104 #size-cells = <0>; 107 - interrupt-map = </*TXEOB*/ 0 &UIC0 a 4 108 - /*RXEOB*/ 1 &UIC0 b 4 109 - /*SERR*/ 2 &UIC1 0 4 110 - /*TXDE*/ 3 &UIC1 1 4 111 - /*RXDE*/ 4 &UIC1 2 4>; 112 - interrupt-map-mask = <ffffffff>; 105 + interrupt-map = </*TXEOB*/ 0x0 &UIC0 0xa 0x4 106 + /*RXEOB*/ 0x1 &UIC0 0xb 0x4 107 + /*SERR*/ 0x2 &UIC1 0x0 0x4 108 + /*TXDE*/ 0x3 &UIC1 0x1 0x4 109 + /*RXDE*/ 0x4 &UIC1 0x2 0x4>; 110 + interrupt-map-mask = <0xffffffff>; 113 111 }; 114 112 115 113 POB0: opb { 116 114 compatible = "ibm,opb-405ex", "ibm,opb"; 117 115 #address-cells = <1>; 118 116 #size-cells = <1>; 119 - ranges = <80000000 80000000 10000000 120 - ef600000 ef600000 a00000 121 - f0000000 f0000000 10000000>; 122 - dcr-reg = <0a0 5>; 117 + ranges = <0x80000000 0x80000000 0x10000000 118 + 0xef600000 0xef600000 0x00a00000 119 + 0xf0000000 0xf0000000 0x10000000>; 120 + dcr-reg = <0x0a0 0x005>; 123 121 clock-frequency = <0>; /* Filled in by U-Boot */ 124 122 125 123 EBC0: ebc { 126 124 compatible = "ibm,ebc-405ex", "ibm,ebc"; 127 - dcr-reg = <012 2>; 125 + dcr-reg = <0x012 0x002>; 128 126 #address-cells = <2>; 129 127 #size-cells = <1>; 130 128 clock-frequency = <0>; /* Filled in by U-Boot */ 131 129 /* ranges property is supplied by U-Boot */ 132 - interrupts = <5 1>; 130 + interrupts = <0x5 0x1>; 133 131 interrupt-parent = <&UIC1>; 134 132 135 133 nor_flash@0,0 { 136 134 compatible = "amd,s29gl512n", "cfi-flash"; 137 135 bank-width = <2>; 138 - reg = <0 000000 4000000>; 136 + reg = <0x00000000 0x00000000 0x04000000>; 139 137 #address-cells = <1>; 140 138 #size-cells = <1>; 141 139 partition@0 { 142 140 label = "kernel"; 143 - reg = <0 200000>; 141 + reg = <0x00000000 0x00200000>; 144 142 }; 145 143 partition@200000 { 146 144 label = "root"; 147 - reg = <200000 200000>; 145 + reg = <0x00200000 0x00200000>; 148 146 }; 149 147 partition@400000 { 150 148 label = "user"; 151 - reg = <400000 3b60000>; 149 + reg = <0x00400000 0x03b60000>; 152 150 }; 153 151 partition@3f60000 { 154 152 label = "env"; 155 - reg = <3f60000 40000>; 153 + reg = <0x03f60000 0x00040000>; 156 154 }; 157 155 partition@3fa0000 { 158 156 label = "u-boot"; 159 - reg = <3fa0000 60000>; 157 + reg = <0x03fa0000 0x00060000>; 160 158 }; 161 159 }; 162 160 }; ··· 164 162 UART0: serial@ef600200 { 165 163 device_type = "serial"; 166 164 compatible = "ns16550"; 167 - reg = <ef600200 8>; 168 - virtual-reg = <ef600200>; 165 + reg = <0xef600200 0x00000008>; 166 + virtual-reg = <0xef600200>; 169 167 clock-frequency = <0>; /* Filled in by U-Boot */ 170 168 current-speed = <0>; 171 169 interrupt-parent = <&UIC0>; 172 - interrupts = <1a 4>; 170 + interrupts = <0x1a 0x4>; 173 171 }; 174 172 175 173 UART1: serial@ef600300 { 176 174 device_type = "serial"; 177 175 compatible = "ns16550"; 178 - reg = <ef600300 8>; 179 - virtual-reg = <ef600300>; 176 + reg = <0xef600300 0x00000008>; 177 + virtual-reg = <0xef600300>; 180 178 clock-frequency = <0>; /* Filled in by U-Boot */ 181 179 current-speed = <0>; 182 180 interrupt-parent = <&UIC0>; 183 - interrupts = <1 4>; 181 + interrupts = <0x1 0x4>; 184 182 }; 185 183 186 184 IIC0: i2c@ef600400 { 187 185 compatible = "ibm,iic-405ex", "ibm,iic"; 188 - reg = <ef600400 14>; 186 + reg = <0xef600400 0x00000014>; 189 187 interrupt-parent = <&UIC0>; 190 - interrupts = <2 4>; 188 + interrupts = <0x2 0x4>; 191 189 }; 192 190 193 191 IIC1: i2c@ef600500 { 194 192 compatible = "ibm,iic-405ex", "ibm,iic"; 195 - reg = <ef600500 14>; 193 + reg = <0xef600500 0x00000014>; 196 194 interrupt-parent = <&UIC0>; 197 - interrupts = <7 4>; 195 + interrupts = <0x7 0x4>; 198 196 }; 199 197 200 198 201 199 RGMII0: emac-rgmii@ef600b00 { 202 200 compatible = "ibm,rgmii-405ex", "ibm,rgmii"; 203 - reg = <ef600b00 104>; 201 + reg = <0xef600b00 0x00000104>; 204 202 has-mdio; 205 203 }; 206 204 207 205 EMAC0: ethernet@ef600900 { 208 - linux,network-index = <0>; 206 + linux,network-index = <0x0>; 209 207 device_type = "network"; 210 208 compatible = "ibm,emac-405ex", "ibm,emac4"; 211 209 interrupt-parent = <&EMAC0>; 212 - interrupts = <0 1>; 210 + interrupts = <0x0 0x1>; 213 211 #interrupt-cells = <1>; 214 212 #address-cells = <0>; 215 213 #size-cells = <0>; 216 - interrupt-map = </*Status*/ 0 &UIC0 18 4 217 - /*Wake*/ 1 &UIC1 1d 4>; 218 - reg = <ef600900 70>; 214 + interrupt-map = </*Status*/ 0x0 &UIC0 0x18 0x4 215 + /*Wake*/ 0x1 &UIC1 0x1d 0x4>; 216 + reg = <0xef600900 0x00000070>; 219 217 local-mac-address = [000000000000]; /* Filled in by U-Boot */ 220 218 mal-device = <&MAL0>; 221 219 mal-tx-channel = <0>; 222 220 mal-rx-channel = <0>; 223 221 cell-index = <0>; 224 - max-frame-size = <2328>; 225 - rx-fifo-size = <1000>; 226 - tx-fifo-size = <800>; 222 + max-frame-size = <9000>; 223 + rx-fifo-size = <4096>; 224 + tx-fifo-size = <2048>; 227 225 phy-mode = "rgmii"; 228 - phy-map = <00000000>; 226 + phy-map = <0x00000000>; 229 227 rgmii-device = <&RGMII0>; 230 228 rgmii-channel = <0>; 231 229 has-inverted-stacr-oc; ··· 233 231 }; 234 232 235 233 EMAC1: ethernet@ef600a00 { 236 - linux,network-index = <1>; 234 + linux,network-index = <0x1>; 237 235 device_type = "network"; 238 236 compatible = "ibm,emac-405ex", "ibm,emac4"; 239 237 interrupt-parent = <&EMAC1>; 240 - interrupts = <0 1>; 238 + interrupts = <0x0 0x1>; 241 239 #interrupt-cells = <1>; 242 240 #address-cells = <0>; 243 241 #size-cells = <0>; 244 - interrupt-map = </*Status*/ 0 &UIC0 19 4 245 - /*Wake*/ 1 &UIC1 1f 4>; 246 - reg = <ef600a00 70>; 242 + interrupt-map = </*Status*/ 0x0 &UIC0 0x19 0x4 243 + /*Wake*/ 0x1 &UIC1 0x1f 0x4>; 244 + reg = <0xef600a00 0x00000070>; 247 245 local-mac-address = [000000000000]; /* Filled in by U-Boot */ 248 246 mal-device = <&MAL0>; 249 247 mal-tx-channel = <1>; 250 248 mal-rx-channel = <1>; 251 249 cell-index = <1>; 252 - max-frame-size = <2328>; 253 - rx-fifo-size = <1000>; 254 - tx-fifo-size = <800>; 250 + max-frame-size = <9000>; 251 + rx-fifo-size = <4096>; 252 + tx-fifo-size = <2048>; 255 253 phy-mode = "rgmii"; 256 - phy-map = <00000000>; 254 + phy-map = <0x00000000>; 257 255 rgmii-device = <&RGMII0>; 258 256 rgmii-channel = <1>; 259 257 has-inverted-stacr-oc; ··· 268 266 #address-cells = <3>; 269 267 compatible = "ibm,plb-pciex-405ex", "ibm,plb-pciex"; 270 268 primary; 271 - port = <0>; /* port number */ 272 - reg = <a0000000 20000000 /* Config space access */ 273 - ef000000 00001000>; /* Registers */ 274 - dcr-reg = <040 020>; 275 - sdr-base = <400>; 269 + port = <0x0>; /* port number */ 270 + reg = <0xa0000000 0x20000000 /* Config space access */ 271 + 0xef000000 0x00001000>; /* Registers */ 272 + dcr-reg = <0x040 0x020>; 273 + sdr-base = <0x400>; 276 274 277 275 /* Outbound ranges, one memory and one IO, 278 276 * later cannot be changed 279 277 */ 280 - ranges = <02000000 0 80000000 90000000 0 08000000 281 - 01000000 0 00000000 e0000000 0 00010000>; 278 + ranges = <0x02000000 0x00000000 0x80000000 0x90000000 0x00000000 0x08000000 279 + 0x01000000 0x00000000 0x00000000 0xe0000000 0x00000000 0x00010000>; 282 280 283 281 /* Inbound 2GB range starting at 0 */ 284 - dma-ranges = <42000000 0 0 0 0 80000000>; 282 + dma-ranges = <0x42000000 0x0 0x0 0x0 0x0 0x80000000>; 285 283 286 284 /* This drives busses 0x00 to 0x3f */ 287 - bus-range = <00 3f>; 285 + bus-range = <0x0 0x3f>; 288 286 289 287 /* Legacy interrupts (note the weird polarity, the bridge seems 290 288 * to invert PCIe legacy interrupts). ··· 294 292 * below are basically de-swizzled numbers. 295 293 * The real slot is on idsel 0, so the swizzling is 1:1 296 294 */ 297 - interrupt-map-mask = <0000 0 0 7>; 295 + interrupt-map-mask = <0x0 0x0 0x0 0x7>; 298 296 interrupt-map = < 299 - 0000 0 0 1 &UIC2 0 4 /* swizzled int A */ 300 - 0000 0 0 2 &UIC2 1 4 /* swizzled int B */ 301 - 0000 0 0 3 &UIC2 2 4 /* swizzled int C */ 302 - 0000 0 0 4 &UIC2 3 4 /* swizzled int D */>; 297 + 0x0 0x0 0x0 0x1 &UIC2 0x0 0x4 /* swizzled int A */ 298 + 0x0 0x0 0x0 0x2 &UIC2 0x1 0x4 /* swizzled int B */ 299 + 0x0 0x0 0x0 0x3 &UIC2 0x2 0x4 /* swizzled int C */ 300 + 0x0 0x0 0x0 0x4 &UIC2 0x3 0x4 /* swizzled int D */>; 303 301 }; 304 302 305 303 PCIE1: pciex@0c0000000 { ··· 309 307 #address-cells = <3>; 310 308 compatible = "ibm,plb-pciex-405ex", "ibm,plb-pciex"; 311 309 primary; 312 - port = <1>; /* port number */ 313 - reg = <c0000000 20000000 /* Config space access */ 314 - ef001000 00001000>; /* Registers */ 315 - dcr-reg = <060 020>; 316 - sdr-base = <440>; 310 + port = <0x1>; /* port number */ 311 + reg = <0xc0000000 0x20000000 /* Config space access */ 312 + 0xef001000 0x00001000>; /* Registers */ 313 + dcr-reg = <0x060 0x020>; 314 + sdr-base = <0x440>; 317 315 318 316 /* Outbound ranges, one memory and one IO, 319 317 * later cannot be changed 320 318 */ 321 - ranges = <02000000 0 80000000 98000000 0 08000000 322 - 01000000 0 00000000 e0010000 0 00010000>; 319 + ranges = <0x02000000 0x00000000 0x80000000 0x98000000 0x00000000 0x08000000 320 + 0x01000000 0x00000000 0x00000000 0xe0010000 0x00000000 0x00010000>; 323 321 324 322 /* Inbound 2GB range starting at 0 */ 325 - dma-ranges = <42000000 0 0 0 0 80000000>; 323 + dma-ranges = <0x42000000 0x0 0x0 0x0 0x0 0x80000000>; 326 324 327 325 /* This drives busses 0x40 to 0x7f */ 328 - bus-range = <40 7f>; 326 + bus-range = <0x40 0x7f>; 329 327 330 328 /* Legacy interrupts (note the weird polarity, the bridge seems 331 329 * to invert PCIe legacy interrupts). ··· 335 333 * below are basically de-swizzled numbers. 336 334 * The real slot is on idsel 0, so the swizzling is 1:1 337 335 */ 338 - interrupt-map-mask = <0000 0 0 7>; 336 + interrupt-map-mask = <0x0 0x0 0x0 0x7>; 339 337 interrupt-map = < 340 - 0000 0 0 1 &UIC2 b 4 /* swizzled int A */ 341 - 0000 0 0 2 &UIC2 c 4 /* swizzled int B */ 342 - 0000 0 0 3 &UIC2 d 4 /* swizzled int C */ 343 - 0000 0 0 4 &UIC2 e 4 /* swizzled int D */>; 338 + 0x0 0x0 0x0 0x1 &UIC2 0xb 0x4 /* swizzled int A */ 339 + 0x0 0x0 0x0 0x2 &UIC2 0xc 0x4 /* swizzled int B */ 340 + 0x0 0x0 0x0 0x3 &UIC2 0xd 0x4 /* swizzled int C */ 341 + 0x0 0x0 0x0 0x4 &UIC2 0xe 0x4 /* swizzled int D */>; 344 342 }; 345 343 }; 346 344 };
+92 -90
arch/powerpc/boot/dts/makalu.dts
··· 8 8 * any warranty of any kind, whether express or implied. 9 9 */ 10 10 11 + /dts-v1/; 12 + 11 13 / { 12 14 #address-cells = <1>; 13 15 #size-cells = <1>; 14 16 model = "amcc,makalu"; 15 17 compatible = "amcc,makalu"; 16 - dcr-parent = <&/cpus/cpu@0>; 18 + dcr-parent = <&{/cpus/cpu@0}>; 17 19 18 20 aliases { 19 21 ethernet0 = &EMAC0; ··· 31 29 cpu@0 { 32 30 device_type = "cpu"; 33 31 model = "PowerPC,405EX"; 34 - reg = <0>; 32 + reg = <0x00000000>; 35 33 clock-frequency = <0>; /* Filled in by U-Boot */ 36 34 timebase-frequency = <0>; /* Filled in by U-Boot */ 37 - i-cache-line-size = <20>; 38 - d-cache-line-size = <20>; 39 - i-cache-size = <4000>; /* 16 kB */ 40 - d-cache-size = <4000>; /* 16 kB */ 35 + i-cache-line-size = <32>; 36 + d-cache-line-size = <32>; 37 + i-cache-size = <16384>; /* 16 kB */ 38 + d-cache-size = <16384>; /* 16 kB */ 41 39 dcr-controller; 42 40 dcr-access-method = "native"; 43 41 }; ··· 45 43 46 44 memory { 47 45 device_type = "memory"; 48 - reg = <0 0>; /* Filled in by U-Boot */ 46 + reg = <0x00000000 0x00000000>; /* Filled in by U-Boot */ 49 47 }; 50 48 51 49 UIC0: interrupt-controller { 52 50 compatible = "ibm,uic-405ex", "ibm,uic"; 53 51 interrupt-controller; 54 52 cell-index = <0>; 55 - dcr-reg = <0c0 009>; 53 + dcr-reg = <0x0c0 0x009>; 56 54 #address-cells = <0>; 57 55 #size-cells = <0>; 58 56 #interrupt-cells = <2>; ··· 62 60 compatible = "ibm,uic-405ex","ibm,uic"; 63 61 interrupt-controller; 64 62 cell-index = <1>; 65 - dcr-reg = <0d0 009>; 63 + dcr-reg = <0x0d0 0x009>; 66 64 #address-cells = <0>; 67 65 #size-cells = <0>; 68 66 #interrupt-cells = <2>; 69 - interrupts = <1e 4 1f 4>; /* cascade */ 67 + interrupts = <0x1e 0x4 0x1f 0x4>; /* cascade */ 70 68 interrupt-parent = <&UIC0>; 71 69 }; 72 70 ··· 74 72 compatible = "ibm,uic-405ex","ibm,uic"; 75 73 interrupt-controller; 76 74 cell-index = <2>; 77 - dcr-reg = <0e0 009>; 75 + dcr-reg = <0x0e0 0x009>; 78 76 #address-cells = <0>; 79 77 #size-cells = <0>; 80 78 #interrupt-cells = <2>; 81 - interrupts = <1c 4 1d 4>; /* cascade */ 79 + interrupts = <0x1c 0x4 0x1d 0x4>; /* cascade */ 82 80 interrupt-parent = <&UIC0>; 83 81 }; 84 82 ··· 91 89 92 90 SDRAM0: memory-controller { 93 91 compatible = "ibm,sdram-405ex"; 94 - dcr-reg = <010 2>; 92 + dcr-reg = <0x010 0x002>; 95 93 }; 96 94 97 95 MAL0: mcmal { 98 96 compatible = "ibm,mcmal-405ex", "ibm,mcmal2"; 99 - dcr-reg = <180 62>; 97 + dcr-reg = <0x180 0x062>; 100 98 num-tx-chans = <2>; 101 99 num-rx-chans = <2>; 102 100 interrupt-parent = <&MAL0>; 103 - interrupts = <0 1 2 3 4>; 101 + interrupts = <0x0 0x1 0x2 0x3 0x4>; 104 102 #interrupt-cells = <1>; 105 103 #address-cells = <0>; 106 104 #size-cells = <0>; 107 - interrupt-map = </*TXEOB*/ 0 &UIC0 a 4 108 - /*RXEOB*/ 1 &UIC0 b 4 109 - /*SERR*/ 2 &UIC1 0 4 110 - /*TXDE*/ 3 &UIC1 1 4 111 - /*RXDE*/ 4 &UIC1 2 4>; 112 - interrupt-map-mask = <ffffffff>; 105 + interrupt-map = </*TXEOB*/ 0x0 &UIC0 0xa 0x4 106 + /*RXEOB*/ 0x1 &UIC0 0xb 0x4 107 + /*SERR*/ 0x2 &UIC1 0x0 0x4 108 + /*TXDE*/ 0x3 &UIC1 0x1 0x4 109 + /*RXDE*/ 0x4 &UIC1 0x2 0x4>; 110 + interrupt-map-mask = <0xffffffff>; 113 111 }; 114 112 115 113 POB0: opb { 116 114 compatible = "ibm,opb-405ex", "ibm,opb"; 117 115 #address-cells = <1>; 118 116 #size-cells = <1>; 119 - ranges = <80000000 80000000 10000000 120 - ef600000 ef600000 a00000 121 - f0000000 f0000000 10000000>; 122 - dcr-reg = <0a0 5>; 117 + ranges = <0x80000000 0x80000000 0x10000000 118 + 0xef600000 0xef600000 0x00a00000 119 + 0xf0000000 0xf0000000 0x10000000>; 120 + dcr-reg = <0x0a0 0x005>; 123 121 clock-frequency = <0>; /* Filled in by U-Boot */ 124 122 125 123 EBC0: ebc { 126 124 compatible = "ibm,ebc-405ex", "ibm,ebc"; 127 - dcr-reg = <012 2>; 125 + dcr-reg = <0x012 0x002>; 128 126 #address-cells = <2>; 129 127 #size-cells = <1>; 130 128 clock-frequency = <0>; /* Filled in by U-Boot */ 131 129 /* ranges property is supplied by U-Boot */ 132 - interrupts = <5 1>; 130 + interrupts = <0x5 0x1>; 133 131 interrupt-parent = <&UIC1>; 134 132 135 133 nor_flash@0,0 { 136 134 compatible = "amd,s29gl512n", "cfi-flash"; 137 135 bank-width = <2>; 138 - reg = <0 000000 4000000>; 136 + reg = <0x00000000 0x00000000 0x04000000>; 139 137 #address-cells = <1>; 140 138 #size-cells = <1>; 141 139 partition@0 { 142 140 label = "kernel"; 143 - reg = <0 200000>; 141 + reg = <0x00000000 0x00200000>; 144 142 }; 145 143 partition@200000 { 146 144 label = "root"; 147 - reg = <200000 200000>; 145 + reg = <0x00200000 0x00200000>; 148 146 }; 149 147 partition@400000 { 150 148 label = "user"; 151 - reg = <400000 3b60000>; 149 + reg = <0x00400000 0x03b60000>; 152 150 }; 153 151 partition@3f60000 { 154 152 label = "env"; 155 - reg = <3f60000 40000>; 153 + reg = <0x03f60000 0x00040000>; 156 154 }; 157 155 partition@3fa0000 { 158 156 label = "u-boot"; 159 - reg = <3fa0000 60000>; 157 + reg = <0x03fa0000 0x00060000>; 160 158 }; 161 159 }; 162 160 }; ··· 164 162 UART0: serial@ef600200 { 165 163 device_type = "serial"; 166 164 compatible = "ns16550"; 167 - reg = <ef600200 8>; 168 - virtual-reg = <ef600200>; 165 + reg = <0xef600200 0x00000008>; 166 + virtual-reg = <0xef600200>; 169 167 clock-frequency = <0>; /* Filled in by U-Boot */ 170 168 current-speed = <0>; 171 169 interrupt-parent = <&UIC0>; 172 - interrupts = <1a 4>; 170 + interrupts = <0x1a 0x4>; 173 171 }; 174 172 175 173 UART1: serial@ef600300 { 176 174 device_type = "serial"; 177 175 compatible = "ns16550"; 178 - reg = <ef600300 8>; 179 - virtual-reg = <ef600300>; 176 + reg = <0xef600300 0x00000008>; 177 + virtual-reg = <0xef600300>; 180 178 clock-frequency = <0>; /* Filled in by U-Boot */ 181 179 current-speed = <0>; 182 180 interrupt-parent = <&UIC0>; 183 - interrupts = <1 4>; 181 + interrupts = <0x1 0x4>; 184 182 }; 185 183 186 184 IIC0: i2c@ef600400 { 187 185 compatible = "ibm,iic-405ex", "ibm,iic"; 188 - reg = <ef600400 14>; 186 + reg = <0xef600400 0x00000014>; 189 187 interrupt-parent = <&UIC0>; 190 - interrupts = <2 4>; 188 + interrupts = <0x2 0x4>; 191 189 }; 192 190 193 191 IIC1: i2c@ef600500 { 194 192 compatible = "ibm,iic-405ex", "ibm,iic"; 195 - reg = <ef600500 14>; 193 + reg = <0xef600500 0x00000014>; 196 194 interrupt-parent = <&UIC0>; 197 - interrupts = <7 4>; 195 + interrupts = <0x7 0x4>; 198 196 }; 199 197 200 198 201 199 RGMII0: emac-rgmii@ef600b00 { 202 200 compatible = "ibm,rgmii-405ex", "ibm,rgmii"; 203 - reg = <ef600b00 104>; 201 + reg = <0xef600b00 0x00000104>; 204 202 has-mdio; 205 203 }; 206 204 207 205 EMAC0: ethernet@ef600900 { 208 - linux,network-index = <0>; 206 + linux,network-index = <0x0>; 209 207 device_type = "network"; 210 208 compatible = "ibm,emac-405ex", "ibm,emac4"; 211 209 interrupt-parent = <&EMAC0>; 212 - interrupts = <0 1>; 210 + interrupts = <0x0 0x1>; 213 211 #interrupt-cells = <1>; 214 212 #address-cells = <0>; 215 213 #size-cells = <0>; 216 - interrupt-map = </*Status*/ 0 &UIC0 18 4 217 - /*Wake*/ 1 &UIC1 1d 4>; 218 - reg = <ef600900 70>; 214 + interrupt-map = </*Status*/ 0x0 &UIC0 0x18 0x4 215 + /*Wake*/ 0x1 &UIC1 0x1d 0x4>; 216 + reg = <0xef600900 0x00000070>; 219 217 local-mac-address = [000000000000]; /* Filled in by U-Boot */ 220 218 mal-device = <&MAL0>; 221 219 mal-tx-channel = <0>; 222 220 mal-rx-channel = <0>; 223 221 cell-index = <0>; 224 - max-frame-size = <2328>; 225 - rx-fifo-size = <1000>; 226 - tx-fifo-size = <800>; 222 + max-frame-size = <9000>; 223 + rx-fifo-size = <4096>; 224 + tx-fifo-size = <2048>; 227 225 phy-mode = "rgmii"; 228 - phy-map = <0000003f>; /* Start at 6 */ 226 + phy-map = <0x0000003f>; /* Start at 6 */ 229 227 rgmii-device = <&RGMII0>; 230 228 rgmii-channel = <0>; 231 229 has-inverted-stacr-oc; ··· 233 231 }; 234 232 235 233 EMAC1: ethernet@ef600a00 { 236 - linux,network-index = <1>; 234 + linux,network-index = <0x1>; 237 235 device_type = "network"; 238 236 compatible = "ibm,emac-405ex", "ibm,emac4"; 239 237 interrupt-parent = <&EMAC1>; 240 - interrupts = <0 1>; 238 + interrupts = <0x0 0x1>; 241 239 #interrupt-cells = <1>; 242 240 #address-cells = <0>; 243 241 #size-cells = <0>; 244 - interrupt-map = </*Status*/ 0 &UIC0 19 4 245 - /*Wake*/ 1 &UIC1 1f 4>; 246 - reg = <ef600a00 70>; 242 + interrupt-map = </*Status*/ 0x0 &UIC0 0x19 0x4 243 + /*Wake*/ 0x1 &UIC1 0x1f 0x4>; 244 + reg = <0xef600a00 0x00000070>; 247 245 local-mac-address = [000000000000]; /* Filled in by U-Boot */ 248 246 mal-device = <&MAL0>; 249 247 mal-tx-channel = <1>; 250 248 mal-rx-channel = <1>; 251 249 cell-index = <1>; 252 - max-frame-size = <2328>; 253 - rx-fifo-size = <1000>; 254 - tx-fifo-size = <800>; 250 + max-frame-size = <9000>; 251 + rx-fifo-size = <4096>; 252 + tx-fifo-size = <2048>; 255 253 phy-mode = "rgmii"; 256 - phy-map = <00000000>; 254 + phy-map = <0x00000000>; 257 255 rgmii-device = <&RGMII0>; 258 256 rgmii-channel = <1>; 259 257 has-inverted-stacr-oc; ··· 268 266 #address-cells = <3>; 269 267 compatible = "ibm,plb-pciex-405ex", "ibm,plb-pciex"; 270 268 primary; 271 - port = <0>; /* port number */ 272 - reg = <a0000000 20000000 /* Config space access */ 273 - ef000000 00001000>; /* Registers */ 274 - dcr-reg = <040 020>; 275 - sdr-base = <400>; 269 + port = <0x0>; /* port number */ 270 + reg = <0xa0000000 0x20000000 /* Config space access */ 271 + 0xef000000 0x00001000>; /* Registers */ 272 + dcr-reg = <0x040 0x020>; 273 + sdr-base = <0x400>; 276 274 277 275 /* Outbound ranges, one memory and one IO, 278 276 * later cannot be changed 279 277 */ 280 - ranges = <02000000 0 80000000 90000000 0 08000000 281 - 01000000 0 00000000 e0000000 0 00010000>; 278 + ranges = <0x02000000 0x00000000 0x80000000 0x90000000 0x00000000 0x08000000 279 + 0x01000000 0x00000000 0x00000000 0xe0000000 0x00000000 0x00010000>; 282 280 283 281 /* Inbound 2GB range starting at 0 */ 284 - dma-ranges = <42000000 0 0 0 0 80000000>; 282 + dma-ranges = <0x42000000 0x0 0x0 0x0 0x0 0x80000000>; 285 283 286 284 /* This drives busses 0x00 to 0x3f */ 287 - bus-range = <00 3f>; 285 + bus-range = <0x0 0x3f>; 288 286 289 287 /* Legacy interrupts (note the weird polarity, the bridge seems 290 288 * to invert PCIe legacy interrupts). ··· 294 292 * below are basically de-swizzled numbers. 295 293 * The real slot is on idsel 0, so the swizzling is 1:1 296 294 */ 297 - interrupt-map-mask = <0000 0 0 7>; 295 + interrupt-map-mask = <0x0 0x0 0x0 0x7>; 298 296 interrupt-map = < 299 - 0000 0 0 1 &UIC2 0 4 /* swizzled int A */ 300 - 0000 0 0 2 &UIC2 1 4 /* swizzled int B */ 301 - 0000 0 0 3 &UIC2 2 4 /* swizzled int C */ 302 - 0000 0 0 4 &UIC2 3 4 /* swizzled int D */>; 297 + 0x0 0x0 0x0 0x1 &UIC2 0x0 0x4 /* swizzled int A */ 298 + 0x0 0x0 0x0 0x2 &UIC2 0x1 0x4 /* swizzled int B */ 299 + 0x0 0x0 0x0 0x3 &UIC2 0x2 0x4 /* swizzled int C */ 300 + 0x0 0x0 0x0 0x4 &UIC2 0x3 0x4 /* swizzled int D */>; 303 301 }; 304 302 305 303 PCIE1: pciex@0c0000000 { ··· 309 307 #address-cells = <3>; 310 308 compatible = "ibm,plb-pciex-405ex", "ibm,plb-pciex"; 311 309 primary; 312 - port = <1>; /* port number */ 313 - reg = <c0000000 20000000 /* Config space access */ 314 - ef001000 00001000>; /* Registers */ 315 - dcr-reg = <060 020>; 316 - sdr-base = <440>; 310 + port = <0x1>; /* port number */ 311 + reg = <0xc0000000 0x20000000 /* Config space access */ 312 + 0xef001000 0x00001000>; /* Registers */ 313 + dcr-reg = <0x060 0x020>; 314 + sdr-base = <0x440>; 317 315 318 316 /* Outbound ranges, one memory and one IO, 319 317 * later cannot be changed 320 318 */ 321 - ranges = <02000000 0 80000000 98000000 0 08000000 322 - 01000000 0 00000000 e0010000 0 00010000>; 319 + ranges = <0x02000000 0x00000000 0x80000000 0x98000000 0x00000000 0x08000000 320 + 0x01000000 0x00000000 0x00000000 0xe0010000 0x00000000 0x00010000>; 323 321 324 322 /* Inbound 2GB range starting at 0 */ 325 - dma-ranges = <42000000 0 0 0 0 80000000>; 323 + dma-ranges = <0x42000000 0x0 0x0 0x0 0x0 0x80000000>; 326 324 327 325 /* This drives busses 0x40 to 0x7f */ 328 - bus-range = <40 7f>; 326 + bus-range = <0x40 0x7f>; 329 327 330 328 /* Legacy interrupts (note the weird polarity, the bridge seems 331 329 * to invert PCIe legacy interrupts). ··· 335 333 * below are basically de-swizzled numbers. 336 334 * The real slot is on idsel 0, so the swizzling is 1:1 337 335 */ 338 - interrupt-map-mask = <0000 0 0 7>; 336 + interrupt-map-mask = <0x0 0x0 0x0 0x7>; 339 337 interrupt-map = < 340 - 0000 0 0 1 &UIC2 b 4 /* swizzled int A */ 341 - 0000 0 0 2 &UIC2 c 4 /* swizzled int B */ 342 - 0000 0 0 3 &UIC2 d 4 /* swizzled int C */ 343 - 0000 0 0 4 &UIC2 e 4 /* swizzled int D */>; 338 + 0x0 0x0 0x0 0x1 &UIC2 0xb 0x4 /* swizzled int A */ 339 + 0x0 0x0 0x0 0x2 &UIC2 0xc 0x4 /* swizzled int B */ 340 + 0x0 0x0 0x0 0x3 &UIC2 0xd 0x4 /* swizzled int C */ 341 + 0x0 0x0 0x0 0x4 &UIC2 0xe 0x4 /* swizzled int D */>; 344 342 }; 345 343 }; 346 344 };
+9 -7
arch/powerpc/boot/dts/ps3.dts
··· 18 18 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 19 19 */ 20 20 21 + /dts-v1/; 22 + 21 23 / { 22 24 model = "SonyPS3"; 23 25 compatible = "sony,ps3"; ··· 36 34 37 35 memory { 38 36 device_type = "memory"; 39 - reg = <0 0 0 0>; 37 + reg = <0x00000000 0x00000000 0x00000000 0x00000000>; 40 38 }; 41 39 42 40 /* ··· 57 55 58 56 cpu@0 { 59 57 device_type = "cpu"; 60 - reg = <0>; 61 - ibm,ppc-interrupt-server#s = <0 1>; 58 + reg = <0x00000000>; 59 + ibm,ppc-interrupt-server#s = <0x0 0x1>; 62 60 clock-frequency = <0>; 63 61 timebase-frequency = <0>; 64 - i-cache-size = <8000>; 65 - d-cache-size = <8000>; 66 - i-cache-line-size = <80>; 67 - d-cache-line-size = <80>; 62 + i-cache-size = <32768>; 63 + d-cache-size = <32768>; 64 + i-cache-line-size = <128>; 65 + d-cache-line-size = <128>; 68 66 }; 69 67 }; 70 68 };
+82 -80
arch/powerpc/boot/dts/rainier.dts
··· 12 12 * 13 13 */ 14 14 15 + /dts-v1/; 16 + 15 17 / { 16 18 #address-cells = <2>; 17 19 #size-cells = <1>; 18 20 model = "amcc,rainier"; 19 21 compatible = "amcc,rainier"; 20 - dcr-parent = <&/cpus/cpu@0>; 22 + dcr-parent = <&{/cpus/cpu@0}>; 21 23 22 24 aliases { 23 25 ethernet0 = &EMAC0; ··· 37 35 cpu@0 { 38 36 device_type = "cpu"; 39 37 model = "PowerPC,440GRx"; 40 - reg = <0>; 38 + reg = <0x00000000>; 41 39 clock-frequency = <0>; /* Filled in by zImage */ 42 40 timebase-frequency = <0>; /* Filled in by zImage */ 43 - i-cache-line-size = <20>; 44 - d-cache-line-size = <20>; 45 - i-cache-size = <8000>; 46 - d-cache-size = <8000>; 41 + i-cache-line-size = <32>; 42 + d-cache-line-size = <32>; 43 + i-cache-size = <32768>; 44 + d-cache-size = <32768>; 47 45 dcr-controller; 48 46 dcr-access-method = "native"; 49 47 }; ··· 51 49 52 50 memory { 53 51 device_type = "memory"; 54 - reg = <0 0 0>; /* Filled in by zImage */ 52 + reg = <0x00000000 0x00000000 0x00000000>; /* Filled in by zImage */ 55 53 }; 56 54 57 55 UIC0: interrupt-controller0 { 58 56 compatible = "ibm,uic-440grx","ibm,uic"; 59 57 interrupt-controller; 60 58 cell-index = <0>; 61 - dcr-reg = <0c0 009>; 59 + dcr-reg = <0x0c0 0x009>; 62 60 #address-cells = <0>; 63 61 #size-cells = <0>; 64 62 #interrupt-cells = <2>; ··· 68 66 compatible = "ibm,uic-440grx","ibm,uic"; 69 67 interrupt-controller; 70 68 cell-index = <1>; 71 - dcr-reg = <0d0 009>; 69 + dcr-reg = <0x0d0 0x009>; 72 70 #address-cells = <0>; 73 71 #size-cells = <0>; 74 72 #interrupt-cells = <2>; 75 - interrupts = <1e 4 1f 4>; /* cascade */ 73 + interrupts = <0x1e 0x4 0x1f 0x4>; /* cascade */ 76 74 interrupt-parent = <&UIC0>; 77 75 }; 78 76 ··· 80 78 compatible = "ibm,uic-440grx","ibm,uic"; 81 79 interrupt-controller; 82 80 cell-index = <2>; 83 - dcr-reg = <0e0 009>; 81 + dcr-reg = <0x0e0 0x009>; 84 82 #address-cells = <0>; 85 83 #size-cells = <0>; 86 84 #interrupt-cells = <2>; 87 - interrupts = <1c 4 1d 4>; /* cascade */ 85 + interrupts = <0x1c 0x4 0x1d 0x4>; /* cascade */ 88 86 interrupt-parent = <&UIC0>; 89 87 }; 90 88 91 89 SDR0: sdr { 92 90 compatible = "ibm,sdr-440grx", "ibm,sdr-440ep"; 93 - dcr-reg = <00e 002>; 91 + dcr-reg = <0x00e 0x002>; 94 92 }; 95 93 96 94 CPR0: cpr { 97 95 compatible = "ibm,cpr-440grx", "ibm,cpr-440ep"; 98 - dcr-reg = <00c 002>; 96 + dcr-reg = <0x00c 0x002>; 99 97 }; 100 98 101 99 plb { ··· 107 105 108 106 SDRAM0: sdram { 109 107 compatible = "ibm,sdram-440grx", "ibm,sdram-44x-ddr2denali"; 110 - dcr-reg = <010 2>; 108 + dcr-reg = <0x010 0x002>; 111 109 }; 112 110 113 111 DMA0: dma { 114 112 compatible = "ibm,dma-440grx", "ibm,dma-4xx"; 115 - dcr-reg = <100 027>; 113 + dcr-reg = <0x100 0x027>; 116 114 }; 117 115 118 116 MAL0: mcmal { 119 117 compatible = "ibm,mcmal-440grx", "ibm,mcmal2"; 120 - dcr-reg = <180 62>; 118 + dcr-reg = <0x180 0x062>; 121 119 num-tx-chans = <2>; 122 120 num-rx-chans = <2>; 123 121 interrupt-parent = <&MAL0>; 124 - interrupts = <0 1 2 3 4>; 122 + interrupts = <0x0 0x1 0x2 0x3 0x4>; 125 123 #interrupt-cells = <1>; 126 124 #address-cells = <0>; 127 125 #size-cells = <0>; 128 - interrupt-map = </*TXEOB*/ 0 &UIC0 a 4 129 - /*RXEOB*/ 1 &UIC0 b 4 130 - /*SERR*/ 2 &UIC1 0 4 131 - /*TXDE*/ 3 &UIC1 1 4 132 - /*RXDE*/ 4 &UIC1 2 4>; 133 - interrupt-map-mask = <ffffffff>; 126 + interrupt-map = </*TXEOB*/ 0x0 &UIC0 0xa 0x4 127 + /*RXEOB*/ 0x1 &UIC0 0xb 0x4 128 + /*SERR*/ 0x2 &UIC1 0x0 0x4 129 + /*TXDE*/ 0x3 &UIC1 0x1 0x4 130 + /*RXDE*/ 0x4 &UIC1 0x2 0x4>; 131 + interrupt-map-mask = <0xffffffff>; 134 132 }; 135 133 136 134 POB0: opb { 137 135 compatible = "ibm,opb-440grx", "ibm,opb"; 138 136 #address-cells = <1>; 139 137 #size-cells = <1>; 140 - ranges = <00000000 1 00000000 80000000 141 - 80000000 1 80000000 80000000>; 138 + ranges = <0x00000000 0x00000001 0x00000000 0x80000000 139 + 0x80000000 0x00000001 0x80000000 0x80000000>; 142 140 interrupt-parent = <&UIC1>; 143 - interrupts = <7 4>; 141 + interrupts = <0x7 0x4>; 144 142 clock-frequency = <0>; /* Filled in by zImage */ 145 143 146 144 EBC0: ebc { 147 145 compatible = "ibm,ebc-440grx", "ibm,ebc"; 148 - dcr-reg = <012 2>; 146 + dcr-reg = <0x012 0x002>; 149 147 #address-cells = <2>; 150 148 #size-cells = <1>; 151 149 clock-frequency = <0>; /* Filled in by zImage */ 152 - interrupts = <5 1>; 150 + interrupts = <0x5 0x1>; 153 151 interrupt-parent = <&UIC1>; 154 152 155 153 nor_flash@0,0 { 156 154 compatible = "amd,s29gl256n", "cfi-flash"; 157 155 bank-width = <2>; 158 - reg = <0 000000 4000000>; 156 + reg = <0x00000000 0x00000000 0x04000000>; 159 157 #address-cells = <1>; 160 158 #size-cells = <1>; 161 159 partition@0 { 162 160 label = "Kernel"; 163 - reg = <0 180000>; 161 + reg = <0x00000000 0x00180000>; 164 162 }; 165 163 partition@180000 { 166 164 label = "ramdisk"; 167 - reg = <180000 200000>; 165 + reg = <0x00180000 0x00200000>; 168 166 }; 169 167 partition@380000 { 170 168 label = "file system"; 171 - reg = <380000 3aa0000>; 169 + reg = <0x00380000 0x03aa0000>; 172 170 }; 173 171 partition@3e20000 { 174 172 label = "kozio"; 175 - reg = <3e20000 140000>; 173 + reg = <0x03e20000 0x00140000>; 176 174 }; 177 175 partition@3f60000 { 178 176 label = "env"; 179 - reg = <3f60000 40000>; 177 + reg = <0x03f60000 0x00040000>; 180 178 }; 181 179 partition@3fa0000 { 182 180 label = "u-boot"; 183 - reg = <3fa0000 60000>; 181 + reg = <0x03fa0000 0x00060000>; 184 182 }; 185 183 }; 186 184 ··· 189 187 UART0: serial@ef600300 { 190 188 device_type = "serial"; 191 189 compatible = "ns16550"; 192 - reg = <ef600300 8>; 193 - virtual-reg = <ef600300>; 190 + reg = <0xef600300 0x00000008>; 191 + virtual-reg = <0xef600300>; 194 192 clock-frequency = <0>; /* Filled in by zImage */ 195 - current-speed = <1c200>; 193 + current-speed = <115200>; 196 194 interrupt-parent = <&UIC0>; 197 - interrupts = <0 4>; 195 + interrupts = <0x0 0x4>; 198 196 }; 199 197 200 198 UART1: serial@ef600400 { 201 199 device_type = "serial"; 202 200 compatible = "ns16550"; 203 - reg = <ef600400 8>; 204 - virtual-reg = <ef600400>; 201 + reg = <0xef600400 0x00000008>; 202 + virtual-reg = <0xef600400>; 205 203 clock-frequency = <0>; 206 204 current-speed = <0>; 207 205 interrupt-parent = <&UIC0>; 208 - interrupts = <1 4>; 206 + interrupts = <0x1 0x4>; 209 207 }; 210 208 211 209 UART2: serial@ef600500 { 212 210 device_type = "serial"; 213 211 compatible = "ns16550"; 214 - reg = <ef600500 8>; 215 - virtual-reg = <ef600500>; 212 + reg = <0xef600500 0x00000008>; 213 + virtual-reg = <0xef600500>; 216 214 clock-frequency = <0>; 217 215 current-speed = <0>; 218 216 interrupt-parent = <&UIC1>; 219 - interrupts = <3 4>; 217 + interrupts = <0x3 0x4>; 220 218 }; 221 219 222 220 UART3: serial@ef600600 { 223 221 device_type = "serial"; 224 222 compatible = "ns16550"; 225 - reg = <ef600600 8>; 226 - virtual-reg = <ef600600>; 223 + reg = <0xef600600 0x00000008>; 224 + virtual-reg = <0xef600600>; 227 225 clock-frequency = <0>; 228 226 current-speed = <0>; 229 227 interrupt-parent = <&UIC1>; 230 - interrupts = <4 4>; 228 + interrupts = <0x4 0x4>; 231 229 }; 232 230 233 231 IIC0: i2c@ef600700 { 234 232 compatible = "ibm,iic-440grx", "ibm,iic"; 235 - reg = <ef600700 14>; 233 + reg = <0xef600700 0x00000014>; 236 234 interrupt-parent = <&UIC0>; 237 - interrupts = <2 4>; 235 + interrupts = <0x2 0x4>; 238 236 }; 239 237 240 238 IIC1: i2c@ef600800 { 241 239 compatible = "ibm,iic-440grx", "ibm,iic"; 242 - reg = <ef600800 14>; 240 + reg = <0xef600800 0x00000014>; 243 241 interrupt-parent = <&UIC0>; 244 - interrupts = <7 4>; 242 + interrupts = <0x7 0x4>; 245 243 }; 246 244 247 245 ZMII0: emac-zmii@ef600d00 { 248 246 compatible = "ibm,zmii-440grx", "ibm,zmii"; 249 - reg = <ef600d00 c>; 247 + reg = <0xef600d00 0x0000000c>; 250 248 }; 251 249 252 250 RGMII0: emac-rgmii@ef601000 { 253 251 compatible = "ibm,rgmii-440grx", "ibm,rgmii"; 254 - reg = <ef601000 8>; 252 + reg = <0xef601000 0x00000008>; 255 253 has-mdio; 256 254 }; 257 255 ··· 259 257 device_type = "network"; 260 258 compatible = "ibm,emac-440grx", "ibm,emac-440epx", "ibm,emac4"; 261 259 interrupt-parent = <&EMAC0>; 262 - interrupts = <0 1>; 260 + interrupts = <0x0 0x1>; 263 261 #interrupt-cells = <1>; 264 262 #address-cells = <0>; 265 263 #size-cells = <0>; 266 - interrupt-map = </*Status*/ 0 &UIC0 18 4 267 - /*Wake*/ 1 &UIC1 1d 4>; 268 - reg = <ef600e00 70>; 264 + interrupt-map = </*Status*/ 0x0 &UIC0 0x18 0x4 265 + /*Wake*/ 0x1 &UIC1 0x1d 0x4>; 266 + reg = <0xef600e00 0x00000070>; 269 267 local-mac-address = [000000000000]; 270 268 mal-device = <&MAL0>; 271 269 mal-tx-channel = <0>; 272 270 mal-rx-channel = <0>; 273 271 cell-index = <0>; 274 - max-frame-size = <2328>; 275 - rx-fifo-size = <1000>; 276 - tx-fifo-size = <800>; 272 + max-frame-size = <9000>; 273 + rx-fifo-size = <4096>; 274 + tx-fifo-size = <2048>; 277 275 phy-mode = "rgmii"; 278 - phy-map = <00000000>; 276 + phy-map = <0x00000000>; 279 277 zmii-device = <&ZMII0>; 280 278 zmii-channel = <0>; 281 279 rgmii-device = <&RGMII0>; ··· 288 286 device_type = "network"; 289 287 compatible = "ibm,emac-440grx", "ibm,emac-440epx", "ibm,emac4"; 290 288 interrupt-parent = <&EMAC1>; 291 - interrupts = <0 1>; 289 + interrupts = <0x0 0x1>; 292 290 #interrupt-cells = <1>; 293 291 #address-cells = <0>; 294 292 #size-cells = <0>; 295 - interrupt-map = </*Status*/ 0 &UIC0 19 4 296 - /*Wake*/ 1 &UIC1 1f 4>; 297 - reg = <ef600f00 70>; 293 + interrupt-map = </*Status*/ 0x0 &UIC0 0x19 0x4 294 + /*Wake*/ 0x1 &UIC1 0x1f 0x4>; 295 + reg = <0xef600f00 0x00000070>; 298 296 local-mac-address = [000000000000]; 299 297 mal-device = <&MAL0>; 300 298 mal-tx-channel = <1>; 301 299 mal-rx-channel = <1>; 302 300 cell-index = <1>; 303 - max-frame-size = <2328>; 304 - rx-fifo-size = <1000>; 305 - tx-fifo-size = <800>; 301 + max-frame-size = <9000>; 302 + rx-fifo-size = <4096>; 303 + tx-fifo-size = <2048>; 306 304 phy-mode = "rgmii"; 307 - phy-map = <00000000>; 305 + phy-map = <0x00000000>; 308 306 zmii-device = <&ZMII0>; 309 307 zmii-channel = <1>; 310 308 rgmii-device = <&RGMII0>; ··· 321 319 #address-cells = <3>; 322 320 compatible = "ibm,plb440grx-pci", "ibm,plb-pci"; 323 321 primary; 324 - reg = <1 eec00000 8 /* Config space access */ 325 - 1 eed00000 4 /* IACK */ 326 - 1 eed00000 4 /* Special cycle */ 327 - 1 ef400000 40>; /* Internal registers */ 322 + reg = <0x00000001 0xeec00000 0x00000008 /* Config space access */ 323 + 0x00000001 0xeed00000 0x00000004 /* IACK */ 324 + 0x00000001 0xeed00000 0x00000004 /* Special cycle */ 325 + 0x00000001 0xef400000 0x00000040>; /* Internal registers */ 328 326 329 327 /* Outbound ranges, one memory and one IO, 330 328 * later cannot be changed. Chip supports a second 331 329 * IO range but we don't use it for now 332 330 */ 333 - ranges = <02000000 0 80000000 1 80000000 0 10000000 334 - 01000000 0 00000000 1 e8000000 0 00100000>; 331 + ranges = <0x02000000 0x00000000 0x80000000 0x00000001 0x80000000 0x00000000 0x10000000 332 + 0x01000000 0x00000000 0x00000000 0x00000001 0xe8000000 0x00000000 0x00100000>; 335 333 336 334 /* Inbound 2GB range starting at 0 */ 337 - dma-ranges = <42000000 0 0 0 0 0 80000000>; 335 + dma-ranges = <0x42000000 0x0 0x0 0x0 0x0 0x0 0x80000000>; 338 336 339 337 /* All PCI interrupts are routed to IRQ 67 */ 340 - interrupt-map-mask = <0000 0 0 0>; 341 - interrupt-map = < 0000 0 0 0 &UIC2 3 8 >; 338 + interrupt-map-mask = <0x0 0x0 0x0 0x0>; 339 + interrupt-map = < 0x0 0x0 0x0 0x0 &UIC2 0x3 0x8 >; 342 340 }; 343 341 }; 344 342
+87 -85
arch/powerpc/boot/dts/sequoia.dts
··· 12 12 * 13 13 */ 14 14 15 + /dts-v1/; 16 + 15 17 / { 16 18 #address-cells = <2>; 17 19 #size-cells = <1>; 18 20 model = "amcc,sequoia"; 19 21 compatible = "amcc,sequoia"; 20 - dcr-parent = <&/cpus/cpu@0>; 22 + dcr-parent = <&{/cpus/cpu@0}>; 21 23 22 24 aliases { 23 25 ethernet0 = &EMAC0; ··· 37 35 cpu@0 { 38 36 device_type = "cpu"; 39 37 model = "PowerPC,440EPx"; 40 - reg = <0>; 38 + reg = <0x00000000>; 41 39 clock-frequency = <0>; /* Filled in by zImage */ 42 40 timebase-frequency = <0>; /* Filled in by zImage */ 43 - i-cache-line-size = <20>; 44 - d-cache-line-size = <20>; 45 - i-cache-size = <8000>; 46 - d-cache-size = <8000>; 41 + i-cache-line-size = <32>; 42 + d-cache-line-size = <32>; 43 + i-cache-size = <32768>; 44 + d-cache-size = <32768>; 47 45 dcr-controller; 48 46 dcr-access-method = "native"; 49 47 }; ··· 51 49 52 50 memory { 53 51 device_type = "memory"; 54 - reg = <0 0 0>; /* Filled in by zImage */ 52 + reg = <0x00000000 0x00000000 0x00000000>; /* Filled in by zImage */ 55 53 }; 56 54 57 55 UIC0: interrupt-controller0 { 58 56 compatible = "ibm,uic-440epx","ibm,uic"; 59 57 interrupt-controller; 60 58 cell-index = <0>; 61 - dcr-reg = <0c0 009>; 59 + dcr-reg = <0x0c0 0x009>; 62 60 #address-cells = <0>; 63 61 #size-cells = <0>; 64 62 #interrupt-cells = <2>; ··· 68 66 compatible = "ibm,uic-440epx","ibm,uic"; 69 67 interrupt-controller; 70 68 cell-index = <1>; 71 - dcr-reg = <0d0 009>; 69 + dcr-reg = <0x0d0 0x009>; 72 70 #address-cells = <0>; 73 71 #size-cells = <0>; 74 72 #interrupt-cells = <2>; 75 - interrupts = <1e 4 1f 4>; /* cascade */ 73 + interrupts = <0x1e 0x4 0x1f 0x4>; /* cascade */ 76 74 interrupt-parent = <&UIC0>; 77 75 }; 78 76 ··· 80 78 compatible = "ibm,uic-440epx","ibm,uic"; 81 79 interrupt-controller; 82 80 cell-index = <2>; 83 - dcr-reg = <0e0 009>; 81 + dcr-reg = <0x0e0 0x009>; 84 82 #address-cells = <0>; 85 83 #size-cells = <0>; 86 84 #interrupt-cells = <2>; 87 - interrupts = <1c 4 1d 4>; /* cascade */ 85 + interrupts = <0x1c 0x4 0x1d 0x4>; /* cascade */ 88 86 interrupt-parent = <&UIC0>; 89 87 }; 90 88 91 89 SDR0: sdr { 92 90 compatible = "ibm,sdr-440epx", "ibm,sdr-440ep"; 93 - dcr-reg = <00e 002>; 91 + dcr-reg = <0x00e 0x002>; 94 92 }; 95 93 96 94 CPR0: cpr { 97 95 compatible = "ibm,cpr-440epx", "ibm,cpr-440ep"; 98 - dcr-reg = <00c 002>; 96 + dcr-reg = <0x00c 0x002>; 99 97 }; 100 98 101 99 plb { ··· 107 105 108 106 SDRAM0: sdram { 109 107 compatible = "ibm,sdram-440epx", "ibm,sdram-44x-ddr2denali"; 110 - dcr-reg = <010 2>; 108 + dcr-reg = <0x010 0x002>; 111 109 }; 112 110 113 111 DMA0: dma { 114 112 compatible = "ibm,dma-440epx", "ibm,dma-4xx"; 115 - dcr-reg = <100 027>; 113 + dcr-reg = <0x100 0x027>; 116 114 }; 117 115 118 116 MAL0: mcmal { 119 117 compatible = "ibm,mcmal-440epx", "ibm,mcmal2"; 120 - dcr-reg = <180 62>; 118 + dcr-reg = <0x180 0x062>; 121 119 num-tx-chans = <2>; 122 120 num-rx-chans = <2>; 123 121 interrupt-parent = <&MAL0>; 124 - interrupts = <0 1 2 3 4>; 122 + interrupts = <0x0 0x1 0x2 0x3 0x4>; 125 123 #interrupt-cells = <1>; 126 124 #address-cells = <0>; 127 125 #size-cells = <0>; 128 - interrupt-map = </*TXEOB*/ 0 &UIC0 a 4 129 - /*RXEOB*/ 1 &UIC0 b 4 130 - /*SERR*/ 2 &UIC1 0 4 131 - /*TXDE*/ 3 &UIC1 1 4 132 - /*RXDE*/ 4 &UIC1 2 4>; 133 - interrupt-map-mask = <ffffffff>; 126 + interrupt-map = </*TXEOB*/ 0x0 &UIC0 0xa 0x4 127 + /*RXEOB*/ 0x1 &UIC0 0xb 0x4 128 + /*SERR*/ 0x2 &UIC1 0x0 0x4 129 + /*TXDE*/ 0x3 &UIC1 0x1 0x4 130 + /*RXDE*/ 0x4 &UIC1 0x2 0x4>; 131 + interrupt-map-mask = <0xffffffff>; 134 132 }; 135 133 136 134 USB1: usb@e0000400 { 137 135 compatible = "ohci-be"; 138 - reg = <0 e0000400 60>; 136 + reg = <0x00000000 0xe0000400 0x00000060>; 139 137 interrupt-parent = <&UIC0>; 140 - interrupts = <15 8>; 138 + interrupts = <0x15 0x8>; 141 139 }; 142 140 143 141 USB0: ehci@e0000300 { 144 142 compatible = "ibm,usb-ehci-440epx", "usb-ehci"; 145 143 interrupt-parent = <&UIC0>; 146 - interrupts = <1a 4>; 147 - reg = <0 e0000300 90 0 e0000390 70>; 144 + interrupts = <0x1a 0x4>; 145 + reg = <0x00000000 0xe0000300 0x00000090 0x00000000 0xe0000390 0x00000070>; 148 146 big-endian; 149 147 }; 150 148 ··· 152 150 compatible = "ibm,opb-440epx", "ibm,opb"; 153 151 #address-cells = <1>; 154 152 #size-cells = <1>; 155 - ranges = <00000000 1 00000000 80000000 156 - 80000000 1 80000000 80000000>; 153 + ranges = <0x00000000 0x00000001 0x00000000 0x80000000 154 + 0x80000000 0x00000001 0x80000000 0x80000000>; 157 155 interrupt-parent = <&UIC1>; 158 - interrupts = <7 4>; 156 + interrupts = <0x7 0x4>; 159 157 clock-frequency = <0>; /* Filled in by zImage */ 160 158 161 159 EBC0: ebc { 162 160 compatible = "ibm,ebc-440epx", "ibm,ebc"; 163 - dcr-reg = <012 2>; 161 + dcr-reg = <0x012 0x002>; 164 162 #address-cells = <2>; 165 163 #size-cells = <1>; 166 164 clock-frequency = <0>; /* Filled in by zImage */ 167 - interrupts = <5 1>; 165 + interrupts = <0x5 0x1>; 168 166 interrupt-parent = <&UIC1>; 169 167 170 168 nor_flash@0,0 { 171 169 compatible = "amd,s29gl256n", "cfi-flash"; 172 170 bank-width = <2>; 173 - reg = <0 000000 4000000>; 171 + reg = <0x00000000 0x00000000 0x04000000>; 174 172 #address-cells = <1>; 175 173 #size-cells = <1>; 176 174 partition@0 { 177 175 label = "Kernel"; 178 - reg = <0 180000>; 176 + reg = <0x00000000 0x00180000>; 179 177 }; 180 178 partition@180000 { 181 179 label = "ramdisk"; 182 - reg = <180000 200000>; 180 + reg = <0x00180000 0x00200000>; 183 181 }; 184 182 partition@380000 { 185 183 label = "file system"; 186 - reg = <380000 3aa0000>; 184 + reg = <0x00380000 0x03aa0000>; 187 185 }; 188 186 partition@3e20000 { 189 187 label = "kozio"; 190 - reg = <3e20000 140000>; 188 + reg = <0x03e20000 0x00140000>; 191 189 }; 192 190 partition@3f60000 { 193 191 label = "env"; 194 - reg = <3f60000 40000>; 192 + reg = <0x03f60000 0x00040000>; 195 193 }; 196 194 partition@3fa0000 { 197 195 label = "u-boot"; 198 - reg = <3fa0000 60000>; 196 + reg = <0x03fa0000 0x00060000>; 199 197 }; 200 198 }; 201 199 ··· 204 202 UART0: serial@ef600300 { 205 203 device_type = "serial"; 206 204 compatible = "ns16550"; 207 - reg = <ef600300 8>; 208 - virtual-reg = <ef600300>; 205 + reg = <0xef600300 0x00000008>; 206 + virtual-reg = <0xef600300>; 209 207 clock-frequency = <0>; /* Filled in by zImage */ 210 - current-speed = <1c200>; 208 + current-speed = <115200>; 211 209 interrupt-parent = <&UIC0>; 212 - interrupts = <0 4>; 210 + interrupts = <0x0 0x4>; 213 211 }; 214 212 215 213 UART1: serial@ef600400 { 216 214 device_type = "serial"; 217 215 compatible = "ns16550"; 218 - reg = <ef600400 8>; 219 - virtual-reg = <ef600400>; 216 + reg = <0xef600400 0x00000008>; 217 + virtual-reg = <0xef600400>; 220 218 clock-frequency = <0>; 221 219 current-speed = <0>; 222 220 interrupt-parent = <&UIC0>; 223 - interrupts = <1 4>; 221 + interrupts = <0x1 0x4>; 224 222 }; 225 223 226 224 UART2: serial@ef600500 { 227 225 device_type = "serial"; 228 226 compatible = "ns16550"; 229 - reg = <ef600500 8>; 230 - virtual-reg = <ef600500>; 227 + reg = <0xef600500 0x00000008>; 228 + virtual-reg = <0xef600500>; 231 229 clock-frequency = <0>; 232 230 current-speed = <0>; 233 231 interrupt-parent = <&UIC1>; 234 - interrupts = <3 4>; 232 + interrupts = <0x3 0x4>; 235 233 }; 236 234 237 235 UART3: serial@ef600600 { 238 236 device_type = "serial"; 239 237 compatible = "ns16550"; 240 - reg = <ef600600 8>; 241 - virtual-reg = <ef600600>; 238 + reg = <0xef600600 0x00000008>; 239 + virtual-reg = <0xef600600>; 242 240 clock-frequency = <0>; 243 241 current-speed = <0>; 244 242 interrupt-parent = <&UIC1>; 245 - interrupts = <4 4>; 243 + interrupts = <0x4 0x4>; 246 244 }; 247 245 248 246 IIC0: i2c@ef600700 { 249 247 compatible = "ibm,iic-440epx", "ibm,iic"; 250 - reg = <ef600700 14>; 248 + reg = <0xef600700 0x00000014>; 251 249 interrupt-parent = <&UIC0>; 252 - interrupts = <2 4>; 250 + interrupts = <0x2 0x4>; 253 251 }; 254 252 255 253 IIC1: i2c@ef600800 { 256 254 compatible = "ibm,iic-440epx", "ibm,iic"; 257 - reg = <ef600800 14>; 255 + reg = <0xef600800 0x00000014>; 258 256 interrupt-parent = <&UIC0>; 259 - interrupts = <7 4>; 257 + interrupts = <0x7 0x4>; 260 258 }; 261 259 262 260 ZMII0: emac-zmii@ef600d00 { 263 261 compatible = "ibm,zmii-440epx", "ibm,zmii"; 264 - reg = <ef600d00 c>; 262 + reg = <0xef600d00 0x0000000c>; 265 263 }; 266 264 267 265 RGMII0: emac-rgmii@ef601000 { 268 266 compatible = "ibm,rgmii-440epx", "ibm,rgmii"; 269 - reg = <ef601000 8>; 267 + reg = <0xef601000 0x00000008>; 270 268 has-mdio; 271 269 }; 272 270 ··· 274 272 device_type = "network"; 275 273 compatible = "ibm,emac-440epx", "ibm,emac4"; 276 274 interrupt-parent = <&EMAC0>; 277 - interrupts = <0 1>; 275 + interrupts = <0x0 0x1>; 278 276 #interrupt-cells = <1>; 279 277 #address-cells = <0>; 280 278 #size-cells = <0>; 281 - interrupt-map = </*Status*/ 0 &UIC0 18 4 282 - /*Wake*/ 1 &UIC1 1d 4>; 283 - reg = <ef600e00 70>; 279 + interrupt-map = </*Status*/ 0x0 &UIC0 0x18 0x4 280 + /*Wake*/ 0x1 &UIC1 0x1d 0x4>; 281 + reg = <0xef600e00 0x00000070>; 284 282 local-mac-address = [000000000000]; 285 283 mal-device = <&MAL0>; 286 284 mal-tx-channel = <0>; 287 285 mal-rx-channel = <0>; 288 286 cell-index = <0>; 289 - max-frame-size = <2328>; 290 - rx-fifo-size = <1000>; 291 - tx-fifo-size = <800>; 287 + max-frame-size = <9000>; 288 + rx-fifo-size = <4096>; 289 + tx-fifo-size = <2048>; 292 290 phy-mode = "rgmii"; 293 - phy-map = <00000000>; 291 + phy-map = <0x00000000>; 294 292 zmii-device = <&ZMII0>; 295 293 zmii-channel = <0>; 296 294 rgmii-device = <&RGMII0>; ··· 303 301 device_type = "network"; 304 302 compatible = "ibm,emac-440epx", "ibm,emac4"; 305 303 interrupt-parent = <&EMAC1>; 306 - interrupts = <0 1>; 304 + interrupts = <0x0 0x1>; 307 305 #interrupt-cells = <1>; 308 306 #address-cells = <0>; 309 307 #size-cells = <0>; 310 - interrupt-map = </*Status*/ 0 &UIC0 19 4 311 - /*Wake*/ 1 &UIC1 1f 4>; 312 - reg = <ef600f00 70>; 308 + interrupt-map = </*Status*/ 0x0 &UIC0 0x19 0x4 309 + /*Wake*/ 0x1 &UIC1 0x1f 0x4>; 310 + reg = <0xef600f00 0x00000070>; 313 311 local-mac-address = [000000000000]; 314 312 mal-device = <&MAL0>; 315 313 mal-tx-channel = <1>; 316 314 mal-rx-channel = <1>; 317 315 cell-index = <1>; 318 - max-frame-size = <2328>; 319 - rx-fifo-size = <1000>; 320 - tx-fifo-size = <800>; 316 + max-frame-size = <9000>; 317 + rx-fifo-size = <4096>; 318 + tx-fifo-size = <2048>; 321 319 phy-mode = "rgmii"; 322 - phy-map = <00000000>; 320 + phy-map = <0x00000000>; 323 321 zmii-device = <&ZMII0>; 324 322 zmii-channel = <1>; 325 323 rgmii-device = <&RGMII0>; ··· 336 334 #address-cells = <3>; 337 335 compatible = "ibm,plb440epx-pci", "ibm,plb-pci"; 338 336 primary; 339 - reg = <1 eec00000 8 /* Config space access */ 340 - 1 eed00000 4 /* IACK */ 341 - 1 eed00000 4 /* Special cycle */ 342 - 1 ef400000 40>; /* Internal registers */ 337 + reg = <0x00000001 0xeec00000 0x00000008 /* Config space access */ 338 + 0x00000001 0xeed00000 0x00000004 /* IACK */ 339 + 0x00000001 0xeed00000 0x00000004 /* Special cycle */ 340 + 0x00000001 0xef400000 0x00000040>; /* Internal registers */ 343 341 344 342 /* Outbound ranges, one memory and one IO, 345 343 * later cannot be changed. Chip supports a second ··· 349 347 * I/O 1 E800 0000 1 E800 FFFF 64KB 350 348 * I/O 1 E880 0000 1 EBFF FFFF 56MB 351 349 */ 352 - ranges = <02000000 0 80000000 1 80000000 0 40000000 353 - 01000000 0 00000000 1 e8000000 0 00010000 354 - 01000000 0 00000000 1 e8800000 0 03800000>; 350 + ranges = <0x02000000 0x00000000 0x80000000 0x00000001 0x80000000 0x00000000 0x40000000 351 + 0x01000000 0x00000000 0x00000000 0x00000001 0xe8000000 0x00000000 0x00010000 352 + 0x01000000 0x00000000 0x00000000 0x00000001 0xe8800000 0x00000000 0x03800000>; 355 353 356 354 /* Inbound 2GB range starting at 0 */ 357 - dma-ranges = <42000000 0 0 0 0 0 80000000>; 355 + dma-ranges = <0x42000000 0x0 0x0 0x0 0x0 0x0 0x80000000>; 358 356 359 357 /* All PCI interrupts are routed to IRQ 67 */ 360 - interrupt-map-mask = <0000 0 0 0>; 361 - interrupt-map = < 0000 0 0 0 &UIC2 3 8 >; 358 + interrupt-map-mask = <0x0 0x0 0x0 0x0>; 359 + interrupt-map = < 0x0 0x0 0x0 0x0 &UIC2 0x3 0x8 >; 362 360 }; 363 361 }; 364 362
+107 -105
arch/powerpc/boot/dts/taishan.dts
··· 10 10 * any warranty of any kind, whether express or implied. 11 11 */ 12 12 13 + /dts-v1/; 14 + 13 15 / { 14 16 #address-cells = <2>; 15 17 #size-cells = <1>; 16 18 model = "amcc,taishan"; 17 19 compatible = "amcc,taishan"; 18 - dcr-parent = <&/cpus/cpu@0>; 20 + dcr-parent = <&{/cpus/cpu@0}>; 19 21 20 22 aliases { 21 23 ethernet0 = &EMAC2; ··· 33 31 cpu@0 { 34 32 device_type = "cpu"; 35 33 model = "PowerPC,440GX"; 36 - reg = <0>; 37 - clock-frequency = <2FAF0800>; // 800MHz 34 + reg = <0x00000000>; 35 + clock-frequency = <800000000>; // 800MHz 38 36 timebase-frequency = <0>; // Filled in by zImage 39 - i-cache-line-size = <32>; 40 - d-cache-line-size = <32>; 41 - i-cache-size = <8000>; /* 32 kB */ 42 - d-cache-size = <8000>; /* 32 kB */ 37 + i-cache-line-size = <50>; 38 + d-cache-line-size = <50>; 39 + i-cache-size = <32768>; /* 32 kB */ 40 + d-cache-size = <32768>; /* 32 kB */ 43 41 dcr-controller; 44 42 dcr-access-method = "native"; 45 43 }; ··· 47 45 48 46 memory { 49 47 device_type = "memory"; 50 - reg = <0 0 0>; // Filled in by zImage 48 + reg = <0x00000000 0x00000000 0x00000000>; // Filled in by zImage 51 49 }; 52 50 53 51 ··· 55 53 compatible = "ibm,uic-440gx", "ibm,uic"; 56 54 interrupt-controller; 57 55 cell-index = <3>; 58 - dcr-reg = <200 009>; 56 + dcr-reg = <0x200 0x009>; 59 57 #address-cells = <0>; 60 58 #size-cells = <0>; 61 59 #interrupt-cells = <2>; ··· 66 64 compatible = "ibm,uic-440gx", "ibm,uic"; 67 65 interrupt-controller; 68 66 cell-index = <0>; 69 - dcr-reg = <0c0 009>; 67 + dcr-reg = <0x0c0 0x009>; 70 68 #address-cells = <0>; 71 69 #size-cells = <0>; 72 70 #interrupt-cells = <2>; 73 - interrupts = <01 4 00 4>; /* cascade - first non-critical */ 71 + interrupts = <0x1 0x4 0x0 0x4>; /* cascade - first non-critical */ 74 72 interrupt-parent = <&UICB0>; 75 73 76 74 }; ··· 79 77 compatible = "ibm,uic-440gx", "ibm,uic"; 80 78 interrupt-controller; 81 79 cell-index = <1>; 82 - dcr-reg = <0d0 009>; 80 + dcr-reg = <0x0d0 0x009>; 83 81 #address-cells = <0>; 84 82 #size-cells = <0>; 85 83 #interrupt-cells = <2>; 86 - interrupts = <03 4 02 4>; /* cascade */ 84 + interrupts = <0x3 0x4 0x2 0x4>; /* cascade */ 87 85 interrupt-parent = <&UICB0>; 88 86 }; 89 87 ··· 91 89 compatible = "ibm,uic-440gx", "ibm,uic"; 92 90 interrupt-controller; 93 91 cell-index = <2>; /* was 1 */ 94 - dcr-reg = <210 009>; 92 + dcr-reg = <0x210 0x009>; 95 93 #address-cells = <0>; 96 94 #size-cells = <0>; 97 95 #interrupt-cells = <2>; 98 - interrupts = <05 4 04 4>; /* cascade */ 96 + interrupts = <0x5 0x4 0x4 0x4>; /* cascade */ 99 97 interrupt-parent = <&UICB0>; 100 98 }; 101 99 102 100 103 101 CPC0: cpc { 104 102 compatible = "ibm,cpc-440gp"; 105 - dcr-reg = <0b0 003 0e0 010>; 103 + dcr-reg = <0x0b0 0x003 0x0e0 0x010>; 106 104 // FIXME: anything else? 107 105 }; 108 106 109 107 L2C0: l2c { 110 108 compatible = "ibm,l2-cache-440gx", "ibm,l2-cache"; 111 - dcr-reg = <20 8 /* Internal SRAM DCR's */ 112 - 30 8>; /* L2 cache DCR's */ 113 - cache-line-size = <20>; /* 32 bytes */ 114 - cache-size = <40000>; /* L2, 256K */ 109 + dcr-reg = <0x020 0x008 /* Internal SRAM DCR's */ 110 + 0x030 0x008>; /* L2 cache DCR's */ 111 + cache-line-size = <32>; /* 32 bytes */ 112 + cache-size = <262144>; /* L2, 256K */ 115 113 interrupt-parent = <&UIC2>; 116 - interrupts = <17 1>; 114 + interrupts = <0x17 0x1>; 117 115 }; 118 116 119 117 plb { ··· 121 119 #address-cells = <2>; 122 120 #size-cells = <1>; 123 121 ranges; 124 - clock-frequency = <9896800>; // 160MHz 122 + clock-frequency = <160000000>; // 160MHz 125 123 126 124 SDRAM0: memory-controller { 127 125 compatible = "ibm,sdram-440gp"; 128 - dcr-reg = <010 2>; 126 + dcr-reg = <0x010 0x002>; 129 127 // FIXME: anything else? 130 128 }; 131 129 132 130 SRAM0: sram { 133 131 compatible = "ibm,sram-440gp"; 134 - dcr-reg = <020 8 00a 1>; 132 + dcr-reg = <0x020 0x008 0x00a 0x001>; 135 133 }; 136 134 137 135 DMA0: dma { 138 136 // FIXME: ??? 139 137 compatible = "ibm,dma-440gp"; 140 - dcr-reg = <100 027>; 138 + dcr-reg = <0x100 0x027>; 141 139 }; 142 140 143 141 MAL0: mcmal { 144 142 compatible = "ibm,mcmal-440gx", "ibm,mcmal2"; 145 - dcr-reg = <180 62>; 143 + dcr-reg = <0x180 0x062>; 146 144 num-tx-chans = <4>; 147 145 num-rx-chans = <4>; 148 146 interrupt-parent = <&MAL0>; 149 - interrupts = <0 1 2 3 4>; 147 + interrupts = <0x0 0x1 0x2 0x3 0x4>; 150 148 #interrupt-cells = <1>; 151 149 #address-cells = <0>; 152 150 #size-cells = <0>; 153 - interrupt-map = </*TXEOB*/ 0 &UIC0 a 4 154 - /*RXEOB*/ 1 &UIC0 b 4 155 - /*SERR*/ 2 &UIC1 0 4 156 - /*TXDE*/ 3 &UIC1 1 4 157 - /*RXDE*/ 4 &UIC1 2 4>; 158 - interrupt-map-mask = <ffffffff>; 151 + interrupt-map = </*TXEOB*/ 0x0 &UIC0 0xa 0x4 152 + /*RXEOB*/ 0x1 &UIC0 0xb 0x4 153 + /*SERR*/ 0x2 &UIC1 0x0 0x4 154 + /*TXDE*/ 0x3 &UIC1 0x1 0x4 155 + /*RXDE*/ 0x4 &UIC1 0x2 0x4>; 156 + interrupt-map-mask = <0xffffffff>; 159 157 }; 160 158 161 159 POB0: opb { ··· 164 162 #size-cells = <1>; 165 163 /* Wish there was a nicer way of specifying a full 32-bit 166 164 range */ 167 - ranges = <00000000 1 00000000 80000000 168 - 80000000 1 80000000 80000000>; 169 - dcr-reg = <090 00b>; 165 + ranges = <0x00000000 0x00000001 0x00000000 0x80000000 166 + 0x80000000 0x00000001 0x80000000 0x80000000>; 167 + dcr-reg = <0x090 0x00b>; 170 168 interrupt-parent = <&UIC1>; 171 - interrupts = <7 4>; 172 - clock-frequency = <4C4B400>; // 80MHz 169 + interrupts = <0x7 0x4>; 170 + clock-frequency = <80000000>; // 80MHz 173 171 174 172 175 173 EBC0: ebc { 176 174 compatible = "ibm,ebc-440gx", "ibm,ebc"; 177 - dcr-reg = <012 2>; 175 + dcr-reg = <0x012 0x002>; 178 176 #address-cells = <2>; 179 177 #size-cells = <1>; 180 - clock-frequency = <4C4B400>; // 80MHz 178 + clock-frequency = <80000000>; // 80MHz 181 179 182 180 /* ranges property is supplied by zImage 183 181 * based on firmware's configuration of the 184 182 * EBC bridge */ 185 183 186 - interrupts = <5 4>; 184 + interrupts = <0x5 0x4>; 187 185 interrupt-parent = <&UIC1>; 188 186 189 187 /* TODO: Add other EBC devices */ ··· 194 192 UART0: serial@40000200 { 195 193 device_type = "serial"; 196 194 compatible = "ns16550"; 197 - reg = <40000200 8>; 198 - virtual-reg = <e0000200>; 199 - clock-frequency = <A8C000>; 200 - current-speed = <1C200>; /* 115200 */ 195 + reg = <0x40000200 0x00000008>; 196 + virtual-reg = <0xe0000200>; 197 + clock-frequency = <11059200>; 198 + current-speed = <115200>; /* 115200 */ 201 199 interrupt-parent = <&UIC0>; 202 - interrupts = <0 4>; 200 + interrupts = <0x0 0x4>; 203 201 }; 204 202 205 203 UART1: serial@40000300 { 206 204 device_type = "serial"; 207 205 compatible = "ns16550"; 208 - reg = <40000300 8>; 209 - virtual-reg = <e0000300>; 210 - clock-frequency = <A8C000>; 211 - current-speed = <1C200>; /* 115200 */ 206 + reg = <0x40000300 0x00000008>; 207 + virtual-reg = <0xe0000300>; 208 + clock-frequency = <11059200>; 209 + current-speed = <115200>; /* 115200 */ 212 210 interrupt-parent = <&UIC0>; 213 - interrupts = <1 4>; 211 + interrupts = <0x1 0x4>; 214 212 }; 215 213 216 214 IIC0: i2c@40000400 { 217 215 /* FIXME */ 218 216 compatible = "ibm,iic-440gp", "ibm,iic"; 219 - reg = <40000400 14>; 217 + reg = <0x40000400 0x00000014>; 220 218 interrupt-parent = <&UIC0>; 221 - interrupts = <2 4>; 219 + interrupts = <0x2 0x4>; 222 220 }; 223 221 IIC1: i2c@40000500 { 224 222 /* FIXME */ 225 223 compatible = "ibm,iic-440gp", "ibm,iic"; 226 - reg = <40000500 14>; 224 + reg = <0x40000500 0x00000014>; 227 225 interrupt-parent = <&UIC0>; 228 - interrupts = <3 4>; 226 + interrupts = <0x3 0x4>; 229 227 }; 230 228 231 229 GPIO0: gpio@40000700 { 232 230 /* FIXME */ 233 231 compatible = "ibm,gpio-440gp"; 234 - reg = <40000700 20>; 232 + reg = <0x40000700 0x00000020>; 235 233 }; 236 234 237 235 ZMII0: emac-zmii@40000780 { 238 236 compatible = "ibm,zmii-440gx", "ibm,zmii"; 239 - reg = <40000780 c>; 237 + reg = <0x40000780 0x0000000c>; 240 238 }; 241 239 242 240 RGMII0: emac-rgmii@40000790 { 243 241 compatible = "ibm,rgmii"; 244 - reg = <40000790 8>; 242 + reg = <0x40000790 0x00000008>; 245 243 }; 246 244 247 245 TAH0: emac-tah@40000b50 { 248 246 compatible = "ibm,tah-440gx", "ibm,tah"; 249 - reg = <40000b50 30>; 247 + reg = <0x40000b50 0x00000030>; 250 248 }; 251 249 252 250 TAH1: emac-tah@40000d50 { 253 251 compatible = "ibm,tah-440gx", "ibm,tah"; 254 - reg = <40000d50 30>; 252 + reg = <0x40000d50 0x00000030>; 255 253 }; 256 254 257 255 EMAC0: ethernet@40000800 { 258 - unused = <1>; 256 + unused = <0x1>; 259 257 device_type = "network"; 260 258 compatible = "ibm,emac-440gx", "ibm,emac4"; 261 259 interrupt-parent = <&UIC1>; 262 - interrupts = <1c 4 1d 4>; 263 - reg = <40000800 70>; 260 + interrupts = <0x1c 0x4 0x1d 0x4>; 261 + reg = <0x40000800 0x00000070>; 264 262 local-mac-address = [000000000000]; // Filled in by zImage 265 263 mal-device = <&MAL0>; 266 264 mal-tx-channel = <0>; 267 265 mal-rx-channel = <0>; 268 266 cell-index = <0>; 269 - max-frame-size = <5dc>; 270 - rx-fifo-size = <1000>; 271 - tx-fifo-size = <800>; 267 + max-frame-size = <1500>; 268 + rx-fifo-size = <4096>; 269 + tx-fifo-size = <2048>; 272 270 phy-mode = "rmii"; 273 - phy-map = <00000001>; 271 + phy-map = <0x00000001>; 274 272 zmii-device = <&ZMII0>; 275 273 zmii-channel = <0>; 276 274 }; 277 275 EMAC1: ethernet@40000900 { 278 - unused = <1>; 276 + unused = <0x1>; 279 277 device_type = "network"; 280 278 compatible = "ibm,emac-440gx", "ibm,emac4"; 281 279 interrupt-parent = <&UIC1>; 282 - interrupts = <1e 4 1f 4>; 283 - reg = <40000900 70>; 280 + interrupts = <0x1e 0x4 0x1f 0x4>; 281 + reg = <0x40000900 0x00000070>; 284 282 local-mac-address = [000000000000]; // Filled in by zImage 285 283 mal-device = <&MAL0>; 286 284 mal-tx-channel = <1>; 287 285 mal-rx-channel = <1>; 288 286 cell-index = <1>; 289 - max-frame-size = <5dc>; 290 - rx-fifo-size = <1000>; 291 - tx-fifo-size = <800>; 287 + max-frame-size = <1500>; 288 + rx-fifo-size = <4096>; 289 + tx-fifo-size = <2048>; 292 290 phy-mode = "rmii"; 293 - phy-map = <00000001>; 291 + phy-map = <0x00000001>; 294 292 zmii-device = <&ZMII0>; 295 293 zmii-channel = <1>; 296 294 }; ··· 299 297 device_type = "network"; 300 298 compatible = "ibm,emac-440gx", "ibm,emac4"; 301 299 interrupt-parent = <&UIC2>; 302 - interrupts = <0 4 1 4>; 303 - reg = <40000c00 70>; 300 + interrupts = <0x0 0x4 0x1 0x4>; 301 + reg = <0x40000c00 0x00000070>; 304 302 local-mac-address = [000000000000]; // Filled in by zImage 305 303 mal-device = <&MAL0>; 306 304 mal-tx-channel = <2>; 307 305 mal-rx-channel = <2>; 308 306 cell-index = <2>; 309 - max-frame-size = <2328>; 310 - rx-fifo-size = <1000>; 311 - tx-fifo-size = <800>; 307 + max-frame-size = <9000>; 308 + rx-fifo-size = <4096>; 309 + tx-fifo-size = <2048>; 312 310 phy-mode = "rgmii"; 313 - phy-map = <00000001>; 311 + phy-map = <0x00000001>; 314 312 rgmii-device = <&RGMII0>; 315 313 rgmii-channel = <0>; 316 314 zmii-device = <&ZMII0>; ··· 323 321 device_type = "network"; 324 322 compatible = "ibm,emac-440gx", "ibm,emac4"; 325 323 interrupt-parent = <&UIC2>; 326 - interrupts = <2 4 3 4>; 327 - reg = <40000e00 70>; 324 + interrupts = <0x2 0x4 0x3 0x4>; 325 + reg = <0x40000e00 0x00000070>; 328 326 local-mac-address = [000000000000]; // Filled in by zImage 329 327 mal-device = <&MAL0>; 330 328 mal-tx-channel = <3>; 331 329 mal-rx-channel = <3>; 332 330 cell-index = <3>; 333 - max-frame-size = <2328>; 334 - rx-fifo-size = <1000>; 335 - tx-fifo-size = <800>; 331 + max-frame-size = <9000>; 332 + rx-fifo-size = <4096>; 333 + tx-fifo-size = <2048>; 336 334 phy-mode = "rgmii"; 337 - phy-map = <00000003>; 335 + phy-map = <0x00000003>; 338 336 rgmii-device = <&RGMII0>; 339 337 rgmii-channel = <1>; 340 338 zmii-device = <&ZMII0>; ··· 346 344 347 345 GPT0: gpt@40000a00 { 348 346 /* FIXME */ 349 - reg = <40000a00 d4>; 347 + reg = <0x40000a00 0x000000d4>; 350 348 interrupt-parent = <&UIC0>; 351 - interrupts = <12 4 13 4 14 4 15 4 16 4>; 349 + interrupts = <0x12 0x4 0x13 0x4 0x14 0x4 0x15 0x4 0x16 0x4>; 352 350 }; 353 351 354 352 }; ··· 362 360 primary; 363 361 large-inbound-windows; 364 362 enable-msi-hole; 365 - reg = <2 0ec00000 8 /* Config space access */ 366 - 0 0 0 /* no IACK cycles */ 367 - 2 0ed00000 4 /* Special cycles */ 368 - 2 0ec80000 100 /* Internal registers */ 369 - 2 0ec80100 fc>; /* Internal messaging registers */ 363 + reg = <0x00000002 0x0ec00000 0x00000008 /* Config space access */ 364 + 0x00000000 0x00000000 0x00000000 /* no IACK cycles */ 365 + 0x00000002 0x0ed00000 0x00000004 /* Special cycles */ 366 + 0x00000002 0x0ec80000 0x00000100 /* Internal registers */ 367 + 0x00000002 0x0ec80100 0x000000fc>; /* Internal messaging registers */ 370 368 371 369 /* Outbound ranges, one memory and one IO, 372 370 * later cannot be changed 373 371 */ 374 - ranges = <02000000 0 80000000 00000003 80000000 0 80000000 375 - 01000000 0 00000000 00000002 08000000 0 00010000>; 372 + ranges = <0x02000000 0x00000000 0x80000000 0x00000003 0x80000000 0x00000000 0x80000000 373 + 0x01000000 0x00000000 0x00000000 0x00000002 0x08000000 0x00000000 0x00010000>; 376 374 377 375 /* Inbound 2GB range starting at 0 */ 378 - dma-ranges = <42000000 0 0 0 0 0 80000000>; 376 + dma-ranges = <0x42000000 0x0 0x0 0x0 0x0 0x0 0x80000000>; 379 377 380 - interrupt-map-mask = <f800 0 0 7>; 378 + interrupt-map-mask = <0xf800 0x0 0x0 0x7>; 381 379 interrupt-map = < 382 380 /* IDSEL 1 */ 383 - 0800 0 0 1 &UIC0 17 8 384 - 0800 0 0 2 &UIC0 18 8 385 - 0800 0 0 3 &UIC0 19 8 386 - 0800 0 0 4 &UIC0 1a 8 381 + 0x800 0x0 0x0 0x1 &UIC0 0x17 0x8 382 + 0x800 0x0 0x0 0x2 &UIC0 0x18 0x8 383 + 0x800 0x0 0x0 0x3 &UIC0 0x19 0x8 384 + 0x800 0x0 0x0 0x4 &UIC0 0x1a 0x8 387 385 388 386 /* IDSEL 2 */ 389 - 1000 0 0 1 &UIC0 18 8 390 - 1000 0 0 2 &UIC0 19 8 391 - 1000 0 0 3 &UIC0 1a 8 392 - 1000 0 0 4 &UIC0 17 8 387 + 0x1000 0x0 0x0 0x1 &UIC0 0x18 0x8 388 + 0x1000 0x0 0x0 0x2 &UIC0 0x19 0x8 389 + 0x1000 0x0 0x0 0x3 &UIC0 0x1a 0x8 390 + 0x1000 0x0 0x0 0x4 &UIC0 0x17 0x8 393 391 >; 394 392 }; 395 393 };
+60 -58
arch/powerpc/boot/dts/walnut.dts
··· 9 9 * any warranty of any kind, whether express or implied. 10 10 */ 11 11 12 + /dts-v1/; 13 + 12 14 / { 13 15 #address-cells = <1>; 14 16 #size-cells = <1>; 15 17 model = "ibm,walnut"; 16 18 compatible = "ibm,walnut"; 17 - dcr-parent = <&/cpus/cpu@0>; 19 + dcr-parent = <&{/cpus/cpu@0}>; 18 20 19 21 aliases { 20 22 ethernet0 = &EMAC; ··· 31 29 cpu@0 { 32 30 device_type = "cpu"; 33 31 model = "PowerPC,405GP"; 34 - reg = <0>; 35 - clock-frequency = <bebc200>; /* Filled in by zImage */ 32 + reg = <0x00000000>; 33 + clock-frequency = <200000000>; /* Filled in by zImage */ 36 34 timebase-frequency = <0>; /* Filled in by zImage */ 37 - i-cache-line-size = <20>; 38 - d-cache-line-size = <20>; 39 - i-cache-size = <4000>; 40 - d-cache-size = <4000>; 35 + i-cache-line-size = <32>; 36 + d-cache-line-size = <32>; 37 + i-cache-size = <16384>; 38 + d-cache-size = <16384>; 41 39 dcr-controller; 42 40 dcr-access-method = "native"; 43 41 }; ··· 45 43 46 44 memory { 47 45 device_type = "memory"; 48 - reg = <0 0>; /* Filled in by zImage */ 46 + reg = <0x00000000 0x00000000>; /* Filled in by zImage */ 49 47 }; 50 48 51 49 UIC0: interrupt-controller { 52 50 compatible = "ibm,uic"; 53 51 interrupt-controller; 54 52 cell-index = <0>; 55 - dcr-reg = <0c0 9>; 53 + dcr-reg = <0x0c0 0x009>; 56 54 #address-cells = <0>; 57 55 #size-cells = <0>; 58 56 #interrupt-cells = <2>; ··· 67 65 68 66 SDRAM0: memory-controller { 69 67 compatible = "ibm,sdram-405gp"; 70 - dcr-reg = <010 2>; 68 + dcr-reg = <0x010 0x002>; 71 69 }; 72 70 73 71 MAL: mcmal { 74 72 compatible = "ibm,mcmal-405gp", "ibm,mcmal"; 75 - dcr-reg = <180 62>; 73 + dcr-reg = <0x180 0x062>; 76 74 num-tx-chans = <1>; 77 75 num-rx-chans = <1>; 78 76 interrupt-parent = <&UIC0>; 79 77 interrupts = < 80 - b 4 /* TXEOB */ 81 - c 4 /* RXEOB */ 82 - a 4 /* SERR */ 83 - d 4 /* TXDE */ 84 - e 4 /* RXDE */>; 78 + 0xb 0x4 /* TXEOB */ 79 + 0xc 0x4 /* RXEOB */ 80 + 0xa 0x4 /* SERR */ 81 + 0xd 0x4 /* TXDE */ 82 + 0xe 0x4 /* RXDE */>; 85 83 }; 86 84 87 85 POB0: opb { 88 86 compatible = "ibm,opb-405gp", "ibm,opb"; 89 87 #address-cells = <1>; 90 88 #size-cells = <1>; 91 - ranges = <ef600000 ef600000 a00000>; 92 - dcr-reg = <0a0 5>; 89 + ranges = <0xef600000 0xef600000 0x00a00000>; 90 + dcr-reg = <0x0a0 0x005>; 93 91 clock-frequency = <0>; /* Filled in by zImage */ 94 92 95 93 UART0: serial@ef600300 { 96 94 device_type = "serial"; 97 95 compatible = "ns16550"; 98 - reg = <ef600300 8>; 99 - virtual-reg = <ef600300>; 96 + reg = <0xef600300 0x00000008>; 97 + virtual-reg = <0xef600300>; 100 98 clock-frequency = <0>; /* Filled in by zImage */ 101 - current-speed = <2580>; 99 + current-speed = <9600>; 102 100 interrupt-parent = <&UIC0>; 103 - interrupts = <0 4>; 101 + interrupts = <0x0 0x4>; 104 102 }; 105 103 106 104 UART1: serial@ef600400 { 107 105 device_type = "serial"; 108 106 compatible = "ns16550"; 109 - reg = <ef600400 8>; 110 - virtual-reg = <ef600400>; 107 + reg = <0xef600400 0x00000008>; 108 + virtual-reg = <0xef600400>; 111 109 clock-frequency = <0>; /* Filled in by zImage */ 112 - current-speed = <2580>; 110 + current-speed = <9600>; 113 111 interrupt-parent = <&UIC0>; 114 - interrupts = <1 4>; 112 + interrupts = <0x1 0x4>; 115 113 }; 116 114 117 115 IIC: i2c@ef600500 { 118 116 compatible = "ibm,iic-405gp", "ibm,iic"; 119 - reg = <ef600500 11>; 117 + reg = <0xef600500 0x00000011>; 120 118 interrupt-parent = <&UIC0>; 121 - interrupts = <2 4>; 119 + interrupts = <0x2 0x4>; 122 120 }; 123 121 124 122 GPIO: gpio@ef600700 { 125 123 compatible = "ibm,gpio-405gp"; 126 - reg = <ef600700 20>; 124 + reg = <0xef600700 0x00000020>; 127 125 }; 128 126 129 127 EMAC: ethernet@ef600800 { ··· 131 129 compatible = "ibm,emac-405gp", "ibm,emac"; 132 130 interrupt-parent = <&UIC0>; 133 131 interrupts = < 134 - f 4 /* Ethernet */ 135 - 9 4 /* Ethernet Wake Up */>; 132 + 0xf 0x4 /* Ethernet */ 133 + 0x9 0x4 /* Ethernet Wake Up */>; 136 134 local-mac-address = [000000000000]; /* Filled in by zImage */ 137 - reg = <ef600800 70>; 135 + reg = <0xef600800 0x00000070>; 138 136 mal-device = <&MAL>; 139 137 mal-tx-channel = <0>; 140 138 mal-rx-channel = <0>; 141 139 cell-index = <0>; 142 - max-frame-size = <5dc>; 143 - rx-fifo-size = <1000>; 144 - tx-fifo-size = <800>; 140 + max-frame-size = <1500>; 141 + rx-fifo-size = <4096>; 142 + tx-fifo-size = <2048>; 145 143 phy-mode = "rmii"; 146 - phy-map = <00000001>; 144 + phy-map = <0x00000001>; 147 145 }; 148 146 149 147 }; 150 148 151 149 EBC0: ebc { 152 150 compatible = "ibm,ebc-405gp", "ibm,ebc"; 153 - dcr-reg = <012 2>; 151 + dcr-reg = <0x012 0x002>; 154 152 #address-cells = <2>; 155 153 #size-cells = <1>; 156 154 /* The ranges property is supplied by the bootwrapper ··· 160 158 clock-frequency = <0>; /* Filled in by zImage */ 161 159 162 160 sram@0,0 { 163 - reg = <0 0 80000>; 161 + reg = <0x00000000 0x00000000 0x00080000>; 164 162 }; 165 163 166 164 flash@0,80000 { 167 165 compatible = "jedec-flash"; 168 166 bank-width = <1>; 169 - reg = <0 80000 80000>; 167 + reg = <0x00000000 0x00080000 0x00080000>; 170 168 #address-cells = <1>; 171 169 #size-cells = <1>; 172 170 partition@0 { 173 171 label = "OpenBIOS"; 174 - reg = <0 80000>; 172 + reg = <0x00000000 0x00080000>; 175 173 read-only; 176 174 }; 177 175 }; ··· 179 177 nvram@1,0 { 180 178 /* NVRAM and RTC */ 181 179 compatible = "ds1743-nvram"; 182 - #bytes = <2000>; 183 - reg = <1 0 2000>; 180 + #bytes = <0x2000>; 181 + reg = <0x00000001 0x00000000 0x00002000>; 184 182 }; 185 183 186 184 keyboard@2,0 { 187 185 compatible = "intel,82C42PC"; 188 - reg = <2 0 2>; 186 + reg = <0x00000002 0x00000000 0x00000002>; 189 187 }; 190 188 191 189 ir@3,0 { 192 190 compatible = "ti,TIR2000PAG"; 193 - reg = <3 0 10>; 191 + reg = <0x00000003 0x00000000 0x00000010>; 194 192 }; 195 193 196 194 fpga@7,0 { 197 195 compatible = "Walnut-FPGA"; 198 - reg = <7 0 10>; 199 - virtual-reg = <f0300005>; 196 + reg = <0x00000007 0x00000000 0x00000010>; 197 + virtual-reg = <0xf0300005>; 200 198 }; 201 199 }; 202 200 ··· 207 205 #address-cells = <3>; 208 206 compatible = "ibm,plb405gp-pci", "ibm,plb-pci"; 209 207 primary; 210 - reg = <eec00000 8 /* Config space access */ 211 - eed80000 4 /* IACK */ 212 - eed80000 4 /* Special cycle */ 213 - ef480000 40>; /* Internal registers */ 208 + reg = <0xeec00000 0x00000008 /* Config space access */ 209 + 0xeed80000 0x00000004 /* IACK */ 210 + 0xeed80000 0x00000004 /* Special cycle */ 211 + 0xef480000 0x00000040>; /* Internal registers */ 214 212 215 213 /* Outbound ranges, one memory and one IO, 216 214 * later cannot be changed. Chip supports a second 217 215 * IO range but we don't use it for now 218 216 */ 219 - ranges = <02000000 0 80000000 80000000 0 20000000 220 - 01000000 0 00000000 e8000000 0 00010000>; 217 + ranges = <0x02000000 0x00000000 0x80000000 0x80000000 0x00000000 0x20000000 218 + 0x01000000 0x00000000 0x00000000 0xe8000000 0x00000000 0x00010000>; 221 219 222 220 /* Inbound 2GB range starting at 0 */ 223 - dma-ranges = <42000000 0 0 0 0 80000000>; 221 + dma-ranges = <0x42000000 0x0 0x0 0x0 0x0 0x80000000>; 224 222 225 223 /* Walnut has all 4 IRQ pins tied together per slot */ 226 - interrupt-map-mask = <f800 0 0 0>; 224 + interrupt-map-mask = <0xf800 0x0 0x0 0x0>; 227 225 interrupt-map = < 228 226 /* IDSEL 1 */ 229 - 0800 0 0 0 &UIC0 1c 8 227 + 0x800 0x0 0x0 0x0 &UIC0 0x1c 0x8 230 228 231 229 /* IDSEL 2 */ 232 - 1000 0 0 0 &UIC0 1d 8 230 + 0x1000 0x0 0x0 0x0 &UIC0 0x1d 0x8 233 231 234 232 /* IDSEL 3 */ 235 - 1800 0 0 0 &UIC0 1e 8 233 + 0x1800 0x0 0x0 0x0 &UIC0 0x1e 0x8 236 234 237 235 /* IDSEL 4 */ 238 - 2000 0 0 0 &UIC0 1f 8 236 + 0x2000 0x0 0x0 0x0 &UIC0 0x1f 0x8 239 237 >; 240 238 }; 241 239 };
+54 -52
arch/powerpc/boot/dts/warp.dts
··· 9 9 * any warranty of any kind, whether express or implied. 10 10 */ 11 11 12 + /dts-v1/; 13 + 12 14 / { 13 15 #address-cells = <2>; 14 16 #size-cells = <1>; 15 17 model = "pika,warp"; 16 18 compatible = "pika,warp"; 17 - dcr-parent = <&/cpus/cpu@0>; 19 + dcr-parent = <&{/cpus/cpu@0}>; 18 20 19 21 aliases { 20 22 ethernet0 = &EMAC0; ··· 30 28 cpu@0 { 31 29 device_type = "cpu"; 32 30 model = "PowerPC,440EP"; 33 - reg = <0>; 31 + reg = <0x00000000>; 34 32 clock-frequency = <0>; /* Filled in by zImage */ 35 33 timebase-frequency = <0>; /* Filled in by zImage */ 36 - i-cache-line-size = <20>; 37 - d-cache-line-size = <20>; 38 - i-cache-size = <8000>; 39 - d-cache-size = <8000>; 34 + i-cache-line-size = <32>; 35 + d-cache-line-size = <32>; 36 + i-cache-size = <32768>; 37 + d-cache-size = <32768>; 40 38 dcr-controller; 41 39 dcr-access-method = "native"; 42 40 }; ··· 44 42 45 43 memory { 46 44 device_type = "memory"; 47 - reg = <0 0 0>; /* Filled in by zImage */ 45 + reg = <0x00000000 0x00000000 0x00000000>; /* Filled in by zImage */ 48 46 }; 49 47 50 48 UIC0: interrupt-controller0 { 51 49 compatible = "ibm,uic-440ep","ibm,uic"; 52 50 interrupt-controller; 53 51 cell-index = <0>; 54 - dcr-reg = <0c0 009>; 52 + dcr-reg = <0x0c0 0x009>; 55 53 #address-cells = <0>; 56 54 #size-cells = <0>; 57 55 #interrupt-cells = <2>; ··· 61 59 compatible = "ibm,uic-440ep","ibm,uic"; 62 60 interrupt-controller; 63 61 cell-index = <1>; 64 - dcr-reg = <0d0 009>; 62 + dcr-reg = <0x0d0 0x009>; 65 63 #address-cells = <0>; 66 64 #size-cells = <0>; 67 65 #interrupt-cells = <2>; 68 - interrupts = <1e 4 1f 4>; /* cascade */ 66 + interrupts = <0x1e 0x4 0x1f 0x4>; /* cascade */ 69 67 interrupt-parent = <&UIC0>; 70 68 }; 71 69 72 70 SDR0: sdr { 73 71 compatible = "ibm,sdr-440ep"; 74 - dcr-reg = <00e 002>; 72 + dcr-reg = <0x00e 0x002>; 75 73 }; 76 74 77 75 CPR0: cpr { 78 76 compatible = "ibm,cpr-440ep"; 79 - dcr-reg = <00c 002>; 77 + dcr-reg = <0x00c 0x002>; 80 78 }; 81 79 82 80 plb { ··· 88 86 89 87 SDRAM0: sdram { 90 88 compatible = "ibm,sdram-440ep", "ibm,sdram-405gp"; 91 - dcr-reg = <010 2>; 89 + dcr-reg = <0x010 0x002>; 92 90 }; 93 91 94 92 DMA0: dma { 95 93 compatible = "ibm,dma-440ep", "ibm,dma-440gp"; 96 - dcr-reg = <100 027>; 94 + dcr-reg = <0x100 0x027>; 97 95 }; 98 96 99 97 MAL0: mcmal { 100 98 compatible = "ibm,mcmal-440ep", "ibm,mcmal-440gp", "ibm,mcmal"; 101 - dcr-reg = <180 62>; 99 + dcr-reg = <0x180 0x062>; 102 100 num-tx-chans = <4>; 103 101 num-rx-chans = <2>; 104 102 interrupt-parent = <&MAL0>; 105 - interrupts = <0 1 2 3 4>; 103 + interrupts = <0x0 0x1 0x2 0x3 0x4>; 106 104 #interrupt-cells = <1>; 107 105 #address-cells = <0>; 108 106 #size-cells = <0>; 109 - interrupt-map = </*TXEOB*/ 0 &UIC0 a 4 110 - /*RXEOB*/ 1 &UIC0 b 4 111 - /*SERR*/ 2 &UIC1 0 4 112 - /*TXDE*/ 3 &UIC1 1 4 113 - /*RXDE*/ 4 &UIC1 2 4>; 107 + interrupt-map = </*TXEOB*/ 0x0 &UIC0 0xa 0x4 108 + /*RXEOB*/ 0x1 &UIC0 0xb 0x4 109 + /*SERR*/ 0x2 &UIC1 0x0 0x4 110 + /*TXDE*/ 0x3 &UIC1 0x1 0x4 111 + /*RXDE*/ 0x4 &UIC1 0x2 0x4>; 114 112 }; 115 113 116 114 POB0: opb { 117 115 compatible = "ibm,opb-440ep", "ibm,opb-440gp", "ibm,opb"; 118 116 #address-cells = <1>; 119 117 #size-cells = <1>; 120 - ranges = <00000000 0 00000000 80000000 121 - 80000000 0 80000000 80000000>; 118 + ranges = <0x00000000 0x00000000 0x00000000 0x80000000 119 + 0x80000000 0x00000000 0x80000000 0x80000000>; 122 120 interrupt-parent = <&UIC1>; 123 - interrupts = <7 4>; 121 + interrupts = <0x7 0x4>; 124 122 clock-frequency = <0>; /* Filled in by zImage */ 125 123 126 124 EBC0: ebc { 127 125 compatible = "ibm,ebc-440ep", "ibm,ebc-440gp", "ibm,ebc"; 128 - dcr-reg = <012 2>; 126 + dcr-reg = <0x012 0x002>; 129 127 #address-cells = <2>; 130 128 #size-cells = <1>; 131 129 clock-frequency = <0>; /* Filled in by zImage */ 132 - interrupts = <5 1>; 130 + interrupts = <0x5 0x1>; 133 131 interrupt-parent = <&UIC1>; 134 132 135 133 fpga@2,0 { 136 134 compatible = "pika,fpga"; 137 - reg = <2 0 2200>; 138 - interrupts = <18 8>; 135 + reg = <0x00000002 0x00000000 0x00002200>; 136 + interrupts = <0x18 0x8>; 139 137 interrupt-parent = <&UIC0>; 140 138 }; 141 139 142 140 nor_flash@0,0 { 143 141 compatible = "amd,s29gl512n", "cfi-flash"; 144 142 bank-width = <2>; 145 - reg = <0 0 4000000>; 143 + reg = <0x00000000 0x00000000 0x04000000>; 146 144 #address-cells = <1>; 147 145 #size-cells = <1>; 148 146 partition@0 { 149 147 label = "kernel"; 150 - reg = <0 180000>; 148 + reg = <0x00000000 0x00180000>; 151 149 }; 152 150 partition@180000 { 153 151 label = "root"; 154 - reg = <180000 3480000>; 152 + reg = <0x00180000 0x03480000>; 155 153 }; 156 154 partition@3600000 { 157 155 label = "user"; 158 - reg = <3600000 900000>; 156 + reg = <0x03600000 0x00900000>; 159 157 }; 160 158 partition@3f00000 { 161 159 label = "fpga"; 162 - reg = <3f00000 40000>; 160 + reg = <0x03f00000 0x00040000>; 163 161 }; 164 162 partition@3f40000 { 165 163 label = "env"; 166 - reg = <3f40000 40000>; 164 + reg = <0x03f40000 0x00040000>; 167 165 }; 168 166 partition@3f80000 { 169 167 label = "u-boot"; 170 - reg = <3f80000 80000>; 168 + reg = <0x03f80000 0x00080000>; 171 169 }; 172 170 }; 173 171 }; ··· 175 173 UART0: serial@ef600300 { 176 174 device_type = "serial"; 177 175 compatible = "ns16550"; 178 - reg = <ef600300 8>; 179 - virtual-reg = <ef600300>; 176 + reg = <0xef600300 0x00000008>; 177 + virtual-reg = <0xef600300>; 180 178 clock-frequency = <0>; /* Filled in by zImage */ 181 - current-speed = <1c200>; 179 + current-speed = <115200>; 182 180 interrupt-parent = <&UIC0>; 183 - interrupts = <0 4>; 181 + interrupts = <0x0 0x4>; 184 182 }; 185 183 186 184 IIC0: i2c@ef600700 { 187 185 compatible = "ibm,iic-440ep", "ibm,iic-440gp", "ibm,iic"; 188 - reg = <ef600700 14>; 186 + reg = <0xef600700 0x00000014>; 189 187 interrupt-parent = <&UIC0>; 190 - interrupts = <2 4>; 188 + interrupts = <0x2 0x4>; 191 189 }; 192 190 193 191 GPIO0: gpio@ef600b00 { 194 192 compatible = "ibm,gpio-440ep"; 195 - reg = <ef600b00 48>; 193 + reg = <0xef600b00 0x00000048>; 196 194 }; 197 195 198 196 GPIO1: gpio@ef600c00 { 199 197 compatible = "ibm,gpio-440ep"; 200 - reg = <ef600c00 48>; 198 + reg = <0xef600c00 0x00000048>; 201 199 }; 202 200 203 201 ZMII0: emac-zmii@ef600d00 { 204 202 compatible = "ibm,zmii-440ep", "ibm,zmii-440gp", "ibm,zmii"; 205 - reg = <ef600d00 c>; 203 + reg = <0xef600d00 0x0000000c>; 206 204 }; 207 205 208 206 EMAC0: ethernet@ef600e00 { 209 207 device_type = "network"; 210 208 compatible = "ibm,emac-440ep", "ibm,emac-440gp", "ibm,emac"; 211 209 interrupt-parent = <&UIC1>; 212 - interrupts = <1c 4 1d 4>; 213 - reg = <ef600e00 70>; 210 + interrupts = <0x1c 0x4 0x1d 0x4>; 211 + reg = <0xef600e00 0x00000070>; 214 212 local-mac-address = [000000000000]; 215 213 mal-device = <&MAL0>; 216 214 mal-tx-channel = <0 1>; 217 215 mal-rx-channel = <0>; 218 216 cell-index = <0>; 219 - max-frame-size = <5dc>; 220 - rx-fifo-size = <1000>; 221 - tx-fifo-size = <800>; 217 + max-frame-size = <1500>; 218 + rx-fifo-size = <4096>; 219 + tx-fifo-size = <2048>; 222 220 phy-mode = "rmii"; 223 - phy-map = <00000000>; 221 + phy-map = <0x00000000>; 224 222 zmii-device = <&ZMII0>; 225 223 zmii-channel = <0>; 226 224 }; 227 225 228 226 usb@ef601000 { 229 227 compatible = "ohci-be"; 230 - reg = <ef601000 80>; 231 - interrupts = <8 1 9 1>; 228 + reg = <0xef601000 0x00000080>; 229 + interrupts = <0x8 0x1 0x9 0x1>; 232 230 interrupt-parent = < &UIC1 >; 233 231 }; 234 232 };
+74 -72
arch/powerpc/boot/dts/yosemite.dts
··· 9 9 * any warranty of any kind, whether express or implied. 10 10 */ 11 11 12 + /dts-v1/; 13 + 12 14 / { 13 15 #address-cells = <2>; 14 16 #size-cells = <1>; 15 17 model = "amcc,yosemite"; 16 18 compatible = "amcc,yosemite","amcc,bamboo"; 17 - dcr-parent = <&/cpus/cpu@0>; 19 + dcr-parent = <&{/cpus/cpu@0}>; 18 20 19 21 aliases { 20 22 ethernet0 = &EMAC0; ··· 34 32 cpu@0 { 35 33 device_type = "cpu"; 36 34 model = "PowerPC,440EP"; 37 - reg = <0>; 35 + reg = <0x00000000>; 38 36 clock-frequency = <0>; /* Filled in by zImage */ 39 37 timebase-frequency = <0>; /* Filled in by zImage */ 40 - i-cache-line-size = <20>; 41 - d-cache-line-size = <20>; 42 - i-cache-size = <8000>; 43 - d-cache-size = <8000>; 38 + i-cache-line-size = <32>; 39 + d-cache-line-size = <32>; 40 + i-cache-size = <32768>; 41 + d-cache-size = <32768>; 44 42 dcr-controller; 45 43 dcr-access-method = "native"; 46 44 }; ··· 48 46 49 47 memory { 50 48 device_type = "memory"; 51 - reg = <0 0 0>; /* Filled in by zImage */ 49 + reg = <0x00000000 0x00000000 0x00000000>; /* Filled in by zImage */ 52 50 }; 53 51 54 52 UIC0: interrupt-controller0 { 55 53 compatible = "ibm,uic-440ep","ibm,uic"; 56 54 interrupt-controller; 57 55 cell-index = <0>; 58 - dcr-reg = <0c0 009>; 56 + dcr-reg = <0x0c0 0x009>; 59 57 #address-cells = <0>; 60 58 #size-cells = <0>; 61 59 #interrupt-cells = <2>; ··· 65 63 compatible = "ibm,uic-440ep","ibm,uic"; 66 64 interrupt-controller; 67 65 cell-index = <1>; 68 - dcr-reg = <0d0 009>; 66 + dcr-reg = <0x0d0 0x009>; 69 67 #address-cells = <0>; 70 68 #size-cells = <0>; 71 69 #interrupt-cells = <2>; 72 - interrupts = <1e 4 1f 4>; /* cascade */ 70 + interrupts = <0x1e 0x4 0x1f 0x4>; /* cascade */ 73 71 interrupt-parent = <&UIC0>; 74 72 }; 75 73 76 74 SDR0: sdr { 77 75 compatible = "ibm,sdr-440ep"; 78 - dcr-reg = <00e 002>; 76 + dcr-reg = <0x00e 0x002>; 79 77 }; 80 78 81 79 CPR0: cpr { 82 80 compatible = "ibm,cpr-440ep"; 83 - dcr-reg = <00c 002>; 81 + dcr-reg = <0x00c 0x002>; 84 82 }; 85 83 86 84 plb { ··· 92 90 93 91 SDRAM0: sdram { 94 92 compatible = "ibm,sdram-440ep", "ibm,sdram-405gp"; 95 - dcr-reg = <010 2>; 93 + dcr-reg = <0x010 0x002>; 96 94 }; 97 95 98 96 DMA0: dma { 99 97 compatible = "ibm,dma-440ep", "ibm,dma-440gp"; 100 - dcr-reg = <100 027>; 98 + dcr-reg = <0x100 0x027>; 101 99 }; 102 100 103 101 MAL0: mcmal { 104 102 compatible = "ibm,mcmal-440ep", "ibm,mcmal-440gp", "ibm,mcmal"; 105 - dcr-reg = <180 62>; 103 + dcr-reg = <0x180 0x062>; 106 104 num-tx-chans = <4>; 107 105 num-rx-chans = <2>; 108 106 interrupt-parent = <&MAL0>; 109 - interrupts = <0 1 2 3 4>; 107 + interrupts = <0x0 0x1 0x2 0x3 0x4>; 110 108 #interrupt-cells = <1>; 111 109 #address-cells = <0>; 112 110 #size-cells = <0>; 113 - interrupt-map = </*TXEOB*/ 0 &UIC0 a 4 114 - /*RXEOB*/ 1 &UIC0 b 4 115 - /*SERR*/ 2 &UIC1 0 4 116 - /*TXDE*/ 3 &UIC1 1 4 117 - /*RXDE*/ 4 &UIC1 2 4>; 111 + interrupt-map = </*TXEOB*/ 0x0 &UIC0 0xa 0x4 112 + /*RXEOB*/ 0x1 &UIC0 0xb 0x4 113 + /*SERR*/ 0x2 &UIC1 0x0 0x4 114 + /*TXDE*/ 0x3 &UIC1 0x1 0x4 115 + /*RXDE*/ 0x4 &UIC1 0x2 0x4>; 118 116 }; 119 117 120 118 POB0: opb { ··· 124 122 /* Bamboo is oddball in the 44x world and doesn't use the ERPN 125 123 * bits. 126 124 */ 127 - ranges = <00000000 0 00000000 80000000 128 - 80000000 0 80000000 80000000>; 125 + ranges = <0x00000000 0x00000000 0x00000000 0x80000000 126 + 0x80000000 0x00000000 0x80000000 0x80000000>; 129 127 interrupt-parent = <&UIC1>; 130 - interrupts = <7 4>; 128 + interrupts = <0x7 0x4>; 131 129 clock-frequency = <0>; /* Filled in by zImage */ 132 130 133 131 EBC0: ebc { 134 132 compatible = "ibm,ebc-440ep", "ibm,ebc-440gp", "ibm,ebc"; 135 - dcr-reg = <012 2>; 133 + dcr-reg = <0x012 0x002>; 136 134 #address-cells = <2>; 137 135 #size-cells = <1>; 138 136 clock-frequency = <0>; /* Filled in by zImage */ 139 - interrupts = <5 1>; 137 + interrupts = <0x5 0x1>; 140 138 interrupt-parent = <&UIC1>; 141 139 }; 142 140 143 141 UART0: serial@ef600300 { 144 142 device_type = "serial"; 145 143 compatible = "ns16550"; 146 - reg = <ef600300 8>; 147 - virtual-reg = <ef600300>; 144 + reg = <0xef600300 0x00000008>; 145 + virtual-reg = <0xef600300>; 148 146 clock-frequency = <0>; /* Filled in by zImage */ 149 - current-speed = <1c200>; 147 + current-speed = <115200>; 150 148 interrupt-parent = <&UIC0>; 151 - interrupts = <0 4>; 149 + interrupts = <0x0 0x4>; 152 150 }; 153 151 154 152 UART1: serial@ef600400 { 155 153 device_type = "serial"; 156 154 compatible = "ns16550"; 157 - reg = <ef600400 8>; 158 - virtual-reg = <ef600400>; 155 + reg = <0xef600400 0x00000008>; 156 + virtual-reg = <0xef600400>; 159 157 clock-frequency = <0>; 160 158 current-speed = <0>; 161 159 interrupt-parent = <&UIC0>; 162 - interrupts = <1 4>; 160 + interrupts = <0x1 0x4>; 163 161 }; 164 162 165 163 UART2: serial@ef600500 { 166 164 device_type = "serial"; 167 165 compatible = "ns16550"; 168 - reg = <ef600500 8>; 169 - virtual-reg = <ef600500>; 166 + reg = <0xef600500 0x00000008>; 167 + virtual-reg = <0xef600500>; 170 168 clock-frequency = <0>; 171 169 current-speed = <0>; 172 170 interrupt-parent = <&UIC0>; 173 - interrupts = <3 4>; 171 + interrupts = <0x3 0x4>; 174 172 status = "disabled"; 175 173 }; 176 174 177 175 UART3: serial@ef600600 { 178 176 device_type = "serial"; 179 177 compatible = "ns16550"; 180 - reg = <ef600600 8>; 181 - virtual-reg = <ef600600>; 178 + reg = <0xef600600 0x00000008>; 179 + virtual-reg = <0xef600600>; 182 180 clock-frequency = <0>; 183 181 current-speed = <0>; 184 182 interrupt-parent = <&UIC0>; 185 - interrupts = <4 4>; 183 + interrupts = <0x4 0x4>; 186 184 status = "disabled"; 187 185 }; 188 186 189 187 IIC0: i2c@ef600700 { 190 188 compatible = "ibm,iic-440ep", "ibm,iic-440gp", "ibm,iic"; 191 - reg = <ef600700 14>; 189 + reg = <0xef600700 0x00000014>; 192 190 interrupt-parent = <&UIC0>; 193 - interrupts = <2 4>; 191 + interrupts = <0x2 0x4>; 194 192 }; 195 193 196 194 IIC1: i2c@ef600800 { 197 195 compatible = "ibm,iic-440ep", "ibm,iic-440gp", "ibm,iic"; 198 - reg = <ef600800 14>; 196 + reg = <0xef600800 0x00000014>; 199 197 interrupt-parent = <&UIC0>; 200 - interrupts = <7 4>; 198 + interrupts = <0x7 0x4>; 201 199 }; 202 200 203 201 spi@ef600900 { 204 202 compatible = "amcc,spi-440ep"; 205 - reg = <ef600900 6>; 206 - interrupts = <8 4>; 203 + reg = <0xef600900 0x00000006>; 204 + interrupts = <0x8 0x4>; 207 205 interrupt-parent = <&UIC0>; 208 206 }; 209 207 210 208 ZMII0: emac-zmii@ef600d00 { 211 209 compatible = "ibm,zmii-440ep", "ibm,zmii-440gp", "ibm,zmii"; 212 - reg = <ef600d00 c>; 210 + reg = <0xef600d00 0x0000000c>; 213 211 }; 214 212 215 213 EMAC0: ethernet@ef600e00 { 216 214 device_type = "network"; 217 215 compatible = "ibm,emac-440ep", "ibm,emac-440gp", "ibm,emac"; 218 216 interrupt-parent = <&UIC1>; 219 - interrupts = <1c 4 1d 4>; 220 - reg = <ef600e00 70>; 217 + interrupts = <0x1c 0x4 0x1d 0x4>; 218 + reg = <0xef600e00 0x00000070>; 221 219 local-mac-address = [000000000000]; 222 220 mal-device = <&MAL0>; 223 221 mal-tx-channel = <0 1>; 224 222 mal-rx-channel = <0>; 225 223 cell-index = <0>; 226 - max-frame-size = <5dc>; 227 - rx-fifo-size = <1000>; 228 - tx-fifo-size = <800>; 224 + max-frame-size = <1500>; 225 + rx-fifo-size = <4096>; 226 + tx-fifo-size = <2048>; 229 227 phy-mode = "rmii"; 230 - phy-map = <00000000>; 228 + phy-map = <0x00000000>; 231 229 zmii-device = <&ZMII0>; 232 230 zmii-channel = <0>; 233 231 }; ··· 236 234 device_type = "network"; 237 235 compatible = "ibm,emac-440ep", "ibm,emac-440gp", "ibm,emac"; 238 236 interrupt-parent = <&UIC1>; 239 - interrupts = <1e 4 1f 4>; 240 - reg = <ef600f00 70>; 237 + interrupts = <0x1e 0x4 0x1f 0x4>; 238 + reg = <0xef600f00 0x00000070>; 241 239 local-mac-address = [000000000000]; 242 240 mal-device = <&MAL0>; 243 241 mal-tx-channel = <2 3>; 244 242 mal-rx-channel = <1>; 245 243 cell-index = <1>; 246 - max-frame-size = <5dc>; 247 - rx-fifo-size = <1000>; 248 - tx-fifo-size = <800>; 244 + max-frame-size = <1500>; 245 + rx-fifo-size = <4096>; 246 + tx-fifo-size = <2048>; 249 247 phy-mode = "rmii"; 250 - phy-map = <00000000>; 248 + phy-map = <0x00000000>; 251 249 zmii-device = <&ZMII0>; 252 250 zmii-channel = <1>; 253 251 }; 254 252 255 253 usb@ef601000 { 256 254 compatible = "ohci-be"; 257 - reg = <ef601000 80>; 258 - interrupts = <8 4 9 4>; 255 + reg = <0xef601000 0x00000080>; 256 + interrupts = <0x8 0x4 0x9 0x4>; 259 257 interrupt-parent = < &UIC1 >; 260 258 }; 261 259 }; ··· 267 265 #address-cells = <3>; 268 266 compatible = "ibm,plb440ep-pci", "ibm,plb-pci"; 269 267 primary; 270 - reg = <0 eec00000 8 /* Config space access */ 271 - 0 eed00000 4 /* IACK */ 272 - 0 eed00000 4 /* Special cycle */ 273 - 0 ef400000 40>; /* Internal registers */ 268 + reg = <0x00000000 0xeec00000 0x00000008 /* Config space access */ 269 + 0x00000000 0xeed00000 0x00000004 /* IACK */ 270 + 0x00000000 0xeed00000 0x00000004 /* Special cycle */ 271 + 0x00000000 0xef400000 0x00000040>; /* Internal registers */ 274 272 275 273 /* Outbound ranges, one memory and one IO, 276 274 * later cannot be changed. Chip supports a second 277 275 * IO range but we don't use it for now 278 276 */ 279 - ranges = <02000000 0 a0000000 0 a0000000 0 20000000 280 - 01000000 0 00000000 0 e8000000 0 00010000>; 277 + ranges = <0x02000000 0x00000000 0xa0000000 0x00000000 0xa0000000 0x00000000 0x20000000 278 + 0x01000000 0x00000000 0x00000000 0x00000000 0xe8000000 0x00000000 0x00010000>; 281 279 282 280 /* Inbound 2GB range starting at 0 */ 283 - dma-ranges = <42000000 0 0 0 0 0 80000000>; 281 + dma-ranges = <0x42000000 0x0 0x0 0x0 0x0 0x0 0x80000000>; 284 282 285 283 /* Bamboo has all 4 IRQ pins tied together per slot */ 286 - interrupt-map-mask = <f800 0 0 0>; 284 + interrupt-map-mask = <0xf800 0x0 0x0 0x0>; 287 285 interrupt-map = < 288 286 /* IDSEL 1 */ 289 - 0800 0 0 0 &UIC0 1c 8 287 + 0x800 0x0 0x0 0x0 &UIC0 0x1c 0x8 290 288 291 289 /* IDSEL 2 */ 292 - 1000 0 0 0 &UIC0 1b 8 290 + 0x1000 0x0 0x0 0x0 &UIC0 0x1b 0x8 293 291 294 292 /* IDSEL 3 */ 295 - 1800 0 0 0 &UIC0 1a 8 293 + 0x1800 0x0 0x0 0x0 &UIC0 0x1a 0x8 296 294 297 295 /* IDSEL 4 */ 298 - 2000 0 0 0 &UIC0 19 8 296 + 0x2000 0x0 0x0 0x0 &UIC0 0x19 0x8 299 297 >; 300 298 }; 301 299 };