Skip to contentSkip to conversation

exynos: be more verbose in process_nodes()

PATCH New Tobias Jakobi 5 participants 11 messages Sep 20, 2015 – Sep 24, 2015 MMC, SD and SDIO

lore
Share & tools
lore
#0 lore raw

PATCH 3/4 exynos: be more verbose in process_nodes()

In case sdhci_get_config() or do_sdhci_init() fail, show the error code that was returned.

---
 drivers/mmc/s5p_sdhci.c | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)
drivers/mmc/s5p_sdhci.c +7 -5
index bc2102a..6be3609 100644
@@ -171,7 +171,7 @@ static int sdhci_get_config(const void *blob, int node, struct sdhci_host *host)
 static int process_nodes(const void *blob, int node_list[], int count)
 {
 	struct sdhci_host *host;
-	int i, node;
+	int i, node, ret;
 
 	debug("%s: count = %d\n", __func__, count);
 
@@ -183,13 +183,15 @@ static int process_nodes(const void *blob, int node_list[], int count)
 
 		host = &sdhci_host[i];
 
-		if (sdhci_get_config(blob, node, host)) {
-			printf("%s: failed to decode dev %d\n",	__func__, i);
+		ret = sdhci_get_config(blob, node, host);
+		if (ret) {
+			printf("%s: failed to decode dev %d (%d)\n", __func__, i, ret);
 			return -1;
 		}
 
-		if (do_sdhci_init(host)) {
-			printf("%s: failed to initialize dev %d\n", __func__, i);
+		ret = do_sdhci_init(host);
+		if (ret) {
+			printf("%s: failed to initialize dev %d (%d)\n", __func__, i, ret);
 			return -2;
 		}
 	}
Signature · 1 line
2.0.5
#1 lore raw

PATCH 4/4 exynos: fix and cleanup do_sdhci_init()

The CD check is currently inverted. dm_gpio_get_value() returns one when a card is detected. All other values (zero when there is no card, or negative values for the internal errors) indicate failure.

---
 drivers/mmc/s5p_sdhci.c | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)
drivers/mmc/s5p_sdhci.c +11 -9
index 6be3609..bc04370 100644
@@ -102,29 +102,31 @@ struct sdhci_host sdhci_host[SDHCI_MAX_HOSTS];
 
 static int do_sdhci_init(struct sdhci_host *host)
 {
-	int dev_id, flag;
-	int err = 0;
+	int dev_id, flag, ret;
 
 	flag = host->bus_width == 8 ? PINMUX_FLAG_8BIT_MODE : PINMUX_FLAG_NONE;
 	dev_id = host->index + PERIPH_ID_SDMMC0;
 
 	if (dm_gpio_is_valid(&host->pwr_gpio)) {
 		dm_gpio_set_value(&host->pwr_gpio, 1);
-		err = exynos_pinmux_config(dev_id, flag);
-		if (err) {
+		ret = exynos_pinmux_config(dev_id, flag);
+		if (ret) {
 			debug("MMC not configured\n");
-			return err;
+			return ret;
 		}
 	}
 
 	if (dm_gpio_is_valid(&host->cd_gpio)) {
-		if (dm_gpio_get_value(&host->cd_gpio))
+		ret = dm_gpio_get_value(&host->cd_gpio);
+		if (ret != 1) {
+			debug("No card detected (%d)\n", ret);
 			return -ENODEV;
+		}
 
-		err = exynos_pinmux_config(dev_id, flag);
-		if (err) {
+		ret = exynos_pinmux_config(dev_id, flag);
+		if (ret) {
 			printf("external SD not configured\n");
-			return err;
+			return ret;
 		}
 	}
 
Signature · 1 line
2.0.5
#2 lore raw

PATCH 4/4 exynos: fix and cleanup do_sdhci_init()

Hi Tobias,

Quoted 45 lines

The CD check is currently inverted. dm_gpio_get_value() returns one when a card is detected. All other values (zero when there is no card, or negative values for the internal errors) indicate failure.

---
 drivers/mmc/s5p_sdhci.c | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)
drivers/mmc/s5p_sdhci.c +8 -6
index 6be3609..bc04370 100644
@@ -102,29 +102,31 @@ struct sdhci_host sdhci_host[SDHCI_MAX_HOSTS];
 
 static int do_sdhci_init(struct sdhci_host *host)
 {
-	int dev_id, flag;
-	int err = 0;
+	int dev_id, flag, ret;
 
 	flag = host->bus_width == 8 ? PINMUX_FLAG_8BIT_MODE :
 PINMUX_FLAG_NONE; dev_id = host->index + PERIPH_ID_SDMMC0;
 
 	if (dm_gpio_is_valid(&host->pwr_gpio)) {
 		dm_gpio_set_value(&host->pwr_gpio, 1);
-		err = exynos_pinmux_config(dev_id, flag);
-		if (err) {
+		ret = exynos_pinmux_config(dev_id, flag);
+		if (ret) {
 			debug("MMC not configured\n");
-			return err;
+			return ret;
 		}
 	}
 
 	if (dm_gpio_is_valid(&host->cd_gpio)) {
-		if (dm_gpio_get_value(&host->cd_gpio))
+		ret = dm_gpio_get_value(&host->cd_gpio);
+		if (ret != 1) {
+			debug("No card detected (%d)\n", ret);
 			return -ENODEV;
+		}
 

drivers/mmc/s5p_sdhci.c struct sdhci_host sdhci_host[SDHCI_MAX_HOSTS]; · line 132

Quoted 10 lines
drivers/mmc/s5p_sdhci.c +3 -3
-		err = exynos_pinmux_config(dev_id, flag);
-		if (err) {
+		ret = exynos_pinmux_config(dev_id, flag);
+		if (ret) {
 			printf("external SD not configured\n");
-			return err;
+			return ret;
 		}
 	}
 
Signature · 5 lines
Best regards,

Lukasz Majewski

Samsung R&D Institute Poland (SRPOL) | Linux Platform Group
#3 lore raw

PATCH 4/4 exynos: fix and cleanup do_sdhci_init()

Hi Lukasz,

Quoted 47 lines

Hi Tobias,

Quoted 45 lines

The CD check is currently inverted. dm_gpio_get_value() returns one when a card is detected. All other values (zero when there is no card, or negative values for the internal errors) indicate failure.

---
 drivers/mmc/s5p_sdhci.c | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)
drivers/mmc/s5p_sdhci.c +8 -6
index 6be3609..bc04370 100644
@@ -102,29 +102,31 @@ struct sdhci_host sdhci_host[SDHCI_MAX_HOSTS];
 
 static int do_sdhci_init(struct sdhci_host *host)
 {
-	int dev_id, flag;
-	int err = 0;
+	int dev_id, flag, ret;
 
 	flag = host->bus_width == 8 ? PINMUX_FLAG_8BIT_MODE :
 PINMUX_FLAG_NONE; dev_id = host->index + PERIPH_ID_SDMMC0;
 
 	if (dm_gpio_is_valid(&host->pwr_gpio)) {
 		dm_gpio_set_value(&host->pwr_gpio, 1);
-		err = exynos_pinmux_config(dev_id, flag);
-		if (err) {
+		ret = exynos_pinmux_config(dev_id, flag);
+		if (ret) {
 			debug("MMC not configured\n");
-			return err;
+			return ret;
 		}
 	}
 
 	if (dm_gpio_is_valid(&host->cd_gpio)) {
-		if (dm_gpio_get_value(&host->cd_gpio))
+		ret = dm_gpio_get_value(&host->cd_gpio);
+		if (ret != 1) {
+			debug("No card detected (%d)\n", ret);
 			return -ENODEV;
+		}
 
Quoted 13 lines

drivers/mmc/s5p_sdhci.c struct sdhci_host sdhci_host[SDHCI_MAX_HOSTS]; · line 132

Quoted 10 lines
drivers/mmc/s5p_sdhci.c +3 -3
-		err = exynos_pinmux_config(dev_id, flag);
-		if (err) {
+		ret = exynos_pinmux_config(dev_id, flag);
+		if (ret) {
 			printf("external SD not configured\n");
-			return err;
+			return ret;
 		}
 	}
 

Sorry, I was too fast. I've read the whole thread and I can confirm that your change would break Trats board.

I hope that we will come up with proper solution.

Signature · 5 lines
Best regards,

Lukasz Majewski

Samsung R&D Institute Poland (SRPOL) | Linux Platform Group
#4 lore raw

PATCH 4/4 exynos: fix and cleanup do_sdhci_init()

Hi,

Quoted 63 lines · Lukasz Majewski

Hi Lukasz,

Quoted 47 lines

Hi Tobias,

Quoted 45 lines

The CD check is currently inverted. dm_gpio_get_value() returns one when a card is detected. All other values (zero when there is no card, or negative values for the internal errors) indicate failure.

---
 drivers/mmc/s5p_sdhci.c | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)
drivers/mmc/s5p_sdhci.c +8 -6
index 6be3609..bc04370 100644
@@ -102,29 +102,31 @@ struct sdhci_host sdhci_host[SDHCI_MAX_HOSTS];
 
 static int do_sdhci_init(struct sdhci_host *host)
 {
-	int dev_id, flag;
-	int err = 0;
+	int dev_id, flag, ret;
 
 	flag = host->bus_width == 8 ? PINMUX_FLAG_8BIT_MODE :
 PINMUX_FLAG_NONE; dev_id = host->index + PERIPH_ID_SDMMC0;
 
 	if (dm_gpio_is_valid(&host->pwr_gpio)) {
 		dm_gpio_set_value(&host->pwr_gpio, 1);
-		err = exynos_pinmux_config(dev_id, flag);
-		if (err) {
+		ret = exynos_pinmux_config(dev_id, flag);
+		if (ret) {
 			debug("MMC not configured\n");
-			return err;
+			return ret;
 		}
 	}
 
 	if (dm_gpio_is_valid(&host->cd_gpio)) {
-		if (dm_gpio_get_value(&host->cd_gpio))
+		ret = dm_gpio_get_value(&host->cd_gpio);
+		if (ret != 1) {
+			debug("No card detected (%d)\n", ret);
 			return -ENODEV;
+		}
 
Quoted 13 lines

drivers/mmc/s5p_sdhci.c struct sdhci_host sdhci_host[SDHCI_MAX_HOSTS]; · line 132

Quoted 10 lines
drivers/mmc/s5p_sdhci.c +3 -3
-		err = exynos_pinmux_config(dev_id, flag);
-		if (err) {
+		ret = exynos_pinmux_config(dev_id, flag);
+		if (ret) {
 			printf("external SD not configured\n");
-			return err;
+			return ret;
 		}
 	}
 
Quoted 4 lines

Sorry, I was too fast. I've read the whole thread and I can confirm that your change would break Trats board.
ry
I hope that we will come up with proper solution.

We can use the "cd-inverted" property like linux-kernel. Then i think that all board based on exynos4412 can cover. how about?

Best Regards,
Jaehoon Chung

Quoted 1 line
#5 lore raw

PATCH 4/4 exynos: fix and cleanup do_sdhci_init()

Hi Jaehoon,

Quoted 66 lines

Hi,

Quoted 63 lines · Lukasz Majewski

Hi Lukasz,

Quoted 60 lines

Hi Tobias,

Quoted 45 lines

The CD check is currently inverted. dm_gpio_get_value() returns one when a card is detected. All other values (zero when there is no card, or negative values for the internal errors) indicate failure.

---
 drivers/mmc/s5p_sdhci.c | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)
drivers/mmc/s5p_sdhci.c +8 -6
index 6be3609..bc04370 100644
@@ -102,29 +102,31 @@ struct sdhci_host
 sdhci_host[SDHCI_MAX_HOSTS]; 
 static int do_sdhci_init(struct sdhci_host *host)
 {
-	int dev_id, flag;
-	int err = 0;
+	int dev_id, flag, ret;
 
 	flag = host->bus_width == 8 ? PINMUX_FLAG_8BIT_MODE :
 PINMUX_FLAG_NONE; dev_id = host->index + PERIPH_ID_SDMMC0;
 
 	if (dm_gpio_is_valid(&host->pwr_gpio)) {
 		dm_gpio_set_value(&host->pwr_gpio, 1);
-		err = exynos_pinmux_config(dev_id, flag);
-		if (err) {
+		ret = exynos_pinmux_config(dev_id, flag);
+		if (ret) {
 			debug("MMC not configured\n");
-			return err;
+			return ret;
 		}
 	}
 
 	if (dm_gpio_is_valid(&host->cd_gpio)) {
-		if (dm_gpio_get_value(&host->cd_gpio))
+		ret = dm_gpio_get_value(&host->cd_gpio);
+		if (ret != 1) {
+			debug("No card detected (%d)\n", ret);
 			return -ENODEV;
+		}
 

drivers/mmc/s5p_sdhci.c struct sdhci_host · line 132

Quoted 10 lines
drivers/mmc/s5p_sdhci.c +3 -3
-		err = exynos_pinmux_config(dev_id, flag);
-		if (err) {
+		ret = exynos_pinmux_config(dev_id, flag);
+		if (ret) {
 			printf("external SD not configured\n");
-			return err;
+			return ret;
 		}
 	}
 
Quoted 8 lines
Quoted 4 lines

Sorry, I was too fast. I've read the whole thread and I can confirm that your change would break Trats board.
ry
I hope that we will come up with proper solution.

We can use the "cd-inverted" property like linux-kernel. Then i think that all board based on exynos4412 can cover. how about?

I'm ok with this approach.

Quoted 7 lines

Best Regards,
Jaehoon Chung

Quoted 1 line
Signature · 5 lines
Best regards,

Lukasz Majewski

Samsung R&D Institute Poland (SRPOL) | Linux Platform Group
#6 lore raw

PATCH 4/4 exynos: fix and cleanup do_sdhci_init()

In reply to Jaehoon Chung
Quoted 66 lines · Jaehoon Chung

Hi,

Quoted 63 lines · Lukasz Majewski

Hi Lukasz,

Quoted 60 lines

Hi Tobias,

Quoted 45 lines

The CD check is currently inverted. dm_gpio_get_value() returns one when a card is detected. All other values (zero when there is no card, or negative values for the internal errors) indicate failure.

---
 drivers/mmc/s5p_sdhci.c | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)
drivers/mmc/s5p_sdhci.c +8 -6
index 6be3609..bc04370 100644
@@ -102,29 +102,31 @@ struct sdhci_host sdhci_host[SDHCI_MAX_HOSTS];
 
 static int do_sdhci_init(struct sdhci_host *host)
 {
-	int dev_id, flag;
-	int err = 0;
+	int dev_id, flag, ret;
 
 	flag = host->bus_width == 8 ? PINMUX_FLAG_8BIT_MODE :
 PINMUX_FLAG_NONE; dev_id = host->index + PERIPH_ID_SDMMC0;
 
 	if (dm_gpio_is_valid(&host->pwr_gpio)) {
 		dm_gpio_set_value(&host->pwr_gpio, 1);
-		err = exynos_pinmux_config(dev_id, flag);
-		if (err) {
+		ret = exynos_pinmux_config(dev_id, flag);
+		if (ret) {
 			debug("MMC not configured\n");
-			return err;
+			return ret;
 		}
 	}
 
 	if (dm_gpio_is_valid(&host->cd_gpio)) {
-		if (dm_gpio_get_value(&host->cd_gpio))
+		ret = dm_gpio_get_value(&host->cd_gpio);
+		if (ret != 1) {
+			debug("No card detected (%d)\n", ret);
 			return -ENODEV;
+		}
 

drivers/mmc/s5p_sdhci.c struct sdhci_host sdhci_host[SDHCI_MAX_HOSTS]; · line 132

Quoted 10 lines
drivers/mmc/s5p_sdhci.c +3 -3
-		err = exynos_pinmux_config(dev_id, flag);
-		if (err) {
+		ret = exynos_pinmux_config(dev_id, flag);
+		if (ret) {
 			printf("external SD not configured\n");
-			return err;
+			return ret;
 		}
 	}
 
Quoted 9 lines
Quoted 4 lines

Sorry, I was too fast. I've read the whole thread and I can confirm that your change would break Trats board.
ry
I hope that we will come up with proper solution.

We can use the "cd-inverted" property like linux-kernel. Then i think that all board based on exynos4412 can cover. how about?

I agree :)

Thanks,
Minkyu Kang.

#7 lore raw

PATCH 4/4 exynos: fix and cleanup do_sdhci_init()

Hello,

Quoted 67 lines · Minkyu Kang
Quoted 66 lines · Jaehoon Chung

Hi,

Quoted 63 lines · Lukasz Majewski

Hi Lukasz,

Quoted 60 lines

Hi Tobias,

Quoted 45 lines

The CD check is currently inverted. dm_gpio_get_value() returns one when a card is detected. All other values (zero when there is no card, or negative values for the internal errors) indicate failure.

---
 drivers/mmc/s5p_sdhci.c | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)
drivers/mmc/s5p_sdhci.c +8 -6
index 6be3609..bc04370 100644
@@ -102,29 +102,31 @@ struct sdhci_host sdhci_host[SDHCI_MAX_HOSTS];
 
 static int do_sdhci_init(struct sdhci_host *host)
 {
-	int dev_id, flag;
-	int err = 0;
+	int dev_id, flag, ret;
 
 	flag = host->bus_width == 8 ? PINMUX_FLAG_8BIT_MODE :
 PINMUX_FLAG_NONE; dev_id = host->index + PERIPH_ID_SDMMC0;
 
 	if (dm_gpio_is_valid(&host->pwr_gpio)) {
 		dm_gpio_set_value(&host->pwr_gpio, 1);
-		err = exynos_pinmux_config(dev_id, flag);
-		if (err) {
+		ret = exynos_pinmux_config(dev_id, flag);
+		if (ret) {
 			debug("MMC not configured\n");
-			return err;
+			return ret;
 		}
 	}
 
 	if (dm_gpio_is_valid(&host->cd_gpio)) {
-		if (dm_gpio_get_value(&host->cd_gpio))
+		ret = dm_gpio_get_value(&host->cd_gpio);
+		if (ret != 1) {
+			debug("No card detected (%d)\n", ret);
 			return -ENODEV;
+		}
 

drivers/mmc/s5p_sdhci.c struct sdhci_host sdhci_host[SDHCI_MAX_HOSTS]; · line 132

Quoted 10 lines
drivers/mmc/s5p_sdhci.c +3 -3
-		err = exynos_pinmux_config(dev_id, flag);
-		if (err) {
+		ret = exynos_pinmux_config(dev_id, flag);
+		if (ret) {
 			printf("external SD not configured\n");
-			return err;
+			return ret;
 		}
 	}
 
Quoted 8 lines
Quoted 8 lines
Quoted 4 lines

Sorry, I was too fast. I've read the whole thread and I can confirm that your change would break Trats board.
ry
I hope that we will come up with proper solution.

We can use the "cd-inverted" property like linux-kernel. Then i think that all board based on exynos4412 can cover. how about?

I don't think this is going to work. I asked someone else to check current upstream u-boot on his Odroid-U3 and he has confirmed that it boots fine from SD card.

So this seems to be a X2 specific thing. However the 'cd-inverted' property is present in exynos4412-odroid-common.dtsi, so it applies to both U3 and X2 in the kernel.

So either the kernel is wrong here, or this is board difference which can't be derived from 'cd-inverted'.

With best wishes,
Tobias

Quoted 7 lines
Quoted 1 line

I agree :)

Thanks,
Minkyu Kang.

#8 lore raw

PATCH 4/4 exynos: fix and cleanup do_sdhci_init()

Hi Tobias,

Quoted 76 lines

Hello,

Quoted 72 lines · Minkyu Kang
Quoted 71 lines · Jaehoon Chung

Hi,

Quoted 67 lines · Lukasz Majewski

Hi Lukasz,

Quoted 47 lines

Hi Tobias,

Quoted 45 lines

The CD check is currently inverted. dm_gpio_get_value() returns one when a card is detected. All other values (zero when there is no card, or negative values for the internal errors) indicate failure.

---
 drivers/mmc/s5p_sdhci.c | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)
drivers/mmc/s5p_sdhci.c +8 -6
index 6be3609..bc04370 100644
@@ -102,29 +102,31 @@ struct sdhci_host
 sdhci_host[SDHCI_MAX_HOSTS]; 
 static int do_sdhci_init(struct sdhci_host *host)
 {
-	int dev_id, flag;
-	int err = 0;
+	int dev_id, flag, ret;
 
 	flag = host->bus_width == 8 ? PINMUX_FLAG_8BIT_MODE :
 PINMUX_FLAG_NONE; dev_id = host->index + PERIPH_ID_SDMMC0;
 
 	if (dm_gpio_is_valid(&host->pwr_gpio)) {
 		dm_gpio_set_value(&host->pwr_gpio, 1);
-		err = exynos_pinmux_config(dev_id, flag);
-		if (err) {
+		ret = exynos_pinmux_config(dev_id, flag);
+		if (ret) {
 			debug("MMC not configured\n");
-			return err;
+			return ret;
 		}
 	}
 
 	if (dm_gpio_is_valid(&host->cd_gpio)) {
-		if (dm_gpio_get_value(&host->cd_gpio))
+		ret = dm_gpio_get_value(&host->cd_gpio);
+		if (ret != 1) {
+			debug("No card detected (%d)\n", ret);
 			return -ENODEV;
+		}
 
Quoted 13 lines

drivers/mmc/s5p_sdhci.c struct sdhci_host sdhci_host[SDHCI_MAX_HOSTS]; · line 132

Quoted 10 lines
drivers/mmc/s5p_sdhci.c +3 -3
-		err = exynos_pinmux_config(dev_id, flag);
-		if (err) {
+		ret = exynos_pinmux_config(dev_id, flag);
+		if (ret) {
 			printf("external SD not configured\n");
-			return err;
+			return ret;
 		}
 	}
 

Sorry, I was too fast. I've read the whole thread and I can confirm that your change would break Trats board. ry
I hope that we will come up with proper solution.

Quoted 6 lines
Quoted 3 lines
Quoted 3 lines

We can use the "cd-inverted" property like linux-kernel. Then i think that all board based on exynos4412 can cover. how about?

I don't think this is going to work. I asked someone else to check current upstream u-boot on his Odroid-U3 and he has confirmed that it boots fine from SD card.

Have you tried the newest mainline? I'm struggling to debrick my Trats board after some eMMC early misconfiguration.

For now I can confirm that it works with v2015.07.

Quoted 23 lines

So this seems to be a X2 specific thing. However the 'cd-inverted' property is present in exynos4412-odroid-common.dtsi, so it applies to both U3 and X2 in the kernel.

So either the kernel is wrong here, or this is board difference which can't be derived from 'cd-inverted'.

With best wishes,
Tobias

Quoted 7 lines
Quoted 1 line

I agree :)

Thanks,
Minkyu Kang.

Signature · 5 lines
Best regards,

Lukasz Majewski

Samsung R&D Institute Poland (SRPOL) | Linux Platform Group
#9 lore raw

PATCH 4/4 exynos: fix and cleanup do_sdhci_init()

In reply to Tobias Jakobi

Hello Tobias,

Quoted 5 lines · Tobias Jakobi

The CD check is currently inverted. dm_gpio_get_value() returns one when a card is detected. All other values (zero when there is no card, or negative values for the internal errors) indicate failure.

If you want revert the GPIO state, please modify the phandle in device-tree and then in the code.

Quoted 24 lines
---
  drivers/mmc/s5p_sdhci.c | 20 +++++++++++---------
  1 file changed, 11 insertions(+), 9 deletions(-)
drivers/mmc/s5p_sdhci.c +1 -4
index 6be3609..bc04370 100644
@@ -102,29 +102,31 @@ struct sdhci_host sdhci_host[SDHCI_MAX_HOSTS];
 
  static int do_sdhci_init(struct sdhci_host *host)
  {
-	int dev_id, flag;
-	int err = 0;
+	int dev_id, flag, ret;
 
  	flag = host->bus_width == 8 ? PINMUX_FLAG_8BIT_MODE : PINMUX_FLAG_NONE;
  	dev_id = host->index + PERIPH_ID_SDMMC0;
 
  	if (dm_gpio_is_valid(&host->pwr_gpio)) {
  		dm_gpio_set_value(&host->pwr_gpio, 1);
-		err = exynos_pinmux_config(dev_id, flag);
-		if (err) {

drivers/mmc/s5p_sdhci.c struct sdhci_host sdhci_host[SDHCI_MAX_HOSTS]; · line 121

Quoted 10 lines
drivers/mmc/s5p_sdhci.c +3 -2
+		ret = exynos_pinmux_config(dev_id, flag);
+		if (ret) {
  			debug("MMC not configured\n");
-			return err;
+			return ret;
  		}
  	}
 
  	if (dm_gpio_is_valid(&host->cd_gpio)) {
-		if (dm_gpio_get_value(&host->cd_gpio))

Please don't revert this GPIO. This part of code was correct. There is another source of broken SD card detect. It's about device-tree parsing. I will send a patches today.

Quoted 7 lines
drivers/mmc/s5p_sdhci.c +4 -0
+		ret = dm_gpio_get_value(&host->cd_gpio);
+		if (ret != 1) {
+			debug("No card detected (%d)\n", ret);
  			return -ENODEV;
+		}
 

drivers/mmc/s5p_sdhci.c struct sdhci_host sdhci_host[SDHCI_MAX_HOSTS]; · line 132

Quoted 10 lines
drivers/mmc/s5p_sdhci.c +3 -3
-		err = exynos_pinmux_config(dev_id, flag);
-		if (err) {
+		ret = exynos_pinmux_config(dev_id, flag);
+		if (ret) {
  			printf("external SD not configured\n");
-			return err;
+			return ret;
  		}
  	}
 

Best regards,

Signature · 4 lines
Przemyslaw Marczak
Samsung R&D Institute Poland
Samsung Electronics
p.marczak at samsung.com
#10 lore raw

PATCH 3/4 exynos: be more verbose in process_nodes()

In reply to Tobias Jakobi

Hi Tobias,

Quoted 4 lines
drivers/mmc/s5p_sdhci.c +3 -0
+		ret = sdhci_get_config(blob, node, host);
+		if (ret) {
+			printf("%s: failed to decode dev %d (%d)\n",

__func__, i, ret); return -1;

My only commit here is regarding leaving return -1 as it is now. I think, that it would be better to return ret.

Signature · 5 lines
Best regards,

Lukasz Majewski

Samsung R&D Institute Poland (SRPOL) | Linux Platform Group