Edward A. James | 7bd8637 | 2017-05-15 12:28:44 -0500 | [diff] [blame] | 1 | From e45cd4677a36eb759537f59c5f5bcf46b91728b3 Mon Sep 17 00:00:00 2001 |
| 2 | From: "Edward A. James" <eajames@us.ibm.com> |
| 3 | Date: Mon, 15 May 2017 11:02:48 -0500 |
| 4 | Subject: [PATCH linux dev-4.10] arm: dts: aspeed: Add FSI devices |
| 5 | |
| 6 | using Jeremy's new bindings |
| 7 | |
| 8 | Signed-off-by: Edward A. James <eajames@us.ibm.com> |
| 9 | --- |
| 10 | arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts | 75 ++++++++++ |
| 11 | arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts | 181 +++++++++++++++++++++++ |
| 12 | arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts | 181 +++++++++++++++++++++++ |
| 13 | 3 files changed, 437 insertions(+) |
| 14 | |
| 15 | diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts b/arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts |
| 16 | index b4faa1d..6f23ce3 100644 |
| 17 | --- a/arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts |
| 18 | +++ b/arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts |
| 19 | @@ -85,12 +85,87 @@ |
| 20 | |
| 21 | gpio-fsi { |
| 22 | compatible = "fsi-master-gpio", "fsi-master"; |
| 23 | + #address-cells = <2>; |
| 24 | + #size-cells = <0>; |
| 25 | |
| 26 | clock-gpios = <&gpio ASPEED_GPIO(A, 4) GPIO_ACTIVE_HIGH>; |
| 27 | data-gpios = <&gpio ASPEED_GPIO(A, 5) GPIO_ACTIVE_HIGH>; |
| 28 | mux-gpios = <&gpio ASPEED_GPIO(A, 6) GPIO_ACTIVE_HIGH>; |
| 29 | enable-gpios = <&gpio ASPEED_GPIO(D, 0) GPIO_ACTIVE_HIGH>; |
| 30 | trans-gpios = <&gpio ASPEED_GPIO(H, 6) GPIO_ACTIVE_HIGH>; |
| 31 | + |
| 32 | + cfam@0,0 { |
| 33 | + reg = <0 0>; |
| 34 | + #address-cells = <1>; |
| 35 | + #size-cells = <1>; |
| 36 | + |
| 37 | + i2c-master@1800 { |
| 38 | + compatible = "ibm,fsi-i2c-master"; |
| 39 | + reg = <0x1800 0x400>; |
| 40 | + #address-cells = <1>; |
| 41 | + #size-cells = <0>; |
| 42 | + |
| 43 | + port@0 { |
| 44 | + port = <0>; |
| 45 | + }; |
| 46 | + |
| 47 | + port@1 { |
| 48 | + port = <1>; |
| 49 | + }; |
| 50 | + |
| 51 | + port@2 { |
| 52 | + port = <2>; |
| 53 | + }; |
| 54 | + |
| 55 | + port@3 { |
| 56 | + port = <3>; |
| 57 | + }; |
| 58 | + |
| 59 | + port@4 { |
| 60 | + port = <4>; |
| 61 | + }; |
| 62 | + |
| 63 | + port@5 { |
| 64 | + port = <5>; |
| 65 | + }; |
| 66 | + |
| 67 | + port@6 { |
| 68 | + port = <6>; |
| 69 | + }; |
| 70 | + |
| 71 | + port@7 { |
| 72 | + port = <7>; |
| 73 | + }; |
| 74 | + |
| 75 | + port@8 { |
| 76 | + port = <8>; |
| 77 | + }; |
| 78 | + |
| 79 | + port@9 { |
| 80 | + port = <9>; |
| 81 | + }; |
| 82 | + |
| 83 | + port@10 { |
| 84 | + port = <10>; |
| 85 | + }; |
| 86 | + |
| 87 | + port@11 { |
| 88 | + port = <11>; |
| 89 | + }; |
| 90 | + |
| 91 | + port@12 { |
| 92 | + port = <12>; |
| 93 | + }; |
| 94 | + |
| 95 | + port@13 { |
| 96 | + port = <13>; |
| 97 | + }; |
| 98 | + |
| 99 | + port@14 { |
| 100 | + port = <14>; |
| 101 | + }; |
| 102 | + }; |
| 103 | + }; |
| 104 | }; |
| 105 | }; |
| 106 | |
| 107 | diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts b/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts |
| 108 | index f20aaf4..5d83a76 100644 |
| 109 | --- a/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts |
| 110 | +++ b/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts |
| 111 | @@ -65,6 +65,8 @@ |
| 112 | |
| 113 | gpio-fsi { |
| 114 | compatible = "fsi-master-gpio", "fsi-master"; |
| 115 | + #address-cells = <2>; |
| 116 | + #size-cells = <0>; |
| 117 | |
| 118 | status = "okay"; |
| 119 | |
| 120 | @@ -73,6 +75,185 @@ |
| 121 | mux-gpios = <&gpio ASPEED_GPIO(A, 6) GPIO_ACTIVE_HIGH>; |
| 122 | enable-gpios = <&gpio ASPEED_GPIO(D, 0) GPIO_ACTIVE_HIGH>; |
| 123 | trans-gpios = <&gpio ASPEED_GPIO(R, 2) GPIO_ACTIVE_HIGH>; |
| 124 | + |
| 125 | + cfam@0,0 { |
| 126 | + reg = <0 0>; |
| 127 | + #address-cells = <1>; |
| 128 | + #size-cells = <1>; |
| 129 | + |
| 130 | + i2c-master@1800 { |
| 131 | + compatible = "ibm,fsi-i2c-master"; |
| 132 | + reg = <0x1800 0x400>; |
| 133 | + #address-cells = <1>; |
| 134 | + #size-cells = <0>; |
| 135 | + |
| 136 | + port@0 { |
| 137 | + port = <0>; |
| 138 | + }; |
| 139 | + |
| 140 | + port@1 { |
| 141 | + port = <1>; |
| 142 | + }; |
| 143 | + |
| 144 | + port@2 { |
| 145 | + port = <2>; |
| 146 | + }; |
| 147 | + |
| 148 | + port@3 { |
| 149 | + port = <3>; |
| 150 | + }; |
| 151 | + |
| 152 | + port@4 { |
| 153 | + port = <4>; |
| 154 | + }; |
| 155 | + |
| 156 | + port@5 { |
| 157 | + port = <5>; |
| 158 | + }; |
| 159 | + |
| 160 | + port@6 { |
| 161 | + port = <6>; |
| 162 | + }; |
| 163 | + |
| 164 | + port@7 { |
| 165 | + port = <7>; |
| 166 | + }; |
| 167 | + |
| 168 | + port@8 { |
| 169 | + port = <8>; |
| 170 | + }; |
| 171 | + |
| 172 | + port@9 { |
| 173 | + port = <9>; |
| 174 | + }; |
| 175 | + |
| 176 | + port@10 { |
| 177 | + port = <10>; |
| 178 | + }; |
| 179 | + |
| 180 | + port@11 { |
| 181 | + port = <11>; |
| 182 | + }; |
| 183 | + |
| 184 | + port@12 { |
| 185 | + port = <12>; |
| 186 | + }; |
| 187 | + |
| 188 | + port@13 { |
| 189 | + port = <13>; |
| 190 | + }; |
| 191 | + |
| 192 | + port@14 { |
| 193 | + port = <14>; |
| 194 | + }; |
| 195 | + }; |
| 196 | + |
| 197 | + sbefifo@2400 { |
| 198 | + compatible = "ibm,p9-sbefifo"; |
| 199 | + reg = <0x2400 0x400>; |
| 200 | + #address-cells = <1>; |
| 201 | + #size-cells = <0>; |
| 202 | + |
| 203 | + occ@1 { |
| 204 | + compatible = "ibm,p9-occ"; |
| 205 | + reg = <1>; |
| 206 | + }; |
| 207 | + }; |
| 208 | + |
| 209 | + hub@3400 { |
| 210 | + compatible = "fsi-master-hub"; |
| 211 | + reg = <0x3400 0x400>; |
| 212 | + #address-cells = <2>; |
| 213 | + #size-cells = <0>; |
| 214 | + |
| 215 | + cfam@1,0 { |
| 216 | + reg = <1 0>; |
| 217 | + #address-cells = <1>; |
| 218 | + #size-cells = <1>; |
| 219 | + |
| 220 | + i2c-master@1800 { |
| 221 | + compatible = |
| 222 | + "ibm,fsi-i2c-master"; |
| 223 | + reg = <0x1800 0x400>; |
| 224 | + #address-cells = <1>; |
| 225 | + #size-cells = <0>; |
| 226 | + |
| 227 | + port@0 { |
| 228 | + port = <0>; |
| 229 | + }; |
| 230 | + |
| 231 | + port@1 { |
| 232 | + port = <1>; |
| 233 | + }; |
| 234 | + |
| 235 | + port@2 { |
| 236 | + port = <2>; |
| 237 | + }; |
| 238 | + |
| 239 | + port@3 { |
| 240 | + port = <3>; |
| 241 | + }; |
| 242 | + |
| 243 | + port@4 { |
| 244 | + port = <4>; |
| 245 | + }; |
| 246 | + |
| 247 | + port@5 { |
| 248 | + port = <5>; |
| 249 | + }; |
| 250 | + |
| 251 | + port@6 { |
| 252 | + port = <6>; |
| 253 | + }; |
| 254 | + |
| 255 | + port@7 { |
| 256 | + port = <7>; |
| 257 | + }; |
| 258 | + |
| 259 | + port@8 { |
| 260 | + port = <8>; |
| 261 | + }; |
| 262 | + |
| 263 | + port@9 { |
| 264 | + port = <9>; |
| 265 | + }; |
| 266 | + |
| 267 | + port@10 { |
| 268 | + port = <10>; |
| 269 | + }; |
| 270 | + |
| 271 | + port@11 { |
| 272 | + port = <11>; |
| 273 | + }; |
| 274 | + |
| 275 | + port@12 { |
| 276 | + port = <12>; |
| 277 | + }; |
| 278 | + |
| 279 | + port@13 { |
| 280 | + port = <13>; |
| 281 | + }; |
| 282 | + |
| 283 | + port@14 { |
| 284 | + port = <14>; |
| 285 | + }; |
| 286 | + }; |
| 287 | + |
| 288 | + sbefifo@2400 { |
| 289 | + compatible = "ibm,p9-sbefifo"; |
| 290 | + reg = <0x2400 0x400>; |
| 291 | + #address-cells = <1>; |
| 292 | + #size-cells = <0>; |
| 293 | + |
| 294 | + occ@2 { |
| 295 | + compatible = |
| 296 | + "ibm,p9-occ"; |
| 297 | + reg = <2>; |
| 298 | + }; |
| 299 | + }; |
| 300 | + }; |
| 301 | + }; |
| 302 | + }; |
| 303 | }; |
| 304 | |
| 305 | iio-hwmon { |
| 306 | diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts b/arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts |
| 307 | index b5c4c0f..6f36e56 100644 |
| 308 | --- a/arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts |
| 309 | +++ b/arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts |
| 310 | @@ -77,6 +77,8 @@ |
| 311 | |
| 312 | gpio-fsi { |
| 313 | compatible = "fsi-master-gpio", "fsi-master"; |
| 314 | + #address-cells = <2>; |
| 315 | + #size-cells = <0>; |
| 316 | |
| 317 | status = "okay"; |
| 318 | |
| 319 | @@ -85,6 +87,185 @@ |
| 320 | trans-gpios = <&gpio ASPEED_GPIO(O, 6) GPIO_ACTIVE_HIGH>; |
| 321 | enable-gpios = <&gpio ASPEED_GPIO(D, 0) GPIO_ACTIVE_HIGH>; |
| 322 | mux-gpios = <&gpio ASPEED_GPIO(P, 6) GPIO_ACTIVE_HIGH>; |
| 323 | + |
| 324 | + cfam@0,0 { |
| 325 | + reg = <0 0>; |
| 326 | + #address-cells = <1>; |
| 327 | + #size-cells = <1>; |
| 328 | + |
| 329 | + i2c-master@1800 { |
| 330 | + compatible = "ibm,fsi-i2c-master"; |
| 331 | + reg = <0x1800 0x400>; |
| 332 | + #address-cells = <1>; |
| 333 | + #size-cells = <0>; |
| 334 | + |
| 335 | + port@0 { |
| 336 | + port = <0>; |
| 337 | + }; |
| 338 | + |
| 339 | + port@1 { |
| 340 | + port = <1>; |
| 341 | + }; |
| 342 | + |
| 343 | + port@2 { |
| 344 | + port = <2>; |
| 345 | + }; |
| 346 | + |
| 347 | + port@3 { |
| 348 | + port = <3>; |
| 349 | + }; |
| 350 | + |
| 351 | + port@4 { |
| 352 | + port = <4>; |
| 353 | + }; |
| 354 | + |
| 355 | + port@5 { |
| 356 | + port = <5>; |
| 357 | + }; |
| 358 | + |
| 359 | + port@6 { |
| 360 | + port = <6>; |
| 361 | + }; |
| 362 | + |
| 363 | + port@7 { |
| 364 | + port = <7>; |
| 365 | + }; |
| 366 | + |
| 367 | + port@8 { |
| 368 | + port = <8>; |
| 369 | + }; |
| 370 | + |
| 371 | + port@9 { |
| 372 | + port = <9>; |
| 373 | + }; |
| 374 | + |
| 375 | + port@10 { |
| 376 | + port = <10>; |
| 377 | + }; |
| 378 | + |
| 379 | + port@11 { |
| 380 | + port = <11>; |
| 381 | + }; |
| 382 | + |
| 383 | + port@12 { |
| 384 | + port = <12>; |
| 385 | + }; |
| 386 | + |
| 387 | + port@13 { |
| 388 | + port = <13>; |
| 389 | + }; |
| 390 | + |
| 391 | + port@14 { |
| 392 | + port = <14>; |
| 393 | + }; |
| 394 | + }; |
| 395 | + |
| 396 | + sbefifo@2400 { |
| 397 | + compatible = "ibm,p9-sbefifo"; |
| 398 | + reg = <0x2400 0x400>; |
| 399 | + #address-cells = <1>; |
| 400 | + #size-cells = <0>; |
| 401 | + |
| 402 | + occ@1 { |
| 403 | + compatible = "ibm,p9-occ"; |
| 404 | + reg = <1>; |
| 405 | + }; |
| 406 | + }; |
| 407 | + |
| 408 | + hub@3400 { |
| 409 | + compatible = "fsi-master-hub"; |
| 410 | + reg = <0x3400 0x400>; |
| 411 | + #address-cells = <2>; |
| 412 | + #size-cells = <0>; |
| 413 | + |
| 414 | + cfam@1,0 { |
| 415 | + reg = <1 0>; |
| 416 | + #address-cells = <1>; |
| 417 | + #size-cells = <1>; |
| 418 | + |
| 419 | + i2c-master@1800 { |
| 420 | + compatible = |
| 421 | + "ibm,fsi-i2c-master"; |
| 422 | + reg = <0x1800 0x400>; |
| 423 | + #address-cells = <1>; |
| 424 | + #size-cells = <0>; |
| 425 | + |
| 426 | + port@0 { |
| 427 | + port = <0>; |
| 428 | + }; |
| 429 | + |
| 430 | + port@1 { |
| 431 | + port = <1>; |
| 432 | + }; |
| 433 | + |
| 434 | + port@2 { |
| 435 | + port = <2>; |
| 436 | + }; |
| 437 | + |
| 438 | + port@3 { |
| 439 | + port = <3>; |
| 440 | + }; |
| 441 | + |
| 442 | + port@4 { |
| 443 | + port = <4>; |
| 444 | + }; |
| 445 | + |
| 446 | + port@5 { |
| 447 | + port = <5>; |
| 448 | + }; |
| 449 | + |
| 450 | + port@6 { |
| 451 | + port = <6>; |
| 452 | + }; |
| 453 | + |
| 454 | + port@7 { |
| 455 | + port = <7>; |
| 456 | + }; |
| 457 | + |
| 458 | + port@8 { |
| 459 | + port = <8>; |
| 460 | + }; |
| 461 | + |
| 462 | + port@9 { |
| 463 | + port = <9>; |
| 464 | + }; |
| 465 | + |
| 466 | + port@10 { |
| 467 | + port = <10>; |
| 468 | + }; |
| 469 | + |
| 470 | + port@11 { |
| 471 | + port = <11>; |
| 472 | + }; |
| 473 | + |
| 474 | + port@12 { |
| 475 | + port = <12>; |
| 476 | + }; |
| 477 | + |
| 478 | + port@13 { |
| 479 | + port = <13>; |
| 480 | + }; |
| 481 | + |
| 482 | + port@14 { |
| 483 | + port = <14>; |
| 484 | + }; |
| 485 | + }; |
| 486 | + |
| 487 | + sbefifo@2400 { |
| 488 | + compatible = "ibm,p9-sbefifo"; |
| 489 | + reg = <0x2400 0x400>; |
| 490 | + #address-cells = <1>; |
| 491 | + #size-cells = <0>; |
| 492 | + |
| 493 | + occ@2 { |
| 494 | + compatible = |
| 495 | + "ibm,p9-occ"; |
| 496 | + reg = <2>; |
| 497 | + }; |
| 498 | + }; |
| 499 | + }; |
| 500 | + }; |
| 501 | + }; |
| 502 | }; |
| 503 | |
| 504 | iio-hwmon { |
| 505 | -- |
| 506 | 1.8.3.1 |
| 507 | |