Merge branch 'drm-next-4.16' of git://people.freedesktop.org/~agd5f/linux into drm...

[sfrench/cifs-2.6.git] / arch / arm / boot / dts / imx6qdl-hummingboard.dtsi

diff --git a/arch/arm/boot/dts/imx6qdl-hummingboard.dtsi b/arch/arm/boot/dts/imx6qdl-hummingboard.dtsi
index 37c07c0748aaf99e57ceef90512331e8c7cdf39b..92583238ca4ad956bbe6e6637a8eeee53ef97ff5 100644 (file)
--- a/arch/arm/boot/dts/imx6qdl-hummingboard.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-hummingboard.dtsi
@@ -38,8 +38,6 @@
  *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
  *     OTHER DEALINGS IN THE SOFTWARE.
  */
-#include "imx6qdl-microsom.dtsi"
-#include "imx6qdl-microsom-ar8035.dtsi"
 
 / {
        chosen {
@@ -53,38 +51,58 @@
                pinctrl-0 = <&pinctrl_hummingboard_gpio3_5>;
        };
 
-       regulators {
-               compatible = "simple-bus";
+       v_3v2: regulator-v-3v2 {
+               compatible = "regulator-fixed";
+               regulator-always-on;
+               regulator-max-microvolt = <3300000>;
+               regulator-min-microvolt = <3300000>;
+               regulator-name = "v_3v2";
+               vin-supply = <&v_5v0>;
+       };
 
-               reg_3p3v: 3p3v {
-                       compatible = "regulator-fixed";
-                       regulator-name = "3P3V";
-                       regulator-min-microvolt = <3300000>;
-                       regulator-max-microvolt = <3300000>;
-                       regulator-always-on;
-               };
+       v_5v0: regulator-v-5v0 {
+               compatible = "regulator-fixed";
+               regulator-always-on;
+               regulator-max-microvolt = <5000000>;
+               regulator-min-microvolt = <5000000>;
+               regulator-name = "v_5v0";
+       };
 
-               reg_usbh1_vbus: usb-h1-vbus {
-                       compatible = "regulator-fixed";
-                       enable-active-high;
-                       gpio = <&gpio1 0 GPIO_ACTIVE_HIGH>;
-                       pinctrl-names = "default";
-                       pinctrl-0 = <&pinctrl_hummingboard_usbh1_vbus>;
-                       regulator-name = "usb_h1_vbus";
-                       regulator-min-microvolt = <5000000>;
-                       regulator-max-microvolt = <5000000>;
-               };
+       v_sd: regulator-v-sd {
+               compatible = "regulator-fixed";
+               gpio = <&gpio4 30 GPIO_ACTIVE_HIGH>;
+               pinctrl-names = "default";
+               pinctrl-0 = <&pinctrl_hummingboard_vmmc>;
+               regulator-boot-on;
+               regulator-max-microvolt = <3300000>;
+               regulator-min-microvolt = <3300000>;
+               regulator-name = "v_sd";
+               startup-delay-us = <1000>;
+               vin-supply = <&v_3v2>;
+       };
 
-               reg_usbotg_vbus: usb-otg-vbus {
-                       compatible = "regulator-fixed";
-                       enable-active-high;
-                       gpio = <&gpio3 22 GPIO_ACTIVE_HIGH>;
-                       pinctrl-names = "default";
-                       pinctrl-0 = <&pinctrl_hummingboard_usbotg_vbus>;
-                       regulator-name = "usb_otg_vbus";
-                       regulator-min-microvolt = <5000000>;
-                       regulator-max-microvolt = <5000000>;
-               };
+       v_usb2: regulator-v-usb2 {
+               compatible = "regulator-fixed";
+               enable-active-high;
+               gpio = <&gpio1 0 GPIO_ACTIVE_HIGH>;
+               pinctrl-names = "default";
+               pinctrl-0 = <&pinctrl_hummingboard_usbh1_vbus>;
+               regulator-max-microvolt = <5000000>;
+               regulator-min-microvolt = <5000000>;
+               regulator-name = "v_usb2";
+               vin-supply = <&v_5v0>;
+       };
+
+       v_usb1: regulator-v-usb1 {
+               compatible = "regulator-fixed";
+               enable-active-high;
+               gpio = <&gpio3 22 GPIO_ACTIVE_HIGH>;
+               pinctrl-names = "default";
+               pinctrl-0 = <&pinctrl_hummingboard_usbotg_vbus>;
+               regulator-max-microvolt = <5000000>;
+               regulator-min-microvolt = <5000000>;
+               regulator-name = "v_usb1";
+               vin-supply = <&v_5v0>;
        };
 
        sound-sgtl5000 {
@@ -132,20 +150,20 @@
        status = "okay";
 
        /* Pro baseboard model */
-       rtc: pcf8523@68 {
+       rtc@68 {
                compatible = "nxp,pcf8523";
                reg = <0x68>;
        };
 
        /* Pro baseboard model */
-       sgtl5000: sgtl5000@a {
+       sgtl5000: codec@a {
                clocks = <&clks IMX6QDL_CLK_CKO>;
                compatible = "fsl,sgtl5000";
                pinctrl-names = "default";
                pinctrl-0 = <&pinctrl_hummingboard_sgtl5000>;
                reg = <0x0a>;
-               VDDA-supply = <&reg_3p3v>;
-               VDDIO-supply = <&reg_3p3v>;
+               VDDA-supply = <&v_3v2>;
+               VDDIO-supply = <&v_3v2>;
        };
 };
 
@@ -247,6 +265,11 @@
                                MX6QDL_PAD_SD2_DAT3__SD2_DATA3 0x13059
                        >;
                };
+               pinctrl_hummingboard_vmmc: hummingboard-vmmc {
+                       fsl,pins = <
+                               MX6QDL_PAD_DISP0_DAT9__GPIO4_IO30 0x1b0b0
+                       >;
+               };
        };
 };
 
@@ -280,7 +303,7 @@
 
 &usbh1 {
        disable-over-current;
-       vbus-supply = <&reg_usbh1_vbus>;
+       vbus-supply = <&v_usb2>;
        status = "okay";
 };
 
@@ -288,7 +311,7 @@
        disable-over-current;
        pinctrl-names = "default";
        pinctrl-0 = <&pinctrl_hummingboard_usbotg_id>;
-       vbus-supply = <&reg_usbotg_vbus>;
+       vbus-supply = <&v_usb1>;
        status = "okay";
 };
 
@@ -298,7 +321,11 @@
                &pinctrl_hummingboard_usdhc2_aux
                &pinctrl_hummingboard_usdhc2
        >;
-       vmmc-supply = <&reg_3p3v>;
+       vmmc-supply = <&v_sd>;
        cd-gpios = <&gpio1 4 GPIO_ACTIVE_LOW>;
        status = "okay";
 };
+
+&vcc_3v3 {
+       vin-supply = <&v_3v2>;
+};