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

[oweals/u-boot.git] / arch / arm / dts / dra7.dtsi

diff --git a/arch/arm/dts/dra7.dtsi b/arch/arm/dts/dra7.dtsi
index 02a136a4661aa1ed172e4926a7a8dabad9e271b9..fd1aea0b1b1617b6c4fa08d03c13204c6da61334 100644 (file)
--- a/arch/arm/dts/dra7.dtsi
+++ b/arch/arm/dts/dra7.dtsi
@@ -170,7 +170,7 @@
                                                pbias_mmc_reg: pbias_mmc_omap5 {
                                                        regulator-name = "pbias_mmc_omap5";
                                                        regulator-min-microvolt = <1800000>;
-                                                       regulator-max-microvolt = <3000000>;
+                                                       regulator-max-microvolt = <3300000>;
                                                };
                                        };
 
@@ -1056,7 +1056,7 @@
                };
 
                mmc1: mmc@4809c000 {
-                       compatible = "ti,omap4-hsmmc";
+                       compatible = "ti,dra7-hsmmc", "ti,omap4-hsmmc";
                        reg = <0x4809c000 0x400>;
                        interrupts = <GIC_SPI 78 IRQ_TYPE_LEVEL_HIGH>;
                        ti,hwmods = "mmc1";
@@ -1067,10 +1067,15 @@
                        status = "disabled";
                        pbias-supply = <&pbias_mmc_reg>;
                        max-frequency = <192000000>;
+                       sd-uhs-sdr104;
+                       sd-uhs-sdr50;
+                       sd-uhs-ddr50;
+                       sd-uhs-sdr25;
+                       sd-uhs-sdr12;
                };
 
                mmc2: mmc@480b4000 {
-                       compatible = "ti,omap4-hsmmc";
+                       compatible = "ti,dra7-hsmmc", "ti,omap4-hsmmc";
                        reg = <0x480b4000 0x400>;
                        interrupts = <GIC_SPI 81 IRQ_TYPE_LEVEL_HIGH>;
                        ti,hwmods = "mmc2";
@@ -1079,10 +1084,14 @@
                        dma-names = "tx", "rx";
                        status = "disabled";
                        max-frequency = <192000000>;
+                       sd-uhs-sdr25;
+                       sd-uhs-sdr12;
+                       mmc-hs200-1_8v;
+                       mmc-ddr-1_8v;
                };
 
                mmc3: mmc@480ad000 {
-                       compatible = "ti,omap4-hsmmc";
+                       compatible = "ti,dra7-hsmmc", "ti,omap4-hsmmc";
                        reg = <0x480ad000 0x400>;
                        interrupts = <GIC_SPI 89 IRQ_TYPE_LEVEL_HIGH>;
                        ti,hwmods = "mmc3";
@@ -1092,10 +1101,13 @@
                        status = "disabled";
                        /* Errata i887 limits max-frequency of MMC3 to 64 MHz */
                        max-frequency = <64000000>;
+                       sd-uhs-sdr12;
+                       sd-uhs-sdr25;
+                       sd-uhs-sdr50;
                };
 
                mmc4: mmc@480d1000 {
-                       compatible = "ti,omap4-hsmmc";
+                       compatible = "ti,dra7-hsmmc", "ti,omap4-hsmmc";
                        reg = <0x480d1000 0x400>;
                        interrupts = <GIC_SPI 91 IRQ_TYPE_LEVEL_HIGH>;
                        ti,hwmods = "mmc4";
@@ -1104,6 +1116,8 @@
                        dma-names = "tx", "rx";
                        status = "disabled";
                        max-frequency = <192000000>;
+                       sd-uhs-sdr12;
+                       sd-uhs-sdr25;
                };
 
                mmu0_dsp1: mmu@40d01000 {