From f270240a2981d117f67fd133306de4474455f22a Mon Sep 17 00:00:00 2001 From: Mateusz Grzywacz Date: Wed, 20 Jan 2021 20:24:46 +0100 Subject: [PATCH] [EGD-5373] Accomodate for T6v1 HW rev. + fix wake up pin Bad Bad pin definitions - overlaping cellular wake up pin with mic ld en. T6v1 has logic converters which require pin conf to be OUTPUT low. Lorem ipsum pin --- module-bsp/board/rt1051/common/pin_mux.c | 15 +-------------- module-bsp/board/rt1051/common/pin_mux.h | 3 +-- module-bsp/bsp/BoardDefinitions.hpp | 6 ++---- 3 files changed, 4 insertions(+), 20 deletions(-) diff --git a/module-bsp/board/rt1051/common/pin_mux.c b/module-bsp/board/rt1051/common/pin_mux.c index 8d12ccc447199fc57e532dd72f2da3d906803add..e08859677a92762db01c63b93f18be5acf0c6643 100644 --- a/module-bsp/board/rt1051/common/pin_mux.c +++ b/module-bsp/board/rt1051/common/pin_mux.c @@ -1132,8 +1132,6 @@ void PINMUX_InitUSBC(void) { CLOCK_EnableClock(kCLOCK_Iomuxc); /* iomuxc clock (iomuxc_clk_enable): 0x03u */ - IOMUXC_SetPinMux(PINMUX_USBC_CONTROLLER_NEN, /* GPIO_AD_B0_00 is configured as LPSPI1_SCK */ - 0U); /* Software Input On Field: Input Path is determined by functionality */ IOMUXC_SetPinMux(PINMUX_USBC_CONTROLLER_NINT, /* GPIO_AD_B0_01 is configured as LPSPI1_SDO */ 0U); /* Software Input On Field: Input Path is determined by functionality */ IOMUXC_SetPinMux(PINMUX_USBC_CONTROLLER_ID, /* GPIO_AD_B0_02 is configured as LPSPI1_SDI */ @@ -1142,16 +1140,6 @@ void PINMUX_InitUSBC(void) 0U); /* Software Input On Field: Input Path is determined by functionality */ IOMUXC_SetPinMux(PINMUX_USB_FUNCTION_MUX_SELECT, 1U); - IOMUXC_SetPinConfig(PINMUX_USBC_CONTROLLER_NEN, /* GPIO_AD_B0_02 PAD functional properties : */ - 0x10B0u); /* Slew Rate Field: Slow Slew Rate - Drive Strength Field: R0/6 - Speed Field: medium(100MHz) - Open Drain Enable Field: Open Drain Disabled - Pull / Keep Enable Field: Pull/Keeper Enabled - Pull / Keep Select Field: Keeper - Pull Up / Down Config. Field: 100K Ohm Pull Down - Hyst. Enable Field: Hysteresis Disabled */ - IOMUXC_SetPinConfig(PINMUX_USBC_CONTROLLER_NINT, /* GPIO_AD_B0_03 PAD functional properties : */ IOMUXC_SW_PAD_CTL_PAD_ODE(1) | PAD_CONFIG_PULL_KEEPER_ENABLED | PAD_CONFIG_SELECT_PULL | PAD_CONFIG_PULL_UP_100kOhm); /* Open drain enable with internal 100k pullup */ @@ -1260,8 +1248,7 @@ void PINMUX_InitCellular(void) IOMUXC_SetPinConfig(PINMUX_CELLULAR_WAKEUP_IN, PAD_CONFIG_SLEW_RATE_SLOW | PAD_CONFIG_DRIVER_STRENGTH_LVL_1 | PAD_CONFIG_SPEED_SLOW_50MHz | - PAD_CONFIG_PULL_KEEPER_ENABLED | PAD_CONFIG_SELECT_PULL | PAD_CONFIG_PULL_DOWN_100kOhm | - PAD_CONFIG_HYSTERESIS_DISABLED); + PAD_CONFIG_PULL_KEEPER_ENABLED | PAD_CONFIG_SELECT_KEEPER | PAD_CONFIG_HYSTERESIS_DISABLED); IOMUXC_SetPinConfig(PINMUX_CELLULAR_SIM_SEL, diff --git a/module-bsp/board/rt1051/common/pin_mux.h b/module-bsp/board/rt1051/common/pin_mux.h index 4e8201151a870345db3c641d00a539e817bc0ad3..c216ede2245235369d42cf8ba22fc52def376b8d 100644 --- a/module-bsp/board/rt1051/common/pin_mux.h +++ b/module-bsp/board/rt1051/common/pin_mux.h @@ -135,7 +135,7 @@ extern "C" #define PINMUX_CELLULAR_AP_READY IOMUXC_GPIO_B1_00_GPIO2_IO16 #define PINMUX_CELLULAR_RESET IOMUXC_GPIO_B1_01_GPIO2_IO17 #define PINMUX_CELLULAR_PWRKEY IOMUXC_GPIO_B1_02_GPIO2_IO18 -#define PINMUX_CELLULAR_WAKEUP_IN IOMUXC_GPIO_B1_03_GPIO2_IO19 +#define PINMUX_CELLULAR_WAKEUP_IN IOMUXC_GPIO_B1_06_GPIO2_IO22 #define PINMUX_CELLULAR_SIM_SEL IOMUXC_GPIO_B1_04_GPIO2_IO20 #define PINMUX_CELLULAR_RI IOMUXC_GPIO_B1_05_GPIO2_IO21 #define PINMUX_CELLULAR_DTR IOMUXC_GPIO_EMC_41_GPIO3_IO27 @@ -169,7 +169,6 @@ extern "C" /** * USB TYPE-C CONTROLLER PINMUX DEFINITIONS */ -#define PINMUX_USBC_CONTROLLER_NEN IOMUXC_GPIO_B1_06_GPIO2_IO22 #define PINMUX_USBC_CONTROLLER_NINT IOMUXC_GPIO_B1_09_GPIO2_IO25 #define PINMUX_USBC_CONTROLLER_ID IOMUXC_GPIO_B1_10_GPIO2_IO26 #define PINMUX_USBC_CONTROLLER_PORT IOMUXC_GPIO_B1_07_GPIO2_IO23 diff --git a/module-bsp/bsp/BoardDefinitions.hpp b/module-bsp/bsp/BoardDefinitions.hpp index 11c7b91b20a36485a01e58c5cddec7853b3091a7..97e4fd04664d28879de47b6d56c203f13855ffb9 100644 --- a/module-bsp/bsp/BoardDefinitions.hpp +++ b/module-bsp/bsp/BoardDefinitions.hpp @@ -65,7 +65,8 @@ enum class BoardDefinitions CELLULAR_GPIO_2_RESET_PIN = 17, CELLULAR_GPIO_2_RI_PIN = 21, CELLULAR_GPIO_2_APRDY_PIN = 16, - CELLULAR_GPIO_2_WAKEUP_PIN = 19, + CELLULAR_GPIO_2_WAKEUP_PIN = 22, /// GPIO_B1_06, long time no see. Active low, external pull-down 10kΩ + CELLULAR_GPIO_2_WIRELESS_DISABLE_PIN = 23, /// GPIO_B1_07, pull-up in modem, active low, equiv. AT+CFUN=4, see docs CELLULAR_GPIO_2_SIM_TRAY_INSERTED_PIN = 11, CELLULAR_GPIO_2_NC = 10, // GPIO_B0_10 CELLULAR_GPIO_2_SIMCARD_PRESENCE_PIN = 9, @@ -96,9 +97,6 @@ enum class BoardDefinitions VIBRATOR_GPIO = static_cast(drivers::GPIOInstances::GPIO_1), VIBRATOR_EN = 0, // GPIO_AD_B0_00 - TORCH_GPIO = static_cast(drivers::GPIOInstances::GPIO_1), - TORCH_EN = 21, // GPIO_AD_B1_05 - MAGNETOMETER_I2C = AUDIOCODEC_I2C, MAGNETOMETER_I2C_BAUDRATE = AUDIOCODEC_I2C_BAUDRATE, MAGNETOMETER_GPIO = static_cast(drivers::GPIOInstances::GPIO_1),