ARM: dts: stm32: Reinstate card detect behavior on ST boards

[platform/kernel/u-boot.git] / arch / arm / dts / stm32mp157a-dk1-u-boot.dtsi

diff --git a/arch/arm/dts/stm32mp157a-dk1-u-boot.dtsi b/arch/arm/dts/stm32mp157a-dk1-u-boot.dtsi
index b4cfba0..e13dade 100644 (file)
--- a/arch/arm/dts/stm32mp157a-dk1-u-boot.dtsi
+++ b/arch/arm/dts/stm32mp157a-dk1-u-boot.dtsi
@@ -4,19 +4,37 @@
  */
 
 #include <dt-bindings/clock/stm32mp1-clksrc.h>
-#include "stm32mp157-u-boot.dtsi"
+#include "stm32mp15-u-boot.dtsi"
 #include "stm32mp15-ddr3-1x4Gb-1066-binG.dtsi"
 
 / {
        aliases {
                i2c3 = &i2c4;
                mmc0 = &sdmmc1;
+               usb0 = &usbotg_hs;
        };
        config {
                u-boot,boot-led = "heartbeat";
                u-boot,error-led = "error";
                st,adc_usb_pd = <&adc1 18>, <&adc1 19>;
+               st,fastboot-gpios = <&gpioa 13 GPIO_ACTIVE_LOW>;
+               st,stm32prog-gpios = <&gpioa 14 GPIO_ACTIVE_LOW>;
        };
+
+       firmware {
+               optee {
+                       compatible = "linaro,optee-tz";
+                       method = "smc";
+               };
+       };
+
+       reserved-memory {
+               optee@de000000 {
+                       reg = <0xde000000 0x02000000>;
+                       no-map;
+               };
+       };
+
        led {
                red {
                        label = "error";
@@ -24,13 +42,13 @@
                        default-state = "off";
                        status = "okay";
                };
-
-               blue {
-                       default-state = "on";
-               };
        };
 };
 
+&adc {
+       status = "okay";
+};
+
 &clk_hse {
        st,digbypass;
 };
@@ -103,7 +121,7 @@
                CLK_UART6_HSI
                CLK_UART78_HSI
                CLK_SPDIF_PLL4P
-               CLK_FDCAN_PLL4Q
+               CLK_FDCAN_PLL4R
                CLK_SAI1_PLL3Q
                CLK_SAI2_PLL3Q
                CLK_SAI3_PLL3Q
@@ -117,6 +135,8 @@
 
        /* VCO = 1300.0 MHz => P = 650 (CPU) */
        pll1: st,pll@0 {
+               compatible = "st,stm32mp1-pll";
+               reg = <0>;
                cfg = < 2 80 0 0 0 PQR(1,0,0) >;
                frac = < 0x800 >;
                u-boot,dm-pre-reloc;
@@ -124,6 +144,8 @@
 
        /* VCO = 1066.0 MHz => P = 266 (AXI), Q = 533 (GPU), R = 533 (DDR) */
        pll2: st,pll@1 {
+               compatible = "st,stm32mp1-pll";
+               reg = <1>;
                cfg = < 2 65 1 0 0 PQR(1,1,1) >;
                frac = < 0x1400 >;
                u-boot,dm-pre-reloc;
@@ -131,6 +153,8 @@
 
        /* VCO = 417.8 MHz => P = 209, Q = 24, R = 11 */
        pll3: st,pll@2 {
+               compatible = "st,stm32mp1-pll";
+               reg = <2>;
                cfg = < 1 33 1 16 36 PQR(1,1,1) >;
                frac = < 0x1a04 >;
                u-boot,dm-pre-reloc;
@@ -138,6 +162,8 @@
 
        /* VCO = 594.0 MHz => P = 99, Q = 74, R = 74 */
        pll4: st,pll@3 {
+               compatible = "st,stm32mp1-pll";
+               reg = <3>;
                cfg = < 3 98 5 7 7 PQR(1,1,1) >;
                u-boot,dm-pre-reloc;
        };
@@ -145,11 +171,16 @@
 
 &sdmmc1 {
        u-boot,dm-spl;
+       broken-cd;
+       /delete-property/ cd-gpios;
 };
 
 &sdmmc1_b4_pins_a {
        u-boot,dm-spl;
-       pins {
+       pins1 {
+               u-boot,dm-spl;
+       };
+       pins2 {
                u-boot,dm-spl;
        };
 };
@@ -165,14 +196,12 @@
        };
        pins2 {
                u-boot,dm-pre-reloc;
+               /* pull-up on rx to avoid floating level */
+               bias-pull-up;
        };
 };
 
 &usbotg_hs {
-       usb1600;
+       u-boot,force-b-session-valid;
        hnp-srp-disable;
 };
-
-&v3v3 {
-       regulator-always-on;
-};