target/linux/brcm2708/patches-4.9/0143-BCM270x-DT-Consolidate-audio-card-overlays.patch

   1 From f134380c19eb38bc276d6d86fa575821c3493c60 Mon Sep 17 00:00:00 2001
   2 From: Matthias Reichl <hias@horus.com>
   3 Date: Sun, 22 Jan 2017 12:49:36 +0100
   4 Subject: [PATCH] BCM270x DT: Consolidate audio card overlays
   5
   6 Reference 3.3V / 5V system rails instead of instantiating local
   7 regulators.
   8
   9 Add missing power supply properties for codecs where these are
  10 required according to the DT bindings docs.
  11
  12 Signed-off-by: Matthias Reichl <hias@horus.com>
  13 ---
  14  .../arm/boot/dts/overlays/adau1977-adc-overlay.dts | 19 ++--------
  15  .../dts/overlays/akkordion-iqdacplus-overlay.dts   |  3 ++
  16  .../dts/overlays/hifiberry-dacplus-overlay.dts     |  3 ++
  17  .../boot/dts/overlays/hifiberry-digi-overlay.dts   |  2 +
  18  .../dts/overlays/hifiberry-digi-pro-overlay.dts    |  2 +
  19  arch/arm/boot/dts/overlays/iqaudio-dac-overlay.dts |  3 ++
  20  .../boot/dts/overlays/iqaudio-dacplus-overlay.dts  |  3 ++
  21  .../overlays/iqaudio-digi-wm8804-audio-overlay.dts |  4 +-
  22  .../arm/boot/dts/overlays/justboom-dac-overlay.dts |  3 ++
  23  .../boot/dts/overlays/justboom-digi-overlay.dts    |  2 +
  24  arch/arm/boot/dts/overlays/raspidac3-overlay.dts   |  4 ++
  25  .../overlays/rra-digidac1-wm8741-audio-overlay.dts | 44 +++-------------------
  26  12 files changed, 36 insertions(+), 56 deletions(-)
  27
  28 --- a/arch/arm/boot/dts/overlays/adau1977-adc-overlay.dts
  29 +++ b/arch/arm/boot/dts/overlays/adau1977-adc-overlay.dts
  30 @@ -6,19 +6,6 @@
  31         compatible = "brcm,bcm2708";
  32
  33         fragment@0 {
  34 -               target = <&soc>;
  35 -
  36 -               __overlay__ {
  37 -                       codec_supply: fixedregulator@0 {
  38 -                               compatible = "regulator-fixed";
  39 -                               regulator-name = "AVDD";
  40 -                               regulator-min-microvolt = <3300000>;
  41 -                               regulator-max-microvolt = <3300000>;
  42 -                       };
  43 -               };
  44 -       };
  45 -
  46 -       fragment@1 {
  47                 target = <&i2c>;
  48
  49                 __overlay__ {
  50 @@ -30,19 +17,19 @@
  51                                 compatible = "adi,adau1977";
  52                                 reg = <0x11>;
  53                                 reset-gpios = <&gpio 5 0>;
  54 -                               AVDD-supply = <&codec_supply>;
  55 +                               AVDD-supply = <&vdd_3v3_reg>;
  56                         };
  57                 };
  58         };
  59
  60 -       fragment@2 {
  61 +       fragment@1 {
  62                 target = <&i2s>;
  63                 __overlay__ {
  64                         status = "okay";
  65                 };
  66         };
  67
  68 -       fragment@3 {
  69 +       fragment@2 {
  70                 target = <&sound>;
  71                 __overlay__ {
  72                         compatible = "adi,adau1977-adc";
  73 --- a/arch/arm/boot/dts/overlays/akkordion-iqdacplus-overlay.dts
  74 +++ b/arch/arm/boot/dts/overlays/akkordion-iqdacplus-overlay.dts
  75 @@ -23,6 +23,9 @@
  76                                 #sound-dai-cells = <0>;
  77                                 compatible = "ti,pcm5122";
  78                                 reg = <0x4c>;
  79 +                               AVDD-supply = <&vdd_3v3_reg>;
  80 +                               DVDD-supply = <&vdd_3v3_reg>;
  81 +                               CPVDD-supply = <&vdd_3v3_reg>;
  82                                 status = "okay";
  83                         };
  84                 };
  85 --- a/arch/arm/boot/dts/overlays/hifiberry-dacplus-overlay.dts
  86 +++ b/arch/arm/boot/dts/overlays/hifiberry-dacplus-overlay.dts
  87 @@ -34,6 +34,9 @@
  88                                 compatible = "ti,pcm5122";
  89                                 reg = <0x4d>;
  90                                 clocks = <&dacpro_osc>;
  91 +                               AVDD-supply = <&vdd_3v3_reg>;
  92 +                               DVDD-supply = <&vdd_3v3_reg>;
  93 +                               CPVDD-supply = <&vdd_3v3_reg>;
  94                                 status = "okay";
  95                         };
  96                 };
  97 --- a/arch/arm/boot/dts/overlays/hifiberry-digi-overlay.dts
  98 +++ b/arch/arm/boot/dts/overlays/hifiberry-digi-overlay.dts
  99 @@ -23,6 +23,8 @@
 100                                 #sound-dai-cells = <0>;
 101                                 compatible = "wlf,wm8804";
 102                                 reg = <0x3b>;
 103 +                               PVDD-supply = <&vdd_3v3_reg>;
 104 +                               DVDD-supply = <&vdd_3v3_reg>;
 105                                 status = "okay";
 106                         };
 107                 };
 108 --- a/arch/arm/boot/dts/overlays/hifiberry-digi-pro-overlay.dts
 109 +++ b/arch/arm/boot/dts/overlays/hifiberry-digi-pro-overlay.dts
 110 @@ -23,6 +23,8 @@
 111                                 #sound-dai-cells = <0>;
 112                                 compatible = "wlf,wm8804";
 113                                 reg = <0x3b>;
 114 +                               PVDD-supply = <&vdd_3v3_reg>;
 115 +                               DVDD-supply = <&vdd_3v3_reg>;
 116                                 status = "okay";
 117                         };
 118                 };
 119 --- a/arch/arm/boot/dts/overlays/iqaudio-dac-overlay.dts
 120 +++ b/arch/arm/boot/dts/overlays/iqaudio-dac-overlay.dts
 121 @@ -23,6 +23,9 @@
 122                                 #sound-dai-cells = <0>;
 123                                 compatible = "ti,pcm5122";
 124                                 reg = <0x4c>;
 125 +                               AVDD-supply = <&vdd_3v3_reg>;
 126 +                               DVDD-supply = <&vdd_3v3_reg>;
 127 +                               CPVDD-supply = <&vdd_3v3_reg>;
 128                                 status = "okay";
 129                         };
 130                 };
 131 --- a/arch/arm/boot/dts/overlays/iqaudio-dacplus-overlay.dts
 132 +++ b/arch/arm/boot/dts/overlays/iqaudio-dacplus-overlay.dts
 133 @@ -23,6 +23,9 @@
 134                                 #sound-dai-cells = <0>;
 135                                 compatible = "ti,pcm5122";
 136                                 reg = <0x4c>;
 137 +                               AVDD-supply = <&vdd_3v3_reg>;
 138 +                               DVDD-supply = <&vdd_3v3_reg>;
 139 +                               CPVDD-supply = <&vdd_3v3_reg>;
 140                                 status = "okay";
 141                         };
 142                 };
 143 --- a/arch/arm/boot/dts/overlays/iqaudio-digi-wm8804-audio-overlay.dts
 144 +++ b/arch/arm/boot/dts/overlays/iqaudio-digi-wm8804-audio-overlay.dts
 145 @@ -24,8 +24,8 @@
 146                                 compatible = "wlf,wm8804";
 147                                 reg = <0x3b>;
 148                                 status = "okay";
 149 -                               // DVDD-supply = <&reg_3v3>;
 150 -                               // PVDD-supply = <&reg_3v3>;
 151 +                               DVDD-supply = <&vdd_3v3_reg>;
 152 +                               PVDD-supply = <&vdd_3v3_reg>;
 153                         };
 154                 };
 155         };
 156 --- a/arch/arm/boot/dts/overlays/justboom-dac-overlay.dts
 157 +++ b/arch/arm/boot/dts/overlays/justboom-dac-overlay.dts
 158 @@ -23,6 +23,9 @@
 159                                 #sound-dai-cells = <0>;
 160                                 compatible = "ti,pcm5122";
 161                                 reg = <0x4d>;
 162 +                               AVDD-supply = <&vdd_3v3_reg>;
 163 +                               DVDD-supply = <&vdd_3v3_reg>;
 164 +                               CPVDD-supply = <&vdd_3v3_reg>;
 165                                 status = "okay";
 166                         };
 167                 };
 168 --- a/arch/arm/boot/dts/overlays/justboom-digi-overlay.dts
 169 +++ b/arch/arm/boot/dts/overlays/justboom-digi-overlay.dts
 170 @@ -23,6 +23,8 @@
 171                                 #sound-dai-cells = <0>;
 172                                 compatible = "wlf,wm8804";
 173                                 reg = <0x3b>;
 174 +                               PVDD-supply = <&vdd_3v3_reg>;
 175 +                               DVDD-supply = <&vdd_3v3_reg>;
 176                                 status = "okay";
 177                         };
 178                 };
 179 --- a/arch/arm/boot/dts/overlays/raspidac3-overlay.dts
 180 +++ b/arch/arm/boot/dts/overlays/raspidac3-overlay.dts
 181 @@ -23,12 +23,16 @@
 182                                 #sound-dai-cells = <0>;
 183                                 compatible = "ti,pcm5122";
 184                                 reg = <0x4c>;
 185 +                               AVDD-supply = <&vdd_3v3_reg>;
 186 +                               DVDD-supply = <&vdd_3v3_reg>;
 187 +                               CPVDD-supply = <&vdd_3v3_reg>;
 188                                 status = "okay";
 189                         };
 190
 191                         tpa6130a2: tpa6130a2@60 {
 192                                 compatible = "ti,tpa6130a2";
 193                                 reg = <0x60>;
 194 +                               Vdd-supply = <&vdd_3v3_reg>;
 195                                 status = "okay";
 196                         };
 197                 };
 198 --- a/arch/arm/boot/dts/overlays/rra-digidac1-wm8741-audio-overlay.dts
 199 +++ b/arch/arm/boot/dts/overlays/rra-digidac1-wm8741-audio-overlay.dts
 200 @@ -6,45 +6,13 @@
 201         compatible = "brcm,bcm2708";
 202
 203         fragment@0 {
 204 -               target-path = "/";
 205 -               __overlay__ {
 206 -                       aliases {
 207 -                               ldo0 = &ldo0;
 208 -                               ldo1 = &ldo1;
 209 -                       };
 210 -               };
 211 -       };
 212 -
 213 -       fragment@1 {
 214 -               target-path = "/soc";
 215 -               __overlay__ {
 216 -
 217 -                       ldo1: ldo1 {
 218 -                               compatible = "regulator-fixed";
 219 -                               regulator-name = "DC_5V";
 220 -                               regulator-min-microvolt = <5000000>;
 221 -                               regulator-max-microvolt = <5000000>;
 222 -                               regulator-always-on;
 223 -                       };
 224 -
 225 -                       ldo0: ldo0 {
 226 -                               compatible = "regulator-fixed";
 227 -                               regulator-name = "DC_3V3";
 228 -                               regulator-min-microvolt = <3300000>;
 229 -                               regulator-max-microvolt = <3300000>;
 230 -                               regulator-always-on;
 231 -                       };
 232 -               };
 233 -       };
 234 -
 235 -       fragment@2 {
 236                 target = <&i2s>;
 237                 __overlay__ {
 238                         status = "okay";
 239                 };
 240         };
 241
 242 -       fragment@3 {
 243 +       fragment@1 {
 244                 target = <&i2c1>;
 245                 __overlay__ {
 246                         #address-cells = <1>;
 247 @@ -56,21 +24,21 @@
 248                                 compatible = "wlf,wm8804";
 249                                 reg = <0x3b>;
 250                                 status = "okay";
 251 -                               PVDD-supply = <&ldo0>;
 252 -                               DVDD-supply = <&ldo0>;
 253 +                               PVDD-supply = <&vdd_3v3_reg>;
 254 +                               DVDD-supply = <&vdd_3v3_reg>;
 255                         };
 256
 257                         wm8742: wm8741@1a {
 258                                 compatible = "wlf,wm8741";
 259                                 reg = <0x1a>;
 260                                 status = "okay";
 261 -                               AVDD-supply = <&ldo1>;
 262 -                               DVDD-supply = <&ldo0>;
 263 +                               AVDD-supply = <&vdd_5v0_reg>;
 264 +                               DVDD-supply = <&vdd_3v3_reg>;
 265                         };
 266                 };
 267         };
 268
 269 -       fragment@4 {
 270 +       fragment@2 {
 271                 target = <&sound>;
 272                 __overlay__ {
 273                         compatible = "rra,digidac1-soundcard";