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 2021/07/04 05:36:13 UTC
[incubator-nuttx] branch master updated (12fb49d -> b3389cf)
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/incubator-nuttx.git.
from 12fb49d boards: cxd56xx: Fix warning of cxd56 audio driver
new cb6ad9d arch: cxd56xx: Fix getting stuck by nested spinlock in serial
new 4364a29 arch: cxd56xx: Use arm_arch.h instead of up_arch.h
new 75b6a26 arch: cxd56xx: Rename to nxsem_set_protocol
new 845da34 arch: cxd56xx: Fix compile warning
new fa12fe9 arch: cxd56x: scu: Fix some printf format warnings
new 6a2733d arch: cxd56x: emmc: Minor fix undefined configuration name
new cd06fc9 arch: cxd56x: sdhci: Minor fix configuration name
new d29db87 arch: cxd56xx: Add eMMC configuration for vendor-specific commands
new 618661d arch: cxd56xx: Fix compile error when CONFIG_LIBM is disabled
new 5c26d68 arch: cxd56x: Add a configuration for PMIC interrupts
new 4738f69 arch: cxd56x: pmic: Fix a compile error
new 7af6b39 arch: cxd56x: Add Kconfig for power management debug output
new b3389cf arch: cxd56x: Add support for power management debug output
The 13 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/include/cxd56xx/pm.h | 3 +-
arch/arm/src/cxd56xx/Kconfig | 52 ++++++++++++++++++
arch/arm/src/cxd56xx/cxd56_charger.c | 7 +--
arch/arm/src/cxd56xx/cxd56_clock.c | 82 +++++++++++++++-------------
arch/arm/src/cxd56xx/cxd56_cpu1signal.c | 2 +-
arch/arm/src/cxd56xx/cxd56_emmc.c | 6 +-
arch/arm/src/cxd56xx/cxd56_hostif.c | 4 +-
arch/arm/src/cxd56xx/cxd56_pmic.c | 2 +-
arch/arm/src/cxd56xx/cxd56_powermgr.c | 22 +++++---
arch/arm/src/cxd56xx/cxd56_powermgr_procfs.c | 52 ++++++++++--------
arch/arm/src/cxd56xx/cxd56_scu.c | 11 ++--
arch/arm/src/cxd56xx/cxd56_sdhci.c | 2 +-
arch/arm/src/cxd56xx/cxd56_serial.c | 4 +-
arch/arm/src/cxd56xx/hardware/cxd56_emmc.h | 3 +
14 files changed, 166 insertions(+), 86 deletions(-)
[incubator-nuttx] 06/13: arch: cxd56x: emmc: Minor fix undefined
configuration name
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/incubator-nuttx.git
commit 6a2733dd05253d152d0f6a05abd48a20d843ef67
Author: SPRESENSE <41...@users.noreply.github.com>
AuthorDate: Sun Jul 4 12:53:22 2021 +0900
arch: cxd56x: emmc: Minor fix undefined configuration name
Replace obsolete CONFIG_DEBUG_VERBOSE to CONFIG_DEBUG_FS_INFO.
---
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 29271be..b1430ab 100644
--- a/arch/arm/src/cxd56xx/cxd56_emmc.c
+++ b/arch/arm/src/cxd56xx/cxd56_emmc.c
@@ -324,7 +324,7 @@ static struct emmc_dma_desc_s *emmc_setupdma(void *buf, unsigned int nbytes)
descs[ndescs - 1].ctrl |= EMMC_IDMAC_DES0_LD;
descs[ndescs - 1].next = 0;
-#ifdef CONFIG_DEBUG_VERBOSE
+#ifdef CONFIG_DEBUG_FS_INFO
for (i = 0, d = descs; i < ndescs; i++, d++)
{
finfo("desc %p = ctrl 0x%x, size 0x%x, addr 0x%x, next 0x%x\n",
[incubator-nuttx] 03/13: arch: cxd56xx: Rename to nxsem_set_protocol
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/incubator-nuttx.git
commit 75b6a260e03524dcc29eafba1a72dd13b73c6849
Author: SPRESENSE <41...@users.noreply.github.com>
AuthorDate: Thu Jun 17 19:12:19 2021 +0900
arch: cxd56xx: Rename to nxsem_set_protocol
nxsem_setprotocol function name was changed to nxsem_set_protocol.
Replace and fix hostif compile error.
---
arch/arm/src/cxd56xx/cxd56_hostif.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/src/cxd56xx/cxd56_hostif.c b/arch/arm/src/cxd56xx/cxd56_hostif.c
index 1facd6c..1dac5b1 100644
--- a/arch/arm/src/cxd56xx/cxd56_hostif.c
+++ b/arch/arm/src/cxd56xx/cxd56_hostif.c
@@ -440,7 +440,7 @@ static int hif_initialize(struct hostif_buff_s *buffer)
cxd56_iccinit(CXD56_PROTO_HOSTIF);
nxsem_init(&drv->sync, 0, 0);
- nxsem_setprotocol(&drv->sync, SEM_PRIO_NONE);
+ nxsem_set_protocol(&drv->sync, SEM_PRIO_NONE);
ret = cxd56_iccregisterhandler(CXD56_PROTO_HOSTIF, hif_rxhandler, NULL);
[incubator-nuttx] 09/13: arch: cxd56xx: Fix compile error when
CONFIG_LIBM is disabled
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/incubator-nuttx.git
commit 618661df931b50e8f848e9e2f7b5774e74f1f9ca
Author: SPRESENSE <41...@users.noreply.github.com>
AuthorDate: Sun Jul 4 12:54:28 2021 +0900
arch: cxd56xx: Fix compile error when CONFIG_LIBM is disabled
It is no longer necessary to define CONFIG_ARCH_MATH_H when we would
like to link libm.a other than nuttx math library. So, this commit
removes the error condition.
---
arch/arm/src/cxd56xx/cxd56_charger.c | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/arch/arm/src/cxd56xx/cxd56_charger.c b/arch/arm/src/cxd56xx/cxd56_charger.c
index 4cb7a07..1bd3970 100644
--- a/arch/arm/src/cxd56xx/cxd56_charger.c
+++ b/arch/arm/src/cxd56xx/cxd56_charger.c
@@ -62,13 +62,8 @@
/* Configuration */
-#undef USE_FLOAT_CONVERSION
-
#ifdef CONFIG_CXD56_CHARGER_TEMP_PRECISE
-#if !defined(CONFIG_LIBM) && !defined(CONFIG_ARCH_MATH_H)
-# error Temperature conversion in float requires math library.
-#endif
-#define USE_FLOAT_CONVERSION 1
+# define USE_FLOAT_CONVERSION
#endif
/****************************************************************************
[incubator-nuttx] 01/13: arch: cxd56xx: Fix getting stuck by nested
spinlock in serial
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/incubator-nuttx.git
commit cb6ad9dfbd98c407c17aafcb7a1beb9b7e41d8c1
Author: SPRESENSE <41...@users.noreply.github.com>
AuthorDate: Sun Jul 4 12:51:53 2021 +0900
arch: cxd56xx: Fix getting stuck by nested spinlock in serial
Fix an issue the serial console gets stuck in SMP caused by nested
spin_lock_irqsave.
---
arch/arm/src/cxd56xx/cxd56_serial.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm/src/cxd56xx/cxd56_serial.c b/arch/arm/src/cxd56xx/cxd56_serial.c
index 4f62145f..5ece1db 100644
--- a/arch/arm/src/cxd56xx/cxd56_serial.c
+++ b/arch/arm/src/cxd56xx/cxd56_serial.c
@@ -862,11 +862,11 @@ static int up_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
#endif
priv->baud = cfgetispeed(termiosp);
+ spin_unlock_irqrestore(&priv->lock, flags);
+
/* Configure the UART line format and speed. */
up_set_format(dev);
-
- spin_unlock_irqrestore(&priv->lock, flags);
}
break;
#endif
[incubator-nuttx] 08/13: arch: cxd56xx: Add eMMC configuration for
vendor-specific commands
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/incubator-nuttx.git
commit d29db87bdcc832114d8c5c6cacf00c751a9f1695
Author: SPRESENSE <41...@users.noreply.github.com>
AuthorDate: Sun Jul 4 12:54:12 2021 +0900
arch: cxd56xx: Add eMMC configuration for vendor-specific commands
The eMMC driver for cxd56xx has been implemented a vendor-specific command
for Toshiba eMMC device, and so add a new configuration to enable the code.
---
arch/arm/src/cxd56xx/Kconfig | 10 ++++++++++
arch/arm/src/cxd56xx/cxd56_emmc.c | 4 ++++
arch/arm/src/cxd56xx/hardware/cxd56_emmc.h | 3 +++
3 files changed, 17 insertions(+)
diff --git a/arch/arm/src/cxd56xx/Kconfig b/arch/arm/src/cxd56xx/Kconfig
index 58c58cc..cbd7619 100644
--- a/arch/arm/src/cxd56xx/Kconfig
+++ b/arch/arm/src/cxd56xx/Kconfig
@@ -1234,6 +1234,16 @@ config CXD56_EMMC
---help---
Emmc driver for cxd56xx chip
+if CXD56_EMMC
+
+config CXD56_EMMC_VENDOR_TOSHIBA
+ bool "Toshiba eMMC device"
+ default n
+ ---help---
+ Enable vendor-specific commands for Toshiba eMMC device.
+
+endif # CXD56_EMMC
+
endmenu
config CXD56_GE2D
diff --git a/arch/arm/src/cxd56xx/cxd56_emmc.c b/arch/arm/src/cxd56xx/cxd56_emmc.c
index b1430ab..2fd8ca1 100644
--- a/arch/arm/src/cxd56xx/cxd56_emmc.c
+++ b/arch/arm/src/cxd56xx/cxd56_emmc.c
@@ -668,11 +668,15 @@ static int emmc_hwinitialize(void)
emmc_changeclock(EMMC_CLKDIV_NON_DIV);
+#ifdef CONFIG_CXD56_EMMC_VENDOR_TOSHIBA
+ /* Vendor-specific command */
+
ret = emmc_switchcmd(EXTCSD_PON, EXTCSD_PON_POWERED_ON);
if (ret)
{
goto errout;
}
+#endif
return OK;
diff --git a/arch/arm/src/cxd56xx/hardware/cxd56_emmc.h b/arch/arm/src/cxd56xx/hardware/cxd56_emmc.h
index b310ed3..a5e2e49 100644
--- a/arch/arm/src/cxd56xx/hardware/cxd56_emmc.h
+++ b/arch/arm/src/cxd56xx/hardware/cxd56_emmc.h
@@ -324,6 +324,9 @@
#define EXTCSD_BUS_WIDTH (183u)
#define EXTCSD_BUS_WIDTH_4BIT_SDR (0x01u)
#define EXTCSD_BUS_WIDTH_4BIT_DDR (0x05u)
+
+/* Vendor-specific Extended CSD */
+
#define EXTCSD_PON (34u) /* Power Off Notification */
#define EXTCSD_PON_POWERED_ON (0x01u)
#define EXTCSD_PON_POWERED_OFF_LONG (0x03u)
[incubator-nuttx] 13/13: arch: cxd56x: Add support for power
management debug output
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/incubator-nuttx.git
commit b3389cf751a1254e274135cbed4797c41cdc0fac
Author: SPRESENSE <41...@users.noreply.github.com>
AuthorDate: Sun Jul 4 12:55:27 2021 +0900
arch: cxd56x: Add support for power management debug output
Add support for power management debug output.
---
arch/arm/include/cxd56xx/pm.h | 3 +-
arch/arm/src/cxd56xx/cxd56_clock.c | 82 +++++++++++++++-------------
arch/arm/src/cxd56xx/cxd56_powermgr.c | 22 +++++---
arch/arm/src/cxd56xx/cxd56_powermgr_procfs.c | 52 ++++++++++--------
4 files changed, 92 insertions(+), 67 deletions(-)
diff --git a/arch/arm/include/cxd56xx/pm.h b/arch/arm/include/cxd56xx/pm.h
index fe3ab71..40506db 100644
--- a/arch/arm/include/cxd56xx/pm.h
+++ b/arch/arm/include/cxd56xx/pm.h
@@ -25,6 +25,7 @@
* Included Files
****************************************************************************/
+#include <nuttx/config.h>
#include <queue.h>
/****************************************************************************
@@ -161,7 +162,7 @@ extern "C"
int up_pmramctrl(int cmd, uintptr_t addr, size_t size);
-#ifdef CONFIG_DEBUG_PM
+#ifdef CONFIG_CXD56_PM_DEBUG_INFO
/****************************************************************************
* Name: up_pmstatdump
*
diff --git a/arch/arm/src/cxd56xx/cxd56_clock.c b/arch/arm/src/cxd56xx/cxd56_clock.c
index 491dea7..7a05641 100644
--- a/arch/arm/src/cxd56xx/cxd56_clock.c
+++ b/arch/arm/src/cxd56xx/cxd56_clock.c
@@ -45,14 +45,22 @@
* Pre-processor Definitions
****************************************************************************/
-#ifdef CONFIG_DEBUG_PM
-# define pmerr(fmt, ...) logerr(fmt, ## __VA_ARGS__)
-# define pminfo(fmt, ...) loginfo(fmt, ## __VA_ARGS__)
-# define pmdbg(fmt, ...) logdebug(fmt, ## __VA_ARGS__)
+/* Debug */
+
+#ifdef CONFIG_CXD56_PM_DEBUG_ERROR
+# define pmerr(format, ...) _err(format, ##__VA_ARGS__)
+#else
+# define pmerr(x, ...)
+#endif
+#ifdef CONFIG_CXD56_PM_DEBUG_WARN
+# define pmwarn(format, ...) _warn(format, ##__VA_ARGS__)
+#else
+# define pmwarn(x, ...)
+#endif
+#ifdef CONFIG_CXD56_PM_DEBUG_INFO
+# define pminfo(format, ...) _info(format, ##__VA_ARGS__)
#else
-# define pmerr(fmt, ...)
-# define pminfo(fmt, ...)
-# define pmdbg(fmt, ...)
+# define pminfo(x, ...)
#endif
/* For enable_pwd, disable_pwd (digital domain) */
@@ -2489,8 +2497,8 @@ int up_pmramctrl(int cmd, uintptr_t addr, size_t size)
endidx = TILEALIGNIDX(TILEALIGN(addr + size));
DEBUGASSERT(startidx < 12 && endidx <= 12);
- pmdbg("%x (size: %x) [%d:%d] -> %d\n", addr, size,
- startidx, endidx, cmd);
+ pminfo("%x (size: %x) [%d:%d] -> %d\n", addr, size,
+ startidx, endidx, cmd);
/* Make controls bits for RAM power control */
@@ -2555,7 +2563,7 @@ int up_pmramctrl(int cmd, uintptr_t addr, size_t size)
return OK;
}
-#ifdef CONFIG_DEBUG_PM
+#ifdef CONFIG_CXD56_PM_DEBUG_INFO
/****************************************************************************
* Name: up_pmstatdump
*
@@ -2574,34 +2582,34 @@ void up_pmstatdump(void)
stat0 = getreg32(CXD56_TOPREG_APPDSP_RAMMODE_STAT0);
stat1 = getreg32(CXD56_TOPREG_APPDSP_RAMMODE_STAT1);
- pmdbg(" 0 1 2 3 4 5 6 7 8 9 A B\n");
- pmdbg("DSP RAM stat: %c %c %c %c %c %c %c %c %c %c %c %c\n",
- statch[(stat0 >> 0) & 3],
- statch[(stat0 >> 2) & 3],
- statch[(stat0 >> 4) & 3],
- statch[(stat0 >> 6) & 3],
- statch[(stat0 >> 8) & 3],
- statch[(stat0 >> 10) & 3],
- statch[(stat1 >> 0) & 3],
- statch[(stat1 >> 2) & 3],
- statch[(stat1 >> 4) & 3],
- statch[(stat1 >> 6) & 3],
- statch[(stat1 >> 8) & 3],
- statch[(stat1 >> 10) & 3]);
+ pminfo(" 0 1 2 3 4 5 6 7 8 9 A B\n");
+ pminfo("DSP RAM stat: %c %c %c %c %c %c %c %c %c %c %c %c\n",
+ statch[(stat0 >> 0) & 3],
+ statch[(stat0 >> 2) & 3],
+ statch[(stat0 >> 4) & 3],
+ statch[(stat0 >> 6) & 3],
+ statch[(stat0 >> 8) & 3],
+ statch[(stat0 >> 10) & 3],
+ statch[(stat1 >> 0) & 3],
+ statch[(stat1 >> 2) & 3],
+ statch[(stat1 >> 4) & 3],
+ statch[(stat1 >> 6) & 3],
+ statch[(stat1 >> 8) & 3],
+ statch[(stat1 >> 10) & 3]);
stat0 = getreg32(CXD56_CRG_APP_TILE_CLK_GATING_ENB);
- pmdbg("Clock gating: %c %c %c %c %c %c %c %c %c %c %c %c\n",
- gatech[(stat0 >> 0) & 1],
- gatech[(stat0 >> 1) & 1],
- gatech[(stat0 >> 2) & 1],
- gatech[(stat0 >> 3) & 1],
- gatech[(stat0 >> 4) & 1],
- gatech[(stat0 >> 5) & 1],
- gatech[(stat0 >> 6) & 1],
- gatech[(stat0 >> 7) & 1],
- gatech[(stat0 >> 8) & 1],
- gatech[(stat0 >> 9) & 1],
- gatech[(stat0 >> 10) & 1],
- gatech[(stat0 >> 11) & 1]);
+ pminfo("Clock gating: %c %c %c %c %c %c %c %c %c %c %c %c\n",
+ gatech[(stat0 >> 0) & 1],
+ gatech[(stat0 >> 1) & 1],
+ gatech[(stat0 >> 2) & 1],
+ gatech[(stat0 >> 3) & 1],
+ gatech[(stat0 >> 4) & 1],
+ gatech[(stat0 >> 5) & 1],
+ gatech[(stat0 >> 6) & 1],
+ gatech[(stat0 >> 7) & 1],
+ gatech[(stat0 >> 8) & 1],
+ gatech[(stat0 >> 9) & 1],
+ gatech[(stat0 >> 10) & 1],
+ gatech[(stat0 >> 11) & 1]);
}
#endif
diff --git a/arch/arm/src/cxd56xx/cxd56_powermgr.c b/arch/arm/src/cxd56xx/cxd56_powermgr.c
index c27d6a6..2c71c4a 100644
--- a/arch/arm/src/cxd56xx/cxd56_powermgr.c
+++ b/arch/arm/src/cxd56xx/cxd56_powermgr.c
@@ -84,14 +84,22 @@
#define PM_CPUFREQLOCK_FLAG_INITIALIZED (0x8000)
-#ifdef CONFIG_CXD56_PM_DEBUG
-# define pmerr(format, ...) _err(format, ##__VA_ARGS__)
-# define pmwarn(format, ...) _warn(format, ##__VA_ARGS__)
-# define pminfo(format, ...) _info(format, ##__VA_ARGS__)
+/* Debug */
+
+#ifdef CONFIG_CXD56_PM_DEBUG_ERROR
+# define pmerr(format, ...) _err(format, ##__VA_ARGS__)
+#else
+# define pmerr(x, ...)
+#endif
+#ifdef CONFIG_CXD56_PM_DEBUG_WARN
+# define pmwarn(format, ...) _warn(format, ##__VA_ARGS__)
+#else
+# define pmwarn(x, ...)
+#endif
+#ifdef CONFIG_CXD56_PM_DEBUG_INFO
+# define pminfo(format, ...) _info(format, ##__VA_ARGS__)
#else
-# define pmerr(x...)
-# define pmwarn(x...)
-# define pminfo(x...)
+# define pminfo(x, ...)
#endif
void up_cpuctxload(void);
diff --git a/arch/arm/src/cxd56xx/cxd56_powermgr_procfs.c b/arch/arm/src/cxd56xx/cxd56_powermgr_procfs.c
index 09bdc68..6f5549a 100644
--- a/arch/arm/src/cxd56xx/cxd56_powermgr_procfs.c
+++ b/arch/arm/src/cxd56xx/cxd56_powermgr_procfs.c
@@ -46,14 +46,22 @@
* Pre-processor Definitions
****************************************************************************/
-#ifdef CONFIG_CXD56_PM_DEBUG
-# define pmerr(format, ...) _err(format, ##__VA_ARGS__)
-# define pmwarn(format, ...) _warn(format, ##__VA_ARGS__)
-# define pminfo(format, ...) _info(format, ##__VA_ARGS__)
+/* Debug */
+
+#ifdef CONFIG_CXD56_PM_DEBUG_ERROR
+# define pmerr(format, ...) _err(format, ##__VA_ARGS__)
+#else
+# define pmerr(x, ...)
+#endif
+#ifdef CONFIG_CXD56_PM_DEBUG_WARN
+# define pmwarn(format, ...) _warn(format, ##__VA_ARGS__)
+#else
+# define pmwarn(x, ...)
+#endif
+#ifdef CONFIG_CXD56_PM_DEBUG_INFO
+# define pminfo(format, ...) _info(format, ##__VA_ARGS__)
#else
-# define pmerr(x...)
-# define pmwarn(x...)
-# define pminfo(x...)
+# define pminfo(x, ...)
#endif
#define PWD_STAT(val, shift) ((val >> shift) & 0x1)
@@ -280,21 +288,21 @@ static void cxd56_powermgr_procfs_clock(void)
len = snprintf(g_powermg_procfs_buffer + g_powermg_procfs_len,
g_powermg_procfs_size - g_powermg_procfs_len,
"Clock Status [Hz]\n"
- " |-RTC : %9d"" |-APP : %9d\n"
- " |-RCOSC : %9d"" ||-DSP0 : %9d\n"
- " |-XOSC : %9d"" ||-DSP1 : %9d\n"
- " |-SYSPLL : %9d"" ||-DSP2 : %9d\n"
- " |-M0P : %9d"" ||-DSP3 : %9d\n"
- " ||-AHB : %9d"" ||-DSP4 : %9d\n"
- " | |-APB : %9d"" ||-DSP5 : %9d\n"
- " |-UART1 : %9d"" ||-UART2 : %9d\n"
- " |-SFC : %9d"" ||-SPI4 : %9d\n"
- " |-SCU : %9d"" ||-SPI5 : %9d\n"
- " ||-LPADC : %9d"" ||-USB : %9d\n"
- " ||-HPADC : %9d"" ||-EMMC : %9d\n"
- " |-I2C4 : %9d"" ||-SDIO : %9d\n"
- " |-GPS : %9d"" ||-VSYNC : %9d\n"
- " ||-AHB : %9d\n",
+ " |-RTC : %9ld"" |-APP : %9ld\n"
+ " |-RCOSC : %9ld"" ||-DSP0 : %9ld\n"
+ " |-XOSC : %9ld"" ||-DSP1 : %9ld\n"
+ " |-SYSPLL : %9ld"" ||-DSP2 : %9ld\n"
+ " |-M0P : %9ld"" ||-DSP3 : %9ld\n"
+ " ||-AHB : %9ld"" ||-DSP4 : %9ld\n"
+ " | |-APB : %9ld"" ||-DSP5 : %9ld\n"
+ " |-UART1 : %9ld"" ||-UART2 : %9ld\n"
+ " |-SFC : %9ld"" ||-SPI4 : %9ld\n"
+ " |-SCU : %9ld"" ||-SPI5 : %9ld\n"
+ " ||-LPADC : %9ld"" ||-USB : %9ld\n"
+ " ||-HPADC : %9ld"" ||-EMMC : %9ld\n"
+ " |-I2C4 : %9ld"" ||-SDIO : %9ld\n"
+ " |-GPS : %9ld"" ||-VSYNC : %9ld\n"
+ " ||-AHB : %9ld\n",
cxd56_get_rtc_clock(), cxd56_get_appsmp_baseclock(),
cxd56_get_rcosc_clock(), dsptabl[0],
cxd56_get_xosc_clock(), dsptabl[1],
[incubator-nuttx] 07/13: arch: cxd56x: sdhci: Minor fix
configuration name
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/incubator-nuttx.git
commit cd06fc97615e00085a83420e5cf465d814c8576e
Author: SPRESENSE <41...@users.noreply.github.com>
AuthorDate: Sun Jul 4 12:53:40 2021 +0900
arch: cxd56x: sdhci: Minor fix configuration name
Modify the referenced CONFIG to CONFIG_DEBUG_MEMCARD_INFO.
---
arch/arm/src/cxd56xx/cxd56_sdhci.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/src/cxd56xx/cxd56_sdhci.c b/arch/arm/src/cxd56xx/cxd56_sdhci.c
index 4f46564..c736c3d 100644
--- a/arch/arm/src/cxd56xx/cxd56_sdhci.c
+++ b/arch/arm/src/cxd56xx/cxd56_sdhci.c
@@ -80,7 +80,7 @@
# define CONFIG_CXD56_SDHCI_DMAPRIO DMA_CCR_PRIMED
#endif
-#if !defined(CONFIG_DEBUG_FS) || !defined(CONFIG_DEBUG_VERBOSE)
+#ifndef CONFIG_DEBUG_MEMCARD_INFO
# undef CONFIG_SDIO_XFRDEBUG
#endif
[incubator-nuttx] 11/13: arch: cxd56x: pmic: Fix a compile 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/incubator-nuttx.git
commit 4738f69569a06ff58aa52c8fc662367cc08b8075
Author: SPRESENSE <41...@users.noreply.github.com>
AuthorDate: Sun Jul 4 12:55:00 2021 +0900
arch: cxd56x: pmic: Fix a compile error
Replace undefined logerr to _err function.
---
arch/arm/src/cxd56xx/cxd56_pmic.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/src/cxd56xx/cxd56_pmic.c b/arch/arm/src/cxd56xx/cxd56_pmic.c
index 54f5f03..d6d1d83 100644
--- a/arch/arm/src/cxd56xx/cxd56_pmic.c
+++ b/arch/arm/src/cxd56xx/cxd56_pmic.c
@@ -246,7 +246,7 @@ static int pmic_int_handler(int irq, void *context, void *arg)
ret = work_queue(LPWORK, &g_irqwork, pmic_int_worker, NULL, 0);
if (ret < 0)
{
- logerr("ERROR: work_queue failed: %d\n", ret);
+ _err("ERROR: work_queue failed: %d\n", ret);
}
/* Disable any further pmic interrupts */
[incubator-nuttx] 10/13: arch: cxd56x: Add a configuration for PMIC
interrupts
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/incubator-nuttx.git
commit 5c26d68f3124f969f58a86f3ab526bab2ca7111b
Author: SPRESENSE <41...@users.noreply.github.com>
AuthorDate: Sun Jul 4 12:54:45 2021 +0900
arch: cxd56x: Add a configuration for PMIC interrupts
Add a configuration for PMIC interrupts to Kconfig.
---
arch/arm/src/cxd56xx/Kconfig | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/arch/arm/src/cxd56xx/Kconfig b/arch/arm/src/cxd56xx/Kconfig
index cbd7619..0b0ae92 100644
--- a/arch/arm/src/cxd56xx/Kconfig
+++ b/arch/arm/src/cxd56xx/Kconfig
@@ -75,6 +75,17 @@ config CXD56_PMIC
default y if CXD56_MAINCORE
default n if CXD56_SUBCORE
+if CXD56_PMIC
+
+config CXD56_PMIC_INT
+ bool "PMIC interrupt"
+ default n
+ depends on SCHED_LPWORK
+ ---help---
+ Enable PMIC interrupt.
+
+endif
+
config CXD56_CPUFIFO
bool
default y
[incubator-nuttx] 02/13: arch: cxd56xx: Use arm_arch.h instead of
up_arch.h
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/incubator-nuttx.git
commit 4364a291f048dae5b1e90dbf874da7e23743901a
Author: SPRESENSE <41...@users.noreply.github.com>
AuthorDate: Sun Jul 4 12:52:14 2021 +0900
arch: cxd56xx: Use arm_arch.h instead of up_arch.h
Use arm_arch.h instead of up_arch.h and fix hostif compile error.
---
arch/arm/src/cxd56xx/cxd56_hostif.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/src/cxd56xx/cxd56_hostif.c b/arch/arm/src/cxd56xx/cxd56_hostif.c
index bf6c624..1facd6c 100644
--- a/arch/arm/src/cxd56xx/cxd56_hostif.c
+++ b/arch/arm/src/cxd56xx/cxd56_hostif.c
@@ -39,7 +39,7 @@
#include <arch/chip/hostif.h>
#include "chip.h"
-#include "up_arch.h"
+#include "arm_arch.h"
#include "cxd56_clock.h"
#include "cxd56_pinconfig.h"
[incubator-nuttx] 04/13: arch: cxd56xx: Fix compile warning
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/incubator-nuttx.git
commit 845da344fdaa3b64dc21b8f5cc164b4c9ca2747b
Author: SPRESENSE <41...@users.noreply.github.com>
AuthorDate: Sun Jul 4 12:52:49 2021 +0900
arch: cxd56xx: Fix compile warning
Fix warning by -Wimplicit-function-declaration
---
arch/arm/src/cxd56xx/cxd56_cpu1signal.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/src/cxd56xx/cxd56_cpu1signal.c b/arch/arm/src/cxd56xx/cxd56_cpu1signal.c
index 42b775b..1dcccc6 100644
--- a/arch/arm/src/cxd56xx/cxd56_cpu1signal.c
+++ b/arch/arm/src/cxd56xx/cxd56_cpu1signal.c
@@ -26,7 +26,7 @@
#include <stdlib.h>
#include <errno.h>
#include <sched.h>
-#include <pthread.h>
+#include <nuttx/kthread.h>
#include <debug.h>
#include "cxd56_icc.h"
[incubator-nuttx] 12/13: arch: cxd56x: Add Kconfig for power
management debug output
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/incubator-nuttx.git
commit 7af6b394dee1641cd3c7932d97815b1078393f9f
Author: SPRESENSE <41...@users.noreply.github.com>
AuthorDate: Sun Jul 4 12:55:16 2021 +0900
arch: cxd56x: Add Kconfig for power management debug output
Add configurations for power management debug output to Kconfig.
---
arch/arm/src/cxd56xx/Kconfig | 31 +++++++++++++++++++++++++++++++
1 file changed, 31 insertions(+)
diff --git a/arch/arm/src/cxd56xx/Kconfig b/arch/arm/src/cxd56xx/Kconfig
index 0b0ae92..c168c3e 100644
--- a/arch/arm/src/cxd56xx/Kconfig
+++ b/arch/arm/src/cxd56xx/Kconfig
@@ -235,6 +235,37 @@ config CXD56_PM_PROCFS
---help---
Enable the power domain status or the clock frequency monitor.
+config CXD56_PM_DEBUG
+ bool "Power Management Debug Features"
+ default n
+ ---help---
+ Enable power management debug features.
+
+if CXD56_PM_DEBUG
+
+config CXD56_PM_DEBUG_ERROR
+ bool "Power Management Error Output"
+ default n
+ depends on DEBUG_ERROR
+ ---help---
+ Enable power management error output to SYSLOG.
+
+config CXD56_PM_DEBUG_WARN
+ bool "Power Management Warnings Output"
+ default n
+ depends on DEBUG_WARN
+ ---help---
+ Enable power management warning output to SYSLOG.
+
+config CXD56_PM_DEBUG_INFO
+ bool "Power Management Informational Output"
+ default n
+ depends on DEBUG_INFO
+ ---help---
+ Enable power management informational output to SYSLOG.
+
+endif # CXD56_PM_DEBUG
+
endif # CXD56_PM
config CXD56_GAUGE
[incubator-nuttx] 05/13: arch: cxd56x: scu: Fix some printf format
warnings
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/incubator-nuttx.git
commit fa12fe9df10af2e84fcd50821f050593233d53b4
Author: SPRESENSE <41...@users.noreply.github.com>
AuthorDate: Sun Jul 4 12:53:08 2021 +0900
arch: cxd56x: scu: Fix some printf format warnings
Fix some printf format warnings by -Wformat.
---
arch/arm/src/cxd56xx/cxd56_scu.c | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/arch/arm/src/cxd56xx/cxd56_scu.c b/arch/arm/src/cxd56xx/cxd56_scu.c
index a555029..12f4e3a 100644
--- a/arch/arm/src/cxd56xx/cxd56_scu.c
+++ b/arch/arm/src/cxd56xx/cxd56_scu.c
@@ -28,6 +28,7 @@
#include <nuttx/signal.h>
#include <nuttx/semaphore.h>
+#include <inttypes.h>
#include <stdio.h>
#include <stdint.h>
#include <stdbool.h>
@@ -1689,7 +1690,7 @@ static int seq_scuirqhandler(int irq, FAR void *context, FAR void *arg)
if (ierr0 != 0)
{
- scuerr("err0: %08x\n", ierr0);
+ scuerr("err0: %08" PRIx32 "\n", ierr0);
ierr0 = (ierr0 >> 9) & 0x3fff;
for (i = 0; i < 14; i++)
{
@@ -1711,7 +1712,7 @@ static int seq_scuirqhandler(int irq, FAR void *context, FAR void *arg)
if (ierr1 != 0)
{
- scuerr("err1: %08x\n", ierr1);
+ scuerr("err1: %08" PRIx32 "\n", ierr1);
ierr1 = (ierr1 >> 9) & 0x3fff;
for (i = 0; i < 14; i++)
{
@@ -1729,7 +1730,7 @@ static int seq_scuirqhandler(int irq, FAR void *context, FAR void *arg)
if (ierr2 != 0)
{
- scuerr("err2: %08x\n", ierr2);
+ scuerr("err2: %08" PRIx32 "\n", ierr2);
for (i = 0; i < 10; i++)
{
@@ -2982,7 +2983,7 @@ int seq_read(FAR struct seq_s *seq, int fifoid, FAR char *buffer, int length)
scuinfo("Available %d samples\n", avail);
#ifdef CONFIG_CXD56_SCU_DEBUG
status = getreg32(SCUFIFO_R_STATUS1(fifo->rid));
- scuinfo("Status: %08x\n", status);
+ scuinfo("Status: %08" PRIx32 "\n", status);
#endif
avail *= seq->sample;
length = MIN(avail, length);
@@ -3134,7 +3135,7 @@ int seq_ioctl(FAR struct seq_s *seq, int fifoid, int cmd, unsigned long arg)
return -EINVAL;
}
- scuinfo("cmd = %04x, arg = %08x\n", cmd, arg);
+ scuinfo("cmd = %04x, arg = %08" PRIx32 "\n", cmd, arg);
switch (cmd)
{