Merge tag 'u-boot-imx-20191009' of https://gitlab.denx.de/u-boot/custodians/u-boot-imx
[oweals/u-boot.git] / arch / arm / dts / stm32mp157c-ed1.dts
index f8b7701167118f42508e303d4895d8c1947240f8..1d9cc734f122e91a0a6dd0ce28fdc23159c7411a 100644 (file)
@@ -6,22 +6,38 @@
 /dts-v1/;
 
 #include "stm32mp157c.dtsi"
-#include "stm32mp157-pinctrl.dtsi"
+#include "stm32mp157xaa-pinctrl.dtsi"
 #include <dt-bindings/gpio/gpio.h>
-#include <dt-bindings/mfd/st,stpmu1.h>
+#include <dt-bindings/mfd/st,stpmic1.h>
 
 / {
        model = "STMicroelectronics STM32MP157C eval daughter";
        compatible = "st,stm32mp157c-ed1", "st,stm32mp157";
 
        chosen {
-               stdout-path = "serial3:115200n8";
+               stdout-path = "serial0:115200n8";
        };
 
        memory@c0000000 {
+               device_type = "memory";
                reg = <0xC0000000 0x40000000>;
        };
 
+       reserved-memory {
+               #address-cells = <1>;
+               #size-cells = <1>;
+               ranges;
+
+               gpu_reserved: gpu@e8000000 {
+                       reg = <0xe8000000 0x8000000>;
+                       no-map;
+               };
+       };
+
+       aliases {
+               serial0 = &uart4;
+       };
+
        sd_switch: regulator-sd_switch {
                compatible = "regulator-gpio";
                regulator-name = "sd_switch";
        };
 };
 
-&rng1 {
+&dts {
        status = "okay";
 };
 
-&timers6 {
+&gpu {
+       contiguous-area = <&gpu_reserved>;
        status = "okay";
-       timer@5 {
-               status = "okay";
-       };
 };
 
 &i2c4 {
        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;
 
-       pmic: stpmu1@33 {
-               compatible = "st,stpmu1";
+       pmic: stpmic@33 {
+               compatible = "st,stpmic1";
                reg = <0x33>;
-               interrupts = <0 2>;
-               interrupt-parent = <&gpioa>;
+               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 = <0x30>;
-
                regulators {
-                       compatible = "st,stpmu1-regulators";
-
+                       compatible = "st,stpmic1-regulators";
                        ldo1-supply = <&v3v3>;
                        ldo2-supply = <&v3v3>;
                        ldo3-supply = <&vdd_ddr>;
                                regulator-min-microvolt = <800000>;
                                regulator-max-microvolt = <1350000>;
                                regulator-always-on;
-                               regulator-initial-mode = <2>;
+                               regulator-initial-mode = <0>;
                                regulator-over-current-protection;
-
-                               regulator-state-standby {
-                                       regulator-on-in-suspend;
-                                       regulator-suspend-microvolt = <1200000>;
-                                       regulator-mode = <8>;
-                               };
-                               regulator-state-mem {
-                                       regulator-off-in-suspend;
-                               };
-                               regulator-state-disk {
-                                       regulator-off-in-suspend;
-                               };
                        };
 
                        vdd_ddr: buck2 {
                                regulator-min-microvolt = <1350000>;
                                regulator-max-microvolt = <1350000>;
                                regulator-always-on;
-                               regulator-initial-mode = <2>;
+                               regulator-initial-mode = <0>;
                                regulator-over-current-protection;
-
-                               regulator-state-standby {
-                                       regulator-suspend-microvolt = <1350000>;
-                                       regulator-on-in-suspend;
-                                       regulator-mode = <8>;
-                               };
-                               regulator-state-mem {
-                                       regulator-suspend-microvolt = <1350000>;
-                                       regulator-on-in-suspend;
-                                       regulator-mode = <8>;
-                               };
-                               regulator-state-disk {
-                                       regulator-off-in-suspend;
-                               };
                        };
 
                        vdd: buck3 {
                                regulator-min-microvolt = <3300000>;
                                regulator-max-microvolt = <3300000>;
                                regulator-always-on;
-                               st,mask_reset;
-                               regulator-initial-mode = <8>;
+                               st,mask-reset;
+                               regulator-initial-mode = <0>;
                                regulator-over-current-protection;
-
-                               regulator-state-standby {
-                                       regulator-suspend-microvolt = <3300000>;
-                                       regulator-on-in-suspend;
-                                       regulator-mode = <8>;
-                               };
-                               regulator-state-mem {
-                                       regulator-suspend-microvolt = <3300000>;
-                                       regulator-on-in-suspend;
-                                       regulator-mode = <8>;
-                               };
-                               regulator-state-disk {
-                                       regulator-suspend-microvolt = <3300000>;
-                                       regulator-on-in-suspend;
-                                       regulator-mode = <8>;
-                               };
                        };
 
                        v3v3: buck4 {
                                regulator-name = "v3v3";
                                regulator-min-microvolt = <3300000>;
                                regulator-max-microvolt = <3300000>;
-                               regulator-boot-on;
+                               regulator-always-on;
                                regulator-over-current-protection;
-                               regulator-initial-mode = <8>;
-
-                               regulator-state-standby {
-                                       regulator-suspend-microvolt = <3300000>;
-                                       regulator-unchanged-in-suspend;
-                                       regulator-mode = <8>;
-                               };
-                               regulator-state-mem {
-                                       regulator-off-in-suspend;
-                               };
-                               regulator-state-disk {
-                                       regulator-off-in-suspend;
-                               };
+                               regulator-initial-mode = <0>;
                        };
 
                        vdda: ldo1 {
                                regulator-min-microvolt = <2900000>;
                                regulator-max-microvolt = <2900000>;
                                interrupts = <IT_CURLIM_LDO1 0>;
-                               interrupt-parent = <&pmic>;
-
-                               regulator-state-standby {
-                                       regulator-suspend-microvolt = <2900000>;
-                                       regulator-unchanged-in-suspend;
-                               };
-                               regulator-state-mem {
-                                       regulator-off-in-suspend;
-                               };
-                               regulator-state-disk {
-                                       regulator-off-in-suspend;
-                               };
                        };
 
                        v2v8: ldo2 {
                                regulator-min-microvolt = <2800000>;
                                regulator-max-microvolt = <2800000>;
                                interrupts = <IT_CURLIM_LDO2 0>;
-                               interrupt-parent = <&pmic>;
-
-                               regulator-state-standby {
-                                       regulator-suspend-microvolt = <2800000>;
-                                       regulator-unchanged-in-suspend;
-                               };
-                               regulator-state-mem {
-                                       regulator-off-in-suspend;
-                               };
-                               regulator-state-disk {
-                                       regulator-off-in-suspend;
-                               };
                        };
 
                        vtt_ddr: ldo3 {
                                regulator-name = "vtt_ddr";
-                               regulator-min-microvolt = <0000000>;
-                               regulator-max-microvolt = <1000000>;
+                               regulator-min-microvolt = <500000>;
+                               regulator-max-microvolt = <750000>;
                                regulator-always-on;
                                regulator-over-current-protection;
-
-                               regulator-state-standby {
-                                       regulator-off-in-suspend;
-                               };
-                               regulator-state-mem {
-                                       regulator-off-in-suspend;
-                               };
-                               regulator-state-disk {
-                                       regulator-off-in-suspend;
-                               };
                        };
 
                        vdd_usb: ldo4 {
                                regulator-min-microvolt = <3300000>;
                                regulator-max-microvolt = <3300000>;
                                interrupts = <IT_CURLIM_LDO4 0>;
-                               interrupt-parent = <&pmic>;
-
-                               regulator-state-standby {
-                                       regulator-unchanged-in-suspend;
-                               };
-                               regulator-state-mem {
-                                       regulator-off-in-suspend;
-                               };
-                               regulator-state-disk {
-                                       regulator-off-in-suspend;
-                               };
                        };
 
                        vdd_sd: ldo5 {
                                regulator-min-microvolt = <2900000>;
                                regulator-max-microvolt = <2900000>;
                                interrupts = <IT_CURLIM_LDO5 0>;
-                               interrupt-parent = <&pmic>;
                                regulator-boot-on;
-
-                               regulator-state-standby {
-                                       regulator-suspend-microvolt = <2900000>;
-                                       regulator-unchanged-in-suspend;
-                               };
-                               regulator-state-mem {
-                                       regulator-off-in-suspend;
-                               };
-                               regulator-state-disk {
-                                       regulator-off-in-suspend;
-                               };
                        };
 
                        v1v8: ldo6 {
                                regulator-min-microvolt = <1800000>;
                                regulator-max-microvolt = <1800000>;
                                interrupts = <IT_CURLIM_LDO6 0>;
-                               interrupt-parent = <&pmic>;
-
-                               regulator-state-standby {
-                                       regulator-suspend-microvolt = <1800000>;
-                                       regulator-unchanged-in-suspend;
-                               };
-                               regulator-state-mem {
-                                       regulator-off-in-suspend;
-                               };
-                               regulator-state-disk {
-                                       regulator-off-in-suspend;
-                               };
                        };
 
                        vref_ddr: vref_ddr {
                                regulator-name = "vref_ddr";
                                regulator-always-on;
                                regulator-over-current-protection;
-
-                               regulator-state-standby {
-                                       regulator-on-in-suspend;
-                               };
-                               regulator-state-mem {
-                                       regulator-on-in-suspend;
-                               };
-                               regulator-state-disk {
-                                       regulator-off-in-suspend;
-                               };
                        };
 
                         bst_out: boost {
                                regulator-name = "bst_out";
                                interrupts = <IT_OCP_BOOST 0>;
-                               interrupt-parent = <&pmic>;
                         };
 
                        vbus_otg: pwr_sw1 {
                                regulator-name = "vbus_otg";
                                interrupts = <IT_OCP_OTG 0>;
-                               interrupt-parent = <&pmic>;
-                               regulator-active-discharge;
                         };
 
                         vbus_sw: pwr_sw2 {
                                regulator-name = "vbus_sw";
                                interrupts = <IT_OCP_SWOUT 0>;
-                               interrupt-parent = <&pmic>;
                                regulator-active-discharge;
                         };
                };
+
+               onkey {
+                       compatible = "st,stpmic1-onkey";
+                       interrupts = <IT_PONKEY_F 0>, <IT_PONKEY_R 0>;
+                       interrupt-names = "onkey-falling", "onkey-rising";
+                       power-off-time-sec = <10>;
+                       status = "okay";
+               };
+
+               watchdog {
+                       compatible = "st,stpmic1-wdt";
+                       status = "disabled";
+               };
        };
 };
 
+&ipcc {
+       status = "okay";
+};
+
+&iwdg2 {
+       timeout-sec = <32>;
+       status = "okay";
+};
+
+&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 {
+       status = "okay";
+};
+
+&rtc {
+       status = "okay";
 };
 
 &sdmmc1 {
+       pinctrl-names = "default", "opendrain", "sleep";
        pinctrl-0 = <&sdmmc1_b4_pins_a &sdmmc1_dir_pins_a>;
+       pinctrl-1 = <&sdmmc1_b4_od_pins_a &sdmmc1_dir_pins_a>;
+       pinctrl-2 = <&sdmmc1_b4_sleep_pins_a &sdmmc1_dir_sleep_pins_a>;
        broken-cd;
-       st,dirpol;
-       st,negedge;
-       st,pin-ckin;
+       st,sig-dir;
+       st,neg-edge;
+       st,use-ckin;
        bus-width = <4>;
        vmmc-supply = <&vdd_sd>;
        vqmmc-supply = <&sd_switch>;
-       sd-uhs-sdr12;
-       sd-uhs-sdr25;
-       sd-uhs-sdr50;
-       sd-uhs-ddr50;
-       sd-uhs-sdr104;
        status = "okay";
 };
 
        non-removable;
        no-sd;
        no-sdio;
-       st,dirpol;
-       st,negedge;
+       st,sig-dir;
+       st,neg-edge;
        bus-width = <8>;
        vmmc-supply = <&v3v3>;
        vqmmc-supply = <&vdd>;
        status = "okay";
 };
 
+&timers6 {
+       status = "okay";
+       /* spare dmas for other usage */
+       /delete-property/dmas;
+       /delete-property/dma-names;
+       timer@5 {
+               status = "okay";
+       };
+};
+
 &uart4 {
        pinctrl-names = "default";
        pinctrl-0 = <&uart4_pins_a>;
 };
 
 &usbotg_hs {
-       usb33d-supply = <&usb33>;
+       vbus-supply = <&vbus_otg>;
 };
 
 &usbphyc_port0 {
        phy-supply = <&vdd_usb>;
-       vdda1v1-supply = <&reg11>;
-       vdda1v8-supply = <&reg18>;
 };
 
 &usbphyc_port1 {
        phy-supply = <&vdd_usb>;
-       vdda1v1-supply = <&reg11>;
-       vdda1v8-supply = <&reg18>;
 };