You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by xi...@apache.org on 2023/03/01 04:29:30 UTC

[nuttx] branch master updated (d71562c794 -> b576a26d51)

This is an automated email from the ASF dual-hosted git repository.

xiaoxiang pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git


    from d71562c794 tools/cxd56: Fix nxstyle
     new 700610e625 arch: cxd56xx: Fix eMMC uninitialize function
     new 134424da18 arch: cxd56xx: Fix a warning in cxd56_serial.c
     new 57ca5c0401 arch: cxd56xx: Disable SubCore to use DMA
     new b576a26d51 arch: cxd56xx: Fix emmc pin control on initialization error

The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 arch/arm/src/cxd56xx/cxd56_dmac.c   |  2 ++
 arch/arm/src/cxd56xx/cxd56_emmc.c   | 26 +++++++++++++++++---------
 arch/arm/src/cxd56xx/cxd56_emmc.h   |  2 +-
 arch/arm/src/cxd56xx/cxd56_serial.c |  2 +-
 4 files changed, 21 insertions(+), 11 deletions(-)


[nuttx] 03/04: arch: cxd56xx: Disable SubCore to use DMA

Posted by xi...@apache.org.
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 57ca5c040127a90ff648ed517051c162d305fa49
Author: SPRESENSE <41...@users.noreply.github.com>
AuthorDate: Tue Jan 24 12:33:56 2023 +0900

    arch: cxd56xx: Disable SubCore to use DMA
    
    Disable SubCore to use SPI transfer with DMA because it may be used
    by MainCore.
---
 arch/arm/src/cxd56xx/cxd56_dmac.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/arch/arm/src/cxd56xx/cxd56_dmac.c b/arch/arm/src/cxd56xx/cxd56_dmac.c
index f0a0649976..c52e495e40 100644
--- a/arch/arm/src/cxd56xx/cxd56_dmac.c
+++ b/arch/arm/src/cxd56xx/cxd56_dmac.c
@@ -731,7 +731,9 @@ void weak_function arm_dma_initialize(void)
   for (i = 0; i < NCHANNELS; i++)
     {
       g_dmach[i].chan = i;
+#ifndef CONFIG_CXD56_SUBCORE
       up_enable_irq(irq_map[i]);
+#endif
     }
 }
 


[nuttx] 04/04: arch: cxd56xx: Fix emmc pin control on initialization error

Posted by xi...@apache.org.
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 b576a26d51cc5cf0c6af9a3c73e342f1d8254254
Author: SPRESENSE <41...@users.noreply.github.com>
AuthorDate: Tue Feb 14 19:22:09 2023 +0900

    arch: cxd56xx: Fix emmc pin control on initialization error
    
    Fix emmc pin control on initialization error.
---
 arch/arm/src/cxd56xx/cxd56_emmc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/src/cxd56xx/cxd56_emmc.c b/arch/arm/src/cxd56xx/cxd56_emmc.c
index 8cf697a15b..abea9af0ec 100644
--- a/arch/arm/src/cxd56xx/cxd56_emmc.c
+++ b/arch/arm/src/cxd56xx/cxd56_emmc.c
@@ -673,7 +673,7 @@ static int emmc_hwinitialize(void)
 
 errout:
   up_disable_irq(CXD56_IRQ_EMMC);
-  emmc_pincontrol(true);
+  emmc_pincontrol(false);
   cxd56_emmc_clock_disable();
 
   return ret;


[nuttx] 02/04: arch: cxd56xx: Fix a warning in cxd56_serial.c

Posted by xi...@apache.org.
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 134424da18f14bdbb6e7482c56e825abe666100f
Author: SPRESENSE <41...@users.noreply.github.com>
AuthorDate: Mon Nov 28 21:59:05 2022 +0900

    arch: cxd56xx: Fix a warning in cxd56_serial.c
    
    Fix a warning by -Wunused-function when CONFIG_UART2_SERIAL_CONSOLE=y.
---
 arch/arm/src/cxd56xx/cxd56_serial.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/src/cxd56xx/cxd56_serial.c b/arch/arm/src/cxd56xx/cxd56_serial.c
index 3d0a917733..d96a15d7bf 100644
--- a/arch/arm/src/cxd56xx/cxd56_serial.c
+++ b/arch/arm/src/cxd56xx/cxd56_serial.c
@@ -336,7 +336,7 @@ static inline void up_enablebreaks(struct up_dev_s *priv, bool enable)
  * Name: cxd56_serial2_pm_event
  ****************************************************************************/
 
-#ifdef CONFIG_CXD56_UART2
+#if defined(CONFIG_CXD56_UART2) && !defined(CONFIG_UART2_SERIAL_CONSOLE)
 static int cxd56_serial2_pm_event(uint8_t id)
 {
   struct up_dev_s *priv = (struct up_dev_s *)&g_uart2priv;


[nuttx] 01/04: arch: cxd56xx: Fix eMMC uninitialize function

Posted by xi...@apache.org.
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 700610e625f2bba3a322057fb099da3559042818
Author: SPRESENSE <41...@users.noreply.github.com>
AuthorDate: Tue Nov 22 11:55:56 2022 +0900

    arch: cxd56xx: Fix eMMC uninitialize function
    
    - Fix prototype function with prefix of cxd56.
    - Add logic to unregister blockdriver.
    - Minor fix nxstyle.
---
 arch/arm/src/cxd56xx/cxd56_emmc.c | 24 ++++++++++++++++--------
 arch/arm/src/cxd56xx/cxd56_emmc.h |  2 +-
 2 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/arch/arm/src/cxd56xx/cxd56_emmc.c b/arch/arm/src/cxd56xx/cxd56_emmc.c
index 4d56aa040f..8cf697a15b 100644
--- a/arch/arm/src/cxd56xx/cxd56_emmc.c
+++ b/arch/arm/src/cxd56xx/cxd56_emmc.c
@@ -932,6 +932,10 @@ static int cxd56_emmc_geometry(struct inode *inode,
   return OK;
 }
 
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
 int cxd56_emmcinitialize(void)
 {
   struct cxd56_emmc_state_s *priv = &g_emmcdev;
@@ -967,21 +971,25 @@ int cxd56_emmcinitialize(void)
     }
 
   ret = register_blockdriver("/dev/emmc0", &g_bops, 0, priv);
-  if (ret)
+  if (ret < 0)
     {
       ferr("register_blockdriver failed: %d\n", -ret);
-      return ret;
     }
 
-  return OK;
+  return ret;
 }
 
-/****************************************************************************
- * Public Functions
- ****************************************************************************/
-
-int emmc_uninitialize(void)
+int cxd56_emmcuninitialize(void)
 {
+  int ret;
+
+  ret = unregister_blockdriver("/dev/emmc0");
+  if (ret < 0)
+    {
+      ferr("unregister_blockdriver failed: %d\n", -ret);
+      return ret;
+    }
+
   /* Send power off command */
 
   emmc_switchcmd(EXTCSD_PON, EXTCSD_PON_POWERED_OFF_LONG);
diff --git a/arch/arm/src/cxd56xx/cxd56_emmc.h b/arch/arm/src/cxd56xx/cxd56_emmc.h
index 91f3211e43..5dcd35cee2 100644
--- a/arch/arm/src/cxd56xx/cxd56_emmc.h
+++ b/arch/arm/src/cxd56xx/cxd56_emmc.h
@@ -43,7 +43,7 @@ extern "C"
  ****************************************************************************/
 
 int cxd56_emmcinitialize(void);
-void cxd56_emmcuninitialize(void);
+int cxd56_emmcuninitialize(void);
 
 #undef EXTERN
 #ifdef __cplusplus