diff options
| author | Nitin Garg <nitin.garg@nxp.com> | 2017-06-06 15:44:46 -0500 |
|---|---|---|
| committer | Abel Vesa <abel.vesa@nxp.com> | 2018-06-08 17:34:09 +0300 |
| commit | 5c5a05fd7eb5a008710b2f1db9b63361674b9de9 (patch) | |
| tree | 90dea50539163184cdec4f42a6288cbc28a205b0 /plat/imx/imx8qxp/imx8qxp_bl31_setup.c | |
| parent | 0c60becfb93b0a828b87ccab96a45eb3a80a4a03 (diff) | |
Fix the pinmux to use correct resource ID for iMX8QM/QX
Signed-off-by: Nitin Garg <nitin.garg@nxp.com>
Diffstat (limited to 'plat/imx/imx8qxp/imx8qxp_bl31_setup.c')
| -rw-r--r-- | plat/imx/imx8qxp/imx8qxp_bl31_setup.c | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/plat/imx/imx8qxp/imx8qxp_bl31_setup.c b/plat/imx/imx8qxp/imx8qxp_bl31_setup.c index 6293d7c2..6737612b 100644 --- a/plat/imx/imx8qxp/imx8qxp_bl31_setup.c +++ b/plat/imx/imx8qxp/imx8qxp_bl31_setup.c @@ -45,6 +45,8 @@ #include <xlat_tables.h> #include <lpuart.h> #include <sec_rsrc.h> +#include <imx8-pins.h> +#include <iomux.h> /* linker defined symbols */ #if USE_COHERENT_MEM @@ -228,12 +230,6 @@ void bl31_early_platform_setup2(u_register_t arg0, u_register_t arg1, while (1); } #if DEBUG_CONSOLE_A35 - /* This maybe updated, need to check SCFW */ - #define SC_P_UART0_RX 30 - #define SC_P_UART0_TX 31 - #define SC_P_UART0_RTS_B 32 - #define SC_P_UART0_CTS_B 33 - /* Power up UART0 */ sc_pm_set_resource_power_mode(ipc_handle, SC_R_UART_0, SC_PM_PW_MODE_ON); @@ -244,14 +240,12 @@ void bl31_early_platform_setup2(u_register_t arg0, u_register_t arg1, /* Enable UART0 clock root */ sc_pm_clock_enable(ipc_handle, SC_R_UART_0, 2, true, false); +#define UART_PAD_CTRL ((SC_PAD_CONFIG_OUT_IN << PADRING_CONFIG_SHIFT) | (SC_PAD_ISO_OFF << PADRING_LPCONFIG_SHIFT) \ + | (SC_PAD_28FDSOI_DSE_DV_LOW << PADRING_DSE_SHIFT) | (SC_PAD_28FDSOI_PS_PD << PADRING_PULL_SHIFT)) /* Configure UART pads */ - sc_pad_set(ipc_handle, SC_P_UART0_RX, 0xc600004c); - - sc_pad_set(ipc_handle, SC_P_UART0_TX, 0xc600004c); - - sc_pad_set(ipc_handle, SC_P_UART0_RTS_B, 0xc600004c); + sc_pad_set(ipc_handle, SC_P_UART0_RX, UART_PAD_CTRL); - sc_pad_set(ipc_handle, SC_P_UART0_CTS_B, 0xc600004c); + sc_pad_set(ipc_handle, SC_P_UART0_TX, UART_PAD_CTRL); lpuart32_serial_init(IMX_BOOT_UART_BASE); #endif |