diff options
| author | Darren Huang <Darren.Huang@advantech.com.tw> | 2020-07-31 11:45:25 +0800 |
|---|---|---|
| committer | Darren Huang <darren.huang@advantech.com.tw> | 2020-12-30 17:18:23 +0800 |
| commit | 13ce2cd46fbc937c572361e6aa6de9803f184303 (patch) | |
| tree | 47f3856c438a8ec0ec508bfbc55c51808f90f598 | |
| parent | 59c412f46c7b294d68c320b2654659a17cf0e658 (diff) | |
[RSB-3720] Remove typec configure and fix watchdog reboot issue
| -rw-r--r-- | board/freescale/imx8mp_rsb3720a1/imx8mp_rsb3720a1.c | 15 | ||||
| -rw-r--r-- | configs/imx8mp_rsb3720a1_6G_defconfig | 2 |
2 files changed, 16 insertions, 1 deletions
diff --git a/board/freescale/imx8mp_rsb3720a1/imx8mp_rsb3720a1.c b/board/freescale/imx8mp_rsb3720a1/imx8mp_rsb3720a1.c index ff46a2b252..e71434f531 100644 --- a/board/freescale/imx8mp_rsb3720a1/imx8mp_rsb3720a1.c +++ b/board/freescale/imx8mp_rsb3720a1/imx8mp_rsb3720a1.c @@ -482,6 +482,19 @@ int board_typec_get_mode(int index) #define DISPMIX 13 #define MIPI 15 +#define WDOG_TRIG IMX_GPIO_NR(4, 20) + +static iomux_v3_cfg_t wdt_trig[] = { + MX8MP_PAD_SAI1_MCLK__GPIO4_IO20 | MUX_PAD_CTRL(NO_PAD_CTRL), +}; + +static void setup_iomux_wdt(void) +{ + imx_iomux_v3_setup_multiple_pads(wdt_trig, ARRAY_SIZE(wdt_trig)); + gpio_request(WDOG_TRIG, "wdt_trig"); + gpio_direction_output(WDOG_TRIG, 1); +} + int board_init(void) { #ifdef CONFIG_USB_TCPC @@ -509,6 +522,8 @@ int board_init(void) call_imx_sip(FSL_SIP_GPC, FSL_SIP_CONFIG_GPC_PM_DOMAIN, DISPMIX, true, 0); call_imx_sip(FSL_SIP_GPC, FSL_SIP_CONFIG_GPC_PM_DOMAIN, MIPI, true, 0); + setup_iomux_wdt(); + return 0; } diff --git a/configs/imx8mp_rsb3720a1_6G_defconfig b/configs/imx8mp_rsb3720a1_6G_defconfig index 36041e2973..a04acb7c04 100644 --- a/configs/imx8mp_rsb3720a1_6G_defconfig +++ b/configs/imx8mp_rsb3720a1_6G_defconfig @@ -124,7 +124,7 @@ CONFIG_SYSRESET=y CONFIG_SYSRESET_PSCI=y CONFIG_DM_THERMAL=y CONFIG_NXP_TMU=y -CONFIG_USB_TCPC=y +# CONFIG_USB_TCPC is not set CONFIG_USB=y CONFIG_USB_GADGET=y CONFIG_DM_USB=y |