Revert "✨ SPI TFT / Touchscreen for STM32H7 (MarlinFirmware#25784)"

This reverts commit 3ea87ad.

# Conflicts:
#	Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h
#	Marlin/src/pins/stm32f4/pins_BTT_SKR_V2_0_common.h
#	Marlin/src/pins/stm32h7/pins_BTT_SKR_V3_0_common.h

Marlin/src/HAL/STM32/tft/tft_spi.cpp

@@ -52,6 +52,7 @@ void TFT_SPI::init() {
   SPIx.Init.NSS                = SPI_NSS_SOFT;
   SPIx.Init.Mode               = SPI_MODE_MASTER;
   SPIx.Init.Direction          = (TFT_MISO_PIN == TFT_MOSI_PIN) ? SPI_DIRECTION_1LINE : SPI_DIRECTION_2LINES;
+  SPIx.Init.BaudRatePrescaler  = SPI_BAUDRATEPRESCALER_2;
   SPIx.Init.CLKPhase           = SPI_PHASE_1EDGE;
   SPIx.Init.CLKPolarity        = SPI_POLARITY_LOW;
   SPIx.Init.DataSize           = SPI_DATASIZE_8BIT;
@@ -60,43 +61,25 @@ void TFT_SPI::init() {
   SPIx.Init.CRCCalculation     = SPI_CRCCALCULATION_DISABLE;
   SPIx.Init.CRCPolynomial      = 10;
 
-  #ifndef STM32H7xx
-    SPIx.Init.BaudRatePrescaler       = SPI_BAUDRATEPRESCALER_2; // 18 MBit/s for F103, 21 MBit/s for F407, 25 MBit/s for F411
-  #else
-    SPIx.Init.BaudRatePrescaler       = SPI_BAUDRATEPRESCALER_4; // 20 MBit/s for H743
-    SPIx.Init.NSSPMode                = SPI_NSS_PULSE_ENABLE;
-    SPIx.Init.NSSPolarity             = SPI_NSS_POLARITY_LOW;
-    SPIx.Init.FifoThreshold           = SPI_FIFO_THRESHOLD_01DATA;
-    SPIx.Init.MasterSSIdleness        = SPI_MASTER_SS_IDLENESS_00CYCLE;
-    SPIx.Init.MasterInterDataIdleness = SPI_MASTER_INTERDATA_IDLENESS_00CYCLE;
-    SPIx.Init.MasterReceiverAutoSusp  = SPI_MASTER_RX_AUTOSUSP_DISABLE;
-    SPIx.Init.MasterKeepIOState       = SPI_MASTER_KEEP_IO_STATE_ENABLE;
-    SPIx.Init.IOSwap                  = SPI_IO_SWAP_DISABLE;
-  #endif
-
   pinmap_pinout(digitalPinToPinName(TFT_SCK_PIN), PinMap_SPI_SCLK);
   pinmap_pinout(digitalPinToPinName(TFT_MOSI_PIN), PinMap_SPI_MOSI);
   #if PIN_EXISTS(TFT_MISO) && TFT_MISO_PIN != TFT_MOSI_PIN
     pinmap_pinout(digitalPinToPinName(TFT_MISO_PIN), PinMap_SPI_MISO);
   #endif
+  pin_PullConfig(get_GPIO_Port(STM_PORT(digitalPinToPinName(TFT_SCK_PIN))), STM_LL_GPIO_PIN(digitalPinToPinName(TFT_SCK_PIN)), GPIO_PULLDOWN);
 
   #ifdef SPI1_BASE
     if (SPIx.Instance == SPI1) {
       __HAL_RCC_SPI1_CLK_ENABLE();
       #ifdef STM32F1xx
         __HAL_RCC_DMA1_CLK_ENABLE();
         DMAtx.Instance = DMA1_Channel3;
-        SPIx.Init.BaudRatePrescaler  = SPI_BAUDRATEPRESCALER_4; // SPI1 clock on F1 and F4 is two times faster than SPI2 and SPI3 clock
       #elif defined(STM32F4xx)
         __HAL_RCC_DMA2_CLK_ENABLE();
         DMAtx.Instance = DMA2_Stream3;
         DMAtx.Init.Channel = DMA_CHANNEL_3;
-        SPIx.Init.BaudRatePrescaler  = SPI_BAUDRATEPRESCALER_4; // SPI1 clock on F1 and F4 is two times faster than SPI2 and SPI3 clock
-      #elif defined(STM32H7xx)
-        __HAL_RCC_DMA1_CLK_ENABLE();
-        DMAtx.Instance = DMA1_Stream4;
-        DMAtx.Init.Request = DMA_REQUEST_SPI1_TX;
       #endif
+      SPIx.Init.BaudRatePrescaler  = SPI_BAUDRATEPRESCALER_4;
     }
   #endif
   #ifdef SPI2_BASE
@@ -109,10 +92,6 @@ void TFT_SPI::init() {
         __HAL_RCC_DMA1_CLK_ENABLE();
         DMAtx.Instance = DMA1_Stream4;
         DMAtx.Init.Channel = DMA_CHANNEL_0;
-      #elif defined(STM32H7xx)
-        __HAL_RCC_DMA1_CLK_ENABLE();
-        DMAtx.Instance = DMA1_Stream4;
-        DMAtx.Init.Request = DMA_REQUEST_SPI2_TX;
       #endif
     }
   #endif
@@ -126,27 +105,25 @@ void TFT_SPI::init() {
         __HAL_RCC_DMA1_CLK_ENABLE();
         DMAtx.Instance = DMA1_Stream5;
         DMAtx.Init.Channel = DMA_CHANNEL_0;
-      #elif defined(STM32H7xx)
-        __HAL_RCC_DMA1_CLK_ENABLE();
-        DMAtx.Instance = DMA1_Stream4;
-        DMAtx.Init.Request = DMA_REQUEST_SPI3_TX;
       #endif
     }
   #endif
 
+  HAL_SPI_Init(&SPIx);
+
   DMAtx.Init.Direction = DMA_MEMORY_TO_PERIPH;
   DMAtx.Init.PeriphInc = DMA_PINC_DISABLE;
   DMAtx.Init.PeriphDataAlignment = DMA_PDATAALIGN_HALFWORD;
   DMAtx.Init.MemDataAlignment = DMA_MDATAALIGN_HALFWORD;
   DMAtx.Init.Mode = DMA_NORMAL;
   DMAtx.Init.Priority = DMA_PRIORITY_LOW;
-  #if ANY(STM32F4xx, STM32H7xx)
+  #ifdef STM32F4xx
     DMAtx.Init.FIFOMode = DMA_FIFOMODE_DISABLE;
   #endif
 }
 
 void TFT_SPI::dataTransferBegin(uint16_t dataSize) {
-  SPIx.Init.DataSize = dataSize;
+  SPIx.Init.DataSize = dataSize == DATASIZE_8BIT ?  SPI_DATASIZE_8BIT : SPI_DATASIZE_16BIT;
   HAL_SPI_Init(&SPIx);
   WRITE(TFT_CS_PIN, LOW);
 }
@@ -171,43 +148,28 @@ uint32_t TFT_SPI::getID() {
 uint32_t TFT_SPI::readID(const uint16_t inReg) {
   uint32_t data = 0;
   #if PIN_EXISTS(TFT_MISO)
-    const uint32_t oldPrescaler = SPIx.Init.BaudRatePrescaler;
+    uint32_t BaudRatePrescaler = SPIx.Init.BaudRatePrescaler;
+    uint32_t i;
 
-    SPIx.Init.BaudRatePrescaler = SPI_BAUDRATEPRESCALER_64;
+    SPIx.Init.BaudRatePrescaler = SPIx.Instance == SPI1 ? SPI_BAUDRATEPRESCALER_8 : SPI_BAUDRATEPRESCALER_4;
     dataTransferBegin(DATASIZE_8BIT);
     writeReg(inReg);
 
     if (SPIx.Init.Direction == SPI_DIRECTION_1LINE) SPI_1LINE_RX(&SPIx);
+    __HAL_SPI_ENABLE(&SPIx);
 
-    #ifdef STM32H7xx
-      for (uint32_t i = 0; i < 4; i++) {
-        MODIFY_REG(SPIx.Instance->CR2, SPI_CR2_TSIZE, 1);
-        __HAL_SPI_ENABLE(&SPIx);
-        SET_BIT(SPIx.Instance->CR1, SPI_CR1_CSTART);
-
-        #if TFT_MISO_PIN != TFT_MOSI_PIN
-          SPIx.Instance->TXDR = 0;
-        #endif
-        while (!__HAL_SPI_GET_FLAG(&SPIx, SPI_FLAG_EOT)) {}
-        data = (data << 8) | SPIx.Instance->RXDR;
-        __HAL_SPI_DISABLE(&SPIx);
-        __HAL_SPI_CLEAR_EOTFLAG(&SPIx);
-        __HAL_SPI_CLEAR_TXTFFLAG(&SPIx);
-      }
-    #else
-      __HAL_SPI_ENABLE(&SPIx);
-      for (uint32_t i = 0; i < 4; i++) {
-        #if TFT_MISO_PIN != TFT_MOSI_PIN
-          while (!__HAL_SPI_GET_FLAG(&SPIx, SPI_FLAG_TXE)) {}
-          SPIx.Instance->DR = 0;
-        #endif
-        while (!__HAL_SPI_GET_FLAG(&SPIx, SPI_FLAG_RXNE)) {}
-        data = (data << 8) | SPIx.Instance->DR;
-      }
-    #endif
+    for (i = 0; i < 4; i++) {
+      #if TFT_MISO_PIN != TFT_MOSI_PIN
+        while (!__HAL_SPI_GET_FLAG(&SPIx, SPI_FLAG_TXE)) {}
+        SPIx.Instance->DR = 0;
+      #endif
+      while (!__HAL_SPI_GET_FLAG(&SPIx, SPI_FLAG_RXNE)) {}
+      data = (data << 8) | SPIx.Instance->DR;
+    }
 
     dataTransferEnd();
-    SPIx.Init.BaudRatePrescaler = oldPrescaler;
+
+    SPIx.Init.BaudRatePrescaler   = BaudRatePrescaler;
   #endif
 
   return data >> 7;
@@ -220,9 +182,6 @@ bool TFT_SPI::isBusy() {
   #elif defined(STM32F4xx)
     #define __IS_DMA_ENABLED(__HANDLE__)      ((__HANDLE__)->Instance->CR & DMA_SxCR_EN)
     #define __IS_DMA_CONFIGURED(__HANDLE__)   ((__HANDLE__)->Instance->PAR != 0)
-  #elif defined(STM32H7xx)
-    #define __IS_DMA_ENABLED(__HANDLE__)      (((DMA_Stream_TypeDef *)((__HANDLE__)->Instance))->CR & DMA_SxCR_EN)
-    #define __IS_DMA_CONFIGURED(__HANDLE__)   (((DMA_Stream_TypeDef *)((__HANDLE__)->Instance))->PAR != 0)
   #endif
 
   if (!__IS_DMA_CONFIGURED(&DMAtx)) return false;
@@ -234,13 +193,8 @@ bool TFT_SPI::isBusy() {
   else {
     // Check if DMA transfer completed flag is set
     if (__HAL_DMA_GET_FLAG(&DMAtx, __HAL_DMA_GET_TC_FLAG_INDEX(&DMAtx)) == 0) return true;
-    #ifdef STM32H7xx
-      // Check if SPI data transfer is completed
-      if (!__HAL_SPI_GET_FLAG(&SPIx, SPI_FLAG_EOT)) return true;
-    #else
-      // Check if SPI is idle
-      if (__HAL_SPI_GET_FLAG(&SPIx, SPI_FLAG_BSY)) return true;
-    #endif
+    // Check if SPI transmit butter is empty and SPI is idle
+    if ((!__HAL_SPI_GET_FLAG(&SPIx, SPI_FLAG_TXE)) || (__HAL_SPI_GET_FLAG(&SPIx, SPI_FLAG_BSY))) return true;
   }
 
   abort();
@@ -251,40 +205,22 @@ void TFT_SPI::abort() {
   HAL_DMA_Abort(&DMAtx);  // Abort DMA transfer if any
   HAL_DMA_DeInit(&DMAtx);
 
-  #ifdef STM32H7xx
-    CLEAR_BIT(SPIx.Instance->CFG1, SPI_CFG1_TXDMAEN);
-    __HAL_SPI_CLEAR_EOTFLAG(&SPIx);
-    __HAL_SPI_CLEAR_TXTFFLAG(&SPIx);
-  #else
-    CLEAR_BIT(SPIx.Instance->CR2, SPI_CR2_TXDMAEN);
-  #endif
+  CLEAR_BIT(SPIx.Instance->CR2, SPI_CR2_TXDMAEN);
 
-  dataTransferEnd();  // Stop SPI and deselect CS
+  dataTransferEnd();      // Stop SPI and deselect CS
 }
 
 void TFT_SPI::transmit(uint16_t data) {
   #if TFT_MISO_PIN == TFT_MOSI_PIN
     SPI_1LINE_TX(&SPIx);
   #endif
 
-  #ifdef STM32H7xx
-    MODIFY_REG(SPIx.Instance->CR2, SPI_CR2_TSIZE, 1);
-    __HAL_SPI_ENABLE(&SPIx);
-    SET_BIT(SPIx.Instance->CR1, SPI_CR1_CSTART);
-
-    SPIx.Instance->TXDR = data;
+  __HAL_SPI_ENABLE(&SPIx);
 
-    while (!__HAL_SPI_GET_FLAG(&SPIx, SPI_SR_EOT)) {}
+  SPIx.Instance->DR = data;
 
-    __HAL_SPI_CLEAR_EOTFLAG(&SPIx);
-    __HAL_SPI_CLEAR_TXTFFLAG(&SPIx);
-  #else
-    __HAL_SPI_ENABLE(&SPIx);
-    SPIx.Instance->DR = data;
-    while (__HAL_SPI_GET_FLAG(&SPIx, SPI_FLAG_BSY)) {}
-  #endif
-
-  __HAL_SPI_DISABLE(&SPIx);
+  while (!__HAL_SPI_GET_FLAG(&SPIx, SPI_FLAG_TXE)) {}
+  while ( __HAL_SPI_GET_FLAG(&SPIx, SPI_FLAG_BSY)) {}
 
   #if TFT_MISO_PIN != TFT_MOSI_PIN
     __HAL_SPI_CLEAR_OVRFLAG(&SPIx);   // Clear overrun flag in 2 Lines communication mode because received data is not read
@@ -301,38 +237,35 @@ void TFT_SPI::transmitDMA(uint32_t memoryIncrease, uint16_t *data, uint16_t coun
 
   dataTransferBegin();
 
-  #ifdef STM32H7xx
-    HAL_DMA_Start(&DMAtx, (uint32_t)data, (uint32_t)&(SPIx.Instance->TXDR), count);
+  HAL_DMA_Start(&DMAtx, (uint32_t)data, (uint32_t)&(SPIx.Instance->DR), count);
+  __HAL_SPI_ENABLE(&SPIx);
 
-    CLEAR_BIT(SPIx.Instance->CFG1, SPI_CFG1_TXDMAEN);
-    MODIFY_REG(SPIx.Instance->CR2, SPI_CR2_TSIZE, count);
-    SET_BIT(SPIx.Instance->CFG1, SPI_CFG1_TXDMAEN);   // Enable Tx DMA Request
-    __HAL_SPI_ENABLE(&SPIx);
-    SET_BIT(SPIx.Instance->CR1, SPI_CR1_CSTART);
-  #else
-    HAL_DMA_Start(&DMAtx, (uint32_t)data, (uint32_t)&(SPIx.Instance->DR), count);
-
-    __HAL_SPI_ENABLE(&SPIx);
-    SET_BIT(SPIx.Instance->CR2, SPI_CR2_TXDMAEN);   // Enable Tx DMA Request
-  #endif
+  SET_BIT(SPIx.Instance->CR2, SPI_CR2_TXDMAEN);   // Enable Tx DMA Request
 
   TERN_(TFT_SHARED_IO, while (isBusy()));
 }
 
 void TFT_SPI::transmit(uint32_t memoryIncrease, uint16_t *data, uint16_t count) {
-  transmitDMA(memoryIncrease, data, count);
+  DMAtx.Init.MemInc = memoryIncrease;
+  HAL_DMA_Init(&DMAtx);
+
+  if (TFT_MISO_PIN == TFT_MOSI_PIN)
+    SPI_1LINE_TX(&SPIx);
+
+  dataTransferBegin();
+
+  HAL_DMA_Start(&DMAtx, (uint32_t)data, (uint32_t)&(SPIx.Instance->DR), count);
+  __HAL_SPI_ENABLE(&SPIx);
+
+  SET_BIT(SPIx.Instance->CR2, SPI_CR2_TXDMAEN);   // Enable Tx DMA Request
 
   HAL_DMA_PollForTransfer(&DMAtx, HAL_DMA_FULL_TRANSFER, HAL_MAX_DELAY);
-  #ifdef STM32H7xx
-    while (!__HAL_SPI_GET_FLAG(&SPIx, SPI_SR_EOT)) {}
-  #else
-    while (__HAL_SPI_GET_FLAG(&SPIx, SPI_FLAG_BSY)) {}
-  #endif
+  while ( __HAL_SPI_GET_FLAG(&SPIx, SPI_FLAG_BSY)) {}
   abort();
 }
 
 #if ENABLED(USE_SPI_DMA_TC)
-  void TFT_SPI::transmitDMA_IT(uint32_t memoryIncrease, uint16_t *data, uint16_t count) {
+  void TFT_SPI::TransmitDMA_IT(uint32_t memoryIncrease, uint16_t *data, uint16_t count) {
 
     DMAtx.Init.MemInc = memoryIncrease;
     HAL_DMA_Init(&DMAtx);

Marlin/src/HAL/STM32/tft/tft_spi.h

@@ -25,10 +25,8 @@
   #include "stm32f1xx_hal.h"
 #elif defined(STM32F4xx)
   #include "stm32f4xx_hal.h"
-#elif defined(STM32H7xx)
-  #include "stm32h7xx_hal.h"
 #else
-  #error SPI TFT is currently only supported on STM32F1, STM32F4 and STM32H7 hardware.
+  #error SPI TFT is currently only supported on STM32F1 and STM32F4 hardware.
 #endif
 
 #ifndef LCD_READ_ID
@@ -40,7 +38,6 @@
 
 #define DATASIZE_8BIT  SPI_DATASIZE_8BIT
 #define DATASIZE_16BIT SPI_DATASIZE_16BIT
-#define DATASIZE_32BIT SPI_DATASIZE_32BIT
 #define TFT_IO_DRIVER  TFT_SPI
 #define DMA_MAX_WORDS  0xFFFF
 
@@ -54,7 +51,7 @@ class TFT_SPI {
   static void transmit(uint32_t memoryIncrease, uint16_t *data, uint16_t count);
   static void transmitDMA(uint32_t memoryIncrease, uint16_t *data, uint16_t count);
   #if ENABLED(USE_SPI_DMA_TC)
-    static void transmitDMA_IT(uint32_t memoryIncrease, uint16_t *data, uint16_t count);
+    static void TransmitDMA_IT(uint32_t memoryIncrease, uint16_t *data, uint16_t count);
   #endif
 
 public:
@@ -74,7 +71,7 @@ class TFT_SPI {
   static void writeMultiple_DMA(uint16_t color, uint16_t count) { static uint16_t data; data = color; transmitDMA(DMA_MINC_DISABLE, &data, count); }
 
   #if ENABLED(USE_SPI_DMA_TC)
-    static void writeSequenceIT(uint16_t *data, uint16_t count) { transmitDMA_IT(DMA_MINC_ENABLE, data, count); }
+    static void writeSequenceIT(uint16_t *data, uint16_t count) { TransmitDMA_IT(DMA_MINC_ENABLE, data, count); }
     inline static void DMA_IRQHandler() { HAL_DMA_IRQHandler(&TFT_SPI::DMAtx); }
   #endif
 

Marlin/src/HAL/STM32/tft/xpt2046.cpp

@@ -56,6 +56,7 @@ void XPT2046::init() {
     SPIx.Init.NSS                = SPI_NSS_SOFT;
     SPIx.Init.Mode               = SPI_MODE_MASTER;
     SPIx.Init.Direction          = SPI_DIRECTION_2LINES;
+    SPIx.Init.BaudRatePrescaler  = SPI_BAUDRATEPRESCALER_8;
     SPIx.Init.CLKPhase           = SPI_PHASE_2EDGE;
     SPIx.Init.CLKPolarity        = SPI_POLARITY_HIGH;
     SPIx.Init.DataSize           = SPI_DATASIZE_8BIT;
@@ -64,20 +65,6 @@ void XPT2046::init() {
     SPIx.Init.CRCCalculation     = SPI_CRCCALCULATION_DISABLE;
     SPIx.Init.CRCPolynomial      = 10;
 
-    #ifndef STM32H7xx
-      SPIx.Init.BaudRatePrescaler       = SPI_BAUDRATEPRESCALER_8; // 4.5 MBit/s for F103 and 5.25 MBit/s for F407
-    #else
-      SPIx.Init.BaudRatePrescaler       = SPI_BAUDRATEPRESCALER_16; // 5 MBit/s for H743
-      SPIx.Init.NSSPMode                = SPI_NSS_PULSE_ENABLE;
-      SPIx.Init.NSSPolarity             = SPI_NSS_POLARITY_LOW;
-      SPIx.Init.FifoThreshold           = SPI_FIFO_THRESHOLD_01DATA;
-      SPIx.Init.MasterSSIdleness        = SPI_MASTER_SS_IDLENESS_00CYCLE;
-      SPIx.Init.MasterInterDataIdleness = SPI_MASTER_INTERDATA_IDLENESS_00CYCLE;
-      SPIx.Init.MasterReceiverAutoSusp  = SPI_MASTER_RX_AUTOSUSP_DISABLE;
-      SPIx.Init.MasterKeepIOState       = SPI_MASTER_KEEP_IO_STATE_ENABLE;
-      SPIx.Init.IOSwap                  = SPI_IO_SWAP_DISABLE;
-    #endif
-
     pinmap_pinout(digitalPinToPinName(TOUCH_SCK_PIN), PinMap_SPI_SCLK);
     pinmap_pinout(digitalPinToPinName(TOUCH_MOSI_PIN), PinMap_SPI_MOSI);
     pinmap_pinout(digitalPinToPinName(TOUCH_MISO_PIN), PinMap_SPI_MISO);
@@ -154,30 +141,13 @@ uint16_t XPT2046::getRawData(const XPTCoordinate coordinate) {
 }
 
 uint16_t XPT2046::hardwareIO(uint16_t data) {
-  #ifdef STM32H7xx
-    MODIFY_REG(SPIx.Instance->CR2, SPI_CR2_TSIZE, 1);
-    __HAL_SPI_ENABLE(&SPIx);
-    SET_BIT(SPIx.Instance->CR1, SPI_CR1_CSTART);
-
-    SPIx.Instance->TXDR = data;
+  __HAL_SPI_ENABLE(&SPIx);
+  while ((SPIx.Instance->SR & SPI_FLAG_TXE) != SPI_FLAG_TXE) {}
+  SPIx.Instance->DR = data;
+  while ((SPIx.Instance->SR & SPI_FLAG_RXNE) != SPI_FLAG_RXNE) {}
+  __HAL_SPI_DISABLE(&SPIx);
 
-    while (!__HAL_SPI_GET_FLAG(&SPIx, SPI_SR_EOT)) {}
-    data = SPIx.Instance->RXDR;
-
-    __HAL_SPI_DISABLE(&SPIx);
-    __HAL_SPI_CLEAR_EOTFLAG(&SPIx);
-    __HAL_SPI_CLEAR_TXTFFLAG(&SPIx);
-
-    return data;
-  #else
-    __HAL_SPI_ENABLE(&SPIx);
-    while ((SPIx.Instance->SR & SPI_FLAG_TXE) != SPI_FLAG_TXE) {}
-    SPIx.Instance->DR = data;
-    while ((SPIx.Instance->SR & SPI_FLAG_RXNE) != SPI_FLAG_RXNE) {}
-    __HAL_SPI_DISABLE(&SPIx);
-
-    return SPIx.Instance->DR;
-  #endif
+  return SPIx.Instance->DR;
 }
 
 uint16_t XPT2046::softwareIO(uint16_t data) {