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 2020/10/21 05:37:08 UTC
[incubator-nuttx] branch master updated (19f7a24 -> 271016a)
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 19f7a24 boards: sabre-6quad: Update smp/defconfig
new 17e624e freedom-k64f: Add I2C to demo image
new 271016a kinetis: Make kinetis_i2c_sem_wait_noncancelable optional
The 2 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/kinetis/kinetis_i2c.c | 6 ++++++
boards/arm/kinetis/freedom-k64f/configs/demo/defconfig | 2 ++
2 files changed, 8 insertions(+)
[incubator-nuttx] 01/02: freedom-k64f: Add I2C to demo image
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 17e624eae41ea5e3eda657b47cd1f8b74013aa0c
Author: Philippe Coval <rz...@users.sf.net>
AuthorDate: Tue Oct 20 11:36:45 2020 +0200
freedom-k64f: Add I2C to demo image
Both flag were selected manualy from menuconfig
Usage:
nsh> ls /dev/i2c0
nsh> i2c bus
BUS EXISTS?
Bus 0: YES
nsh> i2c dev 0 0x7F
0 1 2 3 4 5 6 7 8 9 a b c d e f
00: 00 -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
10: -- -- -- -- -- -- -- -- -- -- -- -- -- 1d -- --
Change-Id: I86c68753609c521af9710190397ef492ae562e38
Bug: https://github.com/apache/incubator-nuttx/pull/1999
Forwarded: # https://github.com/apache/incubator-nuttx/pull/2047
Signed-off-by: Philippe Coval <rz...@users.sf.net>
---
boards/arm/kinetis/freedom-k64f/configs/demo/defconfig | 2 ++
1 file changed, 2 insertions(+)
diff --git a/boards/arm/kinetis/freedom-k64f/configs/demo/defconfig b/boards/arm/kinetis/freedom-k64f/configs/demo/defconfig
index beee227..41f0f5c 100644
--- a/boards/arm/kinetis/freedom-k64f/configs/demo/defconfig
+++ b/boards/arm/kinetis/freedom-k64f/configs/demo/defconfig
@@ -32,6 +32,7 @@ CONFIG_KINETIS_FTM0=y
CONFIG_KINETIS_FTM0_CHANNEL=2
CONFIG_KINETIS_FTM0_PWM=y
CONFIG_KINETIS_GPIOIRQ=y
+CONFIG_KINETIS_I2C0=y
CONFIG_KINETIS_PORTEINTS=y
CONFIG_KINETIS_SDHC=y
CONFIG_KINETIS_UART0=y
@@ -59,6 +60,7 @@ CONFIG_SDCLONE_DISABLE=y
CONFIG_START_DAY=25
CONFIG_START_MONTH=3
CONFIG_START_YEAR=2013
+CONFIG_SYSTEM_I2CTOOL=y
CONFIG_SYSTEM_NSH=y
CONFIG_TASK_NAME_SIZE=0
CONFIG_UART0_SERIAL_CONSOLE=y
[incubator-nuttx] 02/02: kinetis: Make
kinetis_i2c_sem_wait_noncancelable optional
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 271016a3ade7a38787f7660b9265ce332c2e94e6
Author: Philippe Coval <rz...@users.sf.net>
AuthorDate: Tue Oct 20 20:50:52 2020 +0200
kinetis: Make kinetis_i2c_sem_wait_noncancelable optional
CONFIG_I2C_RESET is coming from imxrt_lpi2c.c
Change-Id: I8f55eaf793386fe5ac1d4adaf310d6e0f08dcd92
Bug: https://github.com/apache/incubator-nuttx/pull/1999
Forwarded: https://github.com/apache/incubator-nuttx/pulls/rzr
Signed-off-by: Philippe Coval <rz...@users.sf.net>
---
arch/arm/src/kinetis/kinetis_i2c.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/arch/arm/src/kinetis/kinetis_i2c.c b/arch/arm/src/kinetis/kinetis_i2c.c
index 0abf9d6..fe3806d 100644
--- a/arch/arm/src/kinetis/kinetis_i2c.c
+++ b/arch/arm/src/kinetis/kinetis_i2c.c
@@ -152,8 +152,12 @@ static inline void kinetis_i2c_sem_init(FAR struct kinetis_i2cdev_s *priv);
static inline void
kinetis_i2c_sem_destroy(FAR struct kinetis_i2cdev_s *priv);
static inline int kinetis_i2c_sem_wait(FAR struct kinetis_i2cdev_s *priv);
+
+#ifdef CONFIG_I2C_RESET
static int
kinetis_i2c_sem_wait_noncancelable(FAR struct kinetis_i2cdev_s *priv);
+#endif
+
static inline void kinetis_i2c_sem_post(struct kinetis_i2cdev_s *priv);
/* Signal Helper */
@@ -363,6 +367,7 @@ static inline int kinetis_i2c_sem_wait(FAR struct kinetis_i2cdev_s *priv)
return nxsem_wait(&priv->mutex);
}
+#ifdef CONFIG_I2C_RESET
/****************************************************************************
* Name: kinetis_i2c_sem_wait_noncancelable
*
@@ -376,6 +381,7 @@ static int
{
return nxsem_wait_uninterruptible(&priv->mutex);
}
+#endif
/****************************************************************************
* Name: kinetis_i2c_sem_post