Lerking/micropython
1
0
Fork 0
mirror of https://github.com/micropython/micropython.git synced 2026-01-11 06:27:14 +01:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

alif/ospi_flash: Remove workaround for P10_7 OSPI pinmux issue.

Browse Source 
P5_6 doesn't have that alt function, and only has 7 alt functions.  This
workaround was never really needed, it was introduced in DFP because the
wrong P10_7 alt function was used, in original DFP sources.

This has been removed from DFP starting with 1.3.4, so remove it here also.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
This commit is contained in:
iabdalkader
2025-12-06 09:20:58 +01:00
committed by Damien George
parent 2554e4172f
commit ab5f47c54d
2 changed files with 1 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ports/alif/mcu/ensemble_pin_alt.csv
View File

@@ -45,8 +45,7 @@ P5_2,GPIO,OSPI1_SCLKN,UART5_RX,PDM_C3,SPI0_SS0,LPI2C_SCL,UT1_T0,SD_D2
P5_3,GPIO,OSPI1_SCLK,UART5_TX,SPI0_SCLK,LPI2C_SDA,UT1_T1,SD_D3,CDC_PCLK
P5_4,GPIO,OSPI1_SS1,UART3_CTS,PDM_D2,SPI0_SS3,UT2_T0,SD_D4,CDC_DE
P5_5,GPIO,OSPI1_SCLK,UART3_RTS,PDM_D3,UT2_T1,SD_D5,ETH_RXD0,CDC_HSYNC
# P5_6 doesn't really have OSPI on AF1 but it's needed for P10_7 to be in OSPI1_RXDS mode
P5_6,GPIO,OSPI1_RXDS,UART1_CTS,I2C2_SCL,UT3_T0,SD_D6,ETH_RXD1,CDC_VSYNC
P5_6,GPIO,,UART1_CTS,I2C2_SCL,UT3_T0,SD_D6,ETH_RXD1,CDC_VSYNC
P5_7,GPIO,OSPI1_SS0,UART1_RTS,I2C2_SDA,UT3_T1,SD_D7,ETH_RST,
P6_0,GPIO,OSPI0_D0,UART4_DE,PDM_D0,UT4_T0,SD_D0,ETH_TXD0,
P6_1,GPIO,OSPI0_D1,UART5_DE,PDM_C0,UT4_T1,SD_D1,ETH_TXD1,
1 Pin AF0 AF1 AF2 AF3 AF4 AF5 AF6 AF7
45 P5_3 GPIO OSPI1_SCLK UART5_TX SPI0_SCLK LPI2C_SDA UT1_T1 SD_D3 CDC_PCLK
46 P5_4 GPIO OSPI1_SS1 UART3_CTS PDM_D2 SPI0_SS3 UT2_T0 SD_D4 CDC_DE
47 P5_5 GPIO OSPI1_SCLK UART3_RTS PDM_D3 UT2_T1 SD_D5 ETH_RXD0 CDC_HSYNC
48 # P5_6 doesn't really have OSPI on AF1 but it's needed for P10_7 to be in OSPI1_RXDS mode P5_6 GPIO UART1_CTS I2C2_SCL UT3_T0 SD_D6 ETH_RXD1 CDC_VSYNC
P5_6 GPIO OSPI1_RXDS UART1_CTS I2C2_SCL UT3_T0 SD_D6 ETH_RXD1 CDC_VSYNC
49 P5_7 GPIO OSPI1_SS0 UART1_RTS I2C2_SDA UT3_T1 SD_D7 ETH_RST
50 P6_0 GPIO OSPI0_D0 UART4_DE PDM_D0 UT4_T0 SD_D0 ETH_TXD0
51 P6_1 GPIO OSPI0_D1 UART5_DE PDM_C0 UT4_T1 SD_D1 ETH_TXD1

5
ports/alif/ospi_flash.c
View File

@@ -274,11 +274,6 @@ int ospi_flash_init(void) {
if (pin->pin_rwds != NULL) {
mp_hal_pin_config(pin->pin_rwds, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_NONE,
MP_HAL_PIN_SPEED_HIGH, MP_HAL_PIN_DRIVE_12MA, MP_HAL_PIN_ALT(OSPI_RXDS, unit), true);
if (pin->pin_rwds->port == PORT_10 && pin->pin_rwds->pin == PIN_7) {
// Alif: P5_6 is needed to support proper alt function selection of P10_7.
mp_hal_pin_config(pin_P5_6, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_NONE,
MP_HAL_PIN_SPEED_HIGH, MP_HAL_PIN_DRIVE_12MA, MP_HAL_PIN_ALT(OSPI_RXDS, unit), true);
}
}
mp_hal_pin_config(pin->pin_d0, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_NONE,
MP_HAL_PIN_SPEED_HIGH, MP_HAL_PIN_DRIVE_12MA, MP_HAL_PIN_ALT(OSPI_D0, unit), true);