Skip to contentSkip to conversation

Drop redundant code for eSDHC clock getting

PATCH New Yangbo Lu 3 participants 11 messages Nov 12, 2019 – Nov 21, 2019

Subsystems (3)
lore
Share & tools
lore

Yangbo Lu

author
#0 lore raw

cover Drop redundant code for eSDHC clock getting

This patch-set is to drop redundant code for eSDHC clock getting. The fsl_esdhc driver is able to simply get clock from gd->arch.sdhc_clk.

The CI build link:
https://travis-ci.org/yangbolu1991/u-boot-test/builds/610688748

Yangbo Lu (4):
mmc: fsl_esdhc: get clock directly from global data
arm: ls1021a: drop redundant board_mmc_init()
arm: drop eSDHC clock getting in mxc_get_clock() for layerscape
mpc83xx: remove unused clock.h

 arch/arm/cpu/armv7/ls102xa/clock.c                 |  2 --
 .../arm/cpu/armv8/fsl-layerscape/fsl_lsch2_speed.c | 15 ----------
 .../arm/cpu/armv8/fsl-layerscape/fsl_lsch3_speed.c | 15 ----------
 arch/arm/include/asm/arch-fsl-layerscape/clock.h   |  2 --
 arch/arm/include/asm/arch-ls102xa/clock.h          |  1 -
 arch/powerpc/include/asm/arch-mpc83xx/clock.h      | 22 --------------
 board/freescale/ls1021aiot/ls1021aiot.c            | 15 ----------
 board/freescale/ls1021aqds/ls1021aqds.c            | 14 ---------
 board/freescale/ls1021atwr/ls1021atwr.c            | 14 ---------
 drivers/mmc/fsl_esdhc.c                            | 34 +++-------------------
 10 files changed, 4 insertions(+), 130 deletions(-)
 delete mode 100644 arch/powerpc/include/asm/arch-mpc83xx/clock.h
Signature · 1 line
2.7.4
author
#1 lore raw

PATCH 1/4 mmc: fsl_esdhc: get clock directly from global data

This patch is to get clock directly from global data.

- Remove uclass clk api method. This was what i.MX platforms were using, while QorIQ platforms weren't.
- Get clock only from global data, dropping mxc_get_clock(). QorIQ eSDHC controllers on one silicon use same reference clock.

---
 drivers/mmc/fsl_esdhc.c | 34 ++++------------------------------
 1 file changed, 4 insertions(+), 30 deletions(-)
drivers/mmc/fsl_esdhc.c +4 -30
index 8ff84aa..09cb773 100644
@@ -12,7 +12,6 @@
 #include <config.h>
 #include <common.h>
 #include <command.h>
-#include <clk.h>
 #include <errno.h>
 #include <hwconfig.h>
 #include <mmc.h>
@@ -81,7 +80,6 @@ struct fsl_esdhc_plat {
 struct fsl_esdhc_priv {
 	struct fsl_esdhc *esdhc_regs;
 	unsigned int sdhc_clk;
-	struct clk per_clk;
 	unsigned int clock;
 #if !CONFIG_IS_ENABLED(DM_MMC)
 	struct mmc *mmc;
@@ -831,9 +829,6 @@ int fsl_esdhc_mmc_init(bd_t *bis)
 	return fsl_esdhc_initialize(bis, cfg);
 }
 #else /* DM_MMC */
-#ifndef CONFIG_PPC
-#include <asm/arch/clock.h>
-#endif
 static int fsl_esdhc_probe(struct udevice *dev)
 {
 	struct mmc_uclass_priv *upriv = dev_get_uclass_priv(dev);
@@ -841,7 +836,6 @@ static int fsl_esdhc_probe(struct udevice *dev)
 	struct fsl_esdhc_priv *priv = dev_get_priv(dev);
 	fdt_addr_t addr;
 	struct mmc *mmc;
-	int ret;
 
 	addr = dev_read_addr(dev);
 	if (addr == FDT_ADDR_T_NONE)
@@ -853,30 +847,10 @@ static int fsl_esdhc_probe(struct udevice *dev)
 #endif
 	priv->dev = dev;
 
-	if (IS_ENABLED(CONFIG_CLK)) {
-		/* Assigned clock already set clock */
-		ret = clk_get_by_name(dev, "per", &priv->per_clk);
-		if (ret) {
-			printf("Failed to get per_clk\n");
-			return ret;
-		}
-		ret = clk_enable(&priv->per_clk);
-		if (ret) {
-			printf("Failed to enable per_clk\n");
-			return ret;
-		}
-
-		priv->sdhc_clk = clk_get_rate(&priv->per_clk);
-	} else {
-#ifndef CONFIG_PPC
-		priv->sdhc_clk = mxc_get_clock(MXC_ESDHC_CLK + dev->seq);
-#else
-		priv->sdhc_clk = gd->arch.sdhc_clk;
-#endif
-		if (priv->sdhc_clk <= 0) {
-			dev_err(dev, "Unable to get clk for %s\n", dev->name);
-			return -EINVAL;
-		}
+	priv->sdhc_clk = gd->arch.sdhc_clk;
+	if (priv->sdhc_clk <= 0) {
+		dev_err(dev, "Unable to get clk for %s\n", dev->name);
+		return -EINVAL;
 	}
 
 	fsl_esdhc_get_cfg_common(priv, &plat->cfg);
Signature · 1 line
2.7.4
#2 lore raw

PATCH 1/4 mmc: fsl_esdhc: get clock directly from global data

Quoted 91 lines

-----Original Message-----
From: Yangbo Lu <[email protected]>
Sent: Tuesday, November 12, 2019 4:59 PM
To: u-boot at lists.denx.de
Cc: Peng Fan <[email protected]>; Feng Li <[email protected]>; Alison Wang <[email protected]>; Sumit Garg <[email protected]>; Priyanka Jain <[email protected]>; Mario Six <[email protected]>; Y.b. Lu <[email protected]>
Subject: [PATCH 1/4] mmc: fsl_esdhc: get clock directly from global data

This patch is to get clock directly from global data.

- Remove uclass clk api method. This was what i.MX platforms were using, while QorIQ platforms weren't.
- Get clock only from global data, dropping mxc_get_clock(). QorIQ eSDHC controllers on one silicon use same reference clock.

---
drivers/mmc/fsl_esdhc.c | 34 ++++------------------------------

1 file changed, 4 insertions(+), 30 deletions(-)
drivers/mmc/fsl_esdhc.c index renamed from drivers/mmc/fsl_esdhc.c +0 -0

8ff84aa..09cb773 100644

drivers/mmc/fsl_esdhc.c +0 -2
@@ -12,7 +12,6 @@
 #include <config.h>
 #include <common.h>
 #include <command.h>
-#include <clk.h>
 #include <errno.h>
 #include <hwconfig.h>
 #include <mmc.h>
@@ -81,7 +80,6 @@ struct fsl_esdhc_plat {  struct fsl_esdhc_priv {
 	struct fsl_esdhc *esdhc_regs;
 	unsigned int sdhc_clk;
-	struct clk per_clk;
 	unsigned int clock;
 #if !CONFIG_IS_ENABLED(DM_MMC)
 	struct mmc *mmc;
@@ -831,9 +829,6 @@ int fsl_esdhc_mmc_init(bd_t *bis)
 	return fsl_esdhc_initialize(bis, cfg);  }  #else /* DM_MMC */ -#ifndef

CONFIG_PPC -#include <asm/arch/clock.h> -#endif static int

fsl_esdhc_probe(struct udevice *dev)  {
	struct mmc_uclass_priv *upriv = dev_get_uclass_priv(dev); @@ -841,7
+836,6 @@ static int fsl_esdhc_probe(struct udevice *dev)
	struct fsl_esdhc_priv *priv = dev_get_priv(dev);
	fdt_addr_t addr;
	struct mmc *mmc;
drivers/mmc/fsl_esdhc.c +0 -1
-	int ret;
	addr = dev_read_addr(dev);
	if (addr == FDT_ADDR_T_NONE)
drivers/mmc/fsl_esdhc.c +4 -25
@@ -853,30 +847,10 @@ static int fsl_esdhc_probe(struct udevice *dev)  #endif
 	priv->dev = dev;
 
-	if (IS_ENABLED(CONFIG_CLK)) {
-		/* Assigned clock already set clock */
-		ret = clk_get_by_name(dev, "per", &priv->per_clk);
-		if (ret) {
-			printf("Failed to get per_clk\n");
-			return ret;
-		}
-		ret = clk_enable(&priv->per_clk);
-		if (ret) {
-			printf("Failed to enable per_clk\n");
-			return ret;
-		}
-
-		priv->sdhc_clk = clk_get_rate(&priv->per_clk);
-	} else {
-#ifndef CONFIG_PPC
-		priv->sdhc_clk = mxc_get_clock(MXC_ESDHC_CLK + dev->seq);
-#else
-		priv->sdhc_clk = gd->arch.sdhc_clk;
-#endif
-		if (priv->sdhc_clk <= 0) {
-			dev_err(dev, "Unable to get clk for %s\n", dev->name);
-			return -EINVAL;
-		}
+	priv->sdhc_clk = gd->arch.sdhc_clk;
+	if (priv->sdhc_clk <= 0) {
+		dev_err(dev, "Unable to get clk for %s\n", dev->name);
+		return -EINVAL;
 	}
 
 	fsl_esdhc_get_cfg_common(priv, &plat->cfg);
--
Quoted 1 line

2.7.4

author
#3 lore raw

PATCH 2/4 arm: ls1021a: drop redundant board_mmc_init()

In reply to Yangbo Lu

The board_mmc_init() defined in board files is actually doing same thing with the cpu_mmc_init() defined in arch/arm/cpu/armv7/ls102xa/cpu.c. So drop it.

---
 board/freescale/ls1021aiot/ls1021aiot.c | 15 ---------------
 board/freescale/ls1021aqds/ls1021aqds.c | 14 --------------
 board/freescale/ls1021atwr/ls1021atwr.c | 14 --------------
 3 files changed, 43 deletions(-)
board/freescale/ls1021aiot/ls1021aiot.c +0 -15
index 70992a5..621a3db 100644
@@ -12,7 +12,6 @@
 #include <asm/arch/ls102xa_devdis.h>
 #include <asm/arch/ls102xa_soc.h>
 #include <fsl_csu.h>
-#include <fsl_esdhc.h>
 #include <fsl_immap.h>
 #include <netdev.h>
 #include <fsl_mdio.h>
@@ -103,20 +102,6 @@ int dram_init(void)
 	return 0;
 }
 
-#ifdef CONFIG_FSL_ESDHC
-struct fsl_esdhc_cfg esdhc_cfg[1] = {
-	{CONFIG_SYS_FSL_ESDHC_ADDR},
-};
-
-int board_mmc_init(bd_t *bis)
-{
-	esdhc_cfg[0].sdhc_clk = mxc_get_clock(MXC_ESDHC_CLK);
-
-	return fsl_esdhc_initialize(bis, &esdhc_cfg[0]);
-}
-
-#endif
-
 #ifdef CONFIG_TSEC_ENET
 int board_eth_init(bd_t *bis)
 {
board/freescale/ls1021aqds/ls1021aqds.c +0 -14
index 2ca2bd9..4034b7d 100644
@@ -14,7 +14,6 @@
 #include <hwconfig.h>
 #include <mmc.h>
 #include <fsl_csu.h>
-#include <fsl_esdhc.h>
 #include <fsl_ifc.h>
 #include <fsl_sec.h>
 #include <spl.h>
@@ -161,19 +160,6 @@ int dram_init(void)
 	return fsl_initdram();
 }
 
-#ifdef CONFIG_FSL_ESDHC
-struct fsl_esdhc_cfg esdhc_cfg[1] = {
-	{CONFIG_SYS_FSL_ESDHC_ADDR},
-};
-
-int board_mmc_init(bd_t *bis)
-{
-	esdhc_cfg[0].sdhc_clk = mxc_get_clock(MXC_ESDHC_CLK);
-
-	return fsl_esdhc_initialize(bis, &esdhc_cfg[0]);
-}
-#endif
-
 int board_early_init_f(void)
 {
 	struct ccsr_scfg *scfg = (struct ccsr_scfg *)CONFIG_SYS_FSL_SCFG_ADDR;
board/freescale/ls1021atwr/ls1021atwr.c +0 -14
index fcf2ec9..1a412ee 100644
@@ -14,7 +14,6 @@
 #include <hwconfig.h>
 #include <mmc.h>
 #include <fsl_csu.h>
-#include <fsl_esdhc.h>
 #include <fsl_ifc.h>
 #include <fsl_immap.h>
 #include <netdev.h>
@@ -233,19 +232,6 @@ int dram_init(void)
 	return 0;
 }
 
-#ifdef CONFIG_FSL_ESDHC
-struct fsl_esdhc_cfg esdhc_cfg[1] = {
-	{CONFIG_SYS_FSL_ESDHC_ADDR},
-};
-
-int board_mmc_init(bd_t *bis)
-{
-	esdhc_cfg[0].sdhc_clk = mxc_get_clock(MXC_ESDHC_CLK);
-
-	return fsl_esdhc_initialize(bis, &esdhc_cfg[0]);
-}
-#endif
-
 int board_eth_init(bd_t *bis)
 {
 	return pci_eth_init(bis);
Signature · 1 line
2.7.4
#4 lore raw

PATCH 2/4 arm: ls1021a: drop redundant board_mmc_init()

Quoted 124 lines

-----Original Message-----
From: Yangbo Lu <[email protected]>
Sent: Tuesday, November 12, 2019 4:59 PM
To: u-boot at lists.denx.de
Cc: Peng Fan <[email protected]>; Feng Li <[email protected]>; Alison Wang <[email protected]>; Sumit Garg <[email protected]>; Priyanka Jain <[email protected]>; Mario Six <[email protected]>; Y.b. Lu <[email protected]>
Subject: [PATCH 2/4] arm: ls1021a: drop redundant board_mmc_init()

The board_mmc_init() defined in board files is actually doing same thing with the cpu_mmc_init() defined in arch/arm/cpu/armv7/ls102xa/cpu.c. So drop it.

---

board/freescale/ls1021aiot/ls1021aiot.c | 15 ---------------
board/freescale/ls1021aqds/ls1021aqds.c | 14 --------------
board/freescale/ls1021atwr/ls1021atwr.c | 14 --------------
3 files changed, 43 deletions(-)
board/freescale/ls1021aiot/ls1021aiot.c +0 -15
index 70992a5..621a3db 100644
@@ -12,7 +12,6 @@
 #include <asm/arch/ls102xa_devdis.h>
 #include <asm/arch/ls102xa_soc.h>
 #include <fsl_csu.h>
-#include <fsl_esdhc.h>
 #include <fsl_immap.h>
 #include <netdev.h>
 #include <fsl_mdio.h>
@@ -103,20 +102,6 @@ int dram_init(void)
 	return 0;
 }
 
-#ifdef CONFIG_FSL_ESDHC
-struct fsl_esdhc_cfg esdhc_cfg[1] = {
-	{CONFIG_SYS_FSL_ESDHC_ADDR},
-};
-
-int board_mmc_init(bd_t *bis)
-{
-	esdhc_cfg[0].sdhc_clk = mxc_get_clock(MXC_ESDHC_CLK);
-
-	return fsl_esdhc_initialize(bis, &esdhc_cfg[0]);
-}
-
-#endif
-
 #ifdef CONFIG_TSEC_ENET
 int board_eth_init(bd_t *bis)
 {
board/freescale/ls1021aqds/ls1021aqds.c +0 -14
index 2ca2bd9..4034b7d 100644
@@ -14,7 +14,6 @@
 #include <hwconfig.h>
 #include <mmc.h>
 #include <fsl_csu.h>
-#include <fsl_esdhc.h>
 #include <fsl_ifc.h>
 #include <fsl_sec.h>
 #include <spl.h>
@@ -161,19 +160,6 @@ int dram_init(void)
 	return fsl_initdram();
 }
 
-#ifdef CONFIG_FSL_ESDHC
-struct fsl_esdhc_cfg esdhc_cfg[1] = {
-	{CONFIG_SYS_FSL_ESDHC_ADDR},
-};
-
-int board_mmc_init(bd_t *bis)
-{
-	esdhc_cfg[0].sdhc_clk = mxc_get_clock(MXC_ESDHC_CLK);
-
-	return fsl_esdhc_initialize(bis, &esdhc_cfg[0]);
-}
-#endif
-
 int board_early_init_f(void)
 {
 	struct ccsr_scfg *scfg = (struct ccsr_scfg

*)CONFIG_SYS_FSL_SCFG_ADDR; diff --git
a/board/freescale/ls1021atwr/ls1021atwr.c
b/board/freescale/ls1021atwr/ls1021atwr.c
index fcf2ec9..1a412ee 100644

board/freescale/ls1021atwr/ls1021atwr.c +0 -15
@@ -14,7 +14,6 @@
 #include <hwconfig.h>
 #include <mmc.h>
 #include <fsl_csu.h>
-#include <fsl_esdhc.h>
 #include <fsl_ifc.h>
 #include <fsl_immap.h>
 #include <netdev.h>
@@ -233,19 +232,6 @@ int dram_init(void)
 	return 0;
 }
 
-#ifdef CONFIG_FSL_ESDHC
-struct fsl_esdhc_cfg esdhc_cfg[1] = {
-	{CONFIG_SYS_FSL_ESDHC_ADDR},
-};
-
-int board_mmc_init(bd_t *bis)
-{
-	esdhc_cfg[0].sdhc_clk = mxc_get_clock(MXC_ESDHC_CLK);
-
-	return fsl_esdhc_initialize(bis, &esdhc_cfg[0]);
-}
-#endif
-
 int board_eth_init(bd_t *bis)
 {
 	return pci_eth_init(bis);
--
Quoted 1 line

2.7.4

author
#5 lore raw

PATCH 3/4 arm: drop eSDHC clock getting in mxc_get_clock() for layerscape

In reply to Yangbo Lu

Although layerscape platforms reuse mxc_get_clock() of i.MX platforms, eSDHC clock getting do not have to use it. It uses global data gd->arch.sdhc_clk directly in fsl_esdhc driver. Even there are more than one eSDHC controllers on SoC, they use same reference clock.

---
 arch/arm/cpu/armv7/ls102xa/clock.c                  |  2 --
 arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch2_speed.c | 15 ---------------
 arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch3_speed.c | 15 ---------------
 arch/arm/include/asm/arch-fsl-layerscape/clock.h    |  2 --
 arch/arm/include/asm/arch-ls102xa/clock.h           |  1 -
 5 files changed, 35 deletions(-)
arch/arm/cpu/armv7/ls102xa/clock.c +0 -2
index 30c7b37..7a1053c 100644
@@ -109,8 +109,6 @@ unsigned int mxc_get_clock(enum mxc_clock clk)
 	switch (clk) {
 	case MXC_I2C_CLK:
 		return get_bus_freq(0) / 2;
-	case MXC_ESDHC_CLK:
-		return get_bus_freq(0);
 	case MXC_DSPI_CLK:
 		return get_bus_freq(0) / 2;
 	case MXC_UART_CLK:
arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch2_speed.c +0 -15
index df4df9a..6d82cfe 100644
@@ -227,16 +227,6 @@ ulong get_ddr_freq(ulong dummy)
 	return gd->mem_clk;
 }
 
-#ifdef CONFIG_FSL_ESDHC
-int get_sdhc_freq(ulong dummy)
-{
-	if (!gd->arch.sdhc_clk)
-		get_clocks();
-
-	return gd->arch.sdhc_clk;
-}
-#endif
-
 int get_serial_clock(void)
 {
 	return get_bus_freq(0) / CONFIG_SYS_FSL_DUART_CLK_DIV;
@@ -264,11 +254,6 @@ unsigned int mxc_get_clock(enum mxc_clock clk)
 	switch (clk) {
 	case MXC_I2C_CLK:
 		return get_i2c_freq(0);
-#if defined(CONFIG_FSL_ESDHC)
-	case MXC_ESDHC_CLK:
-	case MXC_ESDHC2_CLK:
-		return get_sdhc_freq(0);
-#endif
 	case MXC_DSPI_CLK:
 		return get_dspi_freq(0);
 #ifdef CONFIG_FSL_LPUART
arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch3_speed.c +0 -15
index b3e6732..1f8289d 100644
@@ -236,16 +236,6 @@ int get_dspi_freq(ulong dummy)
 	return get_bus_freq(0) / CONFIG_SYS_FSL_DSPI_CLK_DIV;
 }
 
-#ifdef CONFIG_FSL_ESDHC
-int get_sdhc_freq(ulong dummy)
-{
-	if (!gd->arch.sdhc_clk)
-		get_clocks();
-
-	return gd->arch.sdhc_clk;
-}
-#endif
-
 int get_serial_clock(void)
 {
 	return get_bus_freq(0) / CONFIG_SYS_FSL_DUART_CLK_DIV;
@@ -256,11 +246,6 @@ unsigned int mxc_get_clock(enum mxc_clock clk)
 	switch (clk) {
 	case MXC_I2C_CLK:
 		return get_i2c_freq(0);
-#if defined(CONFIG_FSL_ESDHC)
-	case MXC_ESDHC_CLK:
-	case MXC_ESDHC2_CLK:
-		return get_sdhc_freq(0);
-#endif
 	case MXC_DSPI_CLK:
 		return get_dspi_freq(0);
 	default:
arch/arm/include/asm/arch-fsl-layerscape/clock.h +0 -2
index b37a08d..95d6156 100644
@@ -14,8 +14,6 @@ enum mxc_clock {
 	MXC_ARM_CLK = 0,
 	MXC_BUS_CLK,
 	MXC_UART_CLK,
-	MXC_ESDHC_CLK,
-	MXC_ESDHC2_CLK,
 	MXC_I2C_CLK,
 	MXC_DSPI_CLK,
 };
arch/arm/include/asm/arch-ls102xa/clock.h +0 -1
index bf67df5..e66e57f 100644
@@ -12,7 +12,6 @@
 enum mxc_clock {
 	MXC_ARM_CLK = 0,
 	MXC_UART_CLK,
-	MXC_ESDHC_CLK,
 	MXC_I2C_CLK,
 	MXC_DSPI_CLK,
 };
Signature · 1 line
2.7.4
#6 lore raw

PATCH 3/4 arm: drop eSDHC clock getting in mxc_get_clock() for layerscape

Quoted 136 lines

-----Original Message-----
From: Yangbo Lu <[email protected]>
Sent: Tuesday, November 12, 2019 4:59 PM
To: u-boot at lists.denx.de
Cc: Peng Fan <[email protected]>; Feng Li <[email protected]>; Alison Wang <[email protected]>; Sumit Garg <[email protected]>; Priyanka Jain <[email protected]>; Mario Six <[email protected]>; Y.b. Lu <[email protected]>
Subject: [PATCH 3/4] arm: drop eSDHC clock getting in mxc_get_clock() for layerscape

Although layerscape platforms reuse mxc_get_clock() of i.MX platforms, eSDHC clock getting do not have to use it. It uses global data gd->arch.sdhc_clk directly in fsl_esdhc driver. Even there are more than one eSDHC controllers on SoC, they use same reference clock.

---

arch/arm/cpu/armv7/ls102xa/clock.c                  |  2 --
arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch2_speed.c | 15 ---------------
arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch3_speed.c | 15 ---------------
arch/arm/include/asm/arch-fsl-layerscape/clock.h    |  2 --
arch/arm/include/asm/arch-ls102xa/clock.h           |  1 -
5 files changed, 35 deletions(-)
arch/arm/cpu/armv7/ls102xa/clock.c +0 -2
index 30c7b37..7a1053c 100644
@@ -109,8 +109,6 @@ unsigned int mxc_get_clock(enum mxc_clock clk)
 	switch (clk) {
 	case MXC_I2C_CLK:
 		return get_bus_freq(0) / 2;
-	case MXC_ESDHC_CLK:
-		return get_bus_freq(0);
 	case MXC_DSPI_CLK:
 		return get_bus_freq(0) / 2;
 	case MXC_UART_CLK:
arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch2_speed.c +0 -10
index df4df9a..6d82cfe 100644
@@ -227,16 +227,6 @@ ulong get_ddr_freq(ulong dummy)
 	return gd->mem_clk;
 }
 
-#ifdef CONFIG_FSL_ESDHC
-int get_sdhc_freq(ulong dummy)
-{
-	if (!gd->arch.sdhc_clk)
-		get_clocks();
-
-	return gd->arch.sdhc_clk;
-}
-#endif
-
 int get_serial_clock(void)
 {
 	return get_bus_freq(0) / CONFIG_SYS_FSL_DUART_CLK_DIV; @@ -

264,11 +254,6 @@ unsigned int mxc_get_clock(enum mxc_clock clk)

	switch (clk) {
	case MXC_I2C_CLK:
		return get_i2c_freq(0);
arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch2_speed.c +0 -5
-#if defined(CONFIG_FSL_ESDHC)
-	case MXC_ESDHC_CLK:
-	case MXC_ESDHC2_CLK:
-		return get_sdhc_freq(0);
-#endif
	case MXC_DSPI_CLK:
		return get_dspi_freq(0);

#ifdef CONFIG_FSL_LPUART

arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch3_speed.c +0 -10
index b3e6732..1f8289d 100644
@@ -236,16 +236,6 @@ int get_dspi_freq(ulong dummy)
 	return get_bus_freq(0) / CONFIG_SYS_FSL_DSPI_CLK_DIV;  }
 
-#ifdef CONFIG_FSL_ESDHC
-int get_sdhc_freq(ulong dummy)
-{
-	if (!gd->arch.sdhc_clk)
-		get_clocks();
-
-	return gd->arch.sdhc_clk;
-}
-#endif
-
 int get_serial_clock(void)
 {
 	return get_bus_freq(0) / CONFIG_SYS_FSL_DUART_CLK_DIV; @@ -
 256,11 +246,6 @@ unsigned int mxc_get_clock(enum mxc_clock clk)
	switch (clk) {
	case MXC_I2C_CLK:
		return get_i2c_freq(0);
arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch3_speed.c +0 -5
-#if defined(CONFIG_FSL_ESDHC)
-	case MXC_ESDHC_CLK:
-	case MXC_ESDHC2_CLK:
-		return get_sdhc_freq(0);
-#endif
	case MXC_DSPI_CLK:
		return get_dspi_freq(0);
	default:
arch/arm/include/asm/arch-fsl-layerscape/clock.h +0 -2
index b37a08d..95d6156 100644
@@ -14,8 +14,6 @@ enum mxc_clock {
 	MXC_ARM_CLK = 0,
 	MXC_BUS_CLK,
 	MXC_UART_CLK,
-	MXC_ESDHC_CLK,
-	MXC_ESDHC2_CLK,
 	MXC_I2C_CLK,
 	MXC_DSPI_CLK,
 };
arch/arm/include/asm/arch-ls102xa/clock.h +0 -2
index bf67df5..e66e57f 100644
@@ -12,7 +12,6 @@
 enum mxc_clock {
 	MXC_ARM_CLK = 0,
 	MXC_UART_CLK,
-	MXC_ESDHC_CLK,
 	MXC_I2C_CLK,
 	MXC_DSPI_CLK,
 };
--
Quoted 1 line

2.7.4

author
#7 lore raw

PATCH 4/4 mpc83xx: remove unused clock.h

In reply to Yangbo Lu

The clock.h was to define mxc_get_clock() providing clock value to fsl_esdhc driver. Since fsl_esdhc driver is using global data gd->arch.sdhc_clk directly now, we can remove this file.

---
 arch/powerpc/include/asm/arch-mpc83xx/clock.h | 22 ----------------------
 1 file changed, 22 deletions(-)
 delete mode 100644 arch/powerpc/include/asm/arch-mpc83xx/clock.h
arch/powerpc/include/asm/arch-mpc83xx/clock.h deleted +0 -22
deleted file mode 100644
index d57e93c..0000000
@@ -1,22 +0,0 @@
-/*
- * (C) Copyright 2018
- * Mario Six, Guntermann & Drunck GmbH, mario.six at gdsys.cc
- *
- * SPDX-License-Identifier:	GPL-2.0+
- */
-
-#ifndef __ASM_POWERPC_CLOCK_H
-#define __ASM_POWERPC_CLOCK_H
-
-/* Make fsl_esdhc driver happy */
-enum mxc_clock {
-	MXC_ESDHC_CLK,
-};
-
-DECLARE_GLOBAL_DATA_PTR;
-
-uint mxc_get_clock(int clk)
-{
-	return gd->arch.sdhc_clk;
-}
-#endif /* __ASM_POWERPC_CLOCK_H */
Signature · 1 line
2.7.4
#8 lore raw

PATCH 4/4 mpc83xx: remove unused clock.h

Quoted 52 lines

-----Original Message-----
From: Yangbo Lu <[email protected]>
Sent: Tuesday, November 12, 2019 4:59 PM
To: u-boot at lists.denx.de
Cc: Peng Fan <[email protected]>; Feng Li <[email protected]>; Alison Wang <[email protected]>; Sumit Garg <[email protected]>; Priyanka Jain <[email protected]>; Mario Six <[email protected]>; Y.b. Lu <[email protected]>
Subject: [PATCH 4/4] mpc83xx: remove unused clock.h

The clock.h was to define mxc_get_clock() providing clock value to fsl_esdhc driver. Since fsl_esdhc driver is using global data gd->arch.sdhc_clk directly now, we can remove this file.

---
arch/powerpc/include/asm/arch-mpc83xx/clock.h | 22 ----------------------

1 file changed, 22 deletions(-)

delete mode 100644 arch/powerpc/include/asm/arch-mpc83xx/clock.h

arch/powerpc/include/asm/arch-mpc83xx/clock.h deleted +0 -23
deleted file mode 100644
index d57e93c..0000000
@@ -1,22 +0,0 @@
-/*
- * (C) Copyright 2018
- * Mario Six, Guntermann & Drunck GmbH, mario.six at gdsys.cc
- *
- * SPDX-License-Identifier:	GPL-2.0+
- */
-
-#ifndef __ASM_POWERPC_CLOCK_H
-#define __ASM_POWERPC_CLOCK_H
-
-/* Make fsl_esdhc driver happy */
-enum mxc_clock {
-	MXC_ESDHC_CLK,
-};
-
-DECLARE_GLOBAL_DATA_PTR;
-
-uint mxc_get_clock(int clk)
-{
-	return gd->arch.sdhc_clk;
-}
-#endif /* __ASM_POWERPC_CLOCK_H */
--
Quoted 1 line

2.7.4

author
#9 lore raw

cover Drop redundant code for eSDHC clock getting

In reply to Yangbo Lu

Any comments?
Thanks.

Quoted 43 lines

-----Original Message-----
From: Yangbo Lu <[email protected]>
Sent: Tuesday, November 12, 2019 7:29 PM
To: u-boot at lists.denx.de
Cc: Peng Fan <[email protected]>; Feng Li <[email protected]>; Alison Wang <[email protected]>; Sumit Garg <[email protected]>; Priyanka Jain <[email protected]>; Mario Six <[email protected]>; Y.b. Lu <[email protected]>
Subject: [PATCH 0/4] Drop redundant code for eSDHC clock getting

This patch-set is to drop redundant code for eSDHC clock getting. The fsl_esdhc driver is able to simply get clock from gd->arch.sdhc_clk.

The CI build link:
https://eur01.safelinks.protection.outlook.com/?url=https%3A%2F%2Ftravis-ci
.org%2Fyangbolu1991%2Fu-boot-test%2Fbuilds%2F610688748&amp;data=02 %7C01%7Cyangbo.lu%40nxp.com%7C631a406c77594a0d737808d767637ae2 %7C686ea1d3bc2b4c6fa92cd99c5c301635%7C0%7C0%7C637091549269378 396&amp;sdata=7FT0Vn3oB0dMB5K1csOnNF5O9o61QxHheVtOeBJjDJw%3D &amp;reserved=0

Yangbo Lu (4):
mmc: fsl_esdhc: get clock directly from global data
arm: ls1021a: drop redundant board_mmc_init()
arm: drop eSDHC clock getting in mxc_get_clock() for layerscape
mpc83xx: remove unused clock.h

 arch/arm/cpu/armv7/ls102xa/clock.c                 |  2 --
 .../arm/cpu/armv8/fsl-layerscape/fsl_lsch2_speed.c | 15
----------  .../arm/cpu/armv8/fsl-layerscape/fsl_lsch3_speed.c | 15 ----------
 arch/arm/include/asm/arch-fsl-layerscape/clock.h   |  2 --
 arch/arm/include/asm/arch-ls102xa/clock.h          |  1 -
 arch/powerpc/include/asm/arch-mpc83xx/clock.h      | 22 --------------
 board/freescale/ls1021aiot/ls1021aiot.c            | 15 ----------
 board/freescale/ls1021aqds/ls1021aqds.c            | 14 ---------
 board/freescale/ls1021atwr/ls1021atwr.c            | 14 ---------
 drivers/mmc/fsl_esdhc.c                            | 34
+++-------------------
 10 files changed, 4 insertions(+), 130 deletions(-)  delete mode 100644

arch/powerpc/include/asm/arch-mpc83xx/clock.h

--
2.7.4

#10 lore raw

cover Drop redundant code for eSDHC clock getting

In reply to Yangbo Lu
Quoted 2 lines

Subject: [PATCH 0/4] Drop redundant code for eSDHC clock getting

After CI https://travis-ci.org/MrVan/u-boot/builds/614839218
It will show in mmc/master.

Thanks,
Peng.

Quoted 33 lines

This patch-set is to drop redundant code for eSDHC clock getting. The fsl_esdhc driver is able to simply get clock from gd->arch.sdhc_clk.

The CI build link:
https://eur01.safelinks.protection.outlook.com/?url=https%3A%2F%2Ftravis-
ci.org%2Fyangbolu1991%2Fu-boot-test%2Fbuilds%2F610688748&amp;data= 02%7C01%7Cpeng.fan%40nxp.com%7C631a406c77594a0d737808d767637a e2%7C686ea1d3bc2b4c6fa92cd99c5c301635%7C0%7C0%7C6370915492695 48293&amp;sdata=M3JTaPLlBN2Cq8P3Fujgkv7pnN73EYlpyMjMSObr2Ys%3D &amp;reserved=0

Yangbo Lu (4):
mmc: fsl_esdhc: get clock directly from global data
arm: ls1021a: drop redundant board_mmc_init()
arm: drop eSDHC clock getting in mxc_get_clock() for layerscape
mpc83xx: remove unused clock.h

 arch/arm/cpu/armv7/ls102xa/clock.c                 |  2 --
 .../arm/cpu/armv8/fsl-layerscape/fsl_lsch2_speed.c | 15
----------  .../arm/cpu/armv8/fsl-layerscape/fsl_lsch3_speed.c | 15 ----------
 arch/arm/include/asm/arch-fsl-layerscape/clock.h   |  2 --
 arch/arm/include/asm/arch-ls102xa/clock.h          |  1 -
 arch/powerpc/include/asm/arch-mpc83xx/clock.h      | 22 --------------
 board/freescale/ls1021aiot/ls1021aiot.c            | 15 ----------
 board/freescale/ls1021aqds/ls1021aqds.c            | 14 ---------
 board/freescale/ls1021atwr/ls1021atwr.c            | 14 ---------
 drivers/mmc/fsl_esdhc.c                            | 34
+++-------------------
 10 files changed, 4 insertions(+), 130 deletions(-)  delete mode 100644

arch/powerpc/include/asm/arch-mpc83xx/clock.h

--
2.7.4