target/linux/brcm2708/patches-4.1/0089-BCM270X_DT-Sort-nodes-by-bus-address-and-consolidate.patch

   1 From 7533e5564600337aec1f767faa6c1e977cafd6a7 Mon Sep 17 00:00:00 2001
   2 From: Phil Elwell <phil@raspberrypi.org>
   3 Date: Mon, 22 Jun 2015 14:21:55 +0100
   4 Subject: [PATCH 089/222] BCM270X_DT: Sort nodes by bus address, and
   5  consolidate aliases
   6
   7 ---
   8  arch/arm/boot/dts/bcm2708-rpi-b-plus.dts | 19 ----------
   9  arch/arm/boot/dts/bcm2708-rpi-b.dts      | 19 ----------
  10  arch/arm/boot/dts/bcm2708-rpi-cm.dtsi    | 21 -----------
  11  arch/arm/boot/dts/bcm2708_common.dtsi    | 63 +++++++++++++++++++++++---------
  12  arch/arm/boot/dts/bcm2709-rpi-2-b.dts    | 19 ----------
  13  5 files changed, 46 insertions(+), 95 deletions(-)
  14
  15 --- a/arch/arm/boot/dts/bcm2708-rpi-b-plus.dts
  16 +++ b/arch/arm/boot/dts/bcm2708-rpi-b-plus.dts
  17 @@ -5,25 +5,6 @@
  18  / {
  19         compatible = "brcm,bcm2708";
  20         model = "Raspberry Pi Model B+";
  21 -
  22 -       aliases {
  23 -               soc = &soc;
  24 -               spi0 = &spi0;
  25 -               i2c0 = &i2c0;
  26 -               i2c1 = &i2c1;
  27 -               i2s  = &i2s;
  28 -               gpio = &gpio;
  29 -               intc = &intc;
  30 -               leds = &leds;
  31 -               audio = &audio;
  32 -               sound = &sound;
  33 -               uart0 = &uart0;
  34 -               uart1 = &uart1;
  35 -               clocks = &clocks;
  36 -       };
  37 -
  38 -       sound: sound {
  39 -       };
  40  };
  41
  42  &gpio {
  43 --- a/arch/arm/boot/dts/bcm2708-rpi-b.dts
  44 +++ b/arch/arm/boot/dts/bcm2708-rpi-b.dts
  45 @@ -5,25 +5,6 @@
  46  / {
  47         compatible = "brcm,bcm2708";
  48         model = "Raspberry Pi Model B";
  49 -
  50 -       aliases {
  51 -               soc = &soc;
  52 -               spi0 = &spi0;
  53 -               i2c0 = &i2c0;
  54 -               i2c1 = &i2c1;
  55 -               i2s  = &i2s;
  56 -               gpio = &gpio;
  57 -               intc = &intc;
  58 -               leds = &leds;
  59 -               audio = &audio;
  60 -               sound = &sound;
  61 -               uart0 = &uart0;
  62 -               uart1 = &uart1;
  63 -               clocks = &clocks;
  64 -       };
  65 -
  66 -       sound: sound {
  67 -       };
  68  };
  69
  70  &gpio {
  71 --- a/arch/arm/boot/dts/bcm2708-rpi-cm.dtsi
  72 +++ b/arch/arm/boot/dts/bcm2708-rpi-cm.dtsi
  73 @@ -1,26 +1,5 @@
  74  /include/ "bcm2708.dtsi"
  75
  76 -/ {
  77 -       aliases {
  78 -               soc = &soc;
  79 -               spi0 = &spi0;
  80 -               i2c0 = &i2c0;
  81 -               i2c1 = &i2c1;
  82 -               i2s  = &i2s;
  83 -               gpio = &gpio;
  84 -               intc = &intc;
  85 -               leds = &leds;
  86 -               audio = &audio;
  87 -               sound = &sound;
  88 -               uart0 = &uart0;
  89 -               uart1 = &uart1;
  90 -               clocks = &clocks;
  91 -       };
  92 -
  93 -       sound: sound {
  94 -       };
  95 -};
  96 -
  97  &leds {
  98         act_led: act {
  99                 label = "led0";
 100 --- a/arch/arm/boot/dts/bcm2708_common.dtsi
 101 +++ b/arch/arm/boot/dts/bcm2708_common.dtsi
 102 @@ -3,6 +3,31 @@
 103  / {
 104         interrupt-parent = <&intc>;
 105
 106 +       aliases {
 107 +               audio = &audio;
 108 +               sound = &sound;
 109 +               soc = &soc;
 110 +               dma = &dma;
 111 +               intc = &intc;
 112 +               watchdog = &watchdog;
 113 +               random = &random;
 114 +               mailbox = &mailbox;
 115 +               gpio = &gpio;
 116 +               uart0 = &uart0;
 117 +               i2s  = &i2s;
 118 +               spi0 = &spi0;
 119 +               i2c0 = &i2c0;
 120 +               uart1 = &uart1;
 121 +               mmc = &mmc;
 122 +               i2c1 = &i2c1;
 123 +               usb = &usb;
 124 +               leds = &leds;
 125 +               fb = &fb;
 126 +               vchiq = &vchiq;
 127 +               thermal = &thermal;
 128 +               clocks = &clocks;
 129 +       };
 130 +
 131         /* Onboard audio */
 132         audio: audio {
 133                 compatible = "brcm,bcm2835-audio";
 134 @@ -10,6 +35,10 @@
 135                 status = "disabled";
 136         };
 137
 138 +       /* External sound card */
 139 +       sound: sound {
 140 +       };
 141 +
 142         soc: soc {
 143                 compatible = "simple-bus";
 144                 #address-cells = <1>;
 145 @@ -43,6 +72,12 @@
 146                         #interrupt-cells = <2>;
 147                 };
 148
 149 +               mailbox: mailbox@7e00b800 {
 150 +                       compatible = "brcm,bcm2708-vcio";
 151 +                       reg = <0x7e00b880 0x40>;
 152 +                       interrupts = <0 1>;
 153 +               };
 154 +
 155                 watchdog: watchdog@7e100000 {
 156                         compatible = "brcm,bcm2835-pm-wdt";
 157                         reg = <0x7e100000 0x28>;
 158 @@ -55,12 +90,6 @@
 159                         status = "disabled";
 160                 };
 161
 162 -               mailbox: mailbox@7e00b800 {
 163 -                       compatible = "brcm,bcm2708-vcio";
 164 -                       reg = <0x7e00b880 0x40>;
 165 -                       interrupts = <0 1>;
 166 -               };
 167 -
 168                 gpio: gpio {
 169                         compatible = "brcm,bcm2835-gpio";
 170                         reg = <0x7e200000 0xb4>;
 171 @@ -73,17 +102,6 @@
 172                         #interrupt-cells = <2>;
 173                 };
 174
 175 -               mmc: mmc@7e300000 {
 176 -                       compatible = "brcm,bcm2835-mmc";
 177 -                       reg = <0x7e300000 0x100>;
 178 -                       interrupts = <2 30>;
 179 -                       clocks = <&clk_mmc>;
 180 -                       dmas = <&dma 11>,
 181 -                              <&dma 11>;
 182 -                       dma-names = "tx", "rx";
 183 -                       status = "disabled";
 184 -               };
 185 -
 186                 uart0: uart@7e201000 {
 187                         compatible = "arm,pl011", "arm,primecell";
 188                         reg = <0x7e201000 0x1000>;
 189 @@ -144,6 +162,17 @@
 190                         status = "disabled";
 191                 };
 192
 193 +               mmc: mmc@7e300000 {
 194 +                       compatible = "brcm,bcm2835-mmc";
 195 +                       reg = <0x7e300000 0x100>;
 196 +                       interrupts = <2 30>;
 197 +                       clocks = <&clk_mmc>;
 198 +                       dmas = <&dma 11>,
 199 +                              <&dma 11>;
 200 +                       dma-names = "tx", "rx";
 201 +                       status = "disabled";
 202 +               };
 203 +
 204                 i2c1: i2c@7e804000 {
 205                         compatible = "brcm,bcm2708-i2c";
 206                         reg = <0x7e804000 0x1000>;
 207 --- a/arch/arm/boot/dts/bcm2709-rpi-2-b.dts
 208 +++ b/arch/arm/boot/dts/bcm2709-rpi-2-b.dts
 209 @@ -5,25 +5,6 @@
 210  / {
 211         compatible = "brcm,bcm2709";
 212         model = "Raspberry Pi 2 Model B";
 213 -
 214 -       aliases {
 215 -               soc = &soc;
 216 -               spi0 = &spi0;
 217 -               i2c0 = &i2c0;
 218 -               i2c1 = &i2c1;
 219 -               i2s  = &i2s;
 220 -               gpio = &gpio;
 221 -               intc = &intc;
 222 -               leds = &leds;
 223 -               audio = &audio;
 224 -               sound = &sound;
 225 -               uart0 = &uart0;
 226 -               uart1 = &uart1;
 227 -               clocks = &clocks;
 228 -       };
 229 -
 230 -       sound: sound {
 231 -       };
 232  };
 233
 234  &gpio {