espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-07-31 19:24:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'contrib/github_pr_12559_v4.4' into 'release/v4.4'

Browse Source 
fix(spi): Correct REG_SPI_BASE(i) macro for all targets (GitHub PR) (v4.4)

See merge request espressif/esp-idf!27717
This commit is contained in:
morris
2024-01-03 11:37:16 +08:00
parent 8262c19a51 a0e8f75336
commit c272210e74
12 changed files with 94 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
components/soc/esp32c3/include/soc/soc.h
View File

@@ -75,6 +75,7 @@
#define REG_I2S_BASE(i) (DR_REG_I2S_BASE + (i) * 0x1E000) #define REG_I2S_BASE(i) (DR_REG_I2S_BASE + (i) * 0x1E000)
#define REG_TIMG_BASE(i) (DR_REG_TIMERGROUP0_BASE + (i)*0x1000) #define REG_TIMG_BASE(i) (DR_REG_TIMERGROUP0_BASE + (i)*0x1000)
#define REG_SPI_MEM_BASE(i) (DR_REG_SPI0_BASE - (i) * 0x1000) #define REG_SPI_MEM_BASE(i) (DR_REG_SPI0_BASE - (i) * 0x1000)
#define REG_SPI_BASE(i) (((i)==2) ? (DR_REG_SPI2_BASE) : (0)) // only one GPSPI
#define REG_I2C_BASE(i) (DR_REG_I2C_EXT_BASE + (i) * 0x14000 ) #define REG_I2C_BASE(i) (DR_REG_I2C_EXT_BASE + (i) * 0x14000 )
//Registers Operation {{ //Registers Operation {{

20
components/soc/esp32c3/include/soc/spi_reg.h
View File

@@ -1,24 +1,16 @@
// Copyright 2020 Espressif Systems (Shanghai) PTE LTD /*
// * SPDX-FileCopyrightText: 2020-2023 Espressif Systems (Shanghai) CO LTD
// Licensed under the Apache License, Version 2.0 (the "License"); *
// you may not use this file except in compliance with the License. * SPDX-License-Identifier: Apache-2.0
// 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 _SOC_SPI_REG_H_ #ifndef _SOC_SPI_REG_H_
#define _SOC_SPI_REG_H_ #define _SOC_SPI_REG_H_
#include "soc.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
#include "soc.h"
#define SPI_CMD_REG(i) (REG_SPI_BASE(i) + 0x0) #define SPI_CMD_REG(i) (REG_SPI_BASE(i) + 0x0)
/* SPI_USR : R/W/SC ;bitpos:[24] ;default: 1'b0 ; */ /* SPI_USR : R/W/SC ;bitpos:[24] ;default: 1'b0 ; */

2
components/soc/esp32c3/ld/esp32c3.peripherals.ld
View File

@@ -21,10 +21,8 @@ PROVIDE ( TIMERG0 = 0x6001F000 );
PROVIDE ( TIMERG1 = 0x60020000 ); PROVIDE ( TIMERG1 = 0x60020000 );
PROVIDE ( SYSTIMER = 0x60023000 ); PROVIDE ( SYSTIMER = 0x60023000 );
PROVIDE ( GPSPI2 = 0x60024000 ); PROVIDE ( GPSPI2 = 0x60024000 );
PROVIDE ( GPSPI3 = 0x60025000 );
PROVIDE ( SYSCON = 0x60026000 ); PROVIDE ( SYSCON = 0x60026000 );
PROVIDE ( TWAI = 0x6002B000 ); PROVIDE ( TWAI = 0x6002B000 );
PROVIDE ( GPSPI4 = 0x60037000 );
PROVIDE ( APB_SARADC = 0x60040000 ); PROVIDE ( APB_SARADC = 0x60040000 );
PROVIDE ( USB_SERIAL_JTAG = 0x60043000 ); PROVIDE ( USB_SERIAL_JTAG = 0x60043000 );
PROVIDE ( GDMA = 0x6003F000 ); PROVIDE ( GDMA = 0x6003F000 );

47
components/soc/esp32c3/spi_periph.c
View File

@@ -1,5 +1,5 @@
/* /*
* SPDX-FileCopyrightText: 2020-2022 Espressif Systems (Shanghai) CO LTD * SPDX-FileCopyrightText: 2020-2023 Espressif Systems (Shanghai) CO LTD
* *
* SPDX-License-Identifier: Apache-2.0 * SPDX-License-Identifier: Apache-2.0
*/ */
@@ -12,29 +12,30 @@
*/ */
const spi_signal_conn_t spi_periph_signal[SOC_SPI_PERIPH_NUM] = { const spi_signal_conn_t spi_periph_signal[SOC_SPI_PERIPH_NUM] = {
{ {
.spiclk_out = SPICLK_OUT_MUX_IDX, // MSPI has dedicated iomux pins
.spiclk_in = 0,/* SPI clock is not an input signal*/ .spiclk_out = -1,
.spid_out = SPID_OUT_IDX, .spiclk_in = -1,
.spiq_out = SPIQ_OUT_IDX, .spid_out = -1,
.spiwp_out = SPIWP_OUT_IDX, .spiq_out = -1,
.spihd_out = SPIHD_OUT_IDX, .spiwp_out = -1,
.spid_in = SPID_IN_IDX, .spihd_out = -1,
.spiq_in = SPIQ_IN_IDX, .spid_in = -1,
.spiwp_in = SPIWP_IN_IDX, .spiq_in = -1,
.spihd_in = SPIHD_IN_IDX, .spiwp_in = -1,
.spics_out = {SPICS0_OUT_IDX, SPICS1_OUT_IDX},/* SPI0/1 do not have CS2 now */ .spihd_in = -1,
.spics_in = 0,/* SPI cs is not an input signal*/ .spics_out = {-1},
.spiclk_iomux_pin = SPI_IOMUX_PIN_NUM_CLK, .spics_in = -1,
.spid_iomux_pin = SPI_IOMUX_PIN_NUM_MOSI, .spiclk_iomux_pin = -1,
.spiq_iomux_pin = SPI_IOMUX_PIN_NUM_MISO, .spid_iomux_pin = -1,
.spiwp_iomux_pin = SPI_IOMUX_PIN_NUM_WP, .spiq_iomux_pin = -1,
.spihd_iomux_pin = SPI_IOMUX_PIN_NUM_HD, .spiwp_iomux_pin = -1,
.spics0_iomux_pin = SPI_IOMUX_PIN_NUM_CS, .spihd_iomux_pin = -1,
.irq = ETS_SPI1_INTR_SOURCE, .spics0_iomux_pin = -1,
.irq = -1,
.irq_dma = -1, .irq_dma = -1,
.module = PERIPH_SPI_MODULE, .module = -1,
.hw = (spi_dev_t *) &SPIMEM1, .hw = NULL,
.func = SPI_FUNC_NUM, .func = -1,
}, { }, {
.spiclk_out = FSPICLK_OUT_IDX, .spiclk_out = FSPICLK_OUT_IDX,
.spiclk_in = FSPICLK_IN_IDX, .spiclk_in = FSPICLK_IN_IDX,

1
components/soc/esp32s2/include/soc/soc.h
View File

@@ -90,6 +90,7 @@
#define REG_I2S_BASE( i ) (DR_REG_I2S_BASE) #define REG_I2S_BASE( i ) (DR_REG_I2S_BASE)
#define REG_TIMG_BASE(i) (DR_REG_TIMERGROUP0_BASE + (i)*0x1000) #define REG_TIMG_BASE(i) (DR_REG_TIMERGROUP0_BASE + (i)*0x1000)
#define REG_SPI_MEM_BASE(i) (DR_REG_SPI0_BASE - (i) * 0x1000) #define REG_SPI_MEM_BASE(i) (DR_REG_SPI0_BASE - (i) * 0x1000)
#define REG_SPI_BASE(i) (((i)>=2) ? (DR_REG_SPI2_BASE + (i-2) * 0x1000) : (0)) // GPSPI2 and GPSPI3
#define REG_I2C_BASE(i) (DR_REG_I2C_EXT_BASE + (i) * 0x14000 ) #define REG_I2C_BASE(i) (DR_REG_I2C_EXT_BASE + (i) * 0x14000 )
//Convenient way to replace the register ops when ulp riscv projects //Convenient way to replace the register ops when ulp riscv projects

21
components/soc/esp32s2/include/soc/spi_mem_reg.h
View File

@@ -1,25 +1,16 @@
// Copyright 2017-2018 Espressif Systems (Shanghai) PTE LTD /*
// * SPDX-FileCopyrightText: 2017-2023 Espressif Systems (Shanghai) CO LTD
// Licensed under the Apache License, Version 2.0 (the "License"); *
// you may not use this file except in compliance with the License. * SPDX-License-Identifier: Apache-2.0
// 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 _SOC_SPI_MEM_REG_H_ #ifndef _SOC_SPI_MEM_REG_H_
#define _SOC_SPI_MEM_REG_H_ #define _SOC_SPI_MEM_REG_H_
#include "soc.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
#include "soc.h"
#define REG_SPI_MEM_BASE(i) (DR_REG_SPI0_BASE - (i) * 0x1000)
#define SPI_MEM_CMD_REG(i) (REG_SPI_MEM_BASE(i) + 0x000) #define SPI_MEM_CMD_REG(i) (REG_SPI_MEM_BASE(i) + 0x000)
/* SPI_MEM_FLASH_READ : R/W ;bitpos:[31] ;default: 1'b0 ; */ /* SPI_MEM_FLASH_READ : R/W ;bitpos:[31] ;default: 1'b0 ; */

21
components/soc/esp32s2/include/soc/spi_reg.h
View File

@@ -1,25 +1,16 @@
// Copyright 2017-2018 Espressif Systems (Shanghai) PTE LTD /*
// * SPDX-FileCopyrightText: 2017-2023 Espressif Systems (Shanghai) CO LTD
// Licensed under the Apache License, Version 2.0 (the "License"); *
// you may not use this file except in compliance with the License. * SPDX-License-Identifier: Apache-2.0
// 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 _SOC_SPI_REG_H_ #ifndef _SOC_SPI_REG_H_
#define _SOC_SPI_REG_H_ #define _SOC_SPI_REG_H_
#include "soc.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
#include "soc.h"
#define REG_SPI_BASE(i) (DR_REG_SPI2_BASE + (((i)>3) ? (((i-2)* 0x1000) + 0x10000) : ((i - 2)* 0x1000 )))
#define SPI_CMD_REG(i) (REG_SPI_BASE(i) + 0x000) #define SPI_CMD_REG(i) (REG_SPI_BASE(i) + 0x000)
/* SPI_USR : R/W ;bitpos:[24] ;default: 1'b0 ; */ /* SPI_USR : R/W ;bitpos:[24] ;default: 1'b0 ; */

1
components/soc/esp32s3/include/soc/soc.h
View File

@@ -119,6 +119,7 @@
#define REG_I2S_BASE( i ) (DR_REG_I2S_BASE + (i) * 0x1E000) #define REG_I2S_BASE( i ) (DR_REG_I2S_BASE + (i) * 0x1E000)
#define REG_TIMG_BASE(i) (DR_REG_TIMERGROUP0_BASE + (i)*0x1000) #define REG_TIMG_BASE(i) (DR_REG_TIMERGROUP0_BASE + (i)*0x1000)
#define REG_SPI_MEM_BASE(i) (DR_REG_SPI0_BASE - (i) * 0x1000) #define REG_SPI_MEM_BASE(i) (DR_REG_SPI0_BASE - (i) * 0x1000)
#define REG_SPI_BASE(i) (((i)>=2) ? (DR_REG_SPI2_BASE + (i-2) * 0x1000) : (0)) // GPSPI2 and GPSPI3
#define REG_I2C_BASE(i) (DR_REG_I2C_EXT_BASE + (i) * 0x14000 ) #define REG_I2C_BASE(i) (DR_REG_I2C_EXT_BASE + (i) * 0x14000 )
//Convenient way to replace the register ops when ulp riscv projects //Convenient way to replace the register ops when ulp riscv projects

1
components/soc/esp32s3/ld/esp32s3.peripherals.ld
View File

@@ -37,7 +37,6 @@ PROVIDE ( SYSCON = 0x60026000 );
PROVIDE ( I2C1 = 0x60027000 ); PROVIDE ( I2C1 = 0x60027000 );
PROVIDE ( SDMMC = 0x60028000 ); PROVIDE ( SDMMC = 0x60028000 );
PROVIDE ( TWAI = 0x6002B000 ); PROVIDE ( TWAI = 0x6002B000 );
PROVIDE ( GPSPI4 = 0x60037000 );
PROVIDE ( GDMA = 0x6003F000 ); PROVIDE ( GDMA = 0x6003F000 );
PROVIDE ( UART2 = 0x6002E000 ); PROVIDE ( UART2 = 0x6002E000 );
PROVIDE ( DMA = 0x6003F000 ); PROVIDE ( DMA = 0x6003F000 );

47
components/soc/esp32s3/spi_periph.c
View File

@@ -1,5 +1,5 @@
/* /*
* SPDX-FileCopyrightText: 2015-2022 Espressif Systems (Shanghai) CO LTD * SPDX-FileCopyrightText: 2015-2023 Espressif Systems (Shanghai) CO LTD
* *
* SPDX-License-Identifier: Apache-2.0 * SPDX-License-Identifier: Apache-2.0
*/ */
@@ -12,29 +12,30 @@
*/ */
const spi_signal_conn_t spi_periph_signal[SOC_SPI_PERIPH_NUM] = { const spi_signal_conn_t spi_periph_signal[SOC_SPI_PERIPH_NUM] = {
{ {
.spiclk_out = SPICLK_OUT_IDX, // MSPI has dedicated iomux pins
.spiclk_in = 0,/* SPI clock is not an input signal*/ .spiclk_out = -1,
.spid_out = SPID_OUT_IDX, .spiclk_in = -1,
.spiq_out = SPIQ_OUT_IDX, .spid_out = -1,
.spiwp_out = SPIWP_OUT_IDX, .spiq_out = -1,
.spihd_out = SPIHD_OUT_IDX, .spiwp_out = -1,
.spid_in = SPID_IN_IDX, .spihd_out = -1,
.spiq_in = SPIQ_IN_IDX, .spid_in = -1,
.spiwp_in = SPIWP_IN_IDX, .spiq_in = -1,
.spihd_in = SPIHD_IN_IDX, .spiwp_in = -1,
.spics_out = {SPICS0_OUT_IDX, SPICS1_OUT_IDX},/* SPI0/1 do not have CS2 now */ .spihd_in = -1,
.spics_in = 0,/* SPI cs is not an input signal*/ .spics_out = {-1},
.spiclk_iomux_pin = SPI_IOMUX_PIN_NUM_CLK, .spics_in = -1,
.spid_iomux_pin = SPI_IOMUX_PIN_NUM_MOSI, .spiclk_iomux_pin = -1,
.spiq_iomux_pin = SPI_IOMUX_PIN_NUM_MISO, .spid_iomux_pin = -1,
.spiwp_iomux_pin = SPI_IOMUX_PIN_NUM_WP, .spiq_iomux_pin = -1,
.spihd_iomux_pin = SPI_IOMUX_PIN_NUM_HD, .spiwp_iomux_pin = -1,
.spics0_iomux_pin = SPI_IOMUX_PIN_NUM_CS, .spihd_iomux_pin = -1,
.irq = ETS_SPI1_INTR_SOURCE, .spics0_iomux_pin = -1,
.irq = -1,
.irq_dma = -1, .irq_dma = -1,
.module = PERIPH_SPI_MODULE, .module = -1,
.hw = (spi_dev_t *) &SPIMEM1, .hw = NULL,
.func = SPI_FUNC_NUM, .func = -1,
}, { }, {
.spiclk_out = FSPICLK_OUT_IDX, .spiclk_out = FSPICLK_OUT_IDX,
.spiclk_in = FSPICLK_IN_IDX, .spiclk_in = FSPICLK_IN_IDX,

11
docs/en/api-reference/protocols/esp_spi_slave_protocol.rst
View File

@@ -44,10 +44,17 @@ should exist):
to/read from. For other commands with this phase, they are meaningless, but still have to to/read from. For other commands with this phase, they are meaningless, but still have to
exist in the transaction. exist in the transaction.
.. only:: esp32s2
- Dummy: 8-bit (for 1-bit mode) or 4-bit (for 2/4-bit mode), floating, optional
This phase is the turnaround time between the master and the slave on the bus, and also provides enough time for the slave to prepare the data to send to the master.
.. only:: not esp32s2
- Dummy: 8-bit, floating, optional - Dummy: 8-bit, floating, optional
This phase is the turn around time between the master and the slave on the bus, and also This phase is the turnaround time between the master and the slave on the bus, and also provides enough time for the slave to prepare the data to send to the master.
provides enough time for the slave to prepare the data to send to master.
- Data: variable length, the direction is also determined by the command. - Data: variable length, the direction is also determined by the command.