tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

Merge branch 'fix/sgtl5000' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-sgtl5000

Conflicts:
Documentation/devicetree/bindings/sound/sgtl5000.txt

Mark Brown 5aa664d6 87357797

+10
+10
Documentation/devicetree/bindings/sound/sgtl5000.txt
··· 18 18 If this node is not mentionned or the value is unknown, then 19 19 the value is set to 1.25V. 20 20 21 + - VDDA-supply : the regulator provider of VDDA 22 + 23 + - VDDIO-supply: the regulator provider of VDDIO 24 + 25 + Optional properties: 26 + 27 + - VDDD-supply : the regulator provider of VDDD 28 + 21 29 Example: 22 30 23 31 codec: sgtl5000@0a { ··· 34 26 clocks = <&clks 150>; 35 27 micbias-resistor-k-ohms = <2>; 36 28 micbias-voltage-m-volts = <2250>; 29 + VDDA-supply = <&reg_3p3v>; 30 + VDDIO-supply = <&reg_3p3v>; 37 31 };