ARM: tegra: apalis-tk1: add missing regulators

Add missing regulators:
- reg_module_3v3_audio being VDDA supply of SGTL5000
- VDDD supply of SGTL5000 actually being reg_1v8_vio
- TMP451 temperature sensor vcc supply being reg_module_3v3
- usb3-0 vbus supply being reg_usbh_vbus
- usb3-1 vbus supply being reg_usbo1_vbus
- carrier board HDMI supply being reg_5v0
- carrier board sata target 5v supply being reg_5v0
- carrier board sata target 12v supply being reg_12v0
- carrier board reg_3v3 actually being backlight power supply

Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
Signed-off-by: Thierry Reding <treding@nvidia.com>

diff --git a/arch/arm/boot/dts/tegra124-apalis-eval.dts b/arch/arm/boot/dts/tegra124-apalis-eval.dts
index a6ad759..c2e918d 100644 (file)
--- a/arch/arm/boot/dts/tegra124-apalis-eval.dts
+++ b/arch/arm/boot/dts/tegra124-apalis-eval.dts
@@ -72,6 +72,7 @@
        host1x@50000000 {
                hdmi@54280000 {
                        status = "okay";
+                       hdmi-supply = <&reg_5v0>;
                };
        };
 
@@ -164,6 +165,8 @@
        /* Apalis Serial ATA */
        sata@70020000 {
                status = "okay";
+               target-5v-supply = <&reg_5v0>;
+               target-12v-supply = <&reg_12v0>;
        };
 
        hda@70030000 {
@@ -230,6 +233,7 @@
                default-brightness-level = <6>;
                /* BKL1_ON */
                enable-gpios = <&gpio TEGRA_GPIO(BB, 5) GPIO_ACTIVE_HIGH>;
+               power-supply = <&reg_3v3>;
        };
 
        gpio-keys {
@@ -244,6 +248,13 @@
                };
        };
 
+       reg_3v3: regulator-3v3 {
+               compatible = "regulator-fixed";
+               regulator-name = "3.3V_SW";
+               regulator-min-microvolt = <3300000>;
+               regulator-max-microvolt = <3300000>;
+       };
+
        reg_5v0: regulator-5v0 {
                compatible = "regulator-fixed";
                regulator-name = "5V_SW";
@@ -251,6 +262,13 @@
                regulator-max-microvolt = <5000000>;
        };
 
+       reg_12v0: regulator-12v0 {
+               compatible = "regulator-fixed";
+               regulator-name = "12V_SW";
+               regulator-min-microvolt = <12000000>;
+               regulator-max-microvolt = <12000000>;
+       };
+
        /* USBO1_EN */
        reg_usbo1_vbus: regulator-usbo1-vbus {
                compatible = "regulator-fixed";

diff --git a/arch/arm/boot/dts/tegra124-apalis-v1.2-eval.dts b/arch/arm/boot/dts/tegra124-apalis-v1.2-eval.dts
index 8a8d5fa..eebcc01 100644 (file)
--- a/arch/arm/boot/dts/tegra124-apalis-v1.2-eval.dts
+++ b/arch/arm/boot/dts/tegra124-apalis-v1.2-eval.dts
@@ -36,6 +36,7 @@
        host1x@50000000 {
                hdmi@54280000 {
                        status = "okay";
+                       hdmi-supply = <&reg_5v0>;
                };
        };
 
@@ -129,6 +130,8 @@
        /* Apalis Serial ATA */
        sata@70020000 {
                status = "okay";
+               target-5v-supply = <&reg_5v0>;
+               target-12v-supply = <&reg_12v0>;
        };
 
        hda@70030000 {
@@ -195,6 +198,7 @@
                default-brightness-level = <6>;
                /* BKL1_ON */
                enable-gpios = <&gpio TEGRA_GPIO(BB, 5) GPIO_ACTIVE_HIGH>;
+               power-supply = <&reg_3v3>;
        };
 
        gpio-keys {
@@ -209,6 +213,13 @@
                };
        };
 
+       reg_3v3: regulator-3v3 {
+               compatible = "regulator-fixed";
+               regulator-name = "3.3V_SW";
+               regulator-min-microvolt = <3300000>;
+               regulator-max-microvolt = <3300000>;
+       };
+
        reg_5v0: regulator-5v0 {
                compatible = "regulator-fixed";
                regulator-name = "5V_SW";
@@ -216,6 +227,13 @@
                regulator-max-microvolt = <5000000>;
        };
 
+       reg_12v0: regulator-12v0 {
+               compatible = "regulator-fixed";
+               regulator-name = "12V_SW";
+               regulator-min-microvolt = <12000000>;
+               regulator-max-microvolt = <12000000>;
+       };
+
        /* USBO1_EN */
        reg_usbo1_vbus: regulator-usbo1-vbus {
                compatible = "regulator-fixed";

diff --git a/arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi b/arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi
index 13aa8c7..00d5308 100644 (file)
--- a/arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi
+++ b/arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi
@@ -1565,7 +1565,8 @@
                sgtl5000: codec@a {
                        compatible = "fsl,sgtl5000";
                        reg = <0x0a>;
-                       VDDA-supply = <&reg_module_3v3>;
+                       VDDA-supply = <&reg_module_3v3_audio>;
+                       VDDD-supply = <&reg_1v8_vddio>;
                        VDDIO-supply = <&reg_1v8_vddio>;
                        clocks = <&tegra_car TEGRA124_CLK_EXTERN1>;
                };
@@ -1754,6 +1755,7 @@
                        interrupt-parent = <&gpio>;
                        interrupts = <TEGRA_GPIO(I, 6) IRQ_TYPE_LEVEL_LOW>;
                        #thermal-sensor-cells = <1>;
+                       vcc-supply = <&reg_module_3v3>;
                };
        };
 
@@ -1902,11 +1904,13 @@
                        usb3-0 {
                                status = "okay";
                                nvidia,usb2-companion = <2>;
+                               vbus-supply = <&reg_usbh_vbus>;
                        };
 
                        usb3-1 {
                                status = "okay";
                                nvidia,usb2-companion = <0>;
+                               vbus-supply = <&reg_usbo1_vbus>;
                        };
                };
        };
@@ -1989,6 +1993,14 @@
                vin-supply = <&reg_3v3_mxm>;
        };
 
+       reg_module_3v3_audio: regulator-module-3v3-audio {
+               compatible = "regulator-fixed";
+               regulator-name = "+V3.3_AUDIO_AVDD_S";
+               regulator-min-microvolt = <3300000>;
+               regulator-max-microvolt = <3300000>;
+               regulator-always-on;
+       };
+
        sound {
                compatible = "toradex,tegra-audio-sgtl5000-apalis_tk1",
                             "nvidia,tegra-audio-sgtl5000";

diff --git a/arch/arm/boot/dts/tegra124-apalis.dtsi b/arch/arm/boot/dts/tegra124-apalis.dtsi
index 40c6ca2..65a88d3 100644 (file)
--- a/arch/arm/boot/dts/tegra124-apalis.dtsi
+++ b/arch/arm/boot/dts/tegra124-apalis.dtsi
@@ -1594,7 +1594,8 @@
                sgtl5000: codec@a {
                        compatible = "fsl,sgtl5000";
                        reg = <0x0a>;
-                       VDDA-supply = <&reg_module_3v3>;
+                       VDDA-supply = <&reg_module_3v3_audio>;
+                       VDDD-supply = <&reg_1v8_vddio>;
                        VDDIO-supply = <&reg_1v8_vddio>;
                        clocks = <&tegra_car TEGRA124_CLK_EXTERN1>;
                };
@@ -1783,6 +1784,7 @@
                        interrupt-parent = <&gpio>;
                        interrupts = <TEGRA_GPIO(I, 6) IRQ_TYPE_LEVEL_LOW>;
                        #thermal-sensor-cells = <1>;
+                       vcc-supply = <&reg_module_3v3>;
                };
        };
 
@@ -1931,11 +1933,13 @@
                        usb3-0 {
                                status = "okay";
                                nvidia,usb2-companion = <2>;
+                               vbus-supply = <&reg_usbh_vbus>;
                        };
 
                        usb3-1 {
                                status = "okay";
                                nvidia,usb2-companion = <0>;
+                               vbus-supply = <&reg_usbo1_vbus>;
                        };
                };
        };
@@ -2018,6 +2022,14 @@
                vin-supply = <&reg_3v3_mxm>;
        };
 
+       reg_module_3v3_audio: regulator-module-3v3-audio {
+               compatible = "regulator-fixed";
+               regulator-name = "+V3.3_AUDIO_AVDD_S";
+               regulator-min-microvolt = <3300000>;
+               regulator-max-microvolt = <3300000>;
+               regulator-always-on;
+       };
+
        sound {
                compatible = "toradex,tegra-audio-sgtl5000-apalis_tk1",
                             "nvidia,tegra-audio-sgtl5000";