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

powerpc/4xx: Convert Sam440ep DTS to dts-v1

This makes the sam440ep.dts dts-v1 compliant.

Signed-off-by: Giuseppe Coviello <gicoviello@gmail.com>
Signed-off-by: Josh Boyer <jwboyer@linux.vnet.ibm.com>

authored by

Giuseppe Coviello and committed by
Josh Boyer
d2146cb2 b6014e15

+51 -50
+51 -50
arch/powerpc/boot/dts/sam440ep.dts
··· 13 13 * any warranty of any kind, whether express or implied. 14 14 */ 15 15 16 + /dts-v1/; 17 + 16 18 / { 17 19 #address-cells = <2>; 18 20 #size-cells = <1>; 19 21 model = "acube,sam440ep"; 20 22 compatible = "acube,sam440ep"; 21 - dcr-parent = <&/cpus/cpu@0>; 22 23 23 24 aliases { 24 25 ethernet0 = &EMAC0; ··· 40 39 reg = <0>; 41 40 clock-frequency = <0>; /* Filled in by zImage */ 42 41 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>; 42 + i-cache-line-size = <32>; 43 + d-cache-line-size = <32>; 44 + i-cache-size = <32768>; 45 + d-cache-size = <32768>; 47 46 dcr-controller; 48 47 dcr-access-method = "native"; 49 48 }; ··· 58 57 compatible = "ibm,uic-440ep","ibm,uic"; 59 58 interrupt-controller; 60 59 cell-index = <0>; 61 - dcr-reg = <0c0 009>; 60 + dcr-reg = <0x0c0 9>; 62 61 #address-cells = <0>; 63 62 #size-cells = <0>; 64 63 #interrupt-cells = <2>; ··· 68 67 compatible = "ibm,uic-440ep","ibm,uic"; 69 68 interrupt-controller; 70 69 cell-index = <1>; 71 - dcr-reg = <0d0 009>; 70 + dcr-reg = <0x0d0 9>; 72 71 #address-cells = <0>; 73 72 #size-cells = <0>; 74 73 #interrupt-cells = <2>; 75 - interrupts = <1e 4 1f 4>; /* cascade */ 74 + interrupts = <0x1e 4 0x1f 4>; /* cascade */ 76 75 interrupt-parent = <&UIC0>; 77 76 }; 78 77 79 78 SDR0: sdr { 80 79 compatible = "ibm,sdr-440ep"; 81 - dcr-reg = <00e 002>; 80 + dcr-reg = <0x00e 2>; 82 81 }; 83 82 84 83 CPR0: cpr { 85 84 compatible = "ibm,cpr-440ep"; 86 - dcr-reg = <00c 002>; 85 + dcr-reg = <0x00c 2>; 87 86 }; 88 87 89 88 plb { ··· 95 94 96 95 SDRAM0: sdram { 97 96 compatible = "ibm,sdram-440ep", "ibm,sdram-405gp"; 98 - dcr-reg = <010 2>; 97 + dcr-reg = <0x010 2>; 99 98 }; 100 99 101 100 DMA0: dma { 102 101 compatible = "ibm,dma-440ep", "ibm,dma-440gp"; 103 - dcr-reg = <100 027>; 102 + dcr-reg = <0x100 0x027>; 104 103 }; 105 104 106 105 MAL0: mcmal { 107 106 compatible = "ibm,mcmal-440ep", "ibm,mcmal-440gp", "ibm,mcmal"; 108 - dcr-reg = <180 62>; 107 + dcr-reg = <0x180 0x062>; 109 108 num-tx-chans = <4>; 110 109 num-rx-chans = <2>; 111 110 interrupt-parent = <&MAL0>; ··· 113 112 #interrupt-cells = <1>; 114 113 #address-cells = <0>; 115 114 #size-cells = <0>; 116 - interrupt-map = </*TXEOB*/ 0 &UIC0 a 4 117 - /*RXEOB*/ 1 &UIC0 b 4 115 + interrupt-map = </*TXEOB*/ 0 &UIC0 10 4 116 + /*RXEOB*/ 1 &UIC0 11 4 118 117 /*SERR*/ 2 &UIC1 0 4 119 118 /*TXDE*/ 3 &UIC1 1 4 120 119 /*RXDE*/ 4 &UIC1 2 4>; ··· 127 126 /* Bamboo is oddball in the 44x world and doesn't use the ERPN 128 127 * bits. 129 128 */ 130 - ranges = <00000000 0 00000000 80000000 131 - 80000000 0 80000000 80000000>; 129 + ranges = <0x00000000 0 0x00000000 0x80000000 130 + 0x80000000 0 0x80000000 0x80000000>; 132 131 interrupt-parent = <&UIC1>; 133 132 interrupts = <7 4>; 134 133 clock-frequency = <0>; /* Filled in by zImage */ 135 134 136 135 EBC0: ebc { 137 136 compatible = "ibm,ebc-440ep", "ibm,ebc-440gp", "ibm,ebc"; 138 - dcr-reg = <012 2>; 137 + dcr-reg = <0x012 2>; 139 138 #address-cells = <2>; 140 139 #size-cells = <1>; 141 140 clock-frequency = <0>; /* Filled in by zImage */ ··· 146 145 UART0: serial@ef600300 { 147 146 device_type = "serial"; 148 147 compatible = "ns16550"; 149 - reg = <ef600300 8>; 150 - virtual-reg = <ef600300>; 148 + reg = <0xef600300 8>; 149 + virtual-reg = <0xef600300>; 151 150 clock-frequency = <0>; /* Filled in by zImage */ 152 - current-speed = <1c200>; 151 + current-speed = <0x1c200>; 153 152 interrupt-parent = <&UIC0>; 154 153 interrupts = <0 4>; 155 154 }; ··· 157 156 UART1: serial@ef600400 { 158 157 device_type = "serial"; 159 158 compatible = "ns16550"; 160 - reg = <ef600400 8>; 161 - virtual-reg = <ef600400>; 159 + reg = <0xef600400 8>; 160 + virtual-reg = <0xef600400>; 162 161 clock-frequency = <0>; 163 162 current-speed = <0>; 164 163 interrupt-parent = <&UIC0>; ··· 168 167 UART2: serial@ef600500 { 169 168 device_type = "serial"; 170 169 compatible = "ns16550"; 171 - reg = <ef600500 8>; 172 - virtual-reg = <ef600500>; 170 + reg = <0xef600500 8>; 171 + virtual-reg = <0xef600500>; 173 172 clock-frequency = <0>; 174 173 current-speed = <0>; 175 174 interrupt-parent = <&UIC0>; ··· 179 178 UART3: serial@ef600600 { 180 179 device_type = "serial"; 181 180 compatible = "ns16550"; 182 - reg = <ef600600 8>; 183 - virtual-reg = <ef600600>; 181 + reg = <0xef600600 8>; 182 + virtual-reg = <0xef600600>; 184 183 clock-frequency = <0>; 185 184 current-speed = <0>; 186 185 interrupt-parent = <&UIC0>; ··· 192 191 #size-cells = <0>; 193 192 compatible = "ibm,iic-440ep", "ibm,iic-440gp", "ibm,iic"; 194 193 index = <0>; 195 - reg = <ef600700 14>; 194 + reg = <0xef600700 0x14>; 196 195 interrupt-parent = <&UIC0>; 197 196 interrupts = <2 4>; 198 197 rtc@68 { 199 198 compatible = "stm,m41t80"; 200 - reg = <68>; 199 + reg = <0x68>; 201 200 }; 202 201 }; 203 202 204 203 IIC1: i2c@ef600800 { 205 204 compatible = "ibm,iic-440ep", "ibm,iic-440gp", "ibm,iic"; 206 205 index = <5>; 207 - reg = <ef600800 14>; 206 + reg = <0xef600800 0x14>; 208 207 interrupt-parent = <&UIC0>; 209 208 interrupts = <7 4>; 210 209 }; 211 210 212 211 ZMII0: emac-zmii@ef600d00 { 213 212 compatible = "ibm,zmii-440ep", "ibm,zmii-440gp", "ibm,zmii"; 214 - reg = <ef600d00 c>; 213 + reg = <0xef600d00 0xc>; 215 214 }; 216 215 217 216 EMAC0: ethernet@ef600e00 { ··· 219 218 device_type = "network"; 220 219 compatible = "ibm,emac-440ep", "ibm,emac-440gp", "ibm,emac"; 221 220 interrupt-parent = <&UIC1>; 222 - interrupts = <1c 4 1d 4>; 223 - reg = <ef600e00 70>; 221 + interrupts = <0x1c 4 0x1d 4>; 222 + reg = <0xef600e00 0x70>; 224 223 local-mac-address = [000000000000]; 225 224 mal-device = <&MAL0>; 226 225 mal-tx-channel = <0 1>; 227 226 mal-rx-channel = <0>; 228 227 cell-index = <0>; 229 - max-frame-size = <5dc>; 230 - rx-fifo-size = <1000>; 231 - tx-fifo-size = <800>; 228 + max-frame-size = <0x5dc>; 229 + rx-fifo-size = <0x1000>; 230 + tx-fifo-size = <0x800>; 232 231 phy-mode = "rmii"; 233 232 phy-map = <00000000>; 234 233 zmii-device = <&ZMII0>; ··· 240 239 device_type = "network"; 241 240 compatible = "ibm,emac-440ep", "ibm,emac-440gp", "ibm,emac"; 242 241 interrupt-parent = <&UIC1>; 243 - interrupts = <1e 4 1f 4>; 244 - reg = <ef600f00 70>; 242 + interrupts = <0x1e 4 0x1f 4>; 243 + reg = <0xef600f00 0x70>; 245 244 local-mac-address = [000000000000]; 246 245 mal-device = <&MAL0>; 247 246 mal-tx-channel = <2 3>; 248 247 mal-rx-channel = <1>; 249 248 cell-index = <1>; 250 - max-frame-size = <5dc>; 251 - rx-fifo-size = <1000>; 252 - tx-fifo-size = <800>; 249 + max-frame-size = <0x5dc>; 250 + rx-fifo-size = <0x1000>; 251 + tx-fifo-size = <0x800>; 253 252 phy-mode = "rmii"; 254 253 phy-map = <00000000>; 255 254 zmii-device = <&ZMII0>; ··· 257 256 }; 258 257 usb@ef601000 { 259 258 compatible = "ohci-be"; 260 - reg = <ef601000 80>; 259 + reg = <0xef601000 0x80>; 261 260 interrupts = <8 4 9 4>; 262 - interrupt-parent = < &UIC1 >; 261 + interrupt-parent = <&UIC1>; 263 262 }; 264 263 }; 265 264 ··· 270 269 #address-cells = <3>; 271 270 compatible = "ibm,plb440ep-pci", "ibm,plb-pci"; 272 271 primary; 273 - reg = <0 eec00000 8 /* Config space access */ 274 - 0 eed00000 4 /* IACK */ 275 - 0 eed00000 4 /* Special cycle */ 276 - 0 ef400000 40>; /* Internal registers */ 272 + reg = <0 0xeec00000 8 /* Config space access */ 273 + 0 0xeed00000 4 /* IACK */ 274 + 0 0xeed00000 4 /* Special cycle */ 275 + 0 0xef400000 0x40>; /* Internal registers */ 277 276 278 277 /* Outbound ranges, one memory and one IO, 279 278 * later cannot be changed. Chip supports a second 280 279 * IO range but we don't use it for now 281 280 */ 282 - ranges = <02000000 0 a0000000 0 a0000000 0 20000000 283 - 01000000 0 00000000 0 e8000000 0 00010000>; 281 + ranges = <0x02000000 0 0xa0000000 0 0xa0000000 0 0x20000000 282 + 0x01000000 0 0x00000000 0 0xe8000000 0 0x00010000>; 284 283 285 284 /* Inbound 2GB range starting at 0 */ 286 - dma-ranges = <42000000 0 0 0 0 0 80000000>; 285 + dma-ranges = <0x42000000 0 0 0 0 0 0x80000000>; 287 286 }; 288 287 }; 289 288