Skip to contentSkip to conversation

mmc: fsl_esdhc_imx: Handle the "broken-cd" property

PATCH New Fabio Estevam 3 participants 10 messages Jan 6, 2020 – Jan 15, 2020

Subsystems (3)
lore
Share & tools
lore

Fabio Estevam

author reviewer
#0 lore raw

PATCH 1/2 mmc: fsl_esdhc_imx: Handle the "broken-cd" property

When no GPIO is used to read the card detect status the following error is seen:

MMC: FSL_SDHC: 0, FSL_SDHC: 1
Loading Environment from MMC... MMC: no card present *** Warning - No block device, using default environment

Fix it by handling the "broken-cd" property in the same way that drivers/mmc/sdhci.c does, which considers that the SD card is present when the "broken-cd" property is passed.

Tested on a imx6ul-evk board.

---
 drivers/mmc/fsl_esdhc_imx.c | 8 ++++++++
 1 file changed, 8 insertions(+)
drivers/mmc/fsl_esdhc_imx.c +8 -0
index f1afab742d..7d465ef76b 100644
@@ -115,6 +115,7 @@ struct esdhc_soc_data {
  * Following is used when Driver Model is enabled for MMC
  * @dev: pointer for the device
  * @non_removable: 0: removable; 1: non-removable
+ * @broken_cd: 0: use GPIO for card detect; 1: Do not use GPIO for card detect
  * @wp_enable: 1: enable checking wp; 0: no check
  * @vs18_enable: 1: use 1.8V voltage; 0: use 3.3V
  * @flags: ESDHC_FLAG_xx in include/fsl_esdhc_imx.h
@@ -138,6 +139,7 @@ struct fsl_esdhc_priv {
 #endif
 	struct udevice *dev;
 	int non_removable;
+	int broken_cd;
 	int wp_enable;
 	int vs18_enable;
 	u32 flags;
@@ -1092,6 +1094,9 @@ static int esdhc_getcd_common(struct fsl_esdhc_priv *priv)
 #if CONFIG_IS_ENABLED(DM_MMC)
 	if (priv->non_removable)
 		return 1;
+
+	if (priv->broken_cd)
+		return 1;
 #ifdef CONFIG_DM_GPIO
 	if (dm_gpio_is_valid(&priv->cd_gpio))
 		return dm_gpio_get_value(&priv->cd_gpio);
@@ -1450,6 +1455,9 @@ static int fsl_esdhc_probe(struct udevice *dev)
 			     ESDHC_STROBE_DLL_CTRL_SLV_DLY_TARGET_DEFAULT);
 	priv->strobe_dll_delay_target = val;
 
+	if (dev_read_bool(dev, "broken-cd"))
+		priv->broken_cd = 1;
+
 	if (dev_read_bool(dev, "non-removable")) {
 		priv->non_removable = 1;
 	 } else {
Signature · 1 line
2.17.1
author reviewer
#3 lore raw

PATCH 2/2 ARM: dts: imx6ul-14x14-evk: Pass the "broken-cd" property

imx6ul-14x14-evk does not have a GPIO dedicated for reading the card detect pin on the eSDHC2 port. In such cases the "broken-cd" property must be passed, otherwise the card cannot be detected.

---
 arch/arm/dts/imx6ul-14x14-evk.dtsi | 1 +
 1 file changed, 1 insertion(+)
arch/arm/dts/imx6ul-14x14-evk.dtsi +1 -0
index d1baf0f081..463d7ca124 100644
@@ -268,6 +268,7 @@
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_usdhc2>;
 	no-1-8-v;
+	broken-cd;
 	keep-power-in-suspend;
 	wakeup-source;
 	status = "okay";
Signature · 1 line
2.17.1
#2 lore raw

PATCH 1/2 mmc: fsl_esdhc_imx: Handle the "broken-cd" property

In reply to Fabio Estevam
Quoted 50 lines · Fabio Estevam

When no GPIO is used to read the card detect status the following error is seen:

MMC: FSL_SDHC: 0, FSL_SDHC: 1
Loading Environment from MMC... MMC: no card present *** Warning - No block device, using default environment

Fix it by handling the "broken-cd" property in the same way that drivers/mmc/sdhci.c does, which considers that the SD card is present when the "broken-cd" property is passed.

Tested on a imx6ul-evk board.

---
 drivers/mmc/fsl_esdhc_imx.c | 8 ++++++++
 1 file changed, 8 insertions(+)
drivers/mmc/fsl_esdhc_imx.c +5 -0
index f1afab742d..7d465ef76b 100644
@@ -115,6 +115,7 @@ struct esdhc_soc_data {
  * Following is used when Driver Model is enabled for MMC
  * @dev: pointer for the device
  * @non_removable: 0: removable; 1: non-removable
+ * @broken_cd: 0: use GPIO for card detect; 1: Do not use GPIO for card detect
  * @wp_enable: 1: enable checking wp; 0: no check
  * @vs18_enable: 1: use 1.8V voltage; 0: use 3.3V
  * @flags: ESDHC_FLAG_xx in include/fsl_esdhc_imx.h
@@ -138,6 +139,7 @@ struct fsl_esdhc_priv {
 #endif
 	struct udevice *dev;
 	int non_removable;
+	int broken_cd;
 	int wp_enable;
 	int vs18_enable;
 	u32 flags;
@@ -1092,6 +1094,9 @@ static int esdhc_getcd_common(struct fsl_esdhc_priv *priv)
 #if CONFIG_IS_ENABLED(DM_MMC)
 	if (priv->non_removable)
 		return 1;
+
+	if (priv->broken_cd)
+		return 1;
 #ifdef CONFIG_DM_GPIO
 	if (dm_gpio_is_valid(&priv->cd_gpio))
 		return dm_gpio_get_value(&priv->cd_gpio);

drivers/mmc/fsl_esdhc_imx.c static int fsl_esdhc_probe(struct udevice *dev) · line 1463

Quoted 9 lines
drivers/mmc/fsl_esdhc_imx.c +3 -0
@@ -1450,6 +1455,9 @@ static int fsl_esdhc_probe(struct udevice *dev)
 			     ESDHC_STROBE_DLL_CTRL_SLV_DLY_TARGET_DEFAULT);
 	priv->strobe_dll_delay_target = val;
 
+	if (dev_read_bool(dev, "broken-cd"))
+		priv->broken_cd = 1;
+
 	if (dev_read_bool(dev, "non-removable")) {
 		priv->non_removable = 1;
 	 } else {

Best regards,
Stefano Babic

Signature · 5 lines
=====================================================================
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de
=====================================================================
#4 lore raw

PATCH 2/2 ARM: dts: imx6ul-14x14-evk: Pass the "broken-cd" property

In reply to Fabio Estevam
Quoted 15 lines · Fabio Estevam

imx6ul-14x14-evk does not have a GPIO dedicated for reading the card detect pin on the eSDHC2 port. In such cases the "broken-cd" property must be passed, otherwise the card cannot be detected.

---
 arch/arm/dts/imx6ul-14x14-evk.dtsi | 1 +
 1 file changed, 1 insertion(+)
arch/arm/dts/imx6ul-14x14-evk.dtsi +0 -0
index d1baf0f081..463d7ca124 100644

arch/arm/dts/imx6ul-14x14-evk.dtsi line 274

Quoted 7 lines
arch/arm/dts/imx6ul-14x14-evk.dtsi +1 -0
@@ -268,6 +268,7 @@
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_usdhc2>;
 	no-1-8-v;
+	broken-cd;
 	keep-power-in-suspend;
 	wakeup-source;
 	status = "okay";

Best regards,
Stefano Babic

Signature · 5 lines
=====================================================================
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de
=====================================================================
#5 lore raw

PATCH 2/2 ARM: dts: imx6ul-14x14-evk: Pass the "broken-cd" property

In reply to Fabio Estevam

Hi Fabio,

Quoted 18 lines

Subject: [PATCH 2/2] ARM: dts: imx6ul-14x14-evk: Pass the "broken-cd" property

imx6ul-14x14-evk does not have a GPIO dedicated for reading the card detect pin on the eSDHC2 port. In such cases the "broken-cd" property must be passed, otherwise the card cannot be detected.

---
 arch/arm/dts/imx6ul-14x14-evk.dtsi | 1 +
 1 file changed, 1 insertion(+)
arch/arm/dts/imx6ul-14x14-evk.dtsi +0 -0
index d1baf0f081..463d7ca124 100644

arch/arm/dts/imx6ul-14x14-evk.dtsi line 271

Quoted 4 lines
arch/arm/dts/imx6ul-14x14-evk.dtsi +1 -0
@@ -268,6 +268,7 @@
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_usdhc2>;
 	no-1-8-v;
+	broken-cd;

Has this been in Kernel dts?

Thanks,
Peng.

Quoted 5 lines
arch/arm/dts/imx6ul-14x14-evk.dtsi +0 -1
 	keep-power-in-suspend;
 	wakeup-source;
 	status = "okay";
--

2.17.1

author reviewer
#7 lore raw

PATCH 2/2 ARM: dts: imx6ul-14x14-evk: Pass the "broken-cd" property

Hi Peng,

Quoted 9 lines · Fabio Estevam

Hi Peng,

Quoted 1 line · Peng Fan

Has this been in Kernel dts?

I have sent a patch to add 'broken-cd' in the kernel dts:
http://lists.infradead.org/pipermail/linux-arm-kernel/2020-January/703473.html

Just to let you know that the dts patch has been applied:
https://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git/commit/?h=for-next&id=3b49b6cde5136972dfa417112a11583a6924204a

author reviewer
#1 lore raw

PATCH 1/2 mmc: fsl_esdhc_imx: Handle the "broken-cd" property

In reply to Fabio Estevam

Hi Peng,

Quoted 8 lines · Fabio Estevam

When no GPIO is used to read the card detect status the following error is seen:

MMC: FSL_SDHC: 0, FSL_SDHC: 1
Loading Environment from MMC... MMC: no card present *** Warning - No block device, using default environment

Quoted 7 lines

Fix it by handling the "broken-cd" property in the same way that drivers/mmc/sdhci.c does, which considers that the SD card is present when the "broken-cd" property is passed.

Tested on a imx6ul-evk board.

Any comments about this series, please?

#9 lore raw

PATCH 1/2 mmc: fsl_esdhc_imx: Handle the "broken-cd" property

In reply to Fabio Estevam
Quoted 11 lines

When no GPIO is used to read the card detect status the following error is seen:
MMC: FSL_SDHC: 0, FSL_SDHC: 1
Loading Environment from MMC... MMC: no card present *** Warning - No block device, using default environment Fix it by handling the "broken-cd" property in the same way that drivers/mmc/sdhci.c does, which considers that the SD card is present when the "broken-cd" property is passed. Tested on a imx6ul-evk board.

Applied to u-boot-imx, master, thanks !

Best regards,
Stefano Babic

Signature · 5 lines
=====================================================================
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de
=====================================================================
#8 lore raw

PATCH 2/2 ARM: dts: imx6ul-14x14-evk: Pass the "broken-cd" property

In reply to Fabio Estevam
Quoted 5 lines

imx6ul-14x14-evk does not have a GPIO dedicated for reading the card detect pin on the eSDHC2 port. In such cases the "broken-cd" property must be passed, otherwise the card cannot be detected.

Applied to u-boot-imx, master, thanks !

Best regards,
Stefano Babic

Signature · 5 lines
=====================================================================
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de
=====================================================================