From d274d4d990b89694b8648882238f5d2f567fabf3 Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Sun, 22 Jan 2017 12:49:36 +0100 Subject: [PATCH] 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 --- .../dts/overlays/adau1977-adc-overlay.dts | 19 ++------ .../overlays/akkordion-iqdacplus-overlay.dts | 3 ++ .../overlays/hifiberry-dacplus-overlay.dts | 3 ++ .../dts/overlays/hifiberry-digi-overlay.dts | 2 + .../overlays/hifiberry-digi-pro-overlay.dts | 2 + .../boot/dts/overlays/iqaudio-dac-overlay.dts | 3 ++ .../dts/overlays/iqaudio-dacplus-overlay.dts | 3 ++ .../iqaudio-digi-wm8804-audio-overlay.dts | 4 +- .../dts/overlays/justboom-dac-overlay.dts | 3 ++ .../dts/overlays/justboom-digi-overlay.dts | 2 + .../boot/dts/overlays/raspidac3-overlay.dts | 4 ++ .../rra-digidac1-wm8741-audio-overlay.dts | 44 +++---------------- 12 files changed, 36 insertions(+), 56 deletions(-) diff --git a/arch/arm/boot/dts/overlays/adau1977-adc-overlay.dts b/arch/arm/boot/dts/overlays/adau1977-adc-overlay.dts index 24fcd58fd1dc..1aaca71c1b67 100644 --- 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 208849d5c392..241d03b9b79e 100644 --- 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 2f078d4747cc..b4dc99633b9d 100644 --- 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 f5e41f48ba4f..64cb1e00343b 100644 --- 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 2a26d9cfffb0..d02479ca4a25 100644 --- 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 0d35c85382bb..f16586f05971 100644 --- 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 d4bad8742a98..4dcf17515f95 100644 --- 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 da4fbfdfdbbb..b86e1e5edc89 100644 --- 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 = <®_3v3>; - // PVDD-supply = <®_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 312632ad376d..2b8dba0c231b 100644 --- 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 cbbede9a5411..1212e3ff591b 100644 --- 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 2fac57ca179f..2c3c97813f22 100644 --- 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 16b1247bfa61..f8d48233e28c 100644 --- 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"; -- 2.30.2