powerpc/dts/fsl: Fix dtc-flagged interrupt errors

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

kernel os linux

mpc8641_hpcn was updated to 4-cell interrupt specifiers, but
PCI interrupt-map was not updated. It was also missing #interrupt-cells
on the outer PCI buses.

p1020rdb-pc was updated to 4-cell interrupt specifiers, but
the ethernet-phy nodes weren't updated.

mpc832x_rdb had an invalid "interrupts = <0>" on the ethernet-phy nodes.
Besides being the wrong number of cells, 0 is not a valid IPIC interrupt
according to ipic.c. Presumably it was meant to indicate that these
PHYs are not connected to an interrupt.

Signed-off-by: Scott Wood <oss@buserror.net>

Scott Wood 7 years ago ccdde478 a6ee0c00

+132 -134

5 changed files

expand all

arch

powerpc

boot

dts

fsl

mpc8641_hpcn.dts

mpc8641_hpcn_36b.dts

mpc8641si-post.dtsi

p1020rdb-pc.dtsi

mpc832x_rdb.dts

+64 -64

arch/powerpc/boot/dts/fsl/mpc8641_hpcn.dts

··· 169 169 interrupt-map-mask = <0xff00 0 0 7>; 170 170 interrupt-map = < 171 171 /* IDSEL 0x11 func 0 - PCI slot 1 */ 172 - 0x8800 0 0 1 &mpic 2 1 173 - 0x8800 0 0 2 &mpic 3 1 174 - 0x8800 0 0 3 &mpic 4 1 175 - 0x8800 0 0 4 &mpic 1 1 172 + 0x8800 0 0 1 &mpic 2 1 0 0 173 + 0x8800 0 0 2 &mpic 3 1 0 0 174 + 0x8800 0 0 3 &mpic 4 1 0 0 175 + 0x8800 0 0 4 &mpic 1 1 0 0 176 176 177 177 /* IDSEL 0x11 func 1 - PCI slot 1 */ 178 - 0x8900 0 0 1 &mpic 2 1 179 - 0x8900 0 0 2 &mpic 3 1 180 - 0x8900 0 0 3 &mpic 4 1 181 - 0x8900 0 0 4 &mpic 1 1 178 + 0x8900 0 0 1 &mpic 2 1 0 0 179 + 0x8900 0 0 2 &mpic 3 1 0 0 180 + 0x8900 0 0 3 &mpic 4 1 0 0 181 + 0x8900 0 0 4 &mpic 1 1 0 0 182 182 183 183 /* IDSEL 0x11 func 2 - PCI slot 1 */ 184 - 0x8a00 0 0 1 &mpic 2 1 185 - 0x8a00 0 0 2 &mpic 3 1 186 - 0x8a00 0 0 3 &mpic 4 1 187 - 0x8a00 0 0 4 &mpic 1 1 184 + 0x8a00 0 0 1 &mpic 2 1 0 0 185 + 0x8a00 0 0 2 &mpic 3 1 0 0 186 + 0x8a00 0 0 3 &mpic 4 1 0 0 187 + 0x8a00 0 0 4 &mpic 1 1 0 0 188 188 189 189 /* IDSEL 0x11 func 3 - PCI slot 1 */ 190 - 0x8b00 0 0 1 &mpic 2 1 191 - 0x8b00 0 0 2 &mpic 3 1 192 - 0x8b00 0 0 3 &mpic 4 1 193 - 0x8b00 0 0 4 &mpic 1 1 190 + 0x8b00 0 0 1 &mpic 2 1 0 0 191 + 0x8b00 0 0 2 &mpic 3 1 0 0 192 + 0x8b00 0 0 3 &mpic 4 1 0 0 193 + 0x8b00 0 0 4 &mpic 1 1 0 0 194 194 195 195 /* IDSEL 0x11 func 4 - PCI slot 1 */ 196 - 0x8c00 0 0 1 &mpic 2 1 197 - 0x8c00 0 0 2 &mpic 3 1 198 - 0x8c00 0 0 3 &mpic 4 1 199 - 0x8c00 0 0 4 &mpic 1 1 196 + 0x8c00 0 0 1 &mpic 2 1 0 0 197 + 0x8c00 0 0 2 &mpic 3 1 0 0 198 + 0x8c00 0 0 3 &mpic 4 1 0 0 199 + 0x8c00 0 0 4 &mpic 1 1 0 0 200 200 201 201 /* IDSEL 0x11 func 5 - PCI slot 1 */ 202 - 0x8d00 0 0 1 &mpic 2 1 203 - 0x8d00 0 0 2 &mpic 3 1 204 - 0x8d00 0 0 3 &mpic 4 1 205 - 0x8d00 0 0 4 &mpic 1 1 202 + 0x8d00 0 0 1 &mpic 2 1 0 0 203 + 0x8d00 0 0 2 &mpic 3 1 0 0 204 + 0x8d00 0 0 3 &mpic 4 1 0 0 205 + 0x8d00 0 0 4 &mpic 1 1 0 0 206 206 207 207 /* IDSEL 0x11 func 6 - PCI slot 1 */ 208 - 0x8e00 0 0 1 &mpic 2 1 209 - 0x8e00 0 0 2 &mpic 3 1 210 - 0x8e00 0 0 3 &mpic 4 1 211 - 0x8e00 0 0 4 &mpic 1 1 208 + 0x8e00 0 0 1 &mpic 2 1 0 0 209 + 0x8e00 0 0 2 &mpic 3 1 0 0 210 + 0x8e00 0 0 3 &mpic 4 1 0 0 211 + 0x8e00 0 0 4 &mpic 1 1 0 0 212 212 213 213 /* IDSEL 0x11 func 7 - PCI slot 1 */ 214 - 0x8f00 0 0 1 &mpic 2 1 215 - 0x8f00 0 0 2 &mpic 3 1 216 - 0x8f00 0 0 3 &mpic 4 1 217 - 0x8f00 0 0 4 &mpic 1 1 214 + 0x8f00 0 0 1 &mpic 2 1 0 0 215 + 0x8f00 0 0 2 &mpic 3 1 0 0 216 + 0x8f00 0 0 3 &mpic 4 1 0 0 217 + 0x8f00 0 0 4 &mpic 1 1 0 0 218 218 219 219 /* IDSEL 0x12 func 0 - PCI slot 2 */ 220 - 0x9000 0 0 1 &mpic 3 1 221 - 0x9000 0 0 2 &mpic 4 1 222 - 0x9000 0 0 3 &mpic 1 1 223 - 0x9000 0 0 4 &mpic 2 1 220 + 0x9000 0 0 1 &mpic 3 1 0 0 221 + 0x9000 0 0 2 &mpic 4 1 0 0 222 + 0x9000 0 0 3 &mpic 1 1 0 0 223 + 0x9000 0 0 4 &mpic 2 1 0 0 224 224 225 225 /* IDSEL 0x12 func 1 - PCI slot 2 */ 226 - 0x9100 0 0 1 &mpic 3 1 227 - 0x9100 0 0 2 &mpic 4 1 228 - 0x9100 0 0 3 &mpic 1 1 229 - 0x9100 0 0 4 &mpic 2 1 226 + 0x9100 0 0 1 &mpic 3 1 0 0 227 + 0x9100 0 0 2 &mpic 4 1 0 0 228 + 0x9100 0 0 3 &mpic 1 1 0 0 229 + 0x9100 0 0 4 &mpic 2 1 0 0 230 230 231 231 /* IDSEL 0x12 func 2 - PCI slot 2 */ 232 - 0x9200 0 0 1 &mpic 3 1 233 - 0x9200 0 0 2 &mpic 4 1 234 - 0x9200 0 0 3 &mpic 1 1 235 - 0x9200 0 0 4 &mpic 2 1 232 + 0x9200 0 0 1 &mpic 3 1 0 0 233 + 0x9200 0 0 2 &mpic 4 1 0 0 234 + 0x9200 0 0 3 &mpic 1 1 0 0 235 + 0x9200 0 0 4 &mpic 2 1 0 0 236 236 237 237 /* IDSEL 0x12 func 3 - PCI slot 2 */ 238 - 0x9300 0 0 1 &mpic 3 1 239 - 0x9300 0 0 2 &mpic 4 1 240 - 0x9300 0 0 3 &mpic 1 1 241 - 0x9300 0 0 4 &mpic 2 1 238 + 0x9300 0 0 1 &mpic 3 1 0 0 239 + 0x9300 0 0 2 &mpic 4 1 0 0 240 + 0x9300 0 0 3 &mpic 1 1 0 0 241 + 0x9300 0 0 4 &mpic 2 1 0 0 242 242 243 243 /* IDSEL 0x12 func 4 - PCI slot 2 */ 244 - 0x9400 0 0 1 &mpic 3 1 245 - 0x9400 0 0 2 &mpic 4 1 246 - 0x9400 0 0 3 &mpic 1 1 247 - 0x9400 0 0 4 &mpic 2 1 244 + 0x9400 0 0 1 &mpic 3 1 0 0 245 + 0x9400 0 0 2 &mpic 4 1 0 0 246 + 0x9400 0 0 3 &mpic 1 1 0 0 247 + 0x9400 0 0 4 &mpic 2 1 0 0 248 248 249 249 /* IDSEL 0x12 func 5 - PCI slot 2 */ 250 - 0x9500 0 0 1 &mpic 3 1 251 - 0x9500 0 0 2 &mpic 4 1 252 - 0x9500 0 0 3 &mpic 1 1 253 - 0x9500 0 0 4 &mpic 2 1 250 + 0x9500 0 0 1 &mpic 3 1 0 0 251 + 0x9500 0 0 2 &mpic 4 1 0 0 252 + 0x9500 0 0 3 &mpic 1 1 0 0 253 + 0x9500 0 0 4 &mpic 2 1 0 0 254 254 255 255 /* IDSEL 0x12 func 6 - PCI slot 2 */ 256 - 0x9600 0 0 1 &mpic 3 1 257 - 0x9600 0 0 2 &mpic 4 1 258 - 0x9600 0 0 3 &mpic 1 1 259 - 0x9600 0 0 4 &mpic 2 1 256 + 0x9600 0 0 1 &mpic 3 1 0 0 257 + 0x9600 0 0 2 &mpic 4 1 0 0 258 + 0x9600 0 0 3 &mpic 1 1 0 0 259 + 0x9600 0 0 4 &mpic 2 1 0 0 260 260 261 261 /* IDSEL 0x12 func 7 - PCI slot 2 */ 262 - 0x9700 0 0 1 &mpic 3 1 263 - 0x9700 0 0 2 &mpic 4 1 264 - 0x9700 0 0 3 &mpic 1 1 265 - 0x9700 0 0 4 &mpic 2 1 262 + 0x9700 0 0 1 &mpic 3 1 0 0 263 + 0x9700 0 0 2 &mpic 4 1 0 0 264 + 0x9700 0 0 3 &mpic 1 1 0 0 265 + 0x9700 0 0 4 &mpic 2 1 0 0 266 266 267 267 // IDSEL 0x1c USB 268 268 0xe000 0 0 1 &i8259 12 2

+64 -64

arch/powerpc/boot/dts/fsl/mpc8641_hpcn_36b.dts

··· 136 136 interrupt-map-mask = <0xff00 0 0 7>; 137 137 interrupt-map = < 138 138 /* IDSEL 0x11 func 0 - PCI slot 1 */ 139 - 0x8800 0 0 1 &mpic 2 1 140 - 0x8800 0 0 2 &mpic 3 1 141 - 0x8800 0 0 3 &mpic 4 1 142 - 0x8800 0 0 4 &mpic 1 1 139 + 0x8800 0 0 1 &mpic 2 1 0 0 140 + 0x8800 0 0 2 &mpic 3 1 0 0 141 + 0x8800 0 0 3 &mpic 4 1 0 0 142 + 0x8800 0 0 4 &mpic 1 1 0 0 143 143 144 144 /* IDSEL 0x11 func 1 - PCI slot 1 */ 145 - 0x8900 0 0 1 &mpic 2 1 146 - 0x8900 0 0 2 &mpic 3 1 147 - 0x8900 0 0 3 &mpic 4 1 148 - 0x8900 0 0 4 &mpic 1 1 145 + 0x8900 0 0 1 &mpic 2 1 0 0 146 + 0x8900 0 0 2 &mpic 3 1 0 0 147 + 0x8900 0 0 3 &mpic 4 1 0 0 148 + 0x8900 0 0 4 &mpic 1 1 0 0 149 149 150 150 /* IDSEL 0x11 func 2 - PCI slot 1 */ 151 - 0x8a00 0 0 1 &mpic 2 1 152 - 0x8a00 0 0 2 &mpic 3 1 153 - 0x8a00 0 0 3 &mpic 4 1 154 - 0x8a00 0 0 4 &mpic 1 1 151 + 0x8a00 0 0 1 &mpic 2 1 0 0 152 + 0x8a00 0 0 2 &mpic 3 1 0 0 153 + 0x8a00 0 0 3 &mpic 4 1 0 0 154 + 0x8a00 0 0 4 &mpic 1 1 0 0 155 155 156 156 /* IDSEL 0x11 func 3 - PCI slot 1 */ 157 - 0x8b00 0 0 1 &mpic 2 1 158 - 0x8b00 0 0 2 &mpic 3 1 159 - 0x8b00 0 0 3 &mpic 4 1 160 - 0x8b00 0 0 4 &mpic 1 1 157 + 0x8b00 0 0 1 &mpic 2 1 0 0 158 + 0x8b00 0 0 2 &mpic 3 1 0 0 159 + 0x8b00 0 0 3 &mpic 4 1 0 0 160 + 0x8b00 0 0 4 &mpic 1 1 0 0 161 161 162 162 /* IDSEL 0x11 func 4 - PCI slot 1 */ 163 - 0x8c00 0 0 1 &mpic 2 1 164 - 0x8c00 0 0 2 &mpic 3 1 165 - 0x8c00 0 0 3 &mpic 4 1 166 - 0x8c00 0 0 4 &mpic 1 1 163 + 0x8c00 0 0 1 &mpic 2 1 0 0 164 + 0x8c00 0 0 2 &mpic 3 1 0 0 165 + 0x8c00 0 0 3 &mpic 4 1 0 0 166 + 0x8c00 0 0 4 &mpic 1 1 0 0 167 167 168 168 /* IDSEL 0x11 func 5 - PCI slot 1 */ 169 - 0x8d00 0 0 1 &mpic 2 1 170 - 0x8d00 0 0 2 &mpic 3 1 171 - 0x8d00 0 0 3 &mpic 4 1 172 - 0x8d00 0 0 4 &mpic 1 1 169 + 0x8d00 0 0 1 &mpic 2 1 0 0 170 + 0x8d00 0 0 2 &mpic 3 1 0 0 171 + 0x8d00 0 0 3 &mpic 4 1 0 0 172 + 0x8d00 0 0 4 &mpic 1 1 0 0 173 173 174 174 /* IDSEL 0x11 func 6 - PCI slot 1 */ 175 - 0x8e00 0 0 1 &mpic 2 1 176 - 0x8e00 0 0 2 &mpic 3 1 177 - 0x8e00 0 0 3 &mpic 4 1 178 - 0x8e00 0 0 4 &mpic 1 1 175 + 0x8e00 0 0 1 &mpic 2 1 0 0 176 + 0x8e00 0 0 2 &mpic 3 1 0 0 177 + 0x8e00 0 0 3 &mpic 4 1 0 0 178 + 0x8e00 0 0 4 &mpic 1 1 0 0 179 179 180 180 /* IDSEL 0x11 func 7 - PCI slot 1 */ 181 - 0x8f00 0 0 1 &mpic 2 1 182 - 0x8f00 0 0 2 &mpic 3 1 183 - 0x8f00 0 0 3 &mpic 4 1 184 - 0x8f00 0 0 4 &mpic 1 1 181 + 0x8f00 0 0 1 &mpic 2 1 0 0 182 + 0x8f00 0 0 2 &mpic 3 1 0 0 183 + 0x8f00 0 0 3 &mpic 4 1 0 0 184 + 0x8f00 0 0 4 &mpic 1 1 0 0 185 185 186 186 /* IDSEL 0x12 func 0 - PCI slot 2 */ 187 - 0x9000 0 0 1 &mpic 3 1 188 - 0x9000 0 0 2 &mpic 4 1 189 - 0x9000 0 0 3 &mpic 1 1 190 - 0x9000 0 0 4 &mpic 2 1 187 + 0x9000 0 0 1 &mpic 3 1 0 0 188 + 0x9000 0 0 2 &mpic 4 1 0 0 189 + 0x9000 0 0 3 &mpic 1 1 0 0 190 + 0x9000 0 0 4 &mpic 2 1 0 0 191 191 192 192 /* IDSEL 0x12 func 1 - PCI slot 2 */ 193 - 0x9100 0 0 1 &mpic 3 1 194 - 0x9100 0 0 2 &mpic 4 1 195 - 0x9100 0 0 3 &mpic 1 1 196 - 0x9100 0 0 4 &mpic 2 1 193 + 0x9100 0 0 1 &mpic 3 1 0 0 194 + 0x9100 0 0 2 &mpic 4 1 0 0 195 + 0x9100 0 0 3 &mpic 1 1 0 0 196 + 0x9100 0 0 4 &mpic 2 1 0 0 197 197 198 198 /* IDSEL 0x12 func 2 - PCI slot 2 */ 199 - 0x9200 0 0 1 &mpic 3 1 200 - 0x9200 0 0 2 &mpic 4 1 201 - 0x9200 0 0 3 &mpic 1 1 202 - 0x9200 0 0 4 &mpic 2 1 199 + 0x9200 0 0 1 &mpic 3 1 0 0 200 + 0x9200 0 0 2 &mpic 4 1 0 0 201 + 0x9200 0 0 3 &mpic 1 1 0 0 202 + 0x9200 0 0 4 &mpic 2 1 0 0 203 203 204 204 /* IDSEL 0x12 func 3 - PCI slot 2 */ 205 - 0x9300 0 0 1 &mpic 3 1 206 - 0x9300 0 0 2 &mpic 4 1 207 - 0x9300 0 0 3 &mpic 1 1 208 - 0x9300 0 0 4 &mpic 2 1 205 + 0x9300 0 0 1 &mpic 3 1 0 0 206 + 0x9300 0 0 2 &mpic 4 1 0 0 207 + 0x9300 0 0 3 &mpic 1 1 0 0 208 + 0x9300 0 0 4 &mpic 2 1 0 0 209 209 210 210 /* IDSEL 0x12 func 4 - PCI slot 2 */ 211 - 0x9400 0 0 1 &mpic 3 1 212 - 0x9400 0 0 2 &mpic 4 1 213 - 0x9400 0 0 3 &mpic 1 1 214 - 0x9400 0 0 4 &mpic 2 1 211 + 0x9400 0 0 1 &mpic 3 1 0 0 212 + 0x9400 0 0 2 &mpic 4 1 0 0 213 + 0x9400 0 0 3 &mpic 1 1 0 0 214 + 0x9400 0 0 4 &mpic 2 1 0 0 215 215 216 216 /* IDSEL 0x12 func 5 - PCI slot 2 */ 217 - 0x9500 0 0 1 &mpic 3 1 218 - 0x9500 0 0 2 &mpic 4 1 219 - 0x9500 0 0 3 &mpic 1 1 220 - 0x9500 0 0 4 &mpic 2 1 217 + 0x9500 0 0 1 &mpic 3 1 0 0 218 + 0x9500 0 0 2 &mpic 4 1 0 0 219 + 0x9500 0 0 3 &mpic 1 1 0 0 220 + 0x9500 0 0 4 &mpic 2 1 0 0 221 221 222 222 /* IDSEL 0x12 func 6 - PCI slot 2 */ 223 - 0x9600 0 0 1 &mpic 3 1 224 - 0x9600 0 0 2 &mpic 4 1 225 - 0x9600 0 0 3 &mpic 1 1 226 - 0x9600 0 0 4 &mpic 2 1 223 + 0x9600 0 0 1 &mpic 3 1 0 0 224 + 0x9600 0 0 2 &mpic 4 1 0 0 225 + 0x9600 0 0 3 &mpic 1 1 0 0 226 + 0x9600 0 0 4 &mpic 2 1 0 0 227 227 228 228 /* IDSEL 0x12 func 7 - PCI slot 2 */ 229 - 0x9700 0 0 1 &mpic 3 1 230 - 0x9700 0 0 2 &mpic 4 1 231 - 0x9700 0 0 3 &mpic 1 1 232 - 0x9700 0 0 4 &mpic 2 1 229 + 0x9700 0 0 1 &mpic 3 1 0 0 230 + 0x9700 0 0 2 &mpic 4 1 0 0 231 + 0x9700 0 0 3 &mpic 1 1 0 0 232 + 0x9700 0 0 4 &mpic 2 1 0 0 233 233 234 234 // IDSEL 0x1c USB 235 235 0xe000 0 0 1 &i8259 12 2

arch/powerpc/boot/dts/fsl/mpc8641si-post.dtsi

··· 97 97 &pci0 { 98 98 compatible = "fsl,mpc8641-pcie"; 99 99 device_type = "pci"; 100 + #interrupt-cells = <1>; 100 101 #size-cells = <2>; 101 102 #address-cells = <3>; 102 103 bus-range = <0x0 0xff>; ··· 124 123 &pci1 { 125 124 compatible = "fsl,mpc8641-pcie"; 126 125 device_type = "pci"; 126 + #interrupt-cells = <1>; 127 127 #size-cells = <2>; 128 128 #address-cells = <3>; 129 129 bus-range = <0x0 0xff>;

+2 -2

arch/powerpc/boot/dts/fsl/p1020rdb-pc.dtsi

··· 205 205 mdio@24000 { 206 206 phy0: ethernet-phy@0 { 207 207 interrupt-parent = <&mpic>; 208 - interrupts = <3 1>; 208 + interrupts = <3 1 0 0>; 209 209 reg = <0x0>; 210 210 }; 211 211 212 212 phy1: ethernet-phy@1 { 213 213 interrupt-parent = <&mpic>; 214 - interrupts = <2 1>; 214 + interrupts = <2 1 0 0>; 215 215 reg = <0x1>; 216 216 }; 217 217

-4

arch/powerpc/boot/dts/mpc832x_rdb.dts

··· 311 311 compatible = "fsl,ucc-mdio"; 312 312 313 313 phy00:ethernet-phy@0 { 314 - interrupt-parent = <&ipic>; 315 - interrupts = <0>; 316 314 reg = <0x0>; 317 315 }; 318 316 phy04:ethernet-phy@4 { 319 - interrupt-parent = <&ipic>; 320 - interrupts = <0>; 321 317 reg = <0x4>; 322 318 }; 323 319 };