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 0d0638ac98 zcu111: add support for user led
0d0638ac98 is described below
commit 0d0638ac980363c3dc1bf2e4b42d6296de2852cc
Author: zouboan <[email protected]>
AuthorDate: Mon Dec 9 17:01:17 2024 +0800
zcu111: add support for user led
---
.../arm64/zynq-mpsoc/zcu111/configs/jtag/defconfig | 1 +
.../arm64/zynq-mpsoc/zcu111/configs/nsh/defconfig | 1 +
boards/arm64/zynq-mpsoc/zcu111/src/Makefile | 6 +-
boards/arm64/zynq-mpsoc/zcu111/src/zcu111.h | 12 ++
.../arm64/zynq-mpsoc/zcu111/src/zcu111_appinit.c | 8 +-
.../arm64/zynq-mpsoc/zcu111/src/zcu111_boardinit.c | 2 +
.../zcu111/src/{zcu111.h => zcu111_bringup.c} | 48 +++--
.../arm64/zynq-mpsoc/zcu111/src/zcu111_userleds.c | 231 +++++++++++++++++++++
8 files changed, 288 insertions(+), 21 deletions(-)
diff --git a/boards/arm64/zynq-mpsoc/zcu111/configs/jtag/defconfig
b/boards/arm64/zynq-mpsoc/zcu111/configs/jtag/defconfig
index 24f564c322..f099aabf08 100644
--- a/boards/arm64/zynq-mpsoc/zcu111/configs/jtag/defconfig
+++ b/boards/arm64/zynq-mpsoc/zcu111/configs/jtag/defconfig
@@ -72,3 +72,4 @@ CONFIG_TESTING_OSTEST=y
CONFIG_UART0_SERIAL_CONSOLE=y
CONFIG_USEC_PER_TICK=1000
CONFIG_USERLED=y
+CONFIG_USERLED_LOWER=y
diff --git a/boards/arm64/zynq-mpsoc/zcu111/configs/nsh/defconfig
b/boards/arm64/zynq-mpsoc/zcu111/configs/nsh/defconfig
index 234e95ec15..490647e971 100644
--- a/boards/arm64/zynq-mpsoc/zcu111/configs/nsh/defconfig
+++ b/boards/arm64/zynq-mpsoc/zcu111/configs/nsh/defconfig
@@ -71,3 +71,4 @@ CONFIG_TESTING_OSTEST=y
CONFIG_UART0_SERIAL_CONSOLE=y
CONFIG_USEC_PER_TICK=1000
CONFIG_USERLED=y
+CONFIG_USERLED_LOWER=y
diff --git a/boards/arm64/zynq-mpsoc/zcu111/src/Makefile
b/boards/arm64/zynq-mpsoc/zcu111/src/Makefile
index f6217519a0..252de5d0f7 100644
--- a/boards/arm64/zynq-mpsoc/zcu111/src/Makefile
+++ b/boards/arm64/zynq-mpsoc/zcu111/src/Makefile
@@ -22,7 +22,7 @@
include $(TOPDIR)/Make.defs
-CSRCS = zcu111_boardinit.c
+CSRCS = zcu111_boardinit.c zcu111_bringup.c
ifeq ($(CONFIG_BOARDCTL),y)
CSRCS += zcu111_appinit.c
ifeq ($(CONFIG_BOARDCTL_RESET),y)
@@ -34,6 +34,10 @@ ifeq ($(CONFIG_ARCH_LEDS),y)
CSRCS += zcu111_autoleds.c
endif
+ifeq ($(CONFIG_USERLED),y)
+CSRCS += zcu111_userleds.c
+endif
+
ifeq ($(CONFIG_ETC_ROMFS),y)
RCSRCS = etc/init.d/rc.sysinit etc/init.d/rcS
endif
diff --git a/boards/arm64/zynq-mpsoc/zcu111/src/zcu111.h
b/boards/arm64/zynq-mpsoc/zcu111/src/zcu111.h
index b6167fbf01..91a92d3593 100644
--- a/boards/arm64/zynq-mpsoc/zcu111/src/zcu111.h
+++ b/boards/arm64/zynq-mpsoc/zcu111/src/zcu111.h
@@ -49,5 +49,17 @@
* Public Functions Definitions
****************************************************************************/
+/****************************************************************************
+ * Name: zcu111_bringup
+ *
+ * Description:
+ * Bring up board features
+ *
+ ****************************************************************************/
+
+#if defined(CONFIG_BOARDCTL) || defined(CONFIG_BOARD_LATE_INITIALIZE)
+int zcu111_bringup(void);
+#endif
+
#endif /* __ASSEMBLY__ */
#endif /* __BOARDS_ARM64_ZYNQ_MPSOC_ZCU111_SRC_ZCU111_H */
diff --git a/boards/arm64/zynq-mpsoc/zcu111/src/zcu111_appinit.c
b/boards/arm64/zynq-mpsoc/zcu111/src/zcu111_appinit.c
index 242e58ccf2..43a18f5df5 100644
--- a/boards/arm64/zynq-mpsoc/zcu111/src/zcu111_appinit.c
+++ b/boards/arm64/zynq-mpsoc/zcu111/src/zcu111_appinit.c
@@ -60,7 +60,13 @@
int board_app_initialize(uintptr_t arg)
{
- /* Perform board initialization */
+#ifdef CONFIG_BOARD_LATE_INITIALIZE
+ /* Board initialization already performed by board_late_initialize() */
return OK;
+#else
+ /* Perform board-specific initialization */
+
+ return zcu111_bringup();
+#endif
}
diff --git a/boards/arm64/zynq-mpsoc/zcu111/src/zcu111_boardinit.c
b/boards/arm64/zynq-mpsoc/zcu111/src/zcu111_boardinit.c
index 1f694cb163..10b32ead85 100644
--- a/boards/arm64/zynq-mpsoc/zcu111/src/zcu111_boardinit.c
+++ b/boards/arm64/zynq-mpsoc/zcu111/src/zcu111_boardinit.c
@@ -105,5 +105,7 @@ void zynq_board_initialize(void)
void board_late_initialize(void)
{
/* Perform board initialization */
+
+ zcu111_bringup();
}
#endif /* CONFIG_BOARD_LATE_INITIALIZE */
diff --git a/boards/arm64/zynq-mpsoc/zcu111/src/zcu111.h
b/boards/arm64/zynq-mpsoc/zcu111/src/zcu111_bringup.c
similarity index 72%
copy from boards/arm64/zynq-mpsoc/zcu111/src/zcu111.h
copy to boards/arm64/zynq-mpsoc/zcu111/src/zcu111_bringup.c
index b6167fbf01..e9204cc726 100644
--- a/boards/arm64/zynq-mpsoc/zcu111/src/zcu111.h
+++ b/boards/arm64/zynq-mpsoc/zcu111/src/zcu111_bringup.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * boards/arm64/zynq-mpsoc/zcu111/src/zcu111.h
+ * boards/arm64/zynq-mpsoc/zcu111/src/zcu111_bringup.c
*
* SPDX-License-Identifier: Apache-2.0
*
@@ -20,34 +20,44 @@
*
****************************************************************************/
-#ifndef __BOARDS_ARM64_ZYNQ_MPSOC_ZCU111_SRC_ZCU111_H
-#define __BOARDS_ARM64_ZYNQ_MPSOC_ZCU111_SRC_ZCU111_H
-
/****************************************************************************
* Included Files
****************************************************************************/
#include <nuttx/config.h>
-#include <stdint.h>
-#include "zynq_mio.h"
+#include <sys/types.h>
+#include <syslog.h>
+#include "zcu111.h"
+
+#ifdef CONFIG_USERLED
+# include <nuttx/leds/userled.h>
+#endif
/****************************************************************************
- * Pre-processor Definitions
+ * Public Functions
****************************************************************************/
-/* Configuration ************************************************************/
-
-/* LEDs *********************************************************************/
-
-/* Green LED on MIO23 */
+/****************************************************************************
+ * Name: zcu111_bringup
+ *
+ * Description:
+ * Bring up board features
+ *
+ ****************************************************************************/
-#define LED_DS50 23
+int zcu111_bringup(void)
+{
+ int ret = OK;
-#ifndef __ASSEMBLY__
+#ifdef CONFIG_USERLED
+ /* Register the LED driver */
-/****************************************************************************
- * Public Functions Definitions
- ****************************************************************************/
+ ret = userled_lower_initialize("/dev/userleds");
+ if (ret < 0)
+ {
+ syslog(LOG_ERR, "ERROR: userled_lower_initialize() failed: %d\n", ret);
+ }
+#endif
-#endif /* __ASSEMBLY__ */
-#endif /* __BOARDS_ARM64_ZYNQ_MPSOC_ZCU111_SRC_ZCU111_H */
+ return ret;
+}
diff --git a/boards/arm64/zynq-mpsoc/zcu111/src/zcu111_userleds.c
b/boards/arm64/zynq-mpsoc/zcu111/src/zcu111_userleds.c
new file mode 100644
index 0000000000..738423c63f
--- /dev/null
+++ b/boards/arm64/zynq-mpsoc/zcu111/src/zcu111_userleds.c
@@ -0,0 +1,231 @@
+/****************************************************************************
+ * boards/arm64/zynq-mpsoc/zcu111/src/zcu111_userleds.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 <stdint.h>
+#include <stdbool.h>
+#include <debug.h>
+
+#include <sys/param.h>
+
+#include <nuttx/board.h>
+#include <arch/board/board.h>
+
+#include "chip.h"
+#include "arm64_internal.h"
+#include "zcu111.h"
+
+#ifdef CONFIG_USERLED
+
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+/* USER LED definitions *****************************************************/
+
+/* LED index values for use with board_userled() */
+
+typedef enum
+{
+ USER_LED1 = 0, /* DS11 */
+ USER_LED2 = 1, /* DS12 */
+ USER_LED3 = 2, /* DS13 */
+ USER_LED4 = 3, /* DS14 */
+ USER_LED5 = 4, /* DS15 */
+ USER_LED6 = 5, /* DS16 */
+ USER_LED7 = 6, /* DS17 */
+ USER_LED8 = 7, /* DS18 */
+ USER_LEDS /* Number of LEDs */
+} led_typedef_enum;
+
+/* LED bits for use with board_userled_all() */
+
+#define USER_LED1_BIT (1 << USER_LED1)
+#define USER_LED2_BIT (1 << USER_LED2)
+#define USER_LED3_BIT (1 << USER_LED3)
+#define USER_LED4_BIT (1 << USER_LED4)
+#define USER_LED5_BIT (1 << USER_LED5)
+#define USER_LED6_BIT (1 << USER_LED6)
+#define USER_LED7_BIT (1 << USER_LED7)
+#define USER_LED8_BIT (1 << USER_LED8)
+
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
+
+/* LED index */
+
+static const uint32_t g_led_map[USER_LEDS] =
+{
+ 78, /* MIO78(EMIO) */
+ 79, /* MIO79(EMIO) */
+ 80, /* MIO80(EMIO) */
+ 81, /* MIO81(EMIO) */
+ 82, /* MIO82(EMIO) */
+ 83, /* MIO83(EMIO) */
+ 84, /* MIO84(EMIO) */
+ 85 /* MIO85(EMIO) */
+};
+
+static const uint32_t g_led_setmap[USER_LEDS] =
+{
+ USER_LED1_BIT, /* BANK 3 Pin 0 */
+ USER_LED2_BIT, /* BANK 3 Pin 1 */
+ USER_LED3_BIT, /* BANK 3 Pin 2 */
+ USER_LED4_BIT, /* BANK 3 Pin 3 */
+ USER_LED5_BIT, /* BANK 3 Pin 4 */
+ USER_LED6_BIT, /* BANK 3 Pin 5 */
+ USER_LED7_BIT, /* BANK 3 Pin 6 */
+ USER_LED8_BIT /* BANK 3 Pin 7 */
+};
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: board_userled_initialize
+ *
+ * Description:
+ * This function may called from application-specific logic during its
+ * to perform board-specific initialization of LED resources. This
+ * includes such things as, for example, configure GPIO pins to drive the
+ * LEDs and also putting the LEDs in their correct initial state.
+ *
+ * If CONFIG_ARCH_LEDS is defined, then NuttX will control the on-board
+ * LEDs. If CONFIG_ARCH_LEDS is not defined, then this interfaces may be
+ * available to control the LEDs directly from user board logic or
+ * indirectly user applications (via the common LED character driver).
+ *
+ * Most boards have only a few LEDs and in those cases all LEDs may be
+ * used by the NuttX LED logic exclusively and may not be available for
+ * use by user logic if CONFIG_ARCH_LEDS=y.
+ *
+ * NOTE: The LED number is returned.
+ *
+ * Input Parameters:
+ * None
+ *
+ * Returned Value:
+ * Number of LEDs on board
+ *
+ ****************************************************************************/
+
+uint32_t board_userled_initialize(void)
+{
+ int i;
+
+ /* Configure the LED GPIO for output. */
+
+ for (i = 0; i < nitems(g_led_map); i++)
+ {
+ /* Configure LED GPIOs for output */
+
+ zynq_mio_setdirpin(g_led_map[i], 1);
+ zynq_mio_setoutenpin(g_led_map[i], 1);
+ zynq_mio_writepin(g_led_map[i], false);
+ }
+
+ return USER_LEDS;
+}
+
+/****************************************************************************
+ * Name: board_userled
+ *
+ * Description:
+ * This interface may be used by application specific logic to set the
+ * state of a single LED. Definitions for the led identification are
+ * provided in the board-specific board.h header file that may be included
+ * like:
+ *
+ * #included <arch/board/board.h>
+ *
+ * If CONFIG_ARCH_LEDS is defined, then NuttX will control the on-board
+ * LEDs. If CONFIG_ARCH_LEDS is not defined, then this interfaces may be
+ * available to control the LEDs directly from user board logic or
+ * indirectly user applications (via the common LED character driver).
+ *
+ * Most boards have only a few LEDs and in those cases all LEDs may be
+ * used by the NuttX LED logic exclusively and may not be available for
+ * use by user logic if CONFIG_ARCH_LEDS=y.
+ *
+ * Input Parameters:
+ * led - LED number
+ * ledon - True if LED should be turned on; False to turn off
+ *
+ * Returned Value:
+ * None
+ *
+ ****************************************************************************/
+
+void board_userled(int led, bool ledon)
+{
+ if ((unsigned)led < nitems(g_led_map))
+ {
+ zynq_mio_writepin(g_led_map[led], ledon);
+ }
+}
+
+/****************************************************************************
+ * Name: board_userled_all
+ *
+ * Description:
+ * This interface may be used by application specific logic to set the
+ * state of all board LED. Definitions for the led set member
+ * identification is provided in the board-specific board.h header file
+ * that may be includedlike:
+ *
+ * #included <arch/board/board.h>
+ *
+ * If CONFIG_ARCH_LEDS is defined, then NuttX will control the on-board
+ * LEDs. If CONFIG_ARCH_LEDS is not defined, then this interfaces may be
+ * available to control the LEDs directly from user board logic or
+ * indirectly user applications (via the common LED character driver).
+ *
+ * Most boards have only a few LEDs and in those cases all LEDs may be
+ * used by the NuttX LED logic exclusively and may not be available for
+ * use by user logic if CONFIG_ARCH_LEDS=y.
+ *
+ * Input Parameters:
+ * ledset - Bitset of LEDs to be turned on and off
+ *
+ * Returned Value:
+ * None
+ *
+ ****************************************************************************/
+
+void board_userled_all(uint32_t ledset)
+{
+ int i;
+
+ /* Configure LED1-3 GPIOs for output */
+
+ for (i = 0; i < nitems(g_led_map); i++)
+ {
+ zynq_mio_writepin(g_led_map[i], (ledset & g_led_setmap[i]) != 0);
+ }
+}
+
+#endif /* CONFIG_USERLED */
