pinephone pro: add support for board reset

apache · Sep 7, 2023 · 987afb1 · 987afb1
1 parent 74b4672
commit 987afb1
Show file tree

Hide file tree

Showing 6 changed files with 75 additions and 6 deletions.
diff --git a/boards/arm64/rk3399/pinephonepro/src/Makefile b/boards/arm64/rk3399/pinephonepro/src/Makefile
@@ -24,6 +24,9 @@ CSRCS = pinephonepro_boardinit.c pinephonepro_bringup.c
 
 ifeq ($(CONFIG_BOARDCTL),y)
 CSRCS += pinephonepro_appinit.c
+ifeq ($(CONFIG_BOARDCTL_RESET),y)
+CSRCS += pinephonepro_reset.c
+endif
 endif
 
 include $(TOPDIR)/boards/Board.mk
diff --git a/boards/arm64/rk3399/pinephonepro/src/pinephonepro.h b/boards/arm64/rk3399/pinephonepro/src/pinephonepro.h
@@ -34,15 +34,15 @@
  ****************************************************************************/
 
 /****************************************************************************
- * Name: pinephone_bringup
+ * Name: pinephonepro_bringup
  *
  * Description:
  *   Bring up board features
  *
  ****************************************************************************/
 
 #if defined(CONFIG_BOARDCTL) || defined(CONFIG_BOARD_LATE_INITIALIZE)
-int pinephone_bringup(void);
+int pinephonepro_bringup(void);
 #endif
 
 #endif /* __ASSEMBLY__ */

diff --git a/boards/arm64/rk3399/pinephonepro/src/pinephonepro_appinit.c b/boards/arm64/rk3399/pinephonepro/src/pinephonepro_appinit.c
@@ -64,7 +64,7 @@ int board_app_initialize(uintptr_t arg)
 #ifndef CONFIG_BOARD_LATE_INITIALIZE
   /* Perform board initialization */
 
-  return pinephone_bringup();
+  return pinephonepro_bringup();
 #else
   return OK;
 #endif

diff --git a/boards/arm64/rk3399/pinephonepro/src/pinephonepro_boardinit.c b/boards/arm64/rk3399/pinephonepro/src/pinephonepro_boardinit.c
@@ -101,6 +101,6 @@ void board_late_initialize(void)
 {
   /* Perform board initialization */
 
-  pinephone_bringup();
+  pinephonepro_bringup();
 }
 #endif /* CONFIG_BOARD_LATE_INITIALIZE */
diff --git a/boards/arm64/rk3399/pinephonepro/src/pinephonepro_bringup.c b/boards/arm64/rk3399/pinephonepro/src/pinephonepro_bringup.c
@@ -37,14 +37,14 @@
  ****************************************************************************/
 
 /****************************************************************************
- * Name: pinephone_bringup
+ * Name: pinephonepro_bringup
  *
  * Description:
  *   Bring up board features
  *
  ****************************************************************************/
 
-int pinephone_bringup(void)
+int pinephonepro_bringup(void)
 {
   int ret = OK;
 

diff --git a/boards/arm64/rk3399/pinephonepro/src/pinephonepro_reset.c b/boards/arm64/rk3399/pinephonepro/src/pinephonepro_reset.c
@@ -0,0 +1,66 @@
+/****************************************************************************
+ * boards/arm64/rk3399/pinephonepro/src/pinephonepro_reset.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 <nuttx/arch.h>
+#include <nuttx/board.h>
+
+#ifdef CONFIG_BOARDCTL_RESET
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Public functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: board_reset
+ *
+ * Description:
+ *   Reset board.  Support for this function is required by board-level
+ *   logic if CONFIG_BOARDCTL_RESET is selected.
+ *
+ * Input Parameters:
+ *   status - Status information provided with the reset event.  This
+ *            meaning of this status information is board-specific.  If not
+ *            used by a board, the value zero may be provided in calls to
+ *            board_reset().
+ *
+ * Returned Value:
+ *   If this function returns, then it was not possible to power-off the
+ *   board due to some constraints.  The return value int this case is a
+ *   board-specific reason for the failure to shutdown.
+ *
+ ****************************************************************************/
+
+int board_reset(int status)
+{
+  up_systemreset();
+  return 0;
+}
+
+#endif /* CONFIG_BOARDCTL_RESET */