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
commit e06ce27f566656dd25f943f7935bebcf6045d59d
Author: raiden00pl <raide...@railab.me>
AuthorDate: Tue May 23 12:00:07 2023 +0200
boards/nrf5340-dk: add mx25 memory support
From now on-board QSPI memory is supported.
---
.../nrf5340-dk/configs/qspi_cpuapp/#defconfig# | 44 +++++++++
.../nrf53/nrf5340-dk/configs/qspi_cpuapp/defconfig | 50 ++++++++++
boards/arm/nrf53/nrf5340-dk/include/board.h | 24 +++++
boards/arm/nrf53/nrf5340-dk/src/Make.defs | 6 +-
boards/arm/nrf53/nrf5340-dk/src/nrf5340-dk.h | 12 +++
boards/arm/nrf53/nrf5340-dk/src/nrf53_bringup.c | 10 ++
boards/arm/nrf53/nrf5340-dk/src/nrf53_mx25.c | 107 +++++++++++++++++++++
7 files changed, 252 insertions(+), 1 deletion(-)
diff --git a/boards/arm/nrf53/nrf5340-dk/configs/qspi_cpuapp/#defconfig#
b/boards/arm/nrf53/nrf5340-dk/configs/qspi_cpuapp/#defconfig#
new file mode 100644
index 0000000000..ba94923f38
--- /dev/null
+++ b/boards/arm/nrf53/nrf5340-dk/configs/qspi_cpuapp/#defconfig#
@@ -0,0 +1,44 @@
+#
+# This file is autogenerated: PLEASE DO NOT EDIT IT.
+#
+# You can use "make menuconfig" to make any modifications to the installed
.config file.
+# You can then do "make savedefconfig" to generate a new defconfig file that
includes your
+# modifications.
+#
+# CONFIG_NSH_DISABLE_IFCONFIG is not set
+# CONFIG_NSH_DISABLE_PS is not set
+# CONFIG_STANDARD_SERIAL is not set
+CONFIG_ARCH="arm"
+CONFIG_ARCH_BOARD="nrf5340-dk"
+CONFIG_ARCH_BOARD_NRF5340_DK=y
+CONFIG_ARCH_CHIP="nrf53"
+CONFIG_ARCH_CHIP_NRF5340=y
+CONFIG_ARCH_CHIP_NRF5340_CPUAPP=y
+CONFIG_ARCH_CHIP_NRF53=y
+CONFIG_ARCH_STACKDUMP=y
+CONFIG_ARCH_STDARG_H=y
+CONFIG_BOARD_LOOPSPERMSEC=5500
+CONFIG_EXPERIMENTAL=y
+CONFIG_FS_LITTLEFS=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
+CONFIG_MM_REGIONS=2
+CONFIG_MTD=y
+CONFIG_MTD_MX25RXX=y
+CONFIG_NRF52_QSPI=y
+CONFIG_NRF53_UART0=y
+CONFIG_NSH_ARCHINIT=y
+CONFIG_NSH_FILEIOSIZE=512
+CONFIG_NSH_LINELEN=64
+CONFIG_NSH_READLINE=y
+CONFIG_PREALLOC_TIMERS=4
+CONFIG_RAM_SIZE=524288
+CONFIG_RAM_START=0x20000000
+CONFIG_RAW_BINARY=y
+CONFIG_RR_INTERVAL=200
+CONFIG_SCHED_WAITPID=y
+CONFIG_START_DAY=26
+CONFIG_START_MONTH=3
+CONFIG_SYMTAB_ORDEREDBYNAME=y
+CONFIG_SYSTEM_NSH=y
+CONFIG_TASK_NAME_SIZE=0
+CONFIG_UART0_SERIAL_CONSOLE=y
diff --git a/boards/arm/nrf53/nrf5340-dk/configs/qspi_cpuapp/defconfig
b/boards/arm/nrf53/nrf5340-dk/configs/qspi_cpuapp/defconfig
new file mode 100644
index 0000000000..5ff9c59011
--- /dev/null
+++ b/boards/arm/nrf53/nrf5340-dk/configs/qspi_cpuapp/defconfig
@@ -0,0 +1,50 @@
+#
+# This file is autogenerated: PLEASE DO NOT EDIT IT.
+#
+# You can use "make menuconfig" to make any modifications to the installed
.config file.
+# You can then do "make savedefconfig" to generate a new defconfig file that
includes your
+# modifications.
+#
+# CONFIG_NSH_DISABLE_IFCONFIG is not set
+# CONFIG_NSH_DISABLE_PS is not set
+# CONFIG_STANDARD_SERIAL is not set
+CONFIG_ARCH="arm"
+CONFIG_ARCH_BOARD="nrf5340-dk"
+CONFIG_ARCH_BOARD_NRF5340_DK=y
+CONFIG_ARCH_CHIP="nrf53"
+CONFIG_ARCH_CHIP_NRF5340=y
+CONFIG_ARCH_CHIP_NRF5340_CPUAPP=y
+CONFIG_ARCH_CHIP_NRF53=y
+CONFIG_ARCH_STACKDUMP=y
+CONFIG_ARCH_STDARG_H=y
+CONFIG_BOARD_LOOPSPERMSEC=5500
+CONFIG_DEBUG_FULLOPT=y
+CONFIG_DEBUG_SYMBOLS=y
+CONFIG_EXPERIMENTAL=y
+CONFIG_FS_LITTLEFS=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
+CONFIG_MM_REGIONS=2
+CONFIG_MTD=y
+CONFIG_MTD_MX25RXX=y
+CONFIG_MX25RXX_QSPI_FREQUENCY=98000000
+CONFIG_MX25RXX_QSPI_READ_FREQUENCY=98000000
+CONFIG_NRF53_QSPI=y
+CONFIG_NRF53_QSPI_RXDELAY=1
+CONFIG_NRF53_UART0=y
+CONFIG_NRF53_USE_HFCLK192M=y
+CONFIG_NSH_ARCHINIT=y
+CONFIG_NSH_FILEIOSIZE=512
+CONFIG_NSH_LINELEN=64
+CONFIG_NSH_READLINE=y
+CONFIG_PREALLOC_TIMERS=4
+CONFIG_RAM_SIZE=524288
+CONFIG_RAM_START=0x20000000
+CONFIG_RAW_BINARY=y
+CONFIG_RR_INTERVAL=200
+CONFIG_SCHED_WAITPID=y
+CONFIG_START_DAY=26
+CONFIG_START_MONTH=3
+CONFIG_SYMTAB_ORDEREDBYNAME=y
+CONFIG_SYSTEM_NSH=y
+CONFIG_TASK_NAME_SIZE=0
+CONFIG_UART0_SERIAL_CONSOLE=y
diff --git a/boards/arm/nrf53/nrf5340-dk/include/board.h
b/boards/arm/nrf53/nrf5340-dk/include/board.h
index 5ee9b31916..e535d03f0a 100644
--- a/boards/arm/nrf53/nrf5340-dk/include/board.h
+++ b/boards/arm/nrf53/nrf5340-dk/include/board.h
@@ -155,4 +155,28 @@
#define NRF53_ADC_CH2_PIN (GPIO_MCUSEL_APP | GPIO_INPUT | GPIO_PORT0 |
GPIO_PIN(6))
#define NRF53_ADC_CH3_PIN (GPIO_MCUSEL_APP | GPIO_INPUT | GPIO_PORT0 |
GPIO_PIN(7))
+/* QSPI Pins ****************************************************************/
+
+/* QSPI0
+ * QSPI CS - P0.18
+ * QSPI SCK - P0.17
+ * QSPI IO0 - P0.13
+ * QSPI IO1 - P0.14
+ * QSPI IO2 - P0.15
+ * QSPI IO3 - P0.16
+ */
+
+#define NRF53_QSPI0_CSN_PIN (GPIO_MCUSEL_PERIP | GPIO_OUTPUT | \
+ GPIO_VALUE_ONE | GPIO_PORT0 | GPIO_PIN(18))
+#define NRF53_QSPI0_SCK_PIN (GPIO_MCUSEL_PERIP | GPIO_OUTPUT | \
+ GPIO_PORT0 | GPIO_PIN(17))
+#define NRF53_QSPI0_IO0_PIN (GPIO_MCUSEL_PERIP | GPIO_OUTPUT | \
+ GPIO_PORT0 | GPIO_PIN(13))
+#define NRF53_QSPI0_IO1_PIN (GPIO_MCUSEL_PERIP | GPIO_OUTPUT | \
+ GPIO_PORT0 | GPIO_PIN(14))
+#define NRF53_QSPI0_IO2_PIN (GPIO_MCUSEL_PERIP | GPIO_OUTPUT | \
+ GPIO_PORT0 | GPIO_PIN(15))
+#define NRF53_QSPI0_IO3_PIN (GPIO_MCUSEL_PERIP | GPIO_OUTPUT | \
+ GPIO_PORT0 | GPIO_PIN(16))
+
#endif /* __BOARDS_ARM_NRF53_NRF5340_DK_INCLUDE_BOARD_H */
diff --git a/boards/arm/nrf53/nrf5340-dk/src/Make.defs
b/boards/arm/nrf53/nrf5340-dk/src/Make.defs
index d28956f307..3ce6ef9935 100644
--- a/boards/arm/nrf53/nrf5340-dk/src/Make.defs
+++ b/boards/arm/nrf53/nrf5340-dk/src/Make.defs
@@ -56,6 +56,10 @@ ifeq ($(CONFIG_USBDEV_COMPOSITE),y)
CSRCS += nrf53_composite.c
endif
+ifeq ($(CONFIG_NRF53_QSPI),y)
+CSRCS += nrf53_mx25.c
+endif
+
DEPPATH += --dep-path board
VPATH += :board
-CFLAGS += $(shell $(INCDIR) "$(CC)"
$(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)board)
\ No newline at end of file
+CFLAGS += $(shell $(INCDIR) "$(CC)"
$(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)board)
diff --git a/boards/arm/nrf53/nrf5340-dk/src/nrf5340-dk.h
b/boards/arm/nrf53/nrf5340-dk/src/nrf5340-dk.h
index 4b0b0ecef7..0b52d1d2a2 100644
--- a/boards/arm/nrf53/nrf5340-dk/src/nrf5340-dk.h
+++ b/boards/arm/nrf53/nrf5340-dk/src/nrf5340-dk.h
@@ -118,5 +118,17 @@ int nrf53_pwm_setup(void);
int nrf53_adc_setup(void);
#endif
+/****************************************************************************
+ * Name: nrf53_mx25_initialize
+ *
+ * Description:
+ * Initialize the MX25RXX QSPI memeory
+ *
+ ****************************************************************************/
+
+#ifdef CONFIG_NRF53_QSPI
+int nrf53_mx25_initialize(void);
+#endif
+
#endif /* __ASSEMBLY__ */
#endif /* __BOARDS_ARM_NRF53_NRF5340_DK_SRC_NRF5340_DK_H */
diff --git a/boards/arm/nrf53/nrf5340-dk/src/nrf53_bringup.c
b/boards/arm/nrf53/nrf5340-dk/src/nrf53_bringup.c
index d9698045a2..c59768f9f8 100644
--- a/boards/arm/nrf53/nrf5340-dk/src/nrf53_bringup.c
+++ b/boards/arm/nrf53/nrf5340-dk/src/nrf53_bringup.c
@@ -285,6 +285,16 @@ int nrf53_bringup(void)
usbdev_rndis_initialize(mac);
#endif
+#ifdef CONFIG_NRF53_QSPI
+ /* Initialize the MX25 QSPU memory */
+
+ ret = nrf53_mx25_initialize();
+ if (ret < 0)
+ {
+ syslog(LOG_ERR, "ERROR: nrf53_mx25_initialize() failed: %d\n", ret);
+ }
+#endif
+
/* Initialize BLE */
#ifdef CONFIG_NRF53_APPCORE
diff --git a/boards/arm/nrf53/nrf5340-dk/src/nrf53_mx25.c
b/boards/arm/nrf53/nrf5340-dk/src/nrf53_mx25.c
new file mode 100644
index 0000000000..6b5fb81570
--- /dev/null
+++ b/boards/arm/nrf53/nrf5340-dk/src/nrf53_mx25.c
@@ -0,0 +1,107 @@
+/****************************************************************************
+ * boards/arm/nrf53/nrf5340-dk/src/nrf53_mx25.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 <debug.h>
+#include <stdio.h>
+#include <sys/types.h>
+
+#include <nuttx/fs/fs.h>
+#include <nuttx/mtd/mtd.h>
+#include <nuttx/spi/qspi.h>
+
+#include "nrf53_qspi.h"
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: nrf53_mx25_initialize
+ *
+ * Description:
+ * Initialize the MX25RXX QSPI memeory
+ *
+ ****************************************************************************/
+
+int nrf53_mx25_initialize(void)
+{
+ struct qspi_dev_s *qspi_dev;
+ struct mtd_dev_s *mtd_dev;
+ char blockdev[32];
+ int ret = -1;
+
+ /* Create an instance of the NRF53 QSPI device driver */
+
+ qspi_dev = nrf53_qspi_initialize(0);
+ if (!qspi_dev)
+ {
+ _err("nrf53_qspi_initialize() failed\n");
+ return -1;
+ }
+
+ _info("nrf53_qspi_initialize() successful\n");
+
+ /* Use the QSPI device instance to initialize the MX25 device */
+
+ mtd_dev = mx25rxx_initialize(qspi_dev, true);
+ if (!mtd_dev)
+ {
+ _err("mx25rxx_initialize() failed\n");
+ return -1;
+ }
+
+ /* Configure the device with no partition support */
+
+ snprintf(blockdev, sizeof(blockdev), "/dev/mtdqspi%d", 0);
+
+ ret = register_mtddriver(blockdev, mtd_dev, 0755, NULL);
+ if (ret != OK)
+ {
+ _err("register_mtddriver() failed: %d\n", ret);
+ return -1;
+ }
+
+ _info("register_mtddriver() successful\n");
+
+#ifdef CONFIG_FS_LITTLEFS
+ ret = nx_mount(blockdev, "/mnt/qspi", "littlefs", 0, NULL);
+ if (ret < 0)
+ {
+ ret = nx_mount(blockdev, "/mnt/qspi", "littlefs", 0,
+ "forceformat");
+ if (ret < 0)
+ {
+ _err("nx_mount() failed: %d\n", ret);
+ }
+ else
+ {
+ _info("nx_mount() successful\n");
+ }
+ }
+#endif
+
+ return ret;
+}
