This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git
The following commit(s) were added to refs/heads/master by this push:
new 37e1f5db47 Add spi slave dev to esp32 xtensa
37e1f5db47 is described below
commit 37e1f5db473e1721810e7b0415e63b759bffb6ac
Author: Felipe Moura <[email protected]>
AuthorDate: Wed Aug 28 11:05:36 2024 -0300
Add spi slave dev to esp32 xtensa
---
.../esp32/common/include/esp32_board_spislavedev.h | 74 +++++++++++++++++++
boards/xtensa/esp32/common/src/Make.defs | 4 ++
.../esp32/common/src/esp32_board_spislavedev.c | 82 ++++++++++++++++++++++
.../xtensa/esp32/esp32-devkitc/src/esp32_bringup.c | 18 ++++-
4 files changed, 175 insertions(+), 3 deletions(-)
diff --git a/boards/xtensa/esp32/common/include/esp32_board_spislavedev.h
b/boards/xtensa/esp32/common/include/esp32_board_spislavedev.h
new file mode 100644
index 0000000000..69dd3e998e
--- /dev/null
+++ b/boards/xtensa/esp32/common/include/esp32_board_spislavedev.h
@@ -0,0 +1,74 @@
+/****************************************************************************
+ * boards/xtensa/esp32/common/include/esp32_board_spislavedev.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 __BOARDS_XTENSA_ESP32_COMMON_INCLUDE_ESP32_BOARD_SPISLAVEDEV_H
+#define __BOARDS_XTENSA_ESP32_COMMON_INCLUDE_ESP32_BOARD_SPISLAVEDEV_H
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <nuttx/config.h>
+
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+#ifndef __ASSEMBLY__
+
+#undef EXTERN
+#if defined(__cplusplus)
+#define EXTERN extern "C"
+extern "C"
+{
+#else
+#define EXTERN extern
+#endif
+
+/****************************************************************************
+ * Public Function Prototypes
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: board_spislavedev_initialize
+ *
+ * Description:
+ * Initialize SPI Slave driver and register the /dev/spislv device.
+ *
+ * Input Parameters:
+ * bus - The SPI bus number, used to build the device path as /dev/spislvN
+ *
+ * Returned Value:
+ * Zero (OK) is returned on success; A negated errno value is returned
+ * to indicate the nature of any failure.
+ *
+ ****************************************************************************/
+
+#ifdef CONFIG_SPI_SLAVE
+int board_spislavedev_initialize(int bus);
+#endif
+
+#undef EXTERN
+#if defined(__cplusplus)
+}
+#endif
+
+#endif /* __ASSEMBLY__ */
+#endif /* __BOARDS_XTENSA_ESP32_COMMON_INCLUDE_ESP32_BOARD_SPISLAVEDEV_H */
diff --git a/boards/xtensa/esp32/common/src/Make.defs
b/boards/xtensa/esp32/common/src/Make.defs
index d4e10c7b03..787a199266 100644
--- a/boards/xtensa/esp32/common/src/Make.defs
+++ b/boards/xtensa/esp32/common/src/Make.defs
@@ -64,6 +64,10 @@ ifeq ($(CONFIG_SPI_DRIVER),y)
CSRCS += esp32_board_spidev.c
endif
+ifeq ($(CONFIG_SPI_SLAVE_DRIVER),y)
+ CSRCS += esp32_board_spislavedev.c
+endif
+
ifeq ($(CONFIG_ESP32_SPIFLASH),y)
CSRCS += esp32_board_spiflash.c
endif
diff --git a/boards/xtensa/esp32/common/src/esp32_board_spislavedev.c
b/boards/xtensa/esp32/common/src/esp32_board_spislavedev.c
new file mode 100644
index 0000000000..f602e97b32
--- /dev/null
+++ b/boards/xtensa/esp32/common/src/esp32_board_spislavedev.c
@@ -0,0 +1,82 @@
+/****************************************************************************
+ * boards/xtensa/esp32/common/src/esp32_board_spislavedev.c
+ *
+ * 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.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <nuttx/config.h>
+
+#include <stdio.h>
+#include <debug.h>
+#include <errno.h>
+
+#include <nuttx/spi/slave.h>
+
+#include "esp32_spi.h"
+
+#include "esp32_board_spislavedev.h"
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: board_spislavedev_initialize
+ *
+ * Description:
+ * Initialize SPI Slave driver and register the /dev/spislv device.
+ *
+ * Input Parameters:
+ * bus - The SPI bus number, used to build the device path as /dev/spislvN
+ *
+ * Returned Value:
+ * Zero (OK) is returned on success; A negated errno value is returned
+ * to indicate the nature of any failure.
+ *
+ ****************************************************************************/
+
+int board_spislavedev_initialize(int bus)
+{
+ int ret;
+
+ struct spi_slave_ctrlr_s *ctrlr;
+
+ spiinfo("Initializing /dev/spislv%d...\n", bus);
+
+ /* Initialize SPI Slave controller device */
+
+ ctrlr = esp32_spislv_ctrlr_initialize(bus);
+ if (ctrlr == NULL)
+ {
+ spierr("Failed to initialize SPI%d as slave.\n", bus);
+ return -ENODEV;
+ }
+
+ ret = spi_slave_register(ctrlr, bus);
+ if (ret < 0)
+ {
+ spierr("Failed to register /dev/spislv%d: %d\n", bus, ret);
+
+ esp32_spislv_ctrlr_uninitialize(ctrlr);
+ }
+
+ return ret;
+}
diff --git a/boards/xtensa/esp32/esp32-devkitc/src/esp32_bringup.c
b/boards/xtensa/esp32/esp32-devkitc/src/esp32_bringup.c
index 3e1ebee0b5..e3891007bf 100644
--- a/boards/xtensa/esp32/esp32-devkitc/src/esp32_bringup.c
+++ b/boards/xtensa/esp32/esp32-devkitc/src/esp32_bringup.c
@@ -153,6 +153,11 @@
# include "esp32_spi.h"
#endif
+#ifdef CONFIG_SPI_SLAVE_DRIVER
+# include "esp32_spi.h"
+# include "esp32_board_spislavedev.h"
+#endif
+
#ifdef CONFIG_LCD_BACKPACK
# include "esp32_lcd_backpack.h"
#endif
@@ -702,15 +707,22 @@ int esp32_bringup(void)
}
#endif
-#ifdef CONFIG_SPI_DRIVER
-# ifdef CONFIG_ESP32_SPI2
+#if defined(CONFIG_ESP32_SPI2) && defined(CONFIG_SPI_DRIVER)
ret = board_spidev_initialize(ESP32_SPI2);
if (ret < 0)
{
syslog(LOG_ERR, "Failed to initialize SPI%d driver: %d\n",
ESP32_SPI2, ret);
}
-# endif
+#endif
+
+# if defined(CONFIG_ESP32_SPI2) && defined(CONFIG_SPI_SLAVE_DRIVER)
+ ret = board_spislavedev_initialize(ESP32_SPI2);
+ if (ret < 0)
+ {
+ syslog(LOG_ERR, "Failed to initialize SPI%d Slave driver: %d\n",
+ ESP32_SPI2, ret);
+ }
#endif
#ifdef CONFIG_WS2812
