February 2018 - U-Boot

[U-Boot] [PATCH 1/2] mtd: nand: tegra: convert to driver model and live tree
by Marcel Ziswiler 23 Feb '18

23 Feb '18

From: Marcel Ziswiler <marcel.ziswiler(a)toradex.com> The Tegra NAND driver recently got broken by ongoing driver model resp. live tree migration work: NAND: Could not decode nand-flash in device tree Tegra NAND init failed 0 MiB A patch for NAND uclass support was proposed about a year ago: https://patchwork.ozlabs.org/patch/722282/ It was not merged and I do not see on-going work for this. This commit just provides a driver model probe hook to retrieve further configuration from the live device tree. As there is no NAND ulass as of yet (ab)using UCLASS_MISC. Once UCLASS_NAND is supported, it would be possible to migrate to it. Signed-off-by: Marcel Ziswiler <marcel.ziswiler(a)toradex.com> --- drivers/mtd/nand/tegra_nand.c | 98 ++++++++++++++++++++++++------------------- 1 file changed, 55 insertions(+), 43 deletions(-) diff --git a/drivers/mtd/nand/tegra_nand.c b/drivers/mtd/nand/tegra_nand.c index c03c9cb178..405018018c 100644 --- a/drivers/mtd/nand/tegra_nand.c +++ b/drivers/mtd/nand/tegra_nand.c @@ -18,6 +18,7 @@ #include <asm/gpio.h> #include <fdtdec.h> #include <bouncebuf.h> +#include <dm.h> #include "tegra_nand.h" DECLARE_GLOBAL_DATA_PTR; @@ -29,6 +30,13 @@ DECLARE_GLOBAL_DATA_PTR; /* ECC bytes to be generated for tag data */ #define TAG_ECC_BYTES 4 +static const struct udevice_id tegra_nand_dt_ids[] = { + { + .compatible = "nvidia,tegra20-nand", + }, + { /* sentinel */ } +}; + /* 64 byte oob block info for large page (== 2KB) device * * OOB flash layout for Tegra with Reed-Solomon 4 symbol correct ECC: @@ -91,9 +99,11 @@ struct nand_drv { struct fdt_nand config; }; -static struct nand_drv nand_ctrl; -static struct mtd_info *our_mtd; -static struct nand_chip nand_chip[CONFIG_SYS_MAX_NAND_DEVICE]; +struct tegra_nand_info { + struct udevice *dev; + struct nand_drv nand_ctrl; + struct nand_chip nand_chip; +}; /** * Wait for command completion @@ -453,8 +463,8 @@ static void stop_command(struct nand_ctlr *reg) * @param *reg_val address of reg_val * @return 0 if ok, -1 on error */ -static int set_bus_width_page_size(struct fdt_nand *config, - u32 *reg_val) +static int set_bus_width_page_size(struct mtd_info *our_mtd, + struct fdt_nand *config, u32 *reg_val) { if (config->width == 8) *reg_val = CFG_BUS_WIDTH_8BIT; @@ -514,7 +524,7 @@ static int nand_rw_page(struct mtd_info *mtd, struct nand_chip *chip, info = (struct nand_drv *)nand_get_controller_data(chip); config = &info->config; - if (set_bus_width_page_size(config, &reg_val)) + if (set_bus_width_page_size(mtd, config, &reg_val)) return -EINVAL; /* Need to be 4-byte aligned */ @@ -722,7 +732,7 @@ static int nand_rw_oob(struct mtd_info *mtd, struct nand_chip *chip, if (((int)chip->oob_poi) & 0x03) return -EINVAL; info = (struct nand_drv *)nand_get_controller_data(chip); - if (set_bus_width_page_size(&info->config, &reg_val)) + if (set_bus_width_page_size(mtd, &info->config, &reg_val)) return -EINVAL; stop_command(info->reg); @@ -883,51 +893,39 @@ static void setup_timing(unsigned timing[FDT_NAND_TIMING_COUNT], /** * Decode NAND parameters from the device tree * - * @param blob Device tree blob - * @param node Node containing "nand-flash" compatible node + * @param dev Driver model device + * @param config Device tree NAND configuration * @return 0 if ok, -ve on error (FDT_ERR_...) */ -static int fdt_decode_nand(const void *blob, int node, struct fdt_nand *config) +static int fdt_decode_nand(struct udevice *dev, struct fdt_nand *config) { int err; - config->reg = (struct nand_ctlr *)fdtdec_get_addr(blob, node, "reg"); - config->enabled = fdtdec_get_is_enabled(blob, node); - config->width = fdtdec_get_int(blob, node, "nvidia,nand-width", 8); - err = gpio_request_by_name_nodev(offset_to_ofnode(node), - "nvidia,wp-gpios", 0, &config->wp_gpio, GPIOD_IS_OUT); + config->reg = (struct nand_ctlr *)dev_read_addr(dev); + config->enabled = dev_read_enabled(dev); + config->width = dev_read_u32_default(dev, "nvidia,nand-width", 8); + err = gpio_request_by_name(dev, "nvidia,wp-gpios", 0, &config->wp_gpio, + GPIOD_IS_OUT); if (err) return err; - err = fdtdec_get_int_array(blob, node, "nvidia,timing", - config->timing, FDT_NAND_TIMING_COUNT); + err = dev_read_u32_array(dev, "nvidia,timing", config->timing, + FDT_NAND_TIMING_COUNT); if (err < 0) return err; - /* Now look up the controller and decode that */ - node = fdt_next_node(blob, node, NULL); - if (node < 0) - return node; - return 0; } -/** - * Board-specific NAND initialization - * - * @param nand nand chip info structure - * @return 0, after initialized, -1 on error - */ -int tegra_nand_init(struct nand_chip *nand, int devnum) +static int tegra_probe(struct udevice *dev) { - struct nand_drv *info = &nand_ctrl; + struct tegra_nand_info *tegra = dev_get_priv(dev); + struct nand_chip *nand = &tegra->nand_chip; + struct nand_drv *info = &tegra->nand_ctrl; struct fdt_nand *config = &info->config; - int node, ret; + struct mtd_info *our_mtd; + int ret; - node = fdtdec_next_compatible(gd->fdt_blob, 0, - COMPAT_NVIDIA_TEGRA20_NAND); - if (node < 0) - return -1; - if (fdt_decode_nand(gd->fdt_blob, node, config)) { + if (fdt_decode_nand(dev, config)) { printf("Could not decode nand-flash in device tree\n"); return -1; } @@ -950,7 +948,7 @@ int tegra_nand_init(struct nand_chip *nand, int devnum) nand->ecc.strength = 1; nand->select_chip = nand_select_chip; nand->dev_ready = nand_dev_ready; - nand_set_controller_data(nand, &nand_ctrl); + nand_set_controller_data(nand, &tegra->nand_ctrl); /* Disable subpage writes as we do not provide ecc->hwctl */ nand->options |= NAND_NO_SUBPAGE_WRITE; @@ -975,17 +973,31 @@ int tegra_nand_init(struct nand_chip *nand, int devnum) if (ret) return ret; - ret = nand_register(devnum, our_mtd); - if (ret) + ret = nand_register(0, our_mtd); + if (ret) { + dev_err(dev, "Failed to register MTD: %d\n", ret); return ret; + } return 0; } +U_BOOT_DRIVER(tegra_nand) = { + .name = "tegra-nand", + .id = UCLASS_MISC, + .of_match = tegra_nand_dt_ids, + .probe = tegra_probe, + .priv_auto_alloc_size = sizeof(struct tegra_nand_info), +}; + void board_nand_init(void) { - struct nand_chip *nand = &nand_chip[0]; - - if (tegra_nand_init(nand, 0)) - puts("Tegra NAND init failed\n"); + struct udevice *dev; + int ret; + + ret = uclass_get_device_by_driver(UCLASS_MISC, + DM_GET_DRIVER(tegra_nand), &dev); + if (ret && ret != -ENODEV) + pr_err("Failed to initialize %s. (error %d)\n", dev->name, + ret); } -- 2.14.3

4 4

[U-Boot] [PATCH v2 1/1] fs: fat: avoid useless conversion when calling get_cluster
by Heinrich Schuchardt 23 Feb '18

23 Feb '18

Parameter size of function get_cluster() is of type unsigned long. It makes no sense to convert actsize to int before passing it to get_cluster as size. Let't use t_off as type of parameter to avoid any type conversion. Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- v2 change type of parameter size --- fs/fat/fat.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/fs/fat/fat.c b/fs/fat/fat.c index dd7888cd6d4..cf4580b63df 100644 --- a/fs/fat/fat.c +++ b/fs/fat/fat.c @@ -244,7 +244,7 @@ static __u32 get_fatent(fsdata *mydata, __u32 entry) * Return 0 on success, -1 otherwise. */ static int -get_cluster(fsdata *mydata, __u32 clustnum, __u8 *buffer, unsigned long size) +get_cluster(fsdata *mydata, __u32 clustnum, __u8 *buffer, loff_t size) { __u32 idx = 0; __u32 startsect; @@ -353,7 +353,7 @@ static int get_contents(fsdata *mydata, dir_entry *dentptr, loff_t pos, if (pos) { actsize = min(filesize, (loff_t)bytesperclust); if (get_cluster(mydata, curclust, get_contents_vfatname_block, - (int)actsize) != 0) { + actsize) != 0) { printf("Error reading cluster\n"); return -1; } @@ -393,14 +393,14 @@ static int get_contents(fsdata *mydata, dir_entry *dentptr, loff_t pos, /* get remaining bytes */ actsize = filesize; - if (get_cluster(mydata, curclust, buffer, (int)actsize) != 0) { + if (get_cluster(mydata, curclust, buffer, actsize) != 0) { printf("Error reading cluster\n"); return -1; } *gotsize += actsize; return 0; getit: - if (get_cluster(mydata, curclust, buffer, (int)actsize) != 0) { + if (get_cluster(mydata, curclust, buffer, actsize) != 0) { printf("Error reading cluster\n"); return -1; } -- 2.11.0

2 1

[U-Boot] [PATCH v2 1/1] fs: fat: avoid superfluous conversion calling set_cluster
by Heinrich Schuchardt 23 Feb '18

23 Feb '18

Parameter size of function set_cluster is of type unsigned long. It makes no sense to convert actsize to int before passing it to set_cluster as size. Let's use loff_t as type of parameter size to avoid any conversion. Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- v2 change type of parameter size --- fs/fat/fat_write.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/fs/fat/fat_write.c b/fs/fat/fat_write.c index 2b753df2820..270b2908acd 100644 --- a/fs/fat/fat_write.c +++ b/fs/fat/fat_write.c @@ -494,8 +494,7 @@ static __u32 determine_fatent(fsdata *mydata, __u32 entry) * Return 0 on success, -1 otherwise. */ static int -set_cluster(fsdata *mydata, __u32 clustnum, __u8 *buffer, - unsigned long size) +set_cluster(fsdata *mydata, __u32 clustnum, __u8 *buffer, loff_t size) { __u32 idx = 0; __u32 startsect; @@ -679,7 +678,7 @@ set_contents(fsdata *mydata, dir_entry *dentptr, __u8 *buffer, /* set remaining bytes */ actsize = filesize; - if (set_cluster(mydata, curclust, buffer, (int)actsize) != 0) { + if (set_cluster(mydata, curclust, buffer, actsize) != 0) { debug("error: writing cluster\n"); return -1; } @@ -696,7 +695,7 @@ set_contents(fsdata *mydata, dir_entry *dentptr, __u8 *buffer, return 0; getit: - if (set_cluster(mydata, curclust, buffer, (int)actsize) != 0) { + if (set_cluster(mydata, curclust, buffer, actsize) != 0) { debug("error: writing cluster\n"); return -1; } -- 2.11.0

2 1

[U-Boot] [PATCH v2] mmc: uniphier-sd: Fix a compile error relevant to unused-function
by Jaehoon Chung 23 Feb '18

23 Feb '18

During disabled MMC_HS200_SUPPORT, some functions don't use anywhere. Signed-off-by: Jaehoon Chung <jh80.chung(a)samsung.com> --- Chnagelog on V2 - Remove functions in uniphier-sd.h drivers/mmc/uniphier-sd-rcar.c | 4 ++++ drivers/mmc/uniphier-sd.h | 9 --------- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/drivers/mmc/uniphier-sd-rcar.c b/drivers/mmc/uniphier-sd-rcar.c index 8baa2a9b46..894decd04d 100644 --- a/drivers/mmc/uniphier-sd-rcar.c +++ b/drivers/mmc/uniphier-sd-rcar.c @@ -80,6 +80,7 @@ static unsigned int uniphier_sd_init_tuning(struct uniphier_sd_priv *priv) SH_MOBILE_SDHI_SCC_DTCNTL_TAPNUM_MASK; } +#if CONFIG_IS_ENABLED(MMC_HS200_SUPPORT) void rcar_gen3_sd_reset_tuning(struct uniphier_sd_priv *priv) { u32 reg; @@ -105,6 +106,7 @@ void rcar_gen3_sd_reset_tuning(struct uniphier_sd_priv *priv) reg &= ~SH_MOBILE_SDHI_SCC_RVSCNTL_RVSEN; uniphier_sd_writel(priv, reg, SH_MOBILE_SDHI_SCC_RVSCNTL); } +#endif static void uniphier_sd_prepare_tuning(struct uniphier_sd_priv *priv, unsigned long tap) @@ -223,6 +225,7 @@ static int uniphier_sd_select_tuning(struct uniphier_sd_priv *priv, return 0; } +#if CONFIG_IS_ENABLED(MMC_HS200_SUPPORT) int rcar_gen3_sd_execute_tuning(struct udevice *dev, uint opcode) { struct uniphier_sd_priv *priv = dev_get_priv(dev); @@ -286,3 +289,4 @@ out: return ret; } +#endif diff --git a/drivers/mmc/uniphier-sd.h b/drivers/mmc/uniphier-sd.h index 38d104296f..6192e5973c 100644 --- a/drivers/mmc/uniphier-sd.h +++ b/drivers/mmc/uniphier-sd.h @@ -141,15 +141,6 @@ void uniphier_sd_writel(struct uniphier_sd_priv *priv, #if CONFIG_IS_ENABLED(MMC_RENESAS_TUNING) void rcar_gen3_sd_reset_tuning(struct uniphier_sd_priv *priv); int rcar_gen3_sd_execute_tuning(struct udevice *dev, uint opcode); -#else -static void rcar_gen3_sd_reset_tuning(struct uniphier_sd_priv *priv) -{ -} - -static int rcar_gen3_sd_execute_tuning(struct udevice *dev, uint opcode) -{ - return -EINVAL; -} #endif #endif /* __MMC_UNIPHIER_SD_H__ */ -- 2.16.1

1 0

[U-Boot] [PATCH] bootcount: flush after storing the bootcounter
by Stefano Babic 23 Feb '18

23 Feb '18

If the bootcounter address is in a cached memory, a flush of dcache must occur after updateing the bootcounter. Issue found on i.MX6 where bootcounter is put into the internal (cached) IRAM. Signed-off-by: Stefano Babic <sbabic(a)denx.de> --- drivers/bootcount/bootcount.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/bootcount/bootcount.c b/drivers/bootcount/bootcount.c index d5ce450..48594a6 100644 --- a/drivers/bootcount/bootcount.c +++ b/drivers/bootcount/bootcount.c @@ -59,6 +59,9 @@ __weak void bootcount_store(ulong a) raw_bootcount_store(reg, a); raw_bootcount_store(reg + 4, BOOTCOUNT_MAGIC); #endif /* defined(CONFIG_SYS_BOOTCOUNT_SINGLEWORD */ + flush_dcache_range(CONFIG_SYS_BOOTCOUNT_ADDR, + CONFIG_SYS_BOOTCOUNT_ADDR + + CONFIG_SYS_CACHELINE_SIZE); } __weak ulong bootcount_load(void) -- 2.7.4

3 5

[U-Boot] [PATCH] mmc: uniphier-sd: Fix a compile error relevant to unused-function
by Jaehoon Chung 23 Feb '18

23 Feb '18

During disabled MMC_HS200_SUPPORT, it doesn't use anywhere. Signed-off-by: Jaehoon Chung <jh80.chung(a)samsung.com> --- drivers/mmc/uniphier-sd-rcar.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/mmc/uniphier-sd-rcar.c b/drivers/mmc/uniphier-sd-rcar.c index 8baa2a9b46..894decd04d 100644 --- a/drivers/mmc/uniphier-sd-rcar.c +++ b/drivers/mmc/uniphier-sd-rcar.c @@ -80,6 +80,7 @@ static unsigned int uniphier_sd_init_tuning(struct uniphier_sd_priv *priv) SH_MOBILE_SDHI_SCC_DTCNTL_TAPNUM_MASK; } +#if CONFIG_IS_ENABLED(MMC_HS200_SUPPORT) void rcar_gen3_sd_reset_tuning(struct uniphier_sd_priv *priv) { u32 reg; @@ -105,6 +106,7 @@ void rcar_gen3_sd_reset_tuning(struct uniphier_sd_priv *priv) reg &= ~SH_MOBILE_SDHI_SCC_RVSCNTL_RVSEN; uniphier_sd_writel(priv, reg, SH_MOBILE_SDHI_SCC_RVSCNTL); } +#endif static void uniphier_sd_prepare_tuning(struct uniphier_sd_priv *priv, unsigned long tap) @@ -223,6 +225,7 @@ static int uniphier_sd_select_tuning(struct uniphier_sd_priv *priv, return 0; } +#if CONFIG_IS_ENABLED(MMC_HS200_SUPPORT) int rcar_gen3_sd_execute_tuning(struct udevice *dev, uint opcode) { struct uniphier_sd_priv *priv = dev_get_priv(dev); @@ -286,3 +289,4 @@ out: return ret; } +#endif -- 2.15.1

1 1

[U-Boot] [PATCH v3 00/24] omap_hsmmc: Add support for HS200 and UHS modes
by Jean-Jacques Hiblot 23 Feb '18

23 Feb '18

This series adds the missing bits to enable the UHS and HS200 modes for the TI platforms. Enabling support for high speed modes on omap5 requires implementing: * io signal voltage selection * tuning support * pin configuration (IO delays) The few last patches enable the high speed modes for the DRA7 platforms and also take care of disabling those modes in the dts for the platforms that cannot support either the UHS or the HS200 because the voltage regulators on board would not allow using those modes (not a SOC limitation). With this in place we observe significant improvements in the performances: on a DRA72 evm: eMMC HS200: 124 MB/s eMMC DDR52: 78 MB/s sd SDR104: 71 MB/s sd SDR50: 44 MB/s For the record, the original performances were: SD High speed: 18 MB/s MMC High speed: 18 MB/s This series has been tested on: * DRA71-evm * DRA72-evm * DRA7x-evm * DRA76-evm * AM57x-evm * Beaglebone Black (dt and non-dt) Changes in v2: - rebased on top of u-boot/master - enable the H200 and UHS support in the defconfigs of the DRA7 platforms Changes in v3: - in omap_hsmmc_set_clock(), if mmc->clock is zero, use the max divider. - prefer the usage of the BIT() macro over the construct ( 1 << x ) - fixed build issue with omap3 platforms Jean-Jacques Hiblot (13): mmc: omap_hsmmc: cleanup clock configuration mmc: omap_hsmmc: set MMC mode in the UHSMS bit field mmc: omap_hsmmc: Add tuning support mmc: omap_hsmmc: Workaround for errata id i802 mmc: omap_hsmmc: Reduce the max timeout for reset controller fsm mmc: omap_hsmmc: allow the simple HS modes to use the default pinctrl mmc: omap_hsmmc: update mmc->clock with the actual bus speed mmc: omap_hsmmc: implement send_init_stream callback mmc: omap_hsmmc: add signal voltage selection support ARM: dts: dra7: Add supported MMC/SD modes in MMC dt nodes dts: am57xx-beagle-x15: disable UHS and HS200 support dts: am57xx-idk: disable HS200 support configs: dra7xx_evm/dra7xx_hs_evm: Enable MMC HS200 and SD UHS support Kishon Vijay Abraham I (11): mmc: omap_hsmmc: cleanup omap_hsmmc_set_ios mmc: omap_hsmmc: add support to set default io voltage mmc: omap_hsmmc: Enable DDR mode support mmc: omap_hsmmc: use mmc_of_parse to populate mmc_config ARM: OMAP5/DRA7: Enable iodelay recalibration to be done from uboot mmc: omap_hsmmc: Add support to set IODELAY values mmc: omap_hsmmc: Add support to get pinctrl values and max frequency for different hw revisions mmc: omap_hsmmc: allow mmc clock to be gated ARM: OMAP5: set mmc clock frequency to 192MHz ARM: dts: DRA7: use new dra7-specific compatible string ARM: DRA7x/AM57x: Add MMC/SD fixups for rev1.0 and rev 1.1 arch/arm/dts/am57xx-beagle-x15.dts | 6 + arch/arm/dts/am57xx-idk-common.dtsi | 2 + arch/arm/dts/dra7.dtsi | 22 +- arch/arm/include/asm/arch-omap5/clock.h | 2 +- arch/arm/include/asm/arch-omap5/dra7xx_iodelay.h | 3 + arch/arm/include/asm/arch-omap5/sys_proto.h | 7 + arch/arm/include/asm/omap_mmc.h | 59 +- arch/arm/mach-omap2/omap5/dra7xx_iodelay.c | 30 + arch/arm/mach-omap2/omap5/hw_data.c | 10 +- board/ti/am57xx/board.c | 30 + board/ti/dra7xx/evm.c | 29 + configs/dra7xx_evm_defconfig | 3 + configs/dra7xx_hs_evm_defconfig | 3 + drivers/mmc/omap_hsmmc.c | 952 +++++++++++++++++++++-- include/configs/am57xx_evm.h | 2 - include/configs/dra7xx_evm.h | 2 - 16 files changed, 1087 insertions(+), 75 deletions(-) -- 1.9.1

3 29

[U-Boot] [PATCH] mmc: fix off-by-one bug in mmc_startup_v4()
by Alexander Kochetkov 23 Feb '18

23 Feb '18

SD-card with EXT_CSD_REV value 9 will trigger off-by-one bug while accessing mmc_versions array. The patch fix that. Signed-off-by: Alexander Kochetkov <al.kochet(a)gmail.com> --- drivers/mmc/mmc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c index 99e2a75..3aa153a 100644 --- a/drivers/mmc/mmc.c +++ b/drivers/mmc/mmc.c @@ -1974,7 +1974,7 @@ static int mmc_startup_v4(struct mmc *mmc) return -ENOMEM; memcpy(mmc->ext_csd, ext_csd, MMC_MAX_BLOCK_LEN); - if (ext_csd[EXT_CSD_REV] > ARRAY_SIZE(mmc_versions)) + if (ext_csd[EXT_CSD_REV] >= ARRAY_SIZE(mmc_versions)) return -EINVAL; mmc->version = mmc_versions[ext_csd[EXT_CSD_REV]]; -- 1.7.9.5

2 6

[U-Boot] [PATCH] mmc: Drop unnecessary case for mmc_probe()
by Faiz Abbas 23 Feb '18

23 Feb '18

Drop the unnecessary empty function case for mmc_probe(). Signed-off-by: Faiz Abbas <faiz_abbas(a)ti.com> --- drivers/mmc/mmc.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c index 255310a..e0b9a42 100644 --- a/drivers/mmc/mmc.c +++ b/drivers/mmc/mmc.c @@ -2657,12 +2657,7 @@ void mmc_set_preinit(struct mmc *mmc, int preinit) mmc->preinit = preinit; } -#if CONFIG_IS_ENABLED(DM_MMC) && defined(CONFIG_SPL_BUILD) -static int mmc_probe(bd_t *bis) -{ - return 0; -} -#elif CONFIG_IS_ENABLED(DM_MMC) +#if CONFIG_IS_ENABLED(DM_MMC) static int mmc_probe(bd_t *bis) { int ret, i; -- 2.7.4

2 2

[U-Boot] [PATCH] mmc: synchronize the sequence with enum bus_mode in mmc.h
by Jaehoon Chung 23 Feb '18

23 Feb '18

If some configs are disabled, number of freqs array will not assigned to correct value with bus_mode. Synchornize the ordering with enum bus_mode in mmc.h. Signed-off-by: Jaehoon Chung <jh80.chung(a)samsung.com> --- drivers/mmc/mmc.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c index 255310a8e6..81b35bbf77 100644 --- a/drivers/mmc/mmc.c +++ b/drivers/mmc/mmc.c @@ -181,23 +181,18 @@ const char *mmc_mode_name(enum bus_mode mode) static uint mmc_mode2freq(struct mmc *mmc, enum bus_mode mode) { static const int freqs[] = { + [MMC_LEGACY] = 25000000, [SD_LEGACY] = 25000000, [MMC_HS] = 26000000, [SD_HS] = 50000000, -#if CONFIG_IS_ENABLED(MMC_UHS_SUPPORT) + [MMC_HS_52] = 52000000, + [MMC_DDR_52] = 52000000, [UHS_SDR12] = 25000000, [UHS_SDR25] = 50000000, [UHS_SDR50] = 100000000, [UHS_DDR50] = 50000000, -#ifdef MMC_SUPPORTS_TUNING [UHS_SDR104] = 208000000, -#endif -#endif - [MMC_HS_52] = 52000000, - [MMC_DDR_52] = 52000000, -#if CONFIG_IS_ENABLED(MMC_HS200_SUPPORT) [MMC_HS_200] = 200000000, -#endif }; if (mode == MMC_LEGACY) -- 2.15.1

1 1