Skip to contentSkip to conversation

ARM: dts: imx6ull-colibri: enable UHS-I for USDHC1

PATCH Applied Igor Opaniuk 4 participants 7 messages Jun 6, 2019 – Jun 12, 2019

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ARM: dts: imx6ull-colibri: enable UHS-I for USDHC1

From: Igor Opaniuk <[email protected]>

Allows to use the SD interface at a higher speed mode if the card supports it. For this the signaling voltage is switched from 3.3V to 1.8V under the usdhc1's drivers control.

---
 arch/arm/boot/dts/imx6ul.dtsi                  |  4 ++++
 arch/arm/boot/dts/imx6ull-colibri-eval-v3.dtsi | 11 +++++++++--
 arch/arm/boot/dts/imx6ull-colibri.dtsi         |  6 ++++++
 3 files changed, 19 insertions(+), 2 deletions(-)
arch/arm/boot/dts/imx6ul.dtsi +4 -0
index fc388b84bf22..91a0ced44e27 100644
@@ -857,6 +857,8 @@
 					 <&clks IMX6UL_CLK_USDHC1>,
 					 <&clks IMX6UL_CLK_USDHC1>;
 				clock-names = "ipg", "ahb", "per";
+				fsl,tuning-step= <2>;
+				fsl,tuning-start-tap = <20>;
 				bus-width = <4>;
 				status = "disabled";
 			};
@@ -870,6 +872,8 @@
 					 <&clks IMX6UL_CLK_USDHC2>;
 				clock-names = "ipg", "ahb", "per";
 				bus-width = <4>;
+				fsl,tuning-step= <2>;
+				fsl,tuning-start-tap = <20>;
 				status = "disabled";
 			};
 
arch/arm/boot/dts/imx6ull-colibri-eval-v3.dtsi +9 -2
index 006690ea98c0..7dc7770cf52c 100644
@@ -145,13 +145,20 @@
 };
 
 &usdhc1 {
-	pinctrl-names = "default";
+	pinctrl-names = "default", "state_100mhz", "state_200mhz", "sleep";
 	pinctrl-0 = <&pinctrl_usdhc1 &pinctrl_snvs_usdhc1_cd>;
-	no-1-8-v;
+	pinctrl-1 = <&pinctrl_usdhc1_100mhz &pinctrl_snvs_usdhc1_cd>;
+	pinctrl-2 = <&pinctrl_usdhc1_100mhz &pinctrl_snvs_usdhc1_cd>;
+	pinctrl-3 = <&pinctrl_usdhc1 &pinctrl_snvs_usdhc1_sleep_cd>;
 	cd-gpios = <&gpio5 0 GPIO_ACTIVE_LOW>;
 	disable-wp;
 	wakeup-source;
 	keep-power-in-suspend;
 	vmmc-supply = <&reg_3v3>;
+	vqmmc-supply = <&reg_sd1_vmmc>;
+	sd-uhs-sdr12;
+	sd-uhs-sdr25;
+	sd-uhs-sdr50;
+	sd-uhs-sdr104;
 	status = "okay";
 };
arch/arm/boot/dts/imx6ull-colibri.dtsi +6 -0
index 9ad1da159768..d56728f03c35 100644
@@ -545,6 +545,12 @@
 		>;
 	};
 
+	pinctrl_snvs_usdhc1_sleep_cd: snvs-usdhc1-cd-grp-slp {
+		fsl,pins = <
+			MX6ULL_PAD_SNVS_TAMPER0__GPIO5_IO00	0x0
+		>;
+	};
+
 	pinctrl_snvs_wifi_pdn: snvs-wifi-pdn-grp {
 		fsl,pins = <
 			MX6ULL_PAD_BOOT_MODE1__GPIO5_IO11	0x14
Signature · 1 line
2.17.1
Reviewed-by on v1 1/1
#1 lore raw
Quoted 7 lines · Igor Opaniuk

From: Igor Opaniuk <[email protected]>

Allows to use the SD interface at a higher speed mode if the card supports it. For this the signaling voltage is switched from 3.3V to 1.8V under the usdhc1's drivers control.

Quoted 76 lines
---
 arch/arm/boot/dts/imx6ul.dtsi                  |  4 ++++
 arch/arm/boot/dts/imx6ull-colibri-eval-v3.dtsi | 11 +++++++++--
 arch/arm/boot/dts/imx6ull-colibri.dtsi         |  6 ++++++
 3 files changed, 19 insertions(+), 2 deletions(-)
arch/arm/boot/dts/imx6ul.dtsi +4 -0
index fc388b84bf22..91a0ced44e27 100644
@@ -857,6 +857,8 @@
 					 <&clks IMX6UL_CLK_USDHC1>,
 					 <&clks IMX6UL_CLK_USDHC1>;
 				clock-names = "ipg", "ahb", "per";
+				fsl,tuning-step= <2>;
+				fsl,tuning-start-tap = <20>;
 				bus-width = <4>;
 				status = "disabled";
 			};
@@ -870,6 +872,8 @@
 					 <&clks IMX6UL_CLK_USDHC2>;
 				clock-names = "ipg", "ahb", "per";
 				bus-width = <4>;
+				fsl,tuning-step= <2>;
+				fsl,tuning-start-tap = <20>;
 				status = "disabled";
 			};
 
arch/arm/boot/dts/imx6ull-colibri-eval-v3.dtsi +9 -2
index 006690ea98c0..7dc7770cf52c 100644
@@ -145,13 +145,20 @@
 };
 
 &usdhc1 {
-	pinctrl-names = "default";
+	pinctrl-names = "default", "state_100mhz", "state_200mhz",
 "sleep";
 	pinctrl-0 = <&pinctrl_usdhc1 &pinctrl_snvs_usdhc1_cd>;
-	no-1-8-v;
+	pinctrl-1 = <&pinctrl_usdhc1_100mhz &pinctrl_snvs_usdhc1_cd>;
+	pinctrl-2 = <&pinctrl_usdhc1_100mhz &pinctrl_snvs_usdhc1_cd>;
+	pinctrl-3 = <&pinctrl_usdhc1 &pinctrl_snvs_usdhc1_sleep_cd>;
 	cd-gpios = <&gpio5 0 GPIO_ACTIVE_LOW>;
 	disable-wp;
 	wakeup-source;
 	keep-power-in-suspend;
 	vmmc-supply = <&reg_3v3>;
+	vqmmc-supply = <&reg_sd1_vmmc>;
+	sd-uhs-sdr12;
+	sd-uhs-sdr25;
+	sd-uhs-sdr50;
+	sd-uhs-sdr104;
 	status = "okay";

};

arch/arm/boot/dts/imx6ull-colibri.dtsi +6 -0
index 9ad1da159768..d56728f03c35 100644
@@ -545,6 +545,12 @@
 		>;
 	};
 
+	pinctrl_snvs_usdhc1_sleep_cd: snvs-usdhc1-cd-grp-slp {
+		fsl,pins = <
+			MX6ULL_PAD_SNVS_TAMPER0__GPIO5_IO00	0x0
+		>;
+	};
+
 	pinctrl_snvs_wifi_pdn: snvs-wifi-pdn-grp {
 		fsl,pins = <
 			MX6ULL_PAD_BOOT_MODE1__GPIO5_IO11	0x14
#3 lore raw
In reply to Igor Opaniuk
Quoted 41 lines · Igor Opaniuk

From: Igor Opaniuk <[email protected]>

Allows to use the SD interface at a higher speed mode if the card supports it. For this the signaling voltage is switched from 3.3V to 1.8V under the usdhc1's drivers control.

---
 arch/arm/boot/dts/imx6ul.dtsi                  |  4 ++++
 arch/arm/boot/dts/imx6ull-colibri-eval-v3.dtsi | 11 +++++++++--
 arch/arm/boot/dts/imx6ull-colibri.dtsi         |  6 ++++++
 3 files changed, 19 insertions(+), 2 deletions(-)
arch/arm/boot/dts/imx6ul.dtsi +4 -0
index fc388b84bf22..91a0ced44e27 100644
@@ -857,6 +857,8 @@
 					 <&clks IMX6UL_CLK_USDHC1>,
 					 <&clks IMX6UL_CLK_USDHC1>;
 				clock-names = "ipg", "ahb", "per";
+				fsl,tuning-step= <2>;
+				fsl,tuning-start-tap = <20>;
 				bus-width = <4>;
 				status = "disabled";
 			};
@@ -870,6 +872,8 @@
 					 <&clks IMX6UL_CLK_USDHC2>;
 				clock-names = "ipg", "ahb", "per";
 				bus-width = <4>;
+				fsl,tuning-step= <2>;
+				fsl,tuning-start-tap = <20>;
 				status = "disabled";
 			};
 
arch/arm/boot/dts/imx6ull-colibri-eval-v3.dtsi +0 -0
index 006690ea98c0..7dc7770cf52c 100644

arch/arm/boot/dts/imx6ull-colibri-eval-v3.dtsi line 151

Quoted 9 lines
arch/arm/boot/dts/imx6ull-colibri-eval-v3.dtsi +3 -2
@@ -145,13 +145,20 @@
 };
 
 &usdhc1 {
-	pinctrl-names = "default";
+	pinctrl-names = "default", "state_100mhz", "state_200mhz", "sleep";
 	pinctrl-0 = <&pinctrl_usdhc1 &pinctrl_snvs_usdhc1_cd>;
-	no-1-8-v;
+	pinctrl-1 = <&pinctrl_usdhc1_100mhz &pinctrl_snvs_usdhc1_cd>;
+	pinctrl-2 = <&pinctrl_usdhc1_100mhz &pinctrl_snvs_usdhc1_cd>;

Should that not be pinctrl_usdhc1_200mhz?

--
Stefan

Quoted 31 lines
arch/arm/boot/dts/imx6ull-colibri-eval-v3.dtsi +6 -0
+	pinctrl-3 = <&pinctrl_usdhc1 &pinctrl_snvs_usdhc1_sleep_cd>;
 	cd-gpios = <&gpio5 0 GPIO_ACTIVE_LOW>;
 	disable-wp;
 	wakeup-source;
 	keep-power-in-suspend;
 	vmmc-supply = <&reg_3v3>;
+	vqmmc-supply = <&reg_sd1_vmmc>;
+	sd-uhs-sdr12;
+	sd-uhs-sdr25;
+	sd-uhs-sdr50;
+	sd-uhs-sdr104;
 	status = "okay";
 };
arch/arm/boot/dts/imx6ull-colibri.dtsi +6 -0
index 9ad1da159768..d56728f03c35 100644
@@ -545,6 +545,12 @@
 		>;
 	};
 
+	pinctrl_snvs_usdhc1_sleep_cd: snvs-usdhc1-cd-grp-slp {
+		fsl,pins = <
+			MX6ULL_PAD_SNVS_TAMPER0__GPIO5_IO00	0x0
+		>;
+	};
+
 	pinctrl_snvs_wifi_pdn: snvs-wifi-pdn-grp {
 		fsl,pins = <
 			MX6ULL_PAD_BOOT_MODE1__GPIO5_IO11	0x14
#4 lore raw

Hi Stefan,

Quoted 45 lines · Stefan Agner
Quoted 43 lines · Igor Opaniuk

From: Igor Opaniuk <[email protected]>

Allows to use the SD interface at a higher speed mode if the card supports it. For this the signaling voltage is switched from 3.3V to 1.8V under the usdhc1's drivers control.

---
 arch/arm/boot/dts/imx6ul.dtsi                  |  4 ++++
 arch/arm/boot/dts/imx6ull-colibri-eval-v3.dtsi | 11 +++++++++--
 arch/arm/boot/dts/imx6ull-colibri.dtsi         |  6 ++++++
 3 files changed, 19 insertions(+), 2 deletions(-)
arch/arm/boot/dts/imx6ul.dtsi +4 -0
index fc388b84bf22..91a0ced44e27 100644
@@ -857,6 +857,8 @@
                                       <&clks IMX6UL_CLK_USDHC1>,
                                       <&clks IMX6UL_CLK_USDHC1>;
                              clock-names = "ipg", "ahb", "per";
+                             fsl,tuning-step= <2>;
+                             fsl,tuning-start-tap = <20>;
                              bus-width = <4>;
                              status = "disabled";
                      };
@@ -870,6 +872,8 @@
                                       <&clks IMX6UL_CLK_USDHC2>;
                              clock-names = "ipg", "ahb", "per";
                              bus-width = <4>;
+                             fsl,tuning-step= <2>;
+                             fsl,tuning-start-tap = <20>;
                              status = "disabled";
                      };
 
arch/arm/boot/dts/imx6ull-colibri-eval-v3.dtsi +0 -0
index 006690ea98c0..7dc7770cf52c 100644
@@ -145,13 +145,20 @@
 };
 
Quoted 10 lines

arch/arm/boot/dts/imx6ull-colibri-eval-v3.dtsi line 151

Quoted 7 lines
arch/arm/boot/dts/imx6ull-colibri-eval-v3.dtsi +3 -2
 &usdhc1 {
-     pinctrl-names = "default";
+     pinctrl-names = "default", "state_100mhz", "state_200mhz", "sleep";
      pinctrl-0 = <&pinctrl_usdhc1 &pinctrl_snvs_usdhc1_cd>;
-     no-1-8-v;
+     pinctrl-1 = <&pinctrl_usdhc1_100mhz &pinctrl_snvs_usdhc1_cd>;
+     pinctrl-2 = <&pinctrl_usdhc1_100mhz &pinctrl_snvs_usdhc1_cd>;

Should that not be pinctrl_usdhc1_200mhz?

Correct, thanks for pointing this out.
Taking into account that the patch was already accepted by Shawn, will send another to fix this typo ASAP (added to my todo list).

Thanks

Quoted 34 lines

--
Stefan

Quoted 31 lines
arch/arm/boot/dts/imx6ull-colibri-eval-v3.dtsi +6 -0
+     pinctrl-3 = <&pinctrl_usdhc1 &pinctrl_snvs_usdhc1_sleep_cd>;
      cd-gpios = <&gpio5 0 GPIO_ACTIVE_LOW>;
      disable-wp;
      wakeup-source;
      keep-power-in-suspend;
      vmmc-supply = <&reg_3v3>;
+     vqmmc-supply = <&reg_sd1_vmmc>;
+     sd-uhs-sdr12;
+     sd-uhs-sdr25;
+     sd-uhs-sdr50;
+     sd-uhs-sdr104;
      status = "okay";
 };
arch/arm/boot/dts/imx6ull-colibri.dtsi +6 -0
index 9ad1da159768..d56728f03c35 100644
@@ -545,6 +545,12 @@
              >;
      };
 
+     pinctrl_snvs_usdhc1_sleep_cd: snvs-usdhc1-cd-grp-slp {
+             fsl,pins = <
+                     MX6ULL_PAD_SNVS_TAMPER0__GPIO5_IO00     0x0
+             >;
+     };
+
      pinctrl_snvs_wifi_pdn: snvs-wifi-pdn-grp {
              fsl,pins = <
                      MX6ULL_PAD_BOOT_MODE1__GPIO5_IO11       0x14
Signature · 13 lines
Best regards - Freundliche Grüsse - Meilleures salutations

Igor Opaniuk

mailto: [email protected]
skype: igor.opanyuk
+380 (93) 836 40 67
http://ua.linkedin.com/in/iopaniuk

_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
#5 lore raw
Quoted 59 lines · Igor Opaniuk

Hi Stefan,

Quoted 45 lines · Stefan Agner
Quoted 43 lines · Igor Opaniuk

From: Igor Opaniuk <[email protected]>

Allows to use the SD interface at a higher speed mode if the card supports it. For this the signaling voltage is switched from 3.3V to 1.8V under the usdhc1's drivers control.

---
 arch/arm/boot/dts/imx6ul.dtsi                  |  4 ++++
 arch/arm/boot/dts/imx6ull-colibri-eval-v3.dtsi | 11 +++++++++--
 arch/arm/boot/dts/imx6ull-colibri.dtsi         |  6 ++++++
 3 files changed, 19 insertions(+), 2 deletions(-)
arch/arm/boot/dts/imx6ul.dtsi +4 -0
index fc388b84bf22..91a0ced44e27 100644
@@ -857,6 +857,8 @@
                                       <&clks IMX6UL_CLK_USDHC1>,
                                       <&clks IMX6UL_CLK_USDHC1>;
                              clock-names = "ipg", "ahb", "per";
+                             fsl,tuning-step= <2>;
+                             fsl,tuning-start-tap = <20>;
                              bus-width = <4>;
                              status = "disabled";
                      };
@@ -870,6 +872,8 @@
                                       <&clks IMX6UL_CLK_USDHC2>;
                              clock-names = "ipg", "ahb", "per";
                              bus-width = <4>;
+                             fsl,tuning-step= <2>;
+                             fsl,tuning-start-tap = <20>;
                              status = "disabled";
                      };
 
arch/arm/boot/dts/imx6ull-colibri-eval-v3.dtsi +0 -0
index 006690ea98c0..7dc7770cf52c 100644
@@ -145,13 +145,20 @@
 };
 
Quoted 10 lines

arch/arm/boot/dts/imx6ull-colibri-eval-v3.dtsi line 151

Quoted 7 lines
arch/arm/boot/dts/imx6ull-colibri-eval-v3.dtsi +3 -2
 &usdhc1 {
-     pinctrl-names = "default";
+     pinctrl-names = "default", "state_100mhz", "state_200mhz", "sleep";
      pinctrl-0 = <&pinctrl_usdhc1 &pinctrl_snvs_usdhc1_cd>;
-     no-1-8-v;
+     pinctrl-1 = <&pinctrl_usdhc1_100mhz &pinctrl_snvs_usdhc1_cd>;
+     pinctrl-2 = <&pinctrl_usdhc1_100mhz &pinctrl_snvs_usdhc1_cd>;

Should that not be pinctrl_usdhc1_200mhz?

Quoted 3 lines

Correct, thanks for pointing this out.
Taking into account that the patch was already accepted by Shawn, will send another to fix this typo ASAP (added to my todo list).

I just fixed it up on my branch.

Shawn

#6 lore raw
Quoted 61 lines · Shawn Guo
Quoted 59 lines · Igor Opaniuk

Hi Stefan,

Quoted 55 lines · Stefan Agner
Quoted 41 lines · Igor Opaniuk

From: Igor Opaniuk <[email protected]>

Allows to use the SD interface at a higher speed mode if the card supports it. For this the signaling voltage is switched from 3.3V to 1.8V under the usdhc1's drivers control.

---
 arch/arm/boot/dts/imx6ul.dtsi                  |  4 ++++
 arch/arm/boot/dts/imx6ull-colibri-eval-v3.dtsi | 11 +++++++++--
 arch/arm/boot/dts/imx6ull-colibri.dtsi         |  6 ++++++
 3 files changed, 19 insertions(+), 2 deletions(-)
arch/arm/boot/dts/imx6ul.dtsi +4 -0
index fc388b84bf22..91a0ced44e27 100644
@@ -857,6 +857,8 @@
                                       <&clks IMX6UL_CLK_USDHC1>,
                                       <&clks IMX6UL_CLK_USDHC1>;
                              clock-names = "ipg", "ahb", "per";
+                             fsl,tuning-step= <2>;
+                             fsl,tuning-start-tap = <20>;
                              bus-width = <4>;
                              status = "disabled";
                      };
@@ -870,6 +872,8 @@
                                       <&clks IMX6UL_CLK_USDHC2>;
                              clock-names = "ipg", "ahb", "per";
                              bus-width = <4>;
+                             fsl,tuning-step= <2>;
+                             fsl,tuning-start-tap = <20>;
                              status = "disabled";
                      };
 
arch/arm/boot/dts/imx6ull-colibri-eval-v3.dtsi +0 -0
index 006690ea98c0..7dc7770cf52c 100644

arch/arm/boot/dts/imx6ull-colibri-eval-v3.dtsi line 151

Quoted 9 lines
arch/arm/boot/dts/imx6ull-colibri-eval-v3.dtsi +3 -2
@@ -145,13 +145,20 @@
 };
 
 &usdhc1 {
-     pinctrl-names = "default";
+     pinctrl-names = "default", "state_100mhz", "state_200mhz", "sleep";
      pinctrl-0 = <&pinctrl_usdhc1 &pinctrl_snvs_usdhc1_cd>;
-     no-1-8-v;
+     pinctrl-1 = <&pinctrl_usdhc1_100mhz &pinctrl_snvs_usdhc1_cd>;
+     pinctrl-2 = <&pinctrl_usdhc1_100mhz &pinctrl_snvs_usdhc1_cd>;

Should that not be pinctrl_usdhc1_200mhz?

Quoted 7 lines
Quoted 3 lines

Correct, thanks for pointing this out.
Taking into account that the patch was already accepted by Shawn, will send another to fix this typo ASAP (added to my todo list).

I just fixed it up on my branch.

Shawn

Thanks a lot!

Signature · 8 lines
Best regards - Freundliche Grüsse - Meilleures salutations

Igor Opaniuk

mailto: [email protected]
skype: igor.opanyuk
+380 (93) 836 40 67
http://ua.linkedin.com/in/iopaniuk