Skip to contentSkip to conversation

samsung: arndale: remove board_mmc_init function

PATCH New Jaehoon Chung 4 participants 7 messages Jan 12, 2021 – Jan 15, 2021 1 message not in the archive

Subsystems (4)
lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): CGME20210112063021epcas1p3e250217446037a524c9db2f3ee3157db@epcas1p3.samsung.com

#1 lore raw

PATCH 1/2 samsung: arndale: remove board_mmc_init function

Remove board_mmc_init function.
It will be probed with driver-model.

---
 arch/arm/mach-exynos/include/mach/dwmmc.h |  2 --
 board/samsung/arndale/arndale.c           | 13 -------------
 2 files changed, 15 deletions(-)
arch/arm/mach-exynos/include/mach/dwmmc.h +0 -2
index 5654a0ea6b..59c28ed54c 100644
@@ -25,5 +25,3 @@
 /* CLKSEL Register */
 #define DWMCI_DIVRATIO_BIT		24
 #define DWMCI_DIVRATIO_MASK		0x7
-
-int exynos_dwmmc_init(const void *blob);
board/samsung/arndale/arndale.c +0 -13
index 91813763ce..d283ef6275 100644
@@ -73,19 +73,6 @@ int dram_init_banksize(void)
 	return 0;
 }
 
-#ifdef CONFIG_MMC
-int board_mmc_init(struct bd_info *bis)
-{
-	int ret;
-	/* dwmmc initializattion for available channels */
-	ret = exynos_dwmmc_init(gd->fdt_blob);
-	if (ret)
-		debug("dwmmc init failed\n");
-
-	return ret;
-}
-#endif
-
 static int board_uart_init(void)
 {
 	int err = 0, uart_id;
Signature · 1 line
2.17.1
#2 lore raw

PATCH 2/2 mmc: exynos_dw_mmc: remove unused function

Remove unused function in exynos_dw_mmc.c.

---
 drivers/mmc/exynos_dw_mmc.c | 56 -------------------------------------
 1 file changed, 56 deletions(-)
drivers/mmc/exynos_dw_mmc.c +0 -56
index 3aa9fb3c89..edb5a52c96 100644
@@ -133,8 +133,6 @@ static int exynos_dwmci_core_init(struct dwmci_host *host)
 	return 0;
 }
 
-static struct dwmci_host dwmci_host[DWMMC_MAX_CH_NUM];
-
 static int do_dwmci_init(struct dwmci_host *host)
 {
 	int flag, err;
@@ -206,60 +204,6 @@ static int exynos_dwmci_get_config(const void *blob, int node,
 	return 0;
 }
 
-static int exynos_dwmci_process_node(const void *blob,
-					int node_list[], int count)
-{
-	struct dwmci_exynos_priv_data *priv;
-	struct dwmci_host *host;
-	int i, node, err;
-
-	for (i = 0; i < count; i++) {
-		node = node_list[i];
-		if (node <= 0)
-			continue;
-		host = &dwmci_host[i];
-
-		priv = malloc(sizeof(struct dwmci_exynos_priv_data));
-		if (!priv) {
-			pr_err("dwmci_exynos_priv_data malloc fail!\n");
-			return -ENOMEM;
-		}
-
-		err = exynos_dwmci_get_config(blob, node, host, priv);
-		if (err) {
-			printf("%s: failed to decode dev %d\n", __func__, i);
-			free(priv);
-			return err;
-		}
-		host->priv = priv;
-
-		do_dwmci_init(host);
-	}
-	return 0;
-}
-
-int exynos_dwmmc_init(const void *blob)
-{
-	int node_list[DWMMC_MAX_CH_NUM];
-	int boot_dev_node;
-	int err = 0, count;
-
-	count = fdtdec_find_aliases_for_id(blob, "mmc",
-			COMPAT_SAMSUNG_EXYNOS_DWMMC, node_list,
-			DWMMC_MAX_CH_NUM);
-
-	/* For DWMMC always set boot device as mmc 0 */
-	if (count >= 3 && get_boot_mode() == BOOT_MODE_SD) {
-		boot_dev_node = node_list[2];
-		node_list[2] = node_list[0];
-		node_list[0] = boot_dev_node;
-	}
-
-	err = exynos_dwmci_process_node(blob, node_list, count);
-
-	return err;
-}
-
 #ifdef CONFIG_DM_MMC
 static int exynos_dwmmc_probe(struct udevice *dev)
 {
Signature · 1 line
2.17.1
#3 lore raw

PATCH 2/2 mmc: exynos_dw_mmc: remove unused function

Quoted 5 lines

Subject: [PATCH 2/2] mmc: exynos_dw_mmc: remove unused function

Remove unused function in exynos_dw_mmc.c.

Quoted 79 lines
---
 drivers/mmc/exynos_dw_mmc.c | 56 -------------------------------------
 1 file changed, 56 deletions(-)
(quoted diff) +0 -0

b/drivers/mmc/exynos_dw_mmc.c index 3aa9fb3c89..edb5a52c96 100644

drivers/mmc/exynos_dw_mmc.c +0 -56
@@ -133,8 +133,6 @@ static int exynos_dwmci_core_init(struct dwmci_host
 *host)
 	return 0;
 }
 
-static struct dwmci_host dwmci_host[DWMMC_MAX_CH_NUM];
-
 static int do_dwmci_init(struct dwmci_host *host)  {
 	int flag, err;
@@ -206,60 +204,6 @@ static int exynos_dwmci_get_config(const void *blob,
 int node,
 	return 0;
 }
 
-static int exynos_dwmci_process_node(const void *blob,
-					int node_list[], int count)
-{
-	struct dwmci_exynos_priv_data *priv;
-	struct dwmci_host *host;
-	int i, node, err;
-
-	for (i = 0; i < count; i++) {
-		node = node_list[i];
-		if (node <= 0)
-			continue;
-		host = &dwmci_host[i];
-
-		priv = malloc(sizeof(struct dwmci_exynos_priv_data));
-		if (!priv) {
-			pr_err("dwmci_exynos_priv_data malloc fail!\n");
-			return -ENOMEM;
-		}
-
-		err = exynos_dwmci_get_config(blob, node, host, priv);
-		if (err) {
-			printf("%s: failed to decode dev %d\n", __func__, i);
-			free(priv);
-			return err;
-		}
-		host->priv = priv;
-
-		do_dwmci_init(host);
-	}
-	return 0;
-}
-
-int exynos_dwmmc_init(const void *blob) -{
-	int node_list[DWMMC_MAX_CH_NUM];
-	int boot_dev_node;
-	int err = 0, count;
-
-	count = fdtdec_find_aliases_for_id(blob, "mmc",
-			COMPAT_SAMSUNG_EXYNOS_DWMMC, node_list,
-			DWMMC_MAX_CH_NUM);
-
-	/* For DWMMC always set boot device as mmc 0 */
-	if (count >= 3 && get_boot_mode() == BOOT_MODE_SD) {
-		boot_dev_node = node_list[2];
-		node_list[2] = node_list[0];
-		node_list[0] = boot_dev_node;
-	}
-
-	err = exynos_dwmci_process_node(blob, node_list, count);
-
-	return err;
-}
-
 #ifdef CONFIG_DM_MMC
 static int exynos_dwmmc_probe(struct udevice *dev)  {
--

2.17.1

#4 lore raw

PATCH 2/2 mmc: exynos_dw_mmc: remove unused function

Hi,

Quoted 80 lines · Peng Fan
Quoted 5 lines

Subject: [PATCH 2/2] mmc: exynos_dw_mmc: remove unused function

Remove unused function in exynos_dw_mmc.c.

Quoted 34 lines
---
 drivers/mmc/exynos_dw_mmc.c | 56 -------------------------------------
 1 file changed, 56 deletions(-)
(quoted diff) +0 -0

b/drivers/mmc/exynos_dw_mmc.c index 3aa9fb3c89..edb5a52c96 100644

drivers/mmc/exynos_dw_mmc.c +0 -14
@@ -133,8 +133,6 @@ static int exynos_dwmci_core_init(struct dwmci_host
 *host)
      return 0;
 }
 
-static struct dwmci_host dwmci_host[DWMMC_MAX_CH_NUM];
-
 static int do_dwmci_init(struct dwmci_host *host)  {
      int flag, err;
@@ -206,60 +204,6 @@ static int exynos_dwmci_get_config(const void *blob,
 int node,
      return 0;
 }
 
-static int exynos_dwmci_process_node(const void *blob,
-                                     int node_list[], int count)
-{
-     struct dwmci_exynos_priv_data *priv;
-     struct dwmci_host *host;
-     int i, node, err;
-
-     for (i = 0; i < count; i++) {
-             node = node_list[i];
-             if (node <= 0)
-                     continue;
-             host = &dwmci_host[i];

drivers/mmc/exynos_dw_mmc.c static int exynos_dwmci_get_config(const void *blob, · line 231

Quoted 10 lines
drivers/mmc/exynos_dw_mmc.c +0 -10
-
-             priv = malloc(sizeof(struct dwmci_exynos_priv_data));
-             if (!priv) {
-                     pr_err("dwmci_exynos_priv_data malloc fail!\n");
-                     return -ENOMEM;
-             }
-
-             err = exynos_dwmci_get_config(blob, node, host, priv);
-             if (err) {
-                     printf("%s: failed to decode dev %d\n", __func__,

i);

Quoted 27 lines
drivers/mmc/exynos_dw_mmc.c +0 -27
-                     free(priv);
-                     return err;
-             }
-             host->priv = priv;
-
-             do_dwmci_init(host);
-     }
-     return 0;
-}
-
-int exynos_dwmmc_init(const void *blob) -{
-     int node_list[DWMMC_MAX_CH_NUM];
-     int boot_dev_node;
-     int err = 0, count;
-
-     count = fdtdec_find_aliases_for_id(blob, "mmc",
-                     COMPAT_SAMSUNG_EXYNOS_DWMMC, node_list,
-                     DWMMC_MAX_CH_NUM);
-
-     /* For DWMMC always set boot device as mmc 0 */
-     if (count >= 3 && get_boot_mode() == BOOT_MODE_SD) {
-             boot_dev_node = node_list[2];
-             node_list[2] = node_list[0];
-             node_list[0] = boot_dev_node;
-     }
-
-     err = exynos_dwmci_process_node(blob, node_list, count);
Quoted 10 lines
Quoted 8 lines
drivers/mmc/exynos_dw_mmc.c +0 -5
-
-     return err;
-}
-
 #ifdef CONFIG_DM_MMC
 static int exynos_dwmmc_probe(struct udevice *dev)  {
--

2.17.1

applied to u-boot-samsung.

Signature · 2 lines
Thanks,
Minkyu Kang.
#5 lore raw

PATCH 1/2 samsung: arndale: remove board_mmc_init function

In reply to Jaehoon Chung
Quoted 6 lines

Subject: [PATCH 1/2] samsung: arndale: remove board_mmc_init function

Remove board_mmc_init function.
It will be probed with driver-model.

Quoted 41 lines
---
 arch/arm/mach-exynos/include/mach/dwmmc.h |  2 --
 board/samsung/arndale/arndale.c           | 13 -------------
 2 files changed, 15 deletions(-)
arch/arm/mach-exynos/include/mach/dwmmc.h +0 -2
index 5654a0ea6b..59c28ed54c 100644
@@ -25,5 +25,3 @@
 /* CLKSEL Register */
 #define DWMCI_DIVRATIO_BIT		24
 #define DWMCI_DIVRATIO_MASK		0x7
-
-int exynos_dwmmc_init(const void *blob); diff --git

a/board/samsung/arndale/arndale.c b/board/samsung/arndale/arndale.c index 91813763ce..d283ef6275 100644

board/samsung/arndale/arndale.c +0 -13
@@ -73,19 +73,6 @@ int dram_init_banksize(void)
 	return 0;
 }
 
-#ifdef CONFIG_MMC
-int board_mmc_init(struct bd_info *bis) -{
-	int ret;
-	/* dwmmc initializattion for available channels */
-	ret = exynos_dwmmc_init(gd->fdt_blob);
-	if (ret)
-		debug("dwmmc init failed\n");
-
-	return ret;
-}
-#endif
-
 static int board_uart_init(void)
 {
 	int err = 0, uart_id;
--

2.17.1

#6 lore raw

PATCH 1/2 samsung: arndale: remove board_mmc_init function

In reply to Jaehoon Chung
Quoted 9 lines · Jaehoon Chung

Remove board_mmc_init function.
It will be probed with driver-model.

---
 arch/arm/mach-exynos/include/mach/dwmmc.h |  2 --
 board/samsung/arndale/arndale.c           | 13 -------------
 2 files changed, 15 deletions(-)

Best regards,
Krzysztof

#7 lore raw

PATCH 1/2 samsung: arndale: remove board_mmc_init function

Hi,

Quoted 11 lines · Krzysztof Kozlowski
Quoted 9 lines · Jaehoon Chung

Remove board_mmc_init function.
It will be probed with driver-model.

---
 arch/arm/mach-exynos/include/mach/dwmmc.h |  2 --
 board/samsung/arndale/arndale.c           | 13 -------------
 2 files changed, 15 deletions(-)
Quoted 5 lines

Best regards,
Krzysztof

applied to u-boot-samsung.

Signature · 2 lines
Thanks,
Minkyu Kang.