socfpga/dwmmc: Adding DesignWare MMC driver support for SOCFPGA
Subsystems (2)
PATCH v2 1/1 socfpga/dwmmc: Adding DesignWare MMC driver support for SOCFPGA
To add the DesignWare MMC driver support for Altera SOCFPGA. It required information such as clocks and bus width from platform specific files (SOCFPGA handoff files)
---
Changes for v2
- Adding u-boot-mmc maintainer
--- arch/arm/include/asm/arch-socfpga/dwmmc.h | 12 +++++ drivers/mmc/Makefile | 1 + drivers/mmc/socfpga_dw_mmc.c | 72 +++++++++++++++++++++++++++++ 3 files changed, 85 insertions(+) create mode 100755 arch/arm/include/asm/arch-socfpga/dwmmc.h create mode 100755 drivers/mmc/socfpga_dw_mmc.c
arch/arm/include/asm/arch-socfpga/dwmmc.h new file +12 -0
@@ -0,0 +1,12 @@ +/* +* (C) Copyright 2013 Altera Corporation <www.altera.com> +* +* SPDX-License-Identifier: GPL-2.0+ +*/ + +#ifndef _SOCFPGA_DWMMC_H_ +#define _SOCFPGA_DWMMC_H_ + +extern int socfpga_dwmmc_init (u32 regbase,int bus_width,int index); + +#endif /* _SOCFPGA_SDMMC_H_ */
drivers/mmc/Makefile +1 -0
@@ -28,6 +28,7 @@ obj-$(CONFIG_TEGRA_MMC) += tegra_mmc.o obj-$(CONFIG_DWMMC) += dw_mmc.o obj-$(CONFIG_EXYNOS_DWMMC) += exynos_dw_mmc.o obj-$(CONFIG_ZYNQ_SDHCI) += zynq_sdhci.o +obj-$(CONFIG_SOCFPGA_DWMMC) += socfpga_dw_mmc.o ifdef CONFIG_SPL_BUILD obj-$(CONFIG_SPL_MMC_BOOT) += fsl_esdhc_spl.o else
drivers/mmc/socfpga_dw_mmc.c new file +72 -0
72 lines not on this page · raw message
Signature · 1 line
1.7.9.5
PATCH v2 1/1 socfpga/dwmmc: Adding DesignWare MMC driver support for SOCFPGA
Hi, Chin.
Quoted 60 lines · Chin Liang See
To add the DesignWare MMC driver support for Altera SOCFPGA. It required information such as clocks and bus width from platform specific files (SOCFPGA handoff files)
Signed-off-by Chin Liang See <[email protected]>Cc Rajeshwari Shinde <[email protected]>Cc Jaehoon Chung <[email protected]>Cc Andy Fleming <[email protected]>Cc Pantelis Antoniou <[email protected]>---
Changes for v2
- Adding u-boot-mmc maintainer--- arch/arm/include/asm/arch-socfpga/dwmmc.h | 12 +++++ drivers/mmc/Makefile | 1 + drivers/mmc/socfpga_dw_mmc.c | 72 +++++++++++++++++++++++++++++ 3 files changed, 85 insertions(+) create mode 100755 arch/arm/include/asm/arch-socfpga/dwmmc.h create mode 100755 drivers/mmc/socfpga_dw_mmc.carch/arm/include/asm/arch-socfpga/dwmmc.h new file +12
-0@@ -0,0 +1,12 @@ +/* +* (C) Copyright 2013 Altera Corporation <www.altera.com> +* +* SPDX-License-Identifier: GPL-2.0+ +*/ + +#ifndef _SOCFPGA_DWMMC_H_ +#define _SOCFPGA_DWMMC_H_ + +extern int socfpga_dwmmc_init (u32 regbase,int bus_width,int index); + +#endif /* _SOCFPGA_SDMMC_H_ */ drivers/mmc/Makefile +1
-0@@ -28,6 +28,7 @@ obj-$(CONFIG_TEGRA_MMC) += tegra_mmc.o obj-$(CONFIG_DWMMC) += dw_mmc.o obj-$(CONFIG_EXYNOS_DWMMC) += exynos_dw_mmc.o obj-$(CONFIG_ZYNQ_SDHCI) += zynq_sdhci.o +obj-$(CONFIG_SOCFPGA_DWMMC) += socfpga_dw_mmc.o ifdef CONFIG_SPL_BUILD obj-$(CONFIG_SPL_MMC_BOOT) += fsl_esdhc_spl.o elsedrivers/mmc/socfpga_dw_mmc.c new file +4
-0@@ -0,0 +1,72 @@ +/* +* (C) Copyright 2013 Altera Corporation <www.altera.com> +* +* SPDX-License-Identifier: GPL-2.0+
drivers/mmc/socfpga_dw_mmc.c line 14
Quoted 10 lines
drivers/mmc/socfpga_dw_mmc.c new file +10
-0+*/ + +#include <common.h> +#include <malloc.h> +#include <dwmmc.h> +#include <asm/arch/dwmmc.h> + +#define CLKMGR_PERPLLGRP_EN_REG (SOCFPGA_CLKMGR_ADDRESS + 0xA0) +#define CLKMGR_SDMMC_CLK_ENABLE (1 << 8) +#define SYSMGR_SDMMCGRP_CTRL_REG (SOCFPGA_SYSMGR_ADDRESS + 0x108)
Where is SOCFPGA_CLKMGR_ADDRESS defined?
drivers/mmc/socfpga_dw_mmc.c line 15
Quoted 1 line
drivers/mmc/socfpga_dw_mmc.c new file +1
-0+#define SYSMGR_SDMMC_CTRL_GET_DRVSEL (x) (((x) >> 0) & 0x7)
((x) & 0x7) is more readable?
Quoted 9 lines
drivers/mmc/socfpga_dw_mmc.c new file +9
-0+#define SYSMGR_SDMMC_CTRL_SET (smplsel, drvsel) \ + ((((drvsel) << 0) & 0x7) | (((smplsel) << 3) & 0x38)) + +static char *SOCFPGA_NAME ="SOCFPGA DWMMC" ; + +static void socfpga_dwmci_clksel (struct dwmci_host *host) +{ +unsigned int en; +unsigned int drvsel;
drivers/mmc/socfpga_dw_mmc.c line 34
Quoted 10 lines
drivers/mmc/socfpga_dw_mmc.c new file +10
-0+unsigned int smplsel; + +/* Disable SDMMC clock. */ + en =readl (CLKMGR_PERPLLGRP_EN_REG ); + en &= ~CLKMGR_SDMMC_CLK_ENABLE ; +writel (en,CLKMGR_PERPLLGRP_EN_REG ); + +/* Configures drv_sel and smpl_sel */ + drvsel =3 ; + smplsel =0 ;
Is this value static? then why is value assigned drvsel and smpsel at here?
I didn't know that SOCFPGA is only used with drvsel = 3, smplsel = 0.
But if you need to change this value for other SoC version in future, I think that hard coding is not good.
Quoted 19 lines
drivers/mmc/socfpga_dw_mmc.c new file +19
-0+ +debug ("%s: drvsel %d smplsel %d\n" , __FUNCTION__, drvsel, smplsel); +writel (SYSMGR_SDMMC_CTRL_SET (smplsel, drvsel), +SYSMGR_SDMMCGRP_CTRL_REG ); + +debug ("%s: SYSMGR_SDMMCGRP_CTRL_REG = 0x%x\n" , __FUNCTION__, +readl (SYSMGR_SDMMCGRP_CTRL_REG )); +/* Enable SDMMC clock */ + en =readl (CLKMGR_PERPLLGRP_EN_REG ); + en |=CLKMGR_SDMMC_CLK_ENABLE ; +writel (en,CLKMGR_PERPLLGRP_EN_REG ); +} + +int socfpga_dwmmc_init (u32 regbase,int bus_width,int index) +{ +struct dwmci_host *host =NULL ; + host =calloc (sizeof (struct dwmci_host ),1 ); +if (!host) { +printf ("dwmci_host calloc fail!\n" );
drivers/mmc/socfpga_dw_mmc.c line 63
Quoted 10 lines
drivers/mmc/socfpga_dw_mmc.c new file +10
-0+return 1 ; + } + + host->name =SOCFPGA_NAME ; + host->ioaddr = (void *)regbase; + host->buswidth = bus_width; + host->clksel = socfpga_dwmci_clksel; + host->dev_index = index; +/* fixed clock divide by 4 which due to the SDMMC wrapper */ + host->bus_hz =CONFIG_DWMMC_BUS_HZ ;
I didn't want to use the CONFIG_DWMMC_BUS_HZ.
drivers/mmc/socfpga_dw_mmc.c line 68
Quoted 5 lines
drivers/mmc/socfpga_dw_mmc.c new file +5
-0+ host->fifoth_val =MSIZE (0x2 ) | +RX_WMARK (CONFIG_DWMMC_FIFO_DEPTH /2 -1 ) | +TX_WMARK (CONFIG_DWMMC_FIFO_DEPTH /2 ); + +add_dwmci (host, host->bus_hz,400000 );
add_dwmci() has the return value.
Best Regards,
Jaehoon Chung
Quoted 5 lines
drivers/mmc/socfpga_dw_mmc.c new file +4
-0+ +return 0 ; +} +
PATCH v2 1/1 socfpga/dwmmc: Adding DesignWare MMC driver support for SOCFPGA
Dear Jaehoon,
Quoted 9 lines · Jaehoon Chung
Hi, Chin.
drivers/mmc/socfpga_dw_mmc.c line 14
Quoted 5 lines · Chin Liang See
drivers/mmc/socfpga_dw_mmc.c new file +4
-0+ +#define CLKMGR_PERPLLGRP_EN_REG (SOCFPGA_CLKMGR_ADDRESS + 0xA0) +#define CLKMGR_SDMMC_CLK_ENABLE (1 << 8) +#define SYSMGR_SDMMCGRP_CTRL_REG (SOCFPGA_SYSMGR_ADDRESS + 0x108)Where is
SOCFPGA_CLKMGR_ADDRESSdefined?
This is located at platform specific declaration file.
Quoted 17 lines
Quoted 2 lines
+#define
SYSMGR_SDMMC_CTRL_GET_DRVSEL(x)(((x) >> 0) &0x7)((x) &
0x7) is more readable?Quoted 14 lines
drivers/mmc/socfpga_dw_mmc.c new file +14
-0+#define SYSMGR_SDMMC_CTRL_SET (smplsel, drvsel) \ + ((((drvsel) << 0) & 0x7) | (((smplsel) << 3) & 0x38)) + +static char *SOCFPGA_NAME ="SOCFPGA DWMMC" ; + +static void socfpga_dwmci_clksel (struct dwmci_host *host) +{ +unsigned int en; +unsigned int drvsel; +unsigned int smplsel; + +/* Disable SDMMC clock. */ + en =readl (CLKMGR_PERPLLGRP_EN_REG ); + en &= ~CLKMGR_SDMMC_CLK_ENABLE ;
Quoted 8 lines
drivers/mmc/socfpga_dw_mmc.c line 34
Quoted 5 lines
drivers/mmc/socfpga_dw_mmc.c new file +5
-0+writel (en,CLKMGR_PERPLLGRP_EN_REG ); + +/* Configures drv_sel and smpl_sel */ + drvsel =3 ; + smplsel =0 ;Is this value static? then why is value assigned drvsel and smpsel at here?
I didn't know that SOCFPGA is only used with drvsel = 3, smplsel = 0.
But if you need to change this value for other SoC version in future, I think that hard coding is not good.
Good suggestion as I put them as macro now for v3
Quoted 23 lines
Quoted 23 lines
drivers/mmc/socfpga_dw_mmc.c new file +22
-0+ +debug ("%s: drvsel %d smplsel %d\n" , __FUNCTION__, drvsel, smplsel); +writel (SYSMGR_SDMMC_CTRL_SET (smplsel, drvsel), +SYSMGR_SDMMCGRP_CTRL_REG ); + +debug ("%s: SYSMGR_SDMMCGRP_CTRL_REG = 0x%x\n" , __FUNCTION__, +readl (SYSMGR_SDMMCGRP_CTRL_REG )); +/* Enable SDMMC clock */ + en =readl (CLKMGR_PERPLLGRP_EN_REG ); + en |=CLKMGR_SDMMC_CLK_ENABLE ; +writel (en,CLKMGR_PERPLLGRP_EN_REG ); +} + +int socfpga_dwmmc_init (u32 regbase,int bus_width,int index) +{ +struct dwmci_host *host =NULL ; + host =calloc (sizeof (struct dwmci_host ),1 ); +if (!host) { +printf ("dwmci_host calloc fail!\n" ); +return 1 ; + } +
Quoted 8 lines
drivers/mmc/socfpga_dw_mmc.c line 63
Quoted 7 lines
drivers/mmc/socfpga_dw_mmc.c new file +7
-0+ host->name =SOCFPGA_NAME ; + host->ioaddr = (void *)regbase; + host->buswidth = bus_width; + host->clksel = socfpga_dwmci_clksel; + host->dev_index = index; +/* fixed clock divide by 4 which due to the SDMMC wrapper */ + host->bus_hz =CONFIG_DWMMC_BUS_HZ ;I didn't want to use the
CONFIG_DWMMC_BUS_HZ.
Yup, this is SOCFPGA specific and I am using CONFIG_SOCFPGA_DWMMC_BUS_HZ for v3
Thanks
Chin Liang
Quoted 17 lines
drivers/mmc/socfpga_dw_mmc.c line 68
Quoted 6 lines
drivers/mmc/socfpga_dw_mmc.c new file +5
-0+ host->fifoth_val =MSIZE (0x2 ) | +RX_WMARK (CONFIG_DWMMC_FIFO_DEPTH /2 -1 ) | +TX_WMARK (CONFIG_DWMMC_FIFO_DEPTH /2 ); + +add_dwmci (host, host->bus_hz,400000 );
add_dwmci()has the return value.Best Regards,
Jaehoon ChungQuoted 5 lines
drivers/mmc/socfpga_dw_mmc.c new file +4
-0+ +return 0 ; +} +
PATCH v2 1/1 socfpga/dwmmc: Adding DesignWare MMC driver support for SOCFPGA
In reply to Chin Liang SeeDear Chin Liang See,
PLease fix your address list. There is no such address as "Andy at denx.de".
Quoted 3 lines · In message <[email protected]> you wrote:
To add the DesignWare MMC driver support for Altera SOCFPGA. It required information such as clocks and bus width from platform specific files (SOCFPGA handoff files)
...
Quoted 1 line
+#define
CLKMGR_PERPLLGRP_EN_REG(SOCFPGA_CLKMGR_ADDRESS+0xA0)
...
Quoted 1 line
+#define
SYSMGR_SDMMCGRP_CTRL_REG(SOCFPGA_SYSMGR_ADDRESS+0x108)
This looks as if you were trying to access device rtegisters through a base address plus offset notation?
We do not allow this in U-Boot, as the compiler then has no chance to check if you are using the correct data types, i. e. it cannot warn you for example when you access a 32 bit register for a 16 bit data type.
Please use C structs and proper I/O accessors instead.
drivers/mmc/socfpga_dw_mmc.c line 30
Quoted 4 lines
drivers/mmc/socfpga_dw_mmc.c new file +4
-0+/* Disable SDMMC clock. */ + en =readl (CLKMGR_PERPLLGRP_EN_REG ); + en &= ~CLKMGR_SDMMC_CLK_ENABLE ; +writel (en,CLKMGR_PERPLLGRP_EN_REG );
Please fix such code. Use proper I/O accessors. This could (and should) be written as:
clrbits_le32(clkmgr->perpllgrp_en, CLKMGR_SDMMC_CLK_ENABLE);
[or similar struct member name].
drivers/mmc/socfpga_dw_mmc.c line 45
Quoted 4 lines
drivers/mmc/socfpga_dw_mmc.c new file +4
-0+/* Enable SDMMC clock */ + en =readl (CLKMGR_PERPLLGRP_EN_REG ); + en |=CLKMGR_SDMMC_CLK_ENABLE ; +writel (en,CLKMGR_PERPLLGRP_EN_REG );
Ditto here, etc.
Please check all your device accesses.
Best regards,
Wolfgang Denk
Signature · 5 lines
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de That was the thing about deserts. They had their own gravity. They sucked you into the centre. - Terry Pratchett, _Small Gods_
PATCH v2 1/1 socfpga/dwmmc: Adding DesignWare MMC driver support for SOCFPGA
Dear Wolfgang,
Quoted 4 lines · ZY - wd
Dear Chin Liang See,
PLease fix your address list. There is no such address as "Andy at denx.de".
Oh... I presume you are referring to Andy Fleming. I am getting delivery failure to afleming at freescale.com and removing it from CC list.
Quoted 10 lines
Quoted 3 lines · In message <[email protected]> you wrote:
To add the DesignWare MMC driver support for Altera SOCFPGA. It required information such as clocks and bus width from platform specific files (SOCFPGA handoff files)
...
Quoted 1 line
+#define
CLKMGR_PERPLLGRP_EN_REG(SOCFPGA_CLKMGR_ADDRESS+0xA0)...
Quoted 1 line
+#define
SYSMGR_SDMMCGRP_CTRL_REG(SOCFPGA_SYSMGR_ADDRESS+0x108)
Quoted 8 lines
This looks as if you were trying to access device rtegisters through a base address plus offset notation?
We do not allow this in U-Boot, as the compiler then has no chance to check if you are using the correct data types, i. e. it cannot warn you for example when you access a 32 bit register for a 16 bit data type.
Noted and I believe I miss out this. I will be using structure for v3
Quoted 12 lines
Please use C structs and proper I/O accessors instead.
drivers/mmc/socfpga_dw_mmc.c line 30
Quoted 4 lines
drivers/mmc/socfpga_dw_mmc.c new file +4
-0+/* Disable SDMMC clock. */ + en =readl (CLKMGR_PERPLLGRP_EN_REG ); + en &= ~CLKMGR_SDMMC_CLK_ENABLE ; +writel (en,CLKMGR_PERPLLGRP_EN_REG );Please fix such code. Use proper I/O accessors. This could (and should) be written as:
clrbits_le32(clkmgr->perpllgrp_en, CLKMGR_SDMMC_CLK_ENABLE);
Quoted 8 lines
[or similar struct member name].
drivers/mmc/socfpga_dw_mmc.c line 45
Quoted 4 lines
drivers/mmc/socfpga_dw_mmc.c new file +4
-0+/* Enable SDMMC clock */ + en =readl (CLKMGR_PERPLLGRP_EN_REG ); + en |=CLKMGR_SDMMC_CLK_ENABLE ; +writel (en,CLKMGR_PERPLLGRP_EN_REG );Ditto here, etc.
Noted.
Thanks
Chin Liang
Quoted 7 lines
Please check all your device accesses.
Best regards,
Wolfgang Denk