summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKishon Vijay Abraham I2017-01-31 06:26:54 -0600
committerKishon Vijay Abraham I2017-06-15 10:10:42 -0500
commit9ff08db517eeee6dae306aff41a418d44aa65efb (patch)
tree0468c57035f7fbe94e856eb44c1343cbbc421886
parentbb61b2596ef60e730e49f8bbfcf49edfa8436cf2 (diff)
downloadlinux-phy-vqmmc.tar.gz
linux-phy-vqmmc.tar.xz
linux-phy-vqmmc.zip
ARM: dts: dra7: Add supported MMC/SD modes in MMC dt nodesvqmmc
On DRA7 family SoCs, MMC1 controller supports SDR104, SDR50, DDR50, SDR25 and SDR12 UHS modes (These UHS modes are not supported in beagle-x15 because it's not possible to switch IO lines supply voltage to 1.8v). MMC2 controller supports HS200 and DDR modes. (Since some of the boards like am57xx-evm reva3, beagle-x15 and am57xx idk has 3.3v line connected to IO lines, HS200 cannot be supported in these boards). MMC3 controller supports SDR12, SDR25 and SDR50 modes. MMC4 controller supports SDR12 and SDR25 modes. Add these supported modes in device-tree file. Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com> Signed-off-by: Sekhar Nori <nsekhar@ti.com>
-rw-r--r--arch/arm/boot/dts/am571x-idk.dts1
-rw-r--r--arch/arm/boot/dts/am57xx-beagle-x15-revb1.dts1
-rw-r--r--arch/arm/boot/dts/am57xx-beagle-x15.dts6
-rw-r--r--arch/arm/boot/dts/am57xx-idk-common.dtsi1
-rw-r--r--arch/arm/boot/dts/dra7.dtsi14
5 files changed, 23 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/am571x-idk.dts b/arch/arm/boot/dts/am571x-idk.dts
index 875291d1bdd7..bdf39d47948f 100644
--- a/arch/arm/boot/dts/am571x-idk.dts
+++ b/arch/arm/boot/dts/am571x-idk.dts
@@ -90,4 +90,5 @@
90 pinctrl-0 = <&mmc2_pins_default>; 90 pinctrl-0 = <&mmc2_pins_default>;
91 pinctrl-1 = <&mmc2_pins_hs>; 91 pinctrl-1 = <&mmc2_pins_hs>;
92 pinctrl-2 = <&mmc2_pins_ddr_rev20 &mmc2_iodelay_ddr_conf>; 92 pinctrl-2 = <&mmc2_pins_ddr_rev20 &mmc2_iodelay_ddr_conf>;
93 /delete-property/ mmc-hs200-1_8v;
93}; 94};
diff --git a/arch/arm/boot/dts/am57xx-beagle-x15-revb1.dts b/arch/arm/boot/dts/am57xx-beagle-x15-revb1.dts
index 5a77b334923d..17a25a74a005 100644
--- a/arch/arm/boot/dts/am57xx-beagle-x15-revb1.dts
+++ b/arch/arm/boot/dts/am57xx-beagle-x15-revb1.dts
@@ -36,6 +36,7 @@
36 pinctrl-0 = <&mmc2_pins_default>; 36 pinctrl-0 = <&mmc2_pins_default>;
37 pinctrl-1 = <&mmc2_pins_hs>; 37 pinctrl-1 = <&mmc2_pins_hs>;
38 pinctrl-2 = <&mmc2_pins_ddr_3_3v_rev11 &mmc2_iodelay_ddr_3_3v_rev11_conf>; 38 pinctrl-2 = <&mmc2_pins_ddr_3_3v_rev11 &mmc2_iodelay_ddr_3_3v_rev11_conf>;
39 /delete-property/ mmc-hs200-1_8v;
39}; 40};
40 41
41/* errata i880 "Ethernet RGMII2 Limited to 10/100 Mbps" */ 42/* errata i880 "Ethernet RGMII2 Limited to 10/100 Mbps" */
diff --git a/arch/arm/boot/dts/am57xx-beagle-x15.dts b/arch/arm/boot/dts/am57xx-beagle-x15.dts
index d6689106d2a8..8d9bdf10a7be 100644
--- a/arch/arm/boot/dts/am57xx-beagle-x15.dts
+++ b/arch/arm/boot/dts/am57xx-beagle-x15.dts
@@ -25,6 +25,11 @@
25 pinctrl-1 = <&mmc1_pins_hs>; 25 pinctrl-1 = <&mmc1_pins_hs>;
26 26
27 vmmc-supply = <&ldo1_reg>; 27 vmmc-supply = <&ldo1_reg>;
28 /delete-property/ sd-uhs-sdr104;
29 /delete-property/ sd-uhs-sdr50;
30 /delete-property/ sd-uhs-ddr50;
31 /delete-property/ sd-uhs-sdr25;
32 /delete-property/ sd-uhs-sdr12;
28}; 33};
29 34
30&mmc2 { 35&mmc2 {
@@ -32,6 +37,7 @@
32 pinctrl-0 = <&mmc2_pins_default>; 37 pinctrl-0 = <&mmc2_pins_default>;
33 pinctrl-1 = <&mmc2_pins_hs>; 38 pinctrl-1 = <&mmc2_pins_hs>;
34 pinctrl-2 = <&mmc2_pins_ddr_3_3v_rev11 &mmc2_iodelay_ddr_3_3v_rev11_conf>; 39 pinctrl-2 = <&mmc2_pins_ddr_3_3v_rev11 &mmc2_iodelay_ddr_3_3v_rev11_conf>;
40 /delete-property/ mmc-hs200-1_8v;
35}; 41};
36 42
37/* errata i880 "Ethernet RGMII2 Limited to 10/100 Mbps" */ 43/* errata i880 "Ethernet RGMII2 Limited to 10/100 Mbps" */
diff --git a/arch/arm/boot/dts/am57xx-idk-common.dtsi b/arch/arm/boot/dts/am57xx-idk-common.dtsi
index 47b5b384809f..bf5bf8f52c79 100644
--- a/arch/arm/boot/dts/am57xx-idk-common.dtsi
+++ b/arch/arm/boot/dts/am57xx-idk-common.dtsi
@@ -413,6 +413,7 @@
413 bus-width = <8>; 413 bus-width = <8>;
414 ti,non-removable; 414 ti,non-removable;
415 max-frequency = <96000000>; 415 max-frequency = <96000000>;
416 /delete-property/ mmc-hs200-1_8v;
416}; 417};
417 418
418&dcan1 { 419&dcan1 {
diff --git a/arch/arm/boot/dts/dra7.dtsi b/arch/arm/boot/dts/dra7.dtsi
index 52ce3fab483f..22b0ade96237 100644
--- a/arch/arm/boot/dts/dra7.dtsi
+++ b/arch/arm/boot/dts/dra7.dtsi
@@ -1046,6 +1046,11 @@
1046 status = "disabled"; 1046 status = "disabled";
1047 pbias-supply = <&pbias_mmc_reg>; 1047 pbias-supply = <&pbias_mmc_reg>;
1048 max-frequency = <192000000>; 1048 max-frequency = <192000000>;
1049 sd-uhs-sdr104;
1050 sd-uhs-sdr50;
1051 sd-uhs-ddr50;
1052 sd-uhs-sdr25;
1053 sd-uhs-sdr12;
1049 }; 1054 };
1050 1055
1051 mmc2: mmc@480b4000 { 1056 mmc2: mmc@480b4000 {
@@ -1058,6 +1063,10 @@
1058 dma-names = "tx", "rx"; 1063 dma-names = "tx", "rx";
1059 status = "disabled"; 1064 status = "disabled";
1060 max-frequency = <192000000>; 1065 max-frequency = <192000000>;
1066 sd-uhs-sdr25;
1067 sd-uhs-sdr12;
1068 mmc-hs200-1_8v;
1069 mmc-ddr-1_8v;
1061 }; 1070 };
1062 1071
1063 mmc3: mmc@480ad000 { 1072 mmc3: mmc@480ad000 {
@@ -1071,6 +1080,9 @@
1071 status = "disabled"; 1080 status = "disabled";
1072 /* Errata i887 limits max-frequency of MMC3 to 64 MHz */ 1081 /* Errata i887 limits max-frequency of MMC3 to 64 MHz */
1073 max-frequency = <64000000>; 1082 max-frequency = <64000000>;
1083 sd-uhs-sdr12;
1084 sd-uhs-sdr25;
1085 sd-uhs-sdr50;
1074 }; 1086 };
1075 1087
1076 mmc4: mmc@480d1000 { 1088 mmc4: mmc@480d1000 {
@@ -1083,6 +1095,8 @@
1083 dma-names = "tx", "rx"; 1095 dma-names = "tx", "rx";
1084 status = "disabled"; 1096 status = "disabled";
1085 max-frequency = <192000000>; 1097 max-frequency = <192000000>;
1098 sd-uhs-sdr12;
1099 sd-uhs-sdr25;
1086 }; 1100 };
1087 1101
1088 mmu0_dsp1: mmu@40d01000 { 1102 mmu0_dsp1: mmu@40d01000 {