diff --git a/arch/xtensa/src/esp32/esp32_psram.c b/arch/xtensa/src/esp32/esp32_psram.c index a319fe548c7..dd3a2b52e29 100644 --- a/arch/xtensa/src/esp32/esp32_psram.c +++ b/arch/xtensa/src/esp32/esp32_psram.c @@ -35,7 +35,6 @@ #include "esp32_gpio.h" #include "esp32_psram.h" #include "hardware/esp32_spi.h" -#include "hardware/esp32_caps.h" #include "hardware/esp32_dport.h" #include "hardware/esp32_iomux.h" #include "hardware/esp32_rtccntl.h" @@ -111,6 +110,9 @@ * built-in flash. */ +#define SPI_IOMUX_PIN_NUM_CLK 6 +#define SPI_IOMUX_PIN_NUM_CS 11 + #define PSRAM_SPIQ_SD0_IO 7 #define PSRAM_SPID_SD1_IO 8 #define PSRAM_SPIWP_SD3_IO 10 diff --git a/arch/xtensa/src/esp32/hardware/esp32_caps.h b/arch/xtensa/src/esp32/hardware/esp32_caps.h deleted file mode 100644 index e8e2871175f..00000000000 --- a/arch/xtensa/src/esp32/hardware/esp32_caps.h +++ /dev/null @@ -1,64 +0,0 @@ -/**************************************************************************** - * arch/xtensa/src/esp32/hardware/esp32_caps.h - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. The - * ASF licenses this file to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance with the - * License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - * - ****************************************************************************/ - -#ifndef __ARCH_XTENSA_SRC_ESP32_HARDWARE_ESP32_CAPS_H -#define __ARCH_XTENSA_SRC_ESP32_HARDWARE_ESP32_CAPS_H - -#define SOC_SPI_PERIPH_NUM 3 -#define SOC_SPI_DMA_CHAN_NUM 2 -#define SOC_SPI_PERIPH_CS_NUM(i) 3 - -#define SPI_FUNC_NUM 1 -#define SPI_IOMUX_PIN_NUM_MISO 7 -#define SPI_IOMUX_PIN_NUM_MOSI 8 -#define SPI_IOMUX_PIN_NUM_CLK 6 -#define SPI_IOMUX_PIN_NUM_CS 11 -#define SPI_IOMUX_PIN_NUM_WP 10 -#define SPI_IOMUX_PIN_NUM_HD 9 - -#define HSPI_FUNC_NUM 1 - -/* For D2WD and PICO-D4 chip */ - -#define SPI_D2WD_PIN_NUM_MISO 17 -#define SPI_D2WD_PIN_NUM_MOSI 8 -#define SPI_D2WD_PIN_NUM_CLK 6 -#define SPI_D2WD_PIN_NUM_CS 16 -#define SPI_D2WD_PIN_NUM_WP 7 -#define SPI_D2WD_PIN_NUM_HD 11 - -#define HSPI_IOMUX_PIN_NUM_MISO 12 -#define HSPI_IOMUX_PIN_NUM_MOSI 13 -#define HSPI_IOMUX_PIN_NUM_CLK 14 -#define HSPI_IOMUX_PIN_NUM_CS 15 -#define HSPI_IOMUX_PIN_NUM_WP 2 -#define HSPI_IOMUX_PIN_NUM_HD 4 - -#define VSPI_FUNC_NUM 1 -#define VSPI_IOMUX_PIN_NUM_MISO 19 -#define VSPI_IOMUX_PIN_NUM_MOSI 23 -#define VSPI_IOMUX_PIN_NUM_CLK 18 -#define VSPI_IOMUX_PIN_NUM_CS 5 -#define VSPI_IOMUX_PIN_NUM_WP 22 -#define VSPI_IOMUX_PIN_NUM_HD 21 - -#define SOC_SPI_MAXIMUM_BUFFER_SIZE 64 - -#endif /* __ARCH_XTENSA_SRC_ESP32_HARDWARE_ESP32_CAPS_H */