mmc: socfpga_dw_mmc: Move drvsel and smplsel to dts
Subsystems (2)
PATCH 1/1 mmc: socfpga_dw_mmc: Move drvsel and smplsel to dts
From: Chin Liang See <[email protected]>
socfpga_dw_mmc driver will obtain the drvsel and smplsel value from device tree instead of definition in config header file.
--- arch/arm/dts/socfpga_cyclone5.dtsi | 2 ++ drivers/mmc/socfpga_dw_mmc.c | 24 ++++++++++++++++++++++-- include/configs/socfpga_common.h | 2 -- 3 files changed, 24 insertions(+), 4 deletions(-)
arch/arm/dts/socfpga_cyclone5.dtsi +2 -0
@@ -25,6 +25,8 @@ bus-width = <4>; cap-mmc-highspeed; cap-sd-highspeed; + drvsel = <3>; + smplsel = <0>; }; sysmgr at ffd08000 {
drivers/mmc/socfpga_dw_mmc.c +22 -2
@@ -19,18 +19,25 @@ static const struct socfpga_clock_manager *clock_manager_base =static const struct socfpga_system_manager *system_manager_base = (void *)SOCFPGA_SYSMGR_ADDRESS ; +/* socfpga implmentation specific drver private data */ +struct dwmci_socfpga_priv_data { +unsigned int drvsel; +unsigned int smplsel; +}; +static void socfpga_dwmci_clksel (struct dwmci_host *host) {unsigned int drvsel;unsigned int smplsel; +struct dwmci_socfpga_priv_data *priv = host->priv;/* Disable SDMMC clock. */ clrbits_le32 (&clock_manager_base->per_pll.en,CLKMGR_PERPLLGRP_EN_SDMMCCLK_MASK );/* Configures drv_sel and smpl_sel */ - drvsel =CONFIG_SOCFPGA_DWMMC_DRVSEL ; - smplsel =CONFIG_SOCFPGA_DWMMC_SMPSEL ; + drvsel = priv->drvsel; + smplsel = priv->smplsel;debug ("%s: drvsel %d smplsel %d\n" , __func__, drvsel, smplsel); writel(SYSMGR_SDMMC_CTRL_SET(smplsel, drvsel),
@@ -50,8 +57,10 @@ static int socfpga_dwmci_of_probe(const void *blob, int node, const int idx)const unsigned long clk =cm_get_mmc_controller_clk_hz ();struct dwmci_host *host; +struct dwmci_socfpga_priv_data *priv;fdt_addr_t reg_base;int bus_width, fifo_depth; +unsigned int drvsel, smplsel;if (clk ==0 ) {printf ("DWMMC%d: MMC clock is zero!" , idx);
@@ -78,11 +87,19 @@ static int socfpga_dwmci_of_probe(const void *blob, int node, const int idx)return -EINVAL ; } + drvsel =fdtdec_get_uint (blob, node,"drvsel" ,0 ); + smplsel =fdtdec_get_uint (blob, node,"smplsel" ,0 ); +/* Allocate the host */ host =calloc (1 ,sizeof (*host));if (!host)return -ENOMEM ; +/* Allocate the priv */ + priv =calloc (1 ,sizeof (*priv)); +if (!priv) +return -ENOMEM ; + host->name ="SOCFPGA DWMMC" ; host->ioaddr = (void *)reg_base; host->buswidth = bus_width;
@@ -92,6 +109,9 @@ static int socfpga_dwmci_of_probe(const void *blob, int node, const int idx) host->bus_hz = clk; host->fifoth_val =MSIZE (0x2 ) |RX_WMARK (fifo_depth /2 -1 ) |TX_WMARK (fifo_depth /2 ); + priv->drvsel = drvsel; + priv->smplsel = smplsel; + host->priv = priv;return add_dwmci (host, host->bus_hz,400000 ); }
include/configs/socfpga_common.h +0 -2
@@ -153,8 +153,6 @@#define CONFIG_DWMMC #define CONFIG_SOCFPGA_DWMMC #define CONFIG_SOCFPGA_DWMMC_FIFO_DEPTH 1024 -#define CONFIG_SOCFPGA_DWMMC_DRVSEL 3 -#define CONFIG_SOCFPGA_DWMMC_SMPSEL 0/* FIXME */ /* using smaller max blk cnt to avoid flooding the limited stack we have */ #define CONFIG_SYS_MMC_MAX_BLK_COUNT 256/* FIXME -- SPL only? */
Signature · 1 line
2.2.0
PATCH 1/1 mmc: socfpga_dw_mmc: Move drvsel and smplsel to dts
Quoted 15 lines · clsee
From: Chin Liang See <[email protected]>
socfpga_dw_mmcdriver will obtain the drvsel and smplsel value from device tree instead of definition in config header file.Signed-off-by Chin Liang See <[email protected]>Cc Dinh Nguyen <[email protected]>Cc Dinh Nguyen <[email protected]>Cc Pavel Machek <[email protected]>Cc Marek Vasut <[email protected]>Cc Stefan Roese <[email protected]>Cc Pantelis Antoniou <[email protected]>Cc Simon Glass <[email protected]>Cc Jaehoon Chung <[email protected]>
Quoted 5 lines
--- arch/arm/dts/socfpga_cyclone5.dtsi | 2 ++ drivers/mmc/socfpga_dw_mmc.c | 24 ++++++++++++++++++++++-- include/configs/socfpga_common.h | 2 -- 3 files changed, 24 insertions(+), 4 deletions(-)
Hi!
[...]
drivers/mmc/socfpga_dw_mmc.c static int socfpga_dwmci_of_probe(const void *blob, int · line 90
Quoted 5 lines
drivers/mmc/socfpga_dw_mmc.c +1
-0@@ -78,11 +87,19 @@ static int socfpga_dwmci_of_probe(const void *blob, int node, const int idx) return -EINVAL; } + drvsel =fdtdec_get_uint (blob, node,"drvsel" ,0 );
The default value here should be 3, otherwise this won't preserve the original behavior of the driver in case the nodes in DT are missing.
drivers/mmc/socfpga_dw_mmc.c static int socfpga_dwmci_of_probe(const void *blob, int node, const int idx) · line 101
Quoted 11 lines
drivers/mmc/socfpga_dw_mmc.c +6
-0+ smplsel =fdtdec_get_uint (blob, node,"smplsel" ,0 ); +/* Allocate the host */ host =calloc (1 ,sizeof (*host));if (!host)return -ENOMEM ; +/* Allocate the priv */ + priv =calloc (1 ,sizeof (*priv)); +if (!priv) +return -ENOMEM ;
If this call fails, you're leaking memory, since you calloc() some stuff before.
drivers/mmc/socfpga_dw_mmc.c static int socfpga_dwmci_of_probe(const void *blob, int · line 114
Quoted 11 lines
drivers/mmc/socfpga_dw_mmc.c +4
-0+ host->name ="SOCFPGA DWMMC" ; host->ioaddr = (void *)reg_base; host->buswidth = bus_width;@@ -92,6 +109,9 @@ static int socfpga_dwmci_of_probe(const void *blob, int node, const int idx) host->bus_hz = clk; host->fifoth_val =MSIZE (0x2 ) |RX_WMARK (fifo_depth /2 -1 ) |TX_WMARK (fifo_depth /2 ); + priv->drvsel = drvsel; + priv->smplsel = smplsel; + host->priv = priv;
You can move the fdtdec_get_uint() calls here directly, no need to introduce ad-hoc variable and then just assign it into the private data.
Quoted 15 lines
drivers/mmc/socfpga_dw_mmc.c +0
-0return add_dwmci (host, host->bus_hz,400000 ); }(quoted diff) +0
-0
b/include/configs/socfpga_common.hindex f6808b5..b661cc2 100644include/configs/socfpga_common.h +0
-2@@ -153,8 +153,6 @@#define CONFIG_DWMMC #define CONFIG_SOCFPGA_DWMMC #define CONFIG_SOCFPGA_DWMMC_FIFO_DEPTH 1024 -#define CONFIG_SOCFPGA_DWMMC_DRVSEL 3 -#define CONFIG_SOCFPGA_DWMMC_SMPSEL 0/* FIXME */ /* using smaller max blk cnt to avoid flooding the limited stack we have */ #define CONFIG_SYS_MMC_MAX_BLK_COUNT 256/* FIXME -- SPL only? */
PATCH 1/1 mmc: socfpga_dw_mmc: Move drvsel and smplsel to dts
Hi Marek,
Quoted 31 lines · Marek Vasut
Quoted 15 lines · clsee
From: Chin Liang See <[email protected]>
socfpga_dw_mmcdriver will obtain the drvsel and smplsel value from device tree instead of definition in config header file.Signed-off-by Chin Liang See <[email protected]>Cc Dinh Nguyen <[email protected]>Cc Dinh Nguyen <[email protected]>Cc Pavel Machek <[email protected]>Cc Marek Vasut <[email protected]>Cc Stefan Roese <[email protected]>Cc Pantelis Antoniou <[email protected]>Cc Simon Glass <[email protected]>Cc Jaehoon Chung <[email protected]>Quoted 5 lines
--- arch/arm/dts/socfpga_cyclone5.dtsi | 2 ++ drivers/mmc/socfpga_dw_mmc.c | 24 ++++++++++++++++++++++-- include/configs/socfpga_common.h | 2 -- 3 files changed, 24 insertions(+), 4 deletions(-)Hi!
[...]
Quoted 5 lines
(quoted diff) +0
-0@@ -78,11 +87,19 @@ static int socfpga_dwmci_of_probe(const void *blob, int node, const int idx) return -EINVAL; }
Quoted 5 lines
drivers/mmc/socfpga_dw_mmc.c static int socfpga_dwmci_of_probe(const void *blob, int node, const int idx) · line 90
Quoted 1 line
drivers/mmc/socfpga_dw_mmc.c +1
-0+ drvsel =fdtdec_get_uint (blob, node,"drvsel" ,0 );The default value here should be 3, otherwise this won't preserve the original
behavior of the driver in case the nodes in DT are missing.
Nice thinking, will update this.
Quoted 8 lines
Quoted 8 lines
drivers/mmc/socfpga_dw_mmc.c +2
-0+ smplsel =fdtdec_get_uint (blob, node,"smplsel" ,0 ); +/* Allocate the host */ host =calloc (1 ,sizeof (*host));if (!host)return -ENOMEM ;
Quoted 8 lines
drivers/mmc/socfpga_dw_mmc.c static int socfpga_dwmci_of_probe(const void *blob, int node, const int idx) · line 101
Quoted 4 lines
drivers/mmc/socfpga_dw_mmc.c +4
-0+/* Allocate the priv */ + priv =calloc (1 ,sizeof (*priv)); +if (!priv) +return -ENOMEM ;If this call fails, you're leaking memory, since you
calloc()some stuff before.
Oops, yup, this need to be fixed
Quoted 9 lines
Quoted 9 lines
drivers/mmc/socfpga_dw_mmc.c +1
-0+ host->name ="SOCFPGA DWMMC" ; host->ioaddr = (void *)reg_base;drivers/mmc/socfpga_dw_mmc.c +0
-0host->buswidth = bus_width;@@ -92,6 +109,9 @@ static int socfpga_dwmci_of_probe(const void *blob, int node, const int idx) host->bus_hz = clk; host->fifoth_val =MSIZE (0x2 ) | RX_WMARK(fifo_depth / 2 - 1) | TX_WMARK(fifo_depth
Quoted 8 lines
drivers/mmc/socfpga_dw_mmc.c static int socfpga_dwmci_of_probe(const void *blob, int node, const int idx) · line 114
Quoted 4 lines
drivers/mmc/socfpga_dw_mmc.c +3
-0/ 2); + priv->drvsel = drvsel; + priv->smplsel = smplsel; + host->priv = priv;You can move the
fdtdec_get_uint()calls here directly, no need to introduce
ad-hoc variable and then just assign it into the private data.
Let me enhance this too
Thanks
Chin Liang
Quoted 18 lines
Quoted 18 lines
drivers/mmc/socfpga_dw_mmc.c +0
-0return add_dwmci (host, host->bus_hz,400000 );}
(quoted diff) +0
-0
b/include/configs/socfpga_common.hindex f6808b5..b661cc2 100644include/configs/socfpga_common.h +0
-2@@ -153,8 +153,6 @@#define CONFIG_DWMMC #define CONFIG_SOCFPGA_DWMMC #define CONFIG_SOCFPGA_DWMMC_FIFO_DEPTH 1024 -#define CONFIG_SOCFPGA_DWMMC_DRVSEL 3 -#define CONFIG_SOCFPGA_DWMMC_SMPSEL 0/* FIXME */ /* using smaller max blk cnt to avoid flooding the limited stack we have
*/ #defineCONFIG_SYS_MMC_MAX_BLK_COUNT256 /* FIXME
-- SPL only? */