@@ -61,17 +61,17 @@
status = "disabled";
};
- reg_2p5v: regulator-2p5v {
+ reg_module_3v3: regulator-module-3v3 {
compatible = "regulator-fixed";
- regulator-name = "2P5V";
- regulator-min-microvolt = <2500000>;
- regulator-max-microvolt = <2500000>;
+ regulator-name = "+V3.3";
+ regulator-min-microvolt = <3300000>;
+ regulator-max-microvolt = <3300000>;
regulator-always-on;
};
- reg_3p3v: regulator-3p3v {
+ reg_module_3v3_audio: regulator-module-3v3-audio {
compatible = "regulator-fixed";
- regulator-name = "3P3V";
+ regulator-name = "+V3.3_AUDIO";
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
regulator-always-on;
@@ -314,8 +314,8 @@
compatible = "fsl,sgtl5000";
reg = <0x0a>;
clocks = <&clks IMX6QDL_CLK_CKO>;
- VDDA-supply = <®_2p5v>;
- VDDIO-supply = <®_3p3v>;
+ VDDA-supply = <®_module_3v3_audio>;
+ VDDIO-supply = <®_module_3v3>;
};
/* STMPE811 touch screen controller */
@@ -447,7 +447,7 @@
&usdhc1 {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_usdhc1_4bit &pinctrl_usdhc1_8bit>;
- vqmmc-supply = <®_3p3v>;
+ vqmmc-supply = <®_module_3v3>;
bus-width = <8>;
disable-wp;
no-1-8-v;
@@ -458,7 +458,7 @@
&usdhc2 {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_usdhc2>;
- vqmmc-supply = <®_3p3v>;
+ vqmmc-supply = <®_module_3v3>;
bus-width = <4>;
disable-wp;
no-1-8-v;
@@ -469,7 +469,7 @@
&usdhc3 {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_usdhc3>;
- vqmmc-supply = <®_3p3v>;
+ vqmmc-supply = <®_module_3v3>;
bus-width = <8>;
no-1-8-v;
non-removable;
@@ -56,17 +56,17 @@
status = "disabled";
};
- reg_2p5v: regulator-2p5v {
+ reg_module_3v3: regulator-module-3v3 {
compatible = "regulator-fixed";
- regulator-name = "2P5V";
- regulator-min-microvolt = <2500000>;
- regulator-max-microvolt = <2500000>;
+ regulator-name = "+V3.3";
+ regulator-min-microvolt = <3300000>;
+ regulator-max-microvolt = <3300000>;
regulator-always-on;
};
- reg_3p3v: regulator-3p3v {
+ reg_module_3v3_audio: regulator-module-3v3-audio {
compatible = "regulator-fixed";
- regulator-name = "3P3V";
+ regulator-name = "+V3.3_AUDIO";
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
regulator-always-on;
@@ -244,8 +244,8 @@
compatible = "fsl,sgtl5000";
reg = <0x0a>;
clocks = <&clks IMX6QDL_CLK_CKO>;
- VDDA-supply = <®_2p5v>;
- VDDIO-supply = <®_3p3v>;
+ VDDA-supply = <®_module_3v3_audio>;
+ VDDIO-supply = <®_module_3v3>;
lrclk-strength = <3>;
};
@@ -380,7 +380,7 @@
pinctrl-0 = <&pinctrl_usdhc1 &pinctrl_mmc_cd>;
cd-gpios = <&gpio2 5 GPIO_ACTIVE_LOW>; /* MMCD */
disable-wp;
- vqmmc-supply = <®_3p3v>;
+ vqmmc-supply = <®_module_3v3>;
bus-width = <4>;
no-1-8-v;
status = "disabled";
@@ -390,7 +390,7 @@
&usdhc3 {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_usdhc3>;
- vqmmc-supply = <®_3p3v>;
+ vqmmc-supply = <®_module_3v3>;
bus-width = <8>;
no-1-8-v;
non-removable;
Remove the 2.5V regulator, it does not exist. There is 3.3V and 3.3V_AUDIO provided to the module through the edge connector, model those as fixed regulators like we use to do in other Colibri device trees. The SGTL5000 uses 3.3V_AUDIO as VDDA. Note that the driver derives the analog ground voltage (VAG) from this supply. The new value should allow higher output swings before clipping occurs. Refer to the SGTL5000 datasheet for details. Signed-off-by: Stefan Agner <stefan@agner.ch> --- arch/arm/boot/dts/imx6qdl-apalis.dtsi | 22 +++++++++++----------- arch/arm/boot/dts/imx6qdl-colibri.dtsi | 20 ++++++++++---------- 2 files changed, 21 insertions(+), 21 deletions(-)