andrius
/
arm-trusted-firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "fix(plat/imx): do not keep mmc_device_info in stack" into integration

This commit is contained in:
Madhukar Pappireddy 2021-07-26 17:39:59 +02:00 committed by TrustedFirmware Code Review
parent 81e63f25ff 99d37c8cb8
commit d31f319492
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
plat/imx/imx7/picopi/picopi_bl2_el3_setup.c
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2018-2019, ARM Limited and Contributors. All rights reserved.
* Copyright (c) 2018-2021, ARM Limited and Contributors. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*/
@ -43,6 +43,8 @@
IOMUXC_SW_PAD_CTL_PAD_SD3_SLEW_SLOW | \
IOMUXC_SW_PAD_CTL_PAD_SD3_DSE_3_X6)
static struct mmc_device_info mmc_info;
static void picopi_setup_pinmux(void)
{
/* Configure UART5 TX */
@ -93,14 +95,13 @@ static void picopi_setup_pinmux(void)
static void picopi_usdhc_setup(void)
{
imx_usdhc_params_t params;
struct mmc_device_info info;
zeromem(&params, sizeof(imx_usdhc_params_t));
params.reg_base = PLAT_PICOPI_BOOT_MMC_BASE;
params.clk_rate = 25000000;
params.bus_width = MMC_BUS_WIDTH_8;
info.mmc_dev_type = MMC_IS_EMMC;
imx_usdhc_init(&params, &info);
mmc_info.mmc_dev_type = MMC_IS_EMMC;
imx_usdhc_init(&params, &mmc_info);
}
static void picopi_setup_usb_clocks(void)

9
plat/imx/imx7/warp7/warp7_bl2_el3_setup.c
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2018-2019, ARM Limited and Contributors. All rights reserved.
* Copyright (c) 2018-2021, ARM Limited and Contributors. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*/
@ -69,6 +69,8 @@
IOMUXC_SW_PAD_CTL_PAD_ECSPI1_SCLK_HYS_EN | \
IOMUXC_SW_PAD_CTL_PAD_ECSPI1_SCLK_DSE_1_X4)
static struct mmc_device_info mmc_info;
static void warp7_setup_pinmux(void)
{
/* Configure UART1 TX */
@ -99,14 +101,13 @@ static void warp7_setup_pinmux(void)
static void warp7_usdhc_setup(void)
{
imx_usdhc_params_t params;
struct mmc_device_info info;
zeromem(&params, sizeof(imx_usdhc_params_t));
params.reg_base = PLAT_WARP7_BOOT_MMC_BASE;
params.clk_rate = 25000000;
params.bus_width = MMC_BUS_WIDTH_8;
info.mmc_dev_type = MMC_IS_EMMC;
imx_usdhc_init(&params, &info);
mmc_info.mmc_dev_type = MMC_IS_EMMC;
imx_usdhc_init(&params, &mmc_info);
}
static void warp7_setup_usb_clocks(void)