target/linux/brcm2708/patches-4.4/0187-BCM270X_DT-Use-spidev-labels-in-overlays.patch

   1 From 33de40886f08899a438a12e26c50d0e6d025775e Mon Sep 17 00:00:00 2001
   2 From: Phil Elwell <phil@raspberrypi.org>
   3 Date: Tue, 15 Mar 2016 16:27:26 +0000
   4 Subject: [PATCH 187/304] BCM270X_DT: Use spidev labels in overlays
   5
   6 ---
   7  arch/arm/boot/dts/overlays/ads7846-overlay.dts     | 22 ++++++++++-------
   8  arch/arm/boot/dts/overlays/at86rf233-overlay.dts   | 11 +++++----
   9  arch/arm/boot/dts/overlays/enc28j60-overlay.dts    | 11 +++++----
  10  arch/arm/boot/dts/overlays/hy28a-overlay.dts       | 22 ++++++++++-------
  11  arch/arm/boot/dts/overlays/hy28b-overlay.dts       | 22 ++++++++++-------
  12  .../arm/boot/dts/overlays/mcp2515-can0-overlay.dts | 16 ++++++++-----
  13  .../arm/boot/dts/overlays/mcp2515-can1-overlay.dts | 16 ++++++++-----
  14  arch/arm/boot/dts/overlays/mz61581-overlay.dts     | 22 ++++++++++-------
  15  arch/arm/boot/dts/overlays/piscreen-overlay.dts    | 22 ++++++++++-------
  16  arch/arm/boot/dts/overlays/piscreen2r-overlay.dts  | 22 ++++++++++-------
  17  .../dts/overlays/pitft28-capacitive-overlay.dts    | 17 +++++++------
  18  .../dts/overlays/pitft28-resistive-overlay.dts     | 24 ++++++++++++-------
  19  arch/arm/boot/dts/overlays/rpi-display-overlay.dts | 22 ++++++++++-------
  20  arch/arm/boot/dts/overlays/tinylcd35-overlay.dts   | 28 +++++++++++++---------
  21  14 files changed, 174 insertions(+), 103 deletions(-)
  22
  23 --- a/arch/arm/boot/dts/overlays/ads7846-overlay.dts
  24 +++ b/arch/arm/boot/dts/overlays/ads7846-overlay.dts
  25 @@ -13,18 +13,24 @@
  26                 target = <&spi0>;
  27                 __overlay__ {
  28                         status = "okay";
  29 +               };
  30 +       };
  31
  32 -                       spidev@0{
  33 -                               status = "disabled";
  34 -                       };
  35 +       fragment@1 {
  36 +               target = <&spidev0>;
  37 +               __overlay__ {
  38 +                       status = "disabled";
  39 +               };
  40 +       };
  41
  42 -                       spidev@1{
  43 -                               status = "disabled";
  44 -                       };
  45 +       fragment@2 {
  46 +               target = <&spidev1>;
  47 +               __overlay__ {
  48 +                       status = "disabled";
  49                 };
  50         };
  51
  52 -       fragment@1 {
  53 +       fragment@3 {
  54                 target = <&gpio>;
  55                 __overlay__ {
  56                         ads7846_pins: ads7846_pins {
  57 @@ -35,7 +41,7 @@
  58                 };
  59         };
  60
  61 -       fragment@2 {
  62 +       fragment@4 {
  63                 target = <&spi0>;
  64                 __overlay__ {
  65                         /* needed to avoid dtc warning */
  66 --- a/arch/arm/boot/dts/overlays/at86rf233-overlay.dts
  67 +++ b/arch/arm/boot/dts/overlays/at86rf233-overlay.dts
  68 @@ -14,10 +14,6 @@
  69
  70                         status = "okay";
  71
  72 -                       spidev@0{
  73 -                               status = "disabled";
  74 -                       };
  75 -
  76                         lowpan0: at86rf233@0 {
  77                                 compatible = "atmel,at86rf233";
  78                                 reg = <0>;
  79 @@ -32,6 +28,13 @@
  80         };
  81
  82         fragment@1 {
  83 +               target = <&spidev0>;
  84 +               __overlay__ {
  85 +                       status = "disabled";
  86 +               };
  87 +       };
  88 +
  89 +       fragment@2 {
  90                 target = <&gpio>;
  91                 __overlay__ {
  92                         lowpan0_pins: lowpan0_pins {
  93 --- a/arch/arm/boot/dts/overlays/enc28j60-overlay.dts
  94 +++ b/arch/arm/boot/dts/overlays/enc28j60-overlay.dts
  95 @@ -14,10 +14,6 @@
  96
  97                         status = "okay";
  98
  99 -                       spidev@0{
 100 -                               status = "disabled";
 101 -                       };
 102 -
 103                         eth1: enc28j60@0{
 104                                 compatible = "microchip,enc28j60";
 105                                 reg = <0>; /* CE0 */
 106 @@ -32,6 +28,13 @@
 107         };
 108
 109         fragment@1 {
 110 +               target = <&spidev0>;
 111 +               __overlay__ {
 112 +                       status = "disabled";
 113 +               };
 114 +       };
 115 +
 116 +       fragment@2 {
 117                 target = <&gpio>;
 118                 __overlay__ {
 119                         eth1_pins: eth1_pins {
 120 --- a/arch/arm/boot/dts/overlays/hy28a-overlay.dts
 121 +++ b/arch/arm/boot/dts/overlays/hy28a-overlay.dts
 122 @@ -13,18 +13,24 @@
 123                 target = <&spi0>;
 124                 __overlay__ {
 125                         status = "okay";
 126 +               };
 127 +       };
 128
 129 -                       spidev@0{
 130 -                               status = "disabled";
 131 -                       };
 132 +       fragment@1 {
 133 +               target = <&spidev0>;
 134 +               __overlay__ {
 135 +                       status = "disabled";
 136 +               };
 137 +       };
 138
 139 -                       spidev@1{
 140 -                               status = "disabled";
 141 -                       };
 142 +       fragment@2 {
 143 +               target = <&spidev1>;
 144 +               __overlay__ {
 145 +                       status = "disabled";
 146                 };
 147         };
 148
 149 -       fragment@1 {
 150 +       fragment@3 {
 151                 target = <&gpio>;
 152                 __overlay__ {
 153                         hy28a_pins: hy28a_pins {
 154 @@ -34,7 +40,7 @@
 155                 };
 156         };
 157
 158 -       fragment@2 {
 159 +       fragment@4 {
 160                 target = <&spi0>;
 161                 __overlay__ {
 162                         /* needed to avoid dtc warning */
 163 --- a/arch/arm/boot/dts/overlays/hy28b-overlay.dts
 164 +++ b/arch/arm/boot/dts/overlays/hy28b-overlay.dts
 165 @@ -13,18 +13,24 @@
 166                 target = <&spi0>;
 167                 __overlay__ {
 168                         status = "okay";
 169 +               };
 170 +       };
 171
 172 -                       spidev@0{
 173 -                               status = "disabled";
 174 -                       };
 175 +       fragment@1 {
 176 +               target = <&spidev0>;
 177 +               __overlay__ {
 178 +                       status = "disabled";
 179 +               };
 180 +       };
 181
 182 -                       spidev@1{
 183 -                               status = "disabled";
 184 -                       };
 185 +       fragment@2 {
 186 +               target = <&spidev1>;
 187 +               __overlay__ {
 188 +                       status = "disabled";
 189                 };
 190         };
 191
 192 -       fragment@1 {
 193 +       fragment@3 {
 194                 target = <&gpio>;
 195                 __overlay__ {
 196                         hy28b_pins: hy28b_pins {
 197 @@ -34,7 +40,7 @@
 198                 };
 199         };
 200
 201 -       fragment@2 {
 202 +       fragment@4 {
 203                 target = <&spi0>;
 204                 __overlay__ {
 205                         /* needed to avoid dtc warning */
 206 --- a/arch/arm/boot/dts/overlays/mcp2515-can0-overlay.dts
 207 +++ b/arch/arm/boot/dts/overlays/mcp2515-can0-overlay.dts
 208 @@ -12,14 +12,18 @@
 209          target = <&spi0>;
 210          __overlay__ {
 211              status = "okay";
 212 -            spidev@0{
 213 -                status = "disabled";
 214 -            };
 215          };
 216      };
 217
 218 -    /* the interrupt pin of the can-controller */
 219      fragment@1 {
 220 +       target = <&spidev0>;
 221 +       __overlay__ {
 222 +           status = "disabled";
 223 +       };
 224 +    };
 225 +
 226 +    /* the interrupt pin of the can-controller */
 227 +    fragment@2 {
 228          target = <&gpio>;
 229          __overlay__ {
 230              can0_pins: can0_pins {
 231 @@ -30,7 +34,7 @@
 232      };
 233
 234      /* the clock/oscillator of the can-controller */
 235 -    fragment@2 {
 236 +    fragment@3 {
 237          target-path = "/clocks";
 238          __overlay__ {
 239              /* external oscillator of mcp2515 on SPI0.0 */
 240 @@ -43,7 +47,7 @@
 241      };
 242
 243      /* the spi config of the can-controller itself binding everything together */
 244 -    fragment@3 {
 245 +    fragment@4 {
 246          target = <&spi0>;
 247          __overlay__ {
 248              /* needed to avoid dtc warning */
 249 --- a/arch/arm/boot/dts/overlays/mcp2515-can1-overlay.dts
 250 +++ b/arch/arm/boot/dts/overlays/mcp2515-can1-overlay.dts
 251 @@ -12,14 +12,18 @@
 252          target = <&spi0>;
 253          __overlay__ {
 254              status = "okay";
 255 -            spidev@1{
 256 -                status = "disabled";
 257 -            };
 258          };
 259      };
 260
 261 -    /* the interrupt pin of the can-controller */
 262      fragment@1 {
 263 +       target = <&spidev1>;
 264 +       __overlay__ {
 265 +           status = "disabled";
 266 +       };
 267 +    };
 268 +
 269 +    /* the interrupt pin of the can-controller */
 270 +    fragment@2 {
 271          target = <&gpio>;
 272          __overlay__ {
 273              can1_pins: can1_pins {
 274 @@ -30,7 +34,7 @@
 275      };
 276
 277      /* the clock/oscillator of the can-controller */
 278 -    fragment@2 {
 279 +    fragment@3 {
 280          target-path = "/clocks";
 281          __overlay__ {
 282              /* external oscillator of mcp2515 on spi0.1 */
 283 @@ -43,7 +47,7 @@
 284      };
 285
 286      /* the spi config of the can-controller itself binding everything together */
 287 -    fragment@3 {
 288 +    fragment@4 {
 289          target = <&spi0>;
 290          __overlay__ {
 291              /* needed to avoid dtc warning */
 292 --- a/arch/arm/boot/dts/overlays/mz61581-overlay.dts
 293 +++ b/arch/arm/boot/dts/overlays/mz61581-overlay.dts
 294 @@ -13,18 +13,24 @@
 295                 target = <&spi0>;
 296                 __overlay__ {
 297                         status = "okay";
 298 +               };
 299 +       };
 300
 301 -                       spidev@0{
 302 -                               status = "disabled";
 303 -                       };
 304 +       fragment@1 {
 305 +               target = <&spidev0>;
 306 +               __overlay__ {
 307 +                       status = "disabled";
 308 +               };
 309 +       };
 310
 311 -                       spidev@1{
 312 -                               status = "disabled";
 313 -                       };
 314 +       fragment@2 {
 315 +               target = <&spidev1>;
 316 +               __overlay__ {
 317 +                       status = "disabled";
 318                 };
 319         };
 320
 321 -       fragment@1 {
 322 +       fragment@3 {
 323                 target = <&gpio>;
 324                 __overlay__ {
 325                         mz61581_pins: mz61581_pins {
 326 @@ -34,7 +40,7 @@
 327                 };
 328         };
 329
 330 -       fragment@2 {
 331 +       fragment@4 {
 332                 target = <&spi0>;
 333                 __overlay__ {
 334                         /* needed to avoid dtc warning */
 335 --- a/arch/arm/boot/dts/overlays/piscreen-overlay.dts
 336 +++ b/arch/arm/boot/dts/overlays/piscreen-overlay.dts
 337 @@ -13,18 +13,24 @@
 338                 target = <&spi0>;
 339                 __overlay__ {
 340                         status = "okay";
 341 +               };
 342 +       };
 343
 344 -                       spidev@0{
 345 -                               status = "disabled";
 346 -                       };
 347 +       fragment@1 {
 348 +               target = <&spidev0>;
 349 +               __overlay__ {
 350 +                       status = "disabled";
 351 +               };
 352 +       };
 353
 354 -                       spidev@1{
 355 -                               status = "disabled";
 356 -                       };
 357 +       fragment@2 {
 358 +               target = <&spidev1>;
 359 +               __overlay__ {
 360 +                       status = "disabled";
 361                 };
 362         };
 363
 364 -       fragment@1 {
 365 +       fragment@3 {
 366                 target = <&gpio>;
 367                 __overlay__ {
 368                         piscreen_pins: piscreen_pins {
 369 @@ -34,7 +40,7 @@
 370                 };
 371         };
 372
 373 -       fragment@2 {
 374 +       fragment@4 {
 375                 target = <&spi0>;
 376                 __overlay__ {
 377                         /* needed to avoid dtc warning */
 378 --- a/arch/arm/boot/dts/overlays/piscreen2r-overlay.dts
 379 +++ b/arch/arm/boot/dts/overlays/piscreen2r-overlay.dts
 380 @@ -13,18 +13,24 @@
 381                 target = <&spi0>;
 382                 __overlay__ {
 383                         status = "okay";
 384 +               };
 385 +       };
 386
 387 -                       spidev@0{
 388 -                               status = "disabled";
 389 -                       };
 390 +       fragment@1 {
 391 +               target = <&spidev0>;
 392 +               __overlay__ {
 393 +                       status = "disabled";
 394 +               };
 395 +       };
 396
 397 -                       spidev@1{
 398 -                               status = "disabled";
 399 -                       };
 400 +       fragment@2 {
 401 +               target = <&spidev1>;
 402 +               __overlay__ {
 403 +                       status = "disabled";
 404                 };
 405         };
 406
 407 -       fragment@1 {
 408 +       fragment@3 {
 409                 target = <&gpio>;
 410                 __overlay__ {
 411                         piscreen2_pins: piscreen2_pins {
 412 @@ -34,7 +40,7 @@
 413                 };
 414         };
 415
 416 -       fragment@2 {
 417 +       fragment@4 {
 418                 target = <&spi0>;
 419                 __overlay__ {
 420                         /* needed to avoid dtc warning */
 421 --- a/arch/arm/boot/dts/overlays/pitft28-capacitive-overlay.dts
 422 +++ b/arch/arm/boot/dts/overlays/pitft28-capacitive-overlay.dts
 423 @@ -13,14 +13,17 @@
 424                  target = <&spi0>;
 425                  __overlay__ {
 426                          status = "okay";
 427 -
 428 -                        spidev@0{
 429 -                                status = "disabled";
 430 -                        };
 431                  };
 432          };
 433
 434 -        fragment@1 {
 435 +       fragment@1 {
 436 +               target = <&spidev0>;
 437 +               __overlay__ {
 438 +                       status = "disabled";
 439 +               };
 440 +       };
 441 +
 442 +        fragment@2 {
 443                  target = <&gpio>;
 444                  __overlay__ {
 445                          pitft_pins: pitft_pins {
 446 @@ -31,7 +34,7 @@
 447                  };
 448          };
 449
 450 -        fragment@2 {
 451 +        fragment@3 {
 452                  target = <&spi0>;
 453                  __overlay__ {
 454                          /* needed to avoid dtc warning */
 455 @@ -55,7 +58,7 @@
 456                  };
 457          };
 458
 459 -        fragment@3 {
 460 +        fragment@4 {
 461                  target = <&i2c1>;
 462                  __overlay__ {
 463                          /* needed to avoid dtc warning */
 464 --- a/arch/arm/boot/dts/overlays/pitft28-resistive-overlay.dts
 465 +++ b/arch/arm/boot/dts/overlays/pitft28-resistive-overlay.dts
 466 @@ -13,18 +13,24 @@
 467                 target = <&spi0>;
 468                 __overlay__ {
 469                         status = "okay";
 470 +               };
 471 +       };
 472
 473 -                       spidev@0{
 474 -                               status = "disabled";
 475 -                       };
 476 +       fragment@1 {
 477 +               target = <&spidev0>;
 478 +               __overlay__ {
 479 +                       status = "disabled";
 480 +               };
 481 +       };
 482
 483 -                       spidev@1{
 484 -                               status = "disabled";
 485 -                       };
 486 +       fragment@2 {
 487 +               target = <&spidev1>;
 488 +               __overlay__ {
 489 +                       status = "disabled";
 490                 };
 491         };
 492
 493 -       fragment@1 {
 494 +       fragment@3 {
 495                 target = <&gpio>;
 496                 __overlay__ {
 497                         pitft_pins: pitft_pins {
 498 @@ -35,7 +41,7 @@
 499                 };
 500         };
 501
 502 -       fragment@2 {
 503 +       fragment@4 {
 504                 target = <&spi0>;
 505                 __overlay__ {
 506                         /* needed to avoid dtc warning */
 507 @@ -95,7 +101,7 @@
 508                 };
 509         };
 510
 511 -       fragment@3 {
 512 +       fragment@5 {
 513                 target-path = "/soc";
 514                 __overlay__ {
 515                         backlight {
 516 --- a/arch/arm/boot/dts/overlays/rpi-display-overlay.dts
 517 +++ b/arch/arm/boot/dts/overlays/rpi-display-overlay.dts
 518 @@ -13,18 +13,24 @@
 519                 target = <&spi0>;
 520                 __overlay__ {
 521                         status = "okay";
 522 +               };
 523 +       };
 524
 525 -                       spidev@0{
 526 -                               status = "disabled";
 527 -                       };
 528 +       fragment@1 {
 529 +               target = <&spidev0>;
 530 +               __overlay__ {
 531 +                       status = "disabled";
 532 +               };
 533 +       };
 534
 535 -                       spidev@1{
 536 -                               status = "disabled";
 537 -                       };
 538 +       fragment@2 {
 539 +               target = <&spidev1>;
 540 +               __overlay__ {
 541 +                       status = "disabled";
 542                 };
 543         };
 544
 545 -       fragment@1 {
 546 +       fragment@3 {
 547                 target = <&gpio>;
 548                 __overlay__ {
 549                         rpi_display_pins: rpi_display_pins {
 550 @@ -35,7 +41,7 @@
 551                 };
 552         };
 553
 554 -       fragment@2 {
 555 +       fragment@4 {
 556                 target = <&spi0>;
 557                 __overlay__ {
 558                         /* needed to avoid dtc warning */
 559 --- a/arch/arm/boot/dts/overlays/tinylcd35-overlay.dts
 560 +++ b/arch/arm/boot/dts/overlays/tinylcd35-overlay.dts
 561 @@ -30,18 +30,24 @@
 562                 target = <&spi0>;
 563                 __overlay__ {
 564                         status = "okay";
 565 +               };
 566 +       };
 567
 568 -                       spidev@0{
 569 -                               status = "disabled";
 570 -                       };
 571 +       fragment@1 {
 572 +               target = <&spidev0>;
 573 +               __overlay__ {
 574 +                       status = "disabled";
 575 +               };
 576 +       };
 577
 578 -                       spidev@1{
 579 -                               status = "disabled";
 580 -                       };
 581 +       fragment@2 {
 582 +               target = <&spidev1>;
 583 +               __overlay__ {
 584 +                       status = "disabled";
 585                 };
 586         };
 587
 588 -       fragment@1 {
 589 +       fragment@3 {
 590                 target = <&gpio>;
 591                 __overlay__ {
 592                         tinylcd35_pins: tinylcd35_pins {
 593 @@ -60,7 +66,7 @@
 594                 };
 595         };
 596
 597 -       fragment@2 {
 598 +       fragment@4 {
 599                 target = <&spi0>;
 600                 __overlay__ {
 601                         /* needed to avoid dtc warning */
 602 @@ -124,7 +130,7 @@
 603
 604         /*  RTC    */
 605
 606 -       fragment@3 {
 607 +       fragment@5 {
 608                 target = <&i2c1>;
 609                 __overlay__ {
 610                         #address-cells = <1>;
 611 @@ -138,7 +144,7 @@
 612                 };
 613         };
 614
 615 -       fragment@4 {
 616 +       fragment@6 {
 617                 target = <&i2c1>;
 618                 __overlay__ {
 619                         #address-cells = <1>;
 620 @@ -156,7 +162,7 @@
 621          * Values for input event code is found under the
 622          * 'Keys and buttons' heading in include/uapi/linux/input.h
 623          */
 624 -       fragment@5 {
 625 +       fragment@7 {
 626                 target-path = "/soc";
 627                 __overlay__ {
 628                         keypad: keypad {