BCM270x DT: Consolidate audio card overlays

Reference 3.3V / 5V system rails instead of instantiating local
regulators.

Add missing power supply properties for codecs where these are
required according to the DT bindings docs.

Signed-off-by: Matthias Reichl <hias@horus.com>

diff --git a/arch/arm/boot/dts/overlays/adau1977-adc-overlay.dts b/arch/arm/boot/dts/overlays/adau1977-adc-overlay.dts
index 24fcd58fd1dc61d97a77def3d5d1f7c65130dde6..1aaca71c1b677e414ada9a3f94e60e5e2cf30815 100644 (file)
--- a/arch/arm/boot/dts/overlays/adau1977-adc-overlay.dts
+++ b/arch/arm/boot/dts/overlays/adau1977-adc-overlay.dts
@@ -6,19 +6,6 @@
        compatible = "brcm,bcm2708";
     
        fragment@0 {
-               target = <&soc>;
-               
-               __overlay__ {
-                       codec_supply: fixedregulator@0 {
-                               compatible = "regulator-fixed";
-                               regulator-name = "AVDD";
-                               regulator-min-microvolt = <3300000>;
-                               regulator-max-microvolt = <3300000>;
-                       };
-               };
-       };
-       
-       fragment@1 {
                target = <&i2c>;
                
                __overlay__ {
@@ -30,19 +17,19 @@
                                compatible = "adi,adau1977";
                                reg = <0x11>;
                                reset-gpios = <&gpio 5 0>;
-                               AVDD-supply = <&codec_supply>;
+                               AVDD-supply = <&vdd_3v3_reg>;
                        };
                };
        };
 
-       fragment@2 {
+       fragment@1 {
                target = <&i2s>;
                __overlay__ {
                        status = "okay";
                };
        };
 
-       fragment@3 {
+       fragment@2 {
                target = <&sound>;
                __overlay__ {
                        compatible = "adi,adau1977-adc";

diff --git a/arch/arm/boot/dts/overlays/akkordion-iqdacplus-overlay.dts b/arch/arm/boot/dts/overlays/akkordion-iqdacplus-overlay.dts
index 208849d5c39274ed0aa557f63a19430a451a95f5..241d03b9b79ef5e833cc28819003946a9eb319fd 100644 (file)
--- a/arch/arm/boot/dts/overlays/akkordion-iqdacplus-overlay.dts
+++ b/arch/arm/boot/dts/overlays/akkordion-iqdacplus-overlay.dts
@@ -23,6 +23,9 @@
                                #sound-dai-cells = <0>;
                                compatible = "ti,pcm5122";
                                reg = <0x4c>;
+                               AVDD-supply = <&vdd_3v3_reg>;
+                               DVDD-supply = <&vdd_3v3_reg>;
+                               CPVDD-supply = <&vdd_3v3_reg>;
                                status = "okay";
                        };
                };

diff --git a/arch/arm/boot/dts/overlays/hifiberry-dacplus-overlay.dts b/arch/arm/boot/dts/overlays/hifiberry-dacplus-overlay.dts
index 2f078d4747ccfdc5172e24b18ce65454f1219b9d..b4dc99633b9d409565c0443de378a4460c7a966a 100644 (file)
--- a/arch/arm/boot/dts/overlays/hifiberry-dacplus-overlay.dts
+++ b/arch/arm/boot/dts/overlays/hifiberry-dacplus-overlay.dts
@@ -34,6 +34,9 @@
                                compatible = "ti,pcm5122";
                                reg = <0x4d>;
                                clocks = <&dacpro_osc>;
+                               AVDD-supply = <&vdd_3v3_reg>;
+                               DVDD-supply = <&vdd_3v3_reg>;
+                               CPVDD-supply = <&vdd_3v3_reg>;
                                status = "okay";
                        };
                };

diff --git a/arch/arm/boot/dts/overlays/hifiberry-digi-overlay.dts b/arch/arm/boot/dts/overlays/hifiberry-digi-overlay.dts
index f5e41f48ba4fed92194ff5a63d13c70bb2d1c091..64cb1e00343b57e3d7dee864416e558dc3163117 100644 (file)
--- a/arch/arm/boot/dts/overlays/hifiberry-digi-overlay.dts
+++ b/arch/arm/boot/dts/overlays/hifiberry-digi-overlay.dts
@@ -23,6 +23,8 @@
                                #sound-dai-cells = <0>;
                                compatible = "wlf,wm8804";
                                reg = <0x3b>;
+                               PVDD-supply = <&vdd_3v3_reg>;
+                               DVDD-supply = <&vdd_3v3_reg>;
                                status = "okay";
                        };
                };

diff --git a/arch/arm/boot/dts/overlays/hifiberry-digi-pro-overlay.dts b/arch/arm/boot/dts/overlays/hifiberry-digi-pro-overlay.dts
index 2a26d9cfffb0f3d7958eb3756ca7c4ba28400e1c..d02479ca4a25c3b2da75fe737fd457b1882c20b1 100644 (file)
--- a/arch/arm/boot/dts/overlays/hifiberry-digi-pro-overlay.dts
+++ b/arch/arm/boot/dts/overlays/hifiberry-digi-pro-overlay.dts
@@ -23,6 +23,8 @@
                                #sound-dai-cells = <0>;
                                compatible = "wlf,wm8804";
                                reg = <0x3b>;
+                               PVDD-supply = <&vdd_3v3_reg>;
+                               DVDD-supply = <&vdd_3v3_reg>;
                                status = "okay";
                        };
                };

diff --git a/arch/arm/boot/dts/overlays/iqaudio-dac-overlay.dts b/arch/arm/boot/dts/overlays/iqaudio-dac-overlay.dts
index 0d35c85382bb5766b3eeb9de1bd4a94621229e4b..f16586f05971f69b928200d212015982e388ce96 100644 (file)
--- a/arch/arm/boot/dts/overlays/iqaudio-dac-overlay.dts
+++ b/arch/arm/boot/dts/overlays/iqaudio-dac-overlay.dts
@@ -23,6 +23,9 @@
                                #sound-dai-cells = <0>;
                                compatible = "ti,pcm5122";
                                reg = <0x4c>;
+                               AVDD-supply = <&vdd_3v3_reg>;
+                               DVDD-supply = <&vdd_3v3_reg>;
+                               CPVDD-supply = <&vdd_3v3_reg>;
                                status = "okay";
                        };
                };

diff --git a/arch/arm/boot/dts/overlays/iqaudio-dacplus-overlay.dts b/arch/arm/boot/dts/overlays/iqaudio-dacplus-overlay.dts
index d4bad8742a985e2f15eed19ca52ef283a74fefb9..4dcf17515f95589addd5194cf825be813d1e0c98 100644 (file)
--- a/arch/arm/boot/dts/overlays/iqaudio-dacplus-overlay.dts
+++ b/arch/arm/boot/dts/overlays/iqaudio-dacplus-overlay.dts
@@ -23,6 +23,9 @@
                                #sound-dai-cells = <0>;
                                compatible = "ti,pcm5122";
                                reg = <0x4c>;
+                               AVDD-supply = <&vdd_3v3_reg>;
+                               DVDD-supply = <&vdd_3v3_reg>;
+                               CPVDD-supply = <&vdd_3v3_reg>;
                                status = "okay";
                        };
                };

diff --git a/arch/arm/boot/dts/overlays/iqaudio-digi-wm8804-audio-overlay.dts b/arch/arm/boot/dts/overlays/iqaudio-digi-wm8804-audio-overlay.dts
index da4fbfdfdbbbcf2505b9eb4789ddb779ec72cea8..b86e1e5edc89fb78fd1ab8482bfff6c7ec4ec9f5 100644 (file)
--- a/arch/arm/boot/dts/overlays/iqaudio-digi-wm8804-audio-overlay.dts
+++ b/arch/arm/boot/dts/overlays/iqaudio-digi-wm8804-audio-overlay.dts
@@ -24,8 +24,8 @@
                                compatible = "wlf,wm8804";
                                reg = <0x3b>;
                                status = "okay";
-                               // DVDD-supply = <&reg_3v3>;
-                               // PVDD-supply = <&reg_3v3>;
+                               DVDD-supply = <&vdd_3v3_reg>;
+                               PVDD-supply = <&vdd_3v3_reg>;
                        };
                };
        };

diff --git a/arch/arm/boot/dts/overlays/justboom-dac-overlay.dts b/arch/arm/boot/dts/overlays/justboom-dac-overlay.dts
index 312632ad376d5b8c8ff1dbf31fa03d0d18181d94..2b8dba0c231b20ac7660152356a06abeacc83c2d 100644 (file)
--- a/arch/arm/boot/dts/overlays/justboom-dac-overlay.dts
+++ b/arch/arm/boot/dts/overlays/justboom-dac-overlay.dts
@@ -23,6 +23,9 @@
                                #sound-dai-cells = <0>;
                                compatible = "ti,pcm5122";
                                reg = <0x4d>;
+                               AVDD-supply = <&vdd_3v3_reg>;
+                               DVDD-supply = <&vdd_3v3_reg>;
+                               CPVDD-supply = <&vdd_3v3_reg>;
                                status = "okay";
                        };
                };

diff --git a/arch/arm/boot/dts/overlays/justboom-digi-overlay.dts b/arch/arm/boot/dts/overlays/justboom-digi-overlay.dts
index cbbede9a541166ba257122918081982016e0b7eb..1212e3ff591b6071604ee4a519c89ec50ac95d00 100644 (file)
--- a/arch/arm/boot/dts/overlays/justboom-digi-overlay.dts
+++ b/arch/arm/boot/dts/overlays/justboom-digi-overlay.dts
@@ -23,6 +23,8 @@
                                #sound-dai-cells = <0>;
                                compatible = "wlf,wm8804";
                                reg = <0x3b>;
+                               PVDD-supply = <&vdd_3v3_reg>;
+                               DVDD-supply = <&vdd_3v3_reg>;
                                status = "okay";
                        };
                };

diff --git a/arch/arm/boot/dts/overlays/raspidac3-overlay.dts b/arch/arm/boot/dts/overlays/raspidac3-overlay.dts
index 2fac57ca179fcf114655ea91dbef419c16aceb79..2c3c97813f22c94eff6da2193aff0920ac7c39b1 100644 (file)
--- a/arch/arm/boot/dts/overlays/raspidac3-overlay.dts
+++ b/arch/arm/boot/dts/overlays/raspidac3-overlay.dts
@@ -23,12 +23,16 @@
                                #sound-dai-cells = <0>;
                                compatible = "ti,pcm5122";
                                reg = <0x4c>;
+                               AVDD-supply = <&vdd_3v3_reg>;
+                               DVDD-supply = <&vdd_3v3_reg>;
+                               CPVDD-supply = <&vdd_3v3_reg>;
                                status = "okay";
                        };
 
                        tpa6130a2: tpa6130a2@60 {
                                compatible = "ti,tpa6130a2";
                                reg = <0x60>;
+                               Vdd-supply = <&vdd_3v3_reg>;
                                status = "okay";
                        };
                };

diff --git a/arch/arm/boot/dts/overlays/rra-digidac1-wm8741-audio-overlay.dts b/arch/arm/boot/dts/overlays/rra-digidac1-wm8741-audio-overlay.dts
index 16b1247bfa618ff85936ddf78c3aea58075eaa67..f8d48233e28c7c18509b4a95692f6aff29ea33fd 100644 (file)
--- a/arch/arm/boot/dts/overlays/rra-digidac1-wm8741-audio-overlay.dts
+++ b/arch/arm/boot/dts/overlays/rra-digidac1-wm8741-audio-overlay.dts
@@ -6,45 +6,13 @@
        compatible = "brcm,bcm2708";
 
        fragment@0 {
-               target-path = "/";
-               __overlay__ {
-                       aliases {
-                               ldo0 = &ldo0;
-                               ldo1 = &ldo1;
-                       };
-               };
-       };
-
-       fragment@1 {
-               target-path = "/soc";
-               __overlay__ {
-
-                       ldo1: ldo1 {
-                               compatible = "regulator-fixed";
-                               regulator-name = "DC_5V";
-                               regulator-min-microvolt = <5000000>;
-                               regulator-max-microvolt = <5000000>;
-                               regulator-always-on;
-                       };
-
-                       ldo0: ldo0 {
-                               compatible = "regulator-fixed";
-                               regulator-name = "DC_3V3";
-                               regulator-min-microvolt = <3300000>;
-                               regulator-max-microvolt = <3300000>;
-                               regulator-always-on;
-                       };
-               };
-       };
-
-       fragment@2 {
                target = <&i2s>;
                __overlay__ {
                        status = "okay";
                };
        };
 
-       fragment@3 {
+       fragment@1 {
                target = <&i2c1>;
                __overlay__ {
                        #address-cells = <1>;
@@ -56,21 +24,21 @@
                                compatible = "wlf,wm8804";
                                reg = <0x3b>;
                                status = "okay";
-                               PVDD-supply = <&ldo0>;
-                               DVDD-supply = <&ldo0>;
+                               PVDD-supply = <&vdd_3v3_reg>;
+                               DVDD-supply = <&vdd_3v3_reg>;
                        };
 
                        wm8742: wm8741@1a {
                                compatible = "wlf,wm8741";
                                reg = <0x1a>;
                                status = "okay";
-                               AVDD-supply = <&ldo1>;
-                               DVDD-supply = <&ldo0>;
+                               AVDD-supply = <&vdd_5v0_reg>;
+                               DVDD-supply = <&vdd_3v3_reg>;
                        };
                };
        };
 
-       fragment@4 {
+       fragment@2 {
                target = <&sound>;
                __overlay__ {
                        compatible = "rra,digidac1-soundcard";