Merge tag 'u-boot-imx-20191105' of https://gitlab.denx.de/u-boot/custodians/u-boot-imx

[oweals/u-boot.git] / arch / arm / dts / stm32mp157a-dk1.dts

diff --git a/arch/arm/dts/stm32mp157a-dk1.dts b/arch/arm/dts/stm32mp157a-dk1.dts
index 0882765d0c9a7f1535ef6c9de697f8b5696bfbab..c210acc0aa22c2bc73facb9837c9a2d65f918323 100644 (file)
--- a/arch/arm/dts/stm32mp157a-dk1.dts
+++ b/arch/arm/dts/stm32mp157a-dk1.dts
@@ -7,7 +7,7 @@
 /dts-v1/;
 
 #include "stm32mp157c.dtsi"
-#include "stm32mp157-pinctrl.dtsi"
+#include "stm32mp157xac-pinctrl.dtsi"
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/mfd/st,stpmic1.h>
 
@@ -28,6 +28,17 @@
                reg = <0xc0000000 0x20000000>;
        };
 
+       reserved-memory {
+               #address-cells = <1>;
+               #size-cells = <1>;
+               ranges;
+
+               gpu_reserved: gpu@d4000000 {
+                       reg = <0xd4000000 0x4000000>;
+                       no-map;
+               };
+       };
+
        led {
                compatible = "gpio-leds";
                blue {
@@ -39,12 +50,19 @@
        };
 };
 
+&cec {
+       pinctrl-names = "default", "sleep";
+       pinctrl-0 = <&cec_pins_b>;
+       pinctrl-1 = <&cec_pins_sleep_b>;
+       status = "okay";
+};
+
 &ethernet0 {
        status = "okay";
        pinctrl-0 = <&ethernet0_rgmii_pins_a>;
        pinctrl-1 = <&ethernet0_rgmii_pins_sleep_a>;
        pinctrl-names = "default", "sleep";
-       phy-mode = "rgmii";
+       phy-mode = "rgmii-id";
        max-speed = <1000>;
        phy-handle = <&phy0>;
 
@@ -58,29 +76,86 @@
        };
 };
 
+&gpu {
+       contiguous-area = <&gpu_reserved>;
+       status = "okay";
+};
+
+&i2c1 {
+       pinctrl-names = "default", "sleep";
+       pinctrl-0 = <&i2c1_pins_a>;
+       pinctrl-1 = <&i2c1_pins_sleep_a>;
+       i2c-scl-rising-time-ns = <100>;
+       i2c-scl-falling-time-ns = <7>;
+       status = "okay";
+       /delete-property/dmas;
+       /delete-property/dma-names;
+
+       hdmi-transmitter@39 {
+               compatible = "sil,sii9022";
+               reg = <0x39>;
+               iovcc-supply = <&v3v3_hdmi>;
+               cvcc12-supply = <&v1v2_hdmi>;
+               reset-gpios = <&gpioa 10 GPIO_ACTIVE_LOW>;
+               interrupts = <1 IRQ_TYPE_EDGE_FALLING>;
+               interrupt-parent = <&gpiog>;
+               pinctrl-names = "default", "sleep";
+               pinctrl-0 = <&ltdc_pins_a>;
+               pinctrl-1 = <&ltdc_pins_sleep_a>;
+               status = "okay";
+
+               ports {
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+
+                       port@0 {
+                               reg = <0>;
+                               sii9022_in: endpoint {
+                                       remote-endpoint = <&ltdc_ep0_out>;
+                               };
+                       };
+               };
+       };
+};
+
 &i2c4 {
        pinctrl-names = "default";
        pinctrl-0 = <&i2c4_pins_a>;
        i2c-scl-rising-time-ns = <185>;
        i2c-scl-falling-time-ns = <20>;
        status = "okay";
+       /* spare dmas for other usage */
        /delete-property/dmas;
        /delete-property/dma-names;
 
+       typec: stusb1600@28 {
+               compatible = "st,stusb1600";
+               reg = <0x28>;
+               interrupts = <11 IRQ_TYPE_EDGE_FALLING>;
+               interrupt-parent = <&gpioi>;
+               pinctrl-names = "default";
+               pinctrl-0 = <&stusb1600_pins_a>;
+
+               status = "okay";
+
+               typec_con: connector {
+                       compatible = "usb-c-connector";
+                       label = "USB-C";
+                       power-role = "sink";
+                       power-opmode = "default";
+               };
+       };
+
        pmic: stpmic@33 {
                compatible = "st,stpmic1";
                reg = <0x33>;
+               interrupts-extended = <&gpioa 0 IRQ_TYPE_EDGE_FALLING>;
                interrupt-controller;
                #interrupt-cells = <2>;
                status = "okay";
 
-               st,main-control-register = <0x04>;
-               st,vin-control-register = <0xc0>;
-               st,usb-control-register = <0x20>;
-
                regulators {
                        compatible = "st,stpmic1-regulators";
-
                        ldo1-supply = <&v3v3>;
                        ldo3-supply = <&vdd_ddr>;
                        ldo6-supply = <&v3v3>;
@@ -89,7 +164,7 @@
 
                        vddcore: buck1 {
                                regulator-name = "vddcore";
-                               regulator-min-microvolt = <1200000>;
+                               regulator-min-microvolt = <800000>;
                                regulator-max-microvolt = <1350000>;
                                regulator-always-on;
                                regulator-initial-mode = <0>;
@@ -169,7 +244,6 @@
                                regulator-max-microvolt = <1200000>;
                                regulator-always-on;
                                interrupts = <IT_CURLIM_LDO6 0>;
-
                        };
 
                        vref_ddr: vref_ddr {
@@ -186,7 +260,6 @@
                        vbus_otg: pwr_sw1 {
                                regulator-name = "vbus_otg";
                                interrupts = <IT_OCP_OTG 0>;
-                               regulator-active-discharge;
                         };
 
                         vbus_sw: pwr_sw2 {
@@ -198,8 +271,9 @@
 
                onkey {
                        compatible = "st,stpmic1-onkey";
-                       interrupts = <IT_PONKEY_F 0>, <IT_PONKEY_R 1>;
+                       interrupts = <IT_PONKEY_F 0>, <IT_PONKEY_R 0>;
                        interrupt-names = "onkey-falling", "onkey-rising";
+                       power-off-time-sec = <10>;
                        status = "okay";
                };
 
@@ -210,13 +284,40 @@
        };
 };
 
+&ipcc {
+       status = "okay";
+};
+
 &iwdg2 {
        timeout-sec = <32>;
        status = "okay";
 };
 
+&ltdc {
+       status = "okay";
+
+       port {
+               #address-cells = <1>;
+               #size-cells = <0>;
+
+               ltdc_ep0_out: endpoint@0 {
+                       reg = <0>;
+                       remote-endpoint = <&sii9022_in>;
+               };
+       };
+};
+
+&m4_rproc {
+       mboxes = <&ipcc 0>, <&ipcc 1>, <&ipcc 2>;
+       mbox-names = "vq0", "vq1", "shutdown";
+       status = "okay";
+};
+
 &pwr {
-       pwr-supply = <&vdd>;
+       pwr-regulators {
+               vdd-supply = <&vdd>;
+               vdd_3v3_usbfs-supply = <&vdd_usb>;
+       };
 };
 
 &rng1 {
@@ -228,8 +329,10 @@
 };
 
 &sdmmc1 {
-       pinctrl-names = "default";
+       pinctrl-names = "default", "opendrain", "sleep";
        pinctrl-0 = <&sdmmc1_b4_pins_a>;
+       pinctrl-1 = <&sdmmc1_b4_od_pins_a>;
+       pinctrl-2 = <&sdmmc1_b4_sleep_pins_a>;
        broken-cd;
        st,neg-edge;
        bus-width = <4>;
@@ -249,11 +352,25 @@
        status = "okay";
 };
 
+&usbotg_hs {
+       dr_mode = "peripheral";
+       phys = <&usbphyc_port1 0>;
+       phy-names = "usb2-phy";
+       status = "okay";
+};
+
 &usbphyc {
-       vdd3v3-supply = <&vdd_usb>;
        status = "okay";
 };
 
+&usbphyc_port0 {
+       phy-supply = <&vdd_usb>;
+};
+
+&usbphyc_port1 {
+       phy-supply = <&vdd_usb>;
+};
+
 &vrefbuf {
        regulator-min-microvolt = <2500000>;
        regulator-max-microvolt = <2500000>;