GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-03-21 14:41:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

mxc: Fix SDHC multi-instance clock

Browse source 
On mxc, each SDHC instance has a dedicated clock, so gd->sdhc_clk is not
suitable for the multi-instance use case (initialization made directly with
fsl_esdhc_initialize()).

This patch fixes this issue by adding a configuration field for the SDHC input
clock frequency.

Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau@advansee.com>
Cc: Stefano Babic <sbabic@denx.de>
Cc: Eric Bénard <eric@eukrea.com>
Cc: Otavio Salvador <otavio@ossystems.com.br>
Cc: Fabio Estevam <fabio.estevam@freescale.com>
Cc: Jason Liu <r64343@freescale.com>
Cc: Matt Sealey <matt@genesi-usa.com>
Cc: Andy Fleming <afleming@gmail.com>
This commit is contained in:
Benoît Thébaudeau 2012-10-01 08:36:25 +00:00 • committed by Stefano Babic
parent 6e3dc12754
commit a2ac1b3a7d
15 changed files with 40 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
board/esg/ima3-mx53/ima3-mx53.c
View file

@ -217,6 +217,7 @@ int board_mmc_init(bd_t *bis)
PAD_CTL_HYS_ENABLE | PAD_CTL_DRV_HIGH | PAD_CTL_PUE_PULL | PAD_CTL_HYS_ENABLE | PAD_CTL_DRV_HIGH | PAD_CTL_PUE_PULL |
PAD_CTL_PKE_ENABLE | PAD_CTL_HYS_ENABLE | PAD_CTL_47K_PU); PAD_CTL_PKE_ENABLE | PAD_CTL_HYS_ENABLE | PAD_CTL_47K_PU);
esdhc_cfg.sdhc_clk = mxc_get_clock(MXC_ESDHC_CLK);
return fsl_esdhc_initialize(bis, &esdhc_cfg); return fsl_esdhc_initialize(bis, &esdhc_cfg);
} }
#endif #endif

2
board/freescale/mx35pdk/mx35pdk.c
View file

@ -27,6 +27,7 @@
#include <asm/errno.h> #include <asm/errno.h>
#include <asm/arch/imx-regs.h> #include <asm/arch/imx-regs.h>
#include <asm/arch/crm_regs.h> #include <asm/arch/crm_regs.h>
#include <asm/arch/clock.h>
#include <asm/arch/mx35_pins.h> #include <asm/arch/mx35_pins.h>
#include <asm/arch/iomux.h> #include <asm/arch/iomux.h>
#include <i2c.h> #include <i2c.h>
@ -292,6 +293,7 @@ int board_mmc_init(bd_t *bis)
mxc_request_iomux(MX35_PIN_SD1_DATA2, MUX_CONFIG_FUNC); mxc_request_iomux(MX35_PIN_SD1_DATA2, MUX_CONFIG_FUNC);
mxc_request_iomux(MX35_PIN_SD1_DATA3, MUX_CONFIG_FUNC); mxc_request_iomux(MX35_PIN_SD1_DATA3, MUX_CONFIG_FUNC);
esdhc_cfg.sdhc_clk = mxc_get_clock(MXC_ESDHC1_CLK);
return fsl_esdhc_initialize(bis, &esdhc_cfg); return fsl_esdhc_initialize(bis, &esdhc_cfg);
} }

4
board/freescale/mx51evk/mx51evk.c
View file

@ -29,6 +29,7 @@
#include <asm/errno.h> #include <asm/errno.h>
#include <asm/arch/sys_proto.h> #include <asm/arch/sys_proto.h>
#include <asm/arch/crm_regs.h> #include <asm/arch/crm_regs.h>
#include <asm/arch/clock.h>
#include <i2c.h> #include <i2c.h>
#include <mmc.h> #include <mmc.h>
#include <fsl_esdhc.h> #include <fsl_esdhc.h>
@ -358,6 +359,9 @@ int board_mmc_init(bd_t *bis)
u32 index; u32 index;
s32 status = 0; s32 status = 0;
esdhc_cfg[0].sdhc_clk = mxc_get_clock(MXC_ESDHC_CLK);
esdhc_cfg[1].sdhc_clk = mxc_get_clock(MXC_ESDHC2_CLK);
for (index = 0; index < CONFIG_SYS_FSL_ESDHC_NUM; for (index = 0; index < CONFIG_SYS_FSL_ESDHC_NUM;
index++) { index++) {
switch (index) { switch (index) {

4
board/freescale/mx53ard/mx53ard.c
View file

@ -26,6 +26,7 @@
#include <asm/arch/mx5x_pins.h> #include <asm/arch/mx5x_pins.h>
#include <asm/arch/sys_proto.h> #include <asm/arch/sys_proto.h>
#include <asm/arch/crm_regs.h> #include <asm/arch/crm_regs.h>
#include <asm/arch/clock.h>
#include <asm/arch/iomux.h> #include <asm/arch/iomux.h>
#include <asm/errno.h> #include <asm/errno.h>
#include <netdev.h> #include <netdev.h>
@ -106,6 +107,9 @@ int board_mmc_init(bd_t *bis)
u32 index; u32 index;
s32 status = 0; s32 status = 0;
esdhc_cfg[0].sdhc_clk = mxc_get_clock(MXC_ESDHC_CLK);
esdhc_cfg[1].sdhc_clk = mxc_get_clock(MXC_ESDHC2_CLK);
for (index = 0; index < CONFIG_SYS_FSL_ESDHC_NUM; index++) { for (index = 0; index < CONFIG_SYS_FSL_ESDHC_NUM; index++) {
switch (index) { switch (index) {
case 0: case 0:

4
board/freescale/mx53evk/mx53evk.c
View file

@ -26,6 +26,7 @@
#include <asm/arch/mx5x_pins.h> #include <asm/arch/mx5x_pins.h>
#include <asm/arch/sys_proto.h> #include <asm/arch/sys_proto.h>
#include <asm/arch/crm_regs.h> #include <asm/arch/crm_regs.h>
#include <asm/arch/clock.h>
#include <asm/arch/iomux.h> #include <asm/arch/iomux.h>
#include <asm/errno.h> #include <asm/errno.h>
#include <asm/imx-common/boot_mode.h> #include <asm/imx-common/boot_mode.h>
@ -232,6 +233,9 @@ int board_mmc_init(bd_t *bis)
u32 index; u32 index;
s32 status = 0; s32 status = 0;
esdhc_cfg[0].sdhc_clk = mxc_get_clock(MXC_ESDHC_CLK);
esdhc_cfg[1].sdhc_clk = mxc_get_clock(MXC_ESDHC3_CLK);
for (index = 0; index < CONFIG_SYS_FSL_ESDHC_NUM; index++) { for (index = 0; index < CONFIG_SYS_FSL_ESDHC_NUM; index++) {
switch (index) { switch (index) {
case 0: case 0:

3
board/freescale/mx53loco/mx53loco.c
View file

@ -192,6 +192,9 @@ int board_mmc_init(bd_t *bis)
u32 index; u32 index;
s32 status = 0; s32 status = 0;
esdhc_cfg[0].sdhc_clk = mxc_get_clock(MXC_ESDHC_CLK);
esdhc_cfg[1].sdhc_clk = mxc_get_clock(MXC_ESDHC3_CLK);
for (index = 0; index < CONFIG_SYS_FSL_ESDHC_NUM; index++) { for (index = 0; index < CONFIG_SYS_FSL_ESDHC_NUM; index++) {
switch (index) { switch (index) {
case 0: case 0:

3
board/freescale/mx53smd/mx53smd.c
View file

@ -26,6 +26,7 @@
#include <asm/arch/mx5x_pins.h> #include <asm/arch/mx5x_pins.h>
#include <asm/arch/sys_proto.h> #include <asm/arch/sys_proto.h>
#include <asm/arch/crm_regs.h> #include <asm/arch/crm_regs.h>
#include <asm/arch/clock.h>
#include <asm/arch/iomux.h> #include <asm/arch/iomux.h>
#include <asm/errno.h> #include <asm/errno.h>
#include <netdev.h> #include <netdev.h>
@ -144,6 +145,8 @@ int board_mmc_init(bd_t *bis)
u32 index; u32 index;
s32 status = 0; s32 status = 0;
esdhc_cfg[0].sdhc_clk = mxc_get_clock(MXC_ESDHC_CLK);
for (index = 0; index < CONFIG_SYS_FSL_ESDHC_NUM; index++) { for (index = 0; index < CONFIG_SYS_FSL_ESDHC_NUM; index++) {
switch (index) { switch (index) {
case 0: case 0:

4
board/freescale/mx6qarm2/mx6qarm2.c
View file

@ -24,6 +24,7 @@
#include <asm/io.h> #include <asm/io.h>
#include <asm/arch/imx-regs.h> #include <asm/arch/imx-regs.h>
#include <asm/arch/mx6x_pins.h> #include <asm/arch/mx6x_pins.h>
#include <asm/arch/clock.h>
#include <asm/errno.h> #include <asm/errno.h>
#include <asm/gpio.h> #include <asm/gpio.h>
#include <asm/imx-common/iomux-v3.h> #include <asm/imx-common/iomux-v3.h>
@ -139,6 +140,9 @@ int board_mmc_init(bd_t *bis)
s32 status = 0; s32 status = 0;
u32 index = 0; u32 index = 0;
usdhc_cfg[0].sdhc_clk = mxc_get_clock(MXC_ESDHC3_CLK);
usdhc_cfg[1].sdhc_clk = mxc_get_clock(MXC_ESDHC4_CLK);
for (index = 0; index < CONFIG_SYS_FSL_USDHC_NUM; ++index) { for (index = 0; index < CONFIG_SYS_FSL_USDHC_NUM; ++index) {
switch (index) { switch (index) {
case 0: case 0:

1
board/freescale/mx6qsabreauto/mx6qsabreauto.c
View file

@ -114,6 +114,7 @@ int board_mmc_init(bd_t *bis)
{ {
imx_iomux_v3_setup_multiple_pads(usdhc3_pads, ARRAY_SIZE(usdhc3_pads)); imx_iomux_v3_setup_multiple_pads(usdhc3_pads, ARRAY_SIZE(usdhc3_pads));
usdhc_cfg[0].sdhc_clk = mxc_get_clock(MXC_ESDHC3_CLK);
return fsl_esdhc_initialize(bis, &usdhc_cfg[0]); return fsl_esdhc_initialize(bis, &usdhc_cfg[0]);
} }
#endif #endif

3
board/freescale/mx6qsabrelite/mx6qsabrelite.c
View file

@ -264,6 +264,9 @@ int board_mmc_init(bd_t *bis)
s32 status = 0; s32 status = 0;
u32 index = 0; u32 index = 0;
usdhc_cfg[0].sdhc_clk = mxc_get_clock(MXC_ESDHC3_CLK);
usdhc_cfg[1].sdhc_clk = mxc_get_clock(MXC_ESDHC4_CLK);
for (index = 0; index < CONFIG_SYS_FSL_USDHC_NUM; ++index) { for (index = 0; index < CONFIG_SYS_FSL_USDHC_NUM; ++index) {
switch (index) { switch (index) {
case 0: case 0:

1
board/freescale/mx6qsabresd/mx6qsabresd.c
View file

@ -120,6 +120,7 @@ int board_mmc_init(bd_t *bis)
{ {
imx_iomux_v3_setup_multiple_pads(usdhc3_pads, ARRAY_SIZE(usdhc3_pads)); imx_iomux_v3_setup_multiple_pads(usdhc3_pads, ARRAY_SIZE(usdhc3_pads));
usdhc_cfg[0].sdhc_clk = mxc_get_clock(MXC_ESDHC3_CLK);
return fsl_esdhc_initialize(bis, &usdhc_cfg[0]); return fsl_esdhc_initialize(bis, &usdhc_cfg[0]);
} }
#endif #endif

4
board/genesi/mx51_efikamx/efikamx.c
View file

@ -29,6 +29,7 @@
#include <asm/errno.h> #include <asm/errno.h>
#include <asm/arch/sys_proto.h> #include <asm/arch/sys_proto.h>
#include <asm/arch/crm_regs.h> #include <asm/arch/crm_regs.h>
#include <asm/arch/clock.h>
#include <i2c.h> #include <i2c.h>
#include <mmc.h> #include <mmc.h>
#include <fsl_esdhc.h> #include <fsl_esdhc.h>
@ -349,6 +350,9 @@ int board_mmc_init(bd_t *bis)
gpio_direction_input(EFIKASB_SDHC1_CD); gpio_direction_input(EFIKASB_SDHC1_CD);
} }
esdhc_cfg[0].sdhc_clk = mxc_get_clock(MXC_ESDHC_CLK);
esdhc_cfg[1].sdhc_clk = mxc_get_clock(MXC_ESDHC2_CLK);
ret = fsl_esdhc_initialize(bis, &esdhc_cfg[0]); ret = fsl_esdhc_initialize(bis, &esdhc_cfg[0]);
if (machine_is_efikasb()) { if (machine_is_efikasb()) {

2
board/ttcontrol/vision2/vision2.c
View file

@ -28,6 +28,7 @@
#include <asm/arch/imx-regs.h> #include <asm/arch/imx-regs.h>
#include <asm/arch/mx5x_pins.h> #include <asm/arch/mx5x_pins.h>
#include <asm/arch/crm_regs.h> #include <asm/arch/crm_regs.h>
#include <asm/arch/clock.h>
#include <asm/arch/iomux.h> #include <asm/arch/iomux.h>
#include <asm/gpio.h> #include <asm/gpio.h>
#include <asm/arch/sys_proto.h> #include <asm/arch/sys_proto.h>
@ -590,6 +591,7 @@ int board_mmc_init(bd_t *bis)
mxc_iomux_set_pad(MX51_PIN_GPIO1_1, mxc_iomux_set_pad(MX51_PIN_GPIO1_1,
PAD_CTL_HYS_ENABLE); PAD_CTL_HYS_ENABLE);
esdhc_cfg[0].sdhc_clk = mxc_get_clock(MXC_ESDHC_CLK);
return fsl_esdhc_initialize(bis, &esdhc_cfg[0]); return fsl_esdhc_initialize(bis, &esdhc_cfg[0]);
} }
#endif #endif

5
drivers/mmc/fsl_esdhc.c
View file

@ -410,12 +410,12 @@ esdhc_send_cmd(struct mmc *mmc, struct mmc_cmd *cmd, struct mmc_data *data)
return 0; return 0;
} }
void set_sysctl(struct mmc *mmc, uint clock) static void set_sysctl(struct mmc *mmc, uint clock)
{ {
int sdhc_clk = gd->sdhc_clk;
int div, pre_div; int div, pre_div;
struct fsl_esdhc_cfg *cfg = (struct fsl_esdhc_cfg *)mmc->priv; struct fsl_esdhc_cfg *cfg = (struct fsl_esdhc_cfg *)mmc->priv;
volatile struct fsl_esdhc *regs = (struct fsl_esdhc *)cfg->esdhc_base; volatile struct fsl_esdhc *regs = (struct fsl_esdhc *)cfg->esdhc_base;
int sdhc_clk = cfg->sdhc_clk;
uint clk; uint clk;
if (clock < mmc->f_min) if (clock < mmc->f_min)
@ -598,6 +598,7 @@ int fsl_esdhc_mmc_init(bd_t *bis)
cfg = malloc(sizeof(struct fsl_esdhc_cfg)); cfg = malloc(sizeof(struct fsl_esdhc_cfg));
memset(cfg, 0, sizeof(struct fsl_esdhc_cfg)); memset(cfg, 0, sizeof(struct fsl_esdhc_cfg));
cfg->esdhc_base = CONFIG_SYS_FSL_ESDHC_ADDR; cfg->esdhc_base = CONFIG_SYS_FSL_ESDHC_ADDR;
cfg->sdhc_clk = gd->sdhc_clk;
return fsl_esdhc_initialize(bis, cfg); return fsl_esdhc_initialize(bis, cfg);
} }

1
include/fsl_esdhc.h
View file

@ -167,6 +167,7 @@
struct fsl_esdhc_cfg { struct fsl_esdhc_cfg {
u32 esdhc_base; u32 esdhc_base;
u32 sdhc_clk;
}; };
/* Select the correct accessors depending on endianess */ /* Select the correct accessors depending on endianess */