LM
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ppa/fm/qe: use block layer in ppa/fm/qe driver 

At present the MMC subsystem maintains its own list of MMC devices.
This cannot work with driver model when CONFIG_BLK is enabled, use
blk_dread to replace previous mmc read interface, use
mmc_get_blk_desc to get the mmc device property.

Signed-off-by: Yinbo Zhu <yinbo.zhu@nxp.com>
[York S: reformatted commit message]
Reviewed-by: York Sun <york.sun@nxp.com>
This commit is contained in:
Yinbo Zhu 2018-09-25 14:47:06 +08:00 committed by York Sun
parent 9dc8d155d4
commit c3ced8a6ed
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
arch/arm/cpu/armv8/fsl-layerscape/ppa.c
View File

@ -99,7 +99,7 @@ int ppa_init(void)
cnt = DIV_ROUND_UP(fdt_header_len, 512); cnt = DIV_ROUND_UP(fdt_header_len, 512);
debug("%s: MMC read PPA FIT header: dev # %u, block # %u, count %u\n", debug("%s: MMC read PPA FIT header: dev # %u, block # %u, count %u\n",
__func__, dev, blk, cnt); __func__, dev, blk, cnt);
ret = mmc->block_dev.block_read(&mmc->block_dev, blk, cnt, fitp); ret = blk_dread(mmc_get_blk_desc(mmc), blk, cnt, fitp);
if (ret != cnt) { if (ret != cnt) {
free(fitp); free(fitp);
printf("MMC/SD read of PPA FIT header at offset 0x%x failed\n", printf("MMC/SD read of PPA FIT header at offset 0x%x failed\n",
@ -123,7 +123,7 @@ int ppa_init(void)
blk = CONFIG_SYS_LS_PPA_ESBC_ADDR >> 9; blk = CONFIG_SYS_LS_PPA_ESBC_ADDR >> 9;
cnt = DIV_ROUND_UP(CONFIG_LS_PPA_ESBC_HDR_SIZE, 512); cnt = DIV_ROUND_UP(CONFIG_LS_PPA_ESBC_HDR_SIZE, 512);
ret = mmc->block_dev.block_read(&mmc->block_dev, blk, cnt, ppa_hdr_ddr); ret = blk_dread(mmc_get_blk_desc(mmc), blk, cnt, ppa_hdr_ddr);
if (ret != cnt) { if (ret != cnt) {
free(ppa_hdr_ddr); free(ppa_hdr_ddr);
printf("MMC/SD read of PPA header failed\n"); printf("MMC/SD read of PPA header failed\n");
@ -149,8 +149,7 @@ int ppa_init(void)
cnt = DIV_ROUND_UP(fw_length, 512); cnt = DIV_ROUND_UP(fw_length, 512);
debug("%s: MMC read PPA FIT image: dev # %u, block # %u, count %u\n", debug("%s: MMC read PPA FIT image: dev # %u, block # %u, count %u\n",
__func__, dev, blk, cnt); __func__, dev, blk, cnt);
ret = mmc->block_dev.block_read(&mmc->block_dev, ret = blk_dread(mmc_get_blk_desc(mmc), blk, cnt, ppa_fit_addr);
blk, cnt, ppa_fit_addr);
if (ret != cnt) { if (ret != cnt) {
free(ppa_fit_addr); free(ppa_fit_addr);
printf("MMC/SD read of PPA FIT header at offset 0x%x failed\n", printf("MMC/SD read of PPA FIT header at offset 0x%x failed\n",

2
drivers/net/fm/fm.c
View File

@ -402,7 +402,7 @@ int fm_init_common(int index, struct ccsr_fman *reg)
printf("\nMMC read: dev # %u, block # %u, count %u ...\n", printf("\nMMC read: dev # %u, block # %u, count %u ...\n",
dev, blk, cnt); dev, blk, cnt);
mmc_init(mmc); mmc_init(mmc);
(void)mmc->block_dev.block_read(&mmc->block_dev, blk, cnt, (void)blk_dread(mmc_get_blk_desc(mmc), blk, cnt,
addr); addr);
} }
#elif defined(CONFIG_SYS_QE_FMAN_FW_IN_REMOTE) #elif defined(CONFIG_SYS_QE_FMAN_FW_IN_REMOTE)

2
drivers/qe/qe.c
View File

@ -218,7 +218,7 @@ void u_qe_init(void)
printf("\nMMC read: dev # %u, block # %u, count %u ...\n", printf("\nMMC read: dev # %u, block # %u, count %u ...\n",
dev, blk, cnt); dev, blk, cnt);
mmc_init(mmc); mmc_init(mmc);
(void)mmc->block_dev.block_read(&mmc->block_dev, blk, cnt, (void)blk_dread(mmc_get_blk_desc(mmc), blk, cnt,
addr); addr);
} }
#endif #endif