You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mynewt.apache.org by GitBox <gi...@apache.org> on 2018/11/20 21:17:32 UTC
[GitHub] ccollins476ad closed pull request #1525: Adding 380kHz i2c
frequency for nrf52840
ccollins476ad closed pull request #1525: Adding 380kHz i2c frequency for nrf52840
URL: https://github.com/apache/mynewt-core/pull/1525
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/hw/mcu/nordic/nrf52xxx/src/hal_i2c.c b/hw/mcu/nordic/nrf52xxx/src/hal_i2c.c
index b925394a3a..d242bc54e2 100644
--- a/hw/mcu/nordic/nrf52xxx/src/hal_i2c.c
+++ b/hw/mcu/nordic/nrf52xxx/src/hal_i2c.c
@@ -280,6 +280,9 @@ hal_i2c_init(uint8_t i2c_num, void *usercfg)
case 250:
freq = TWI_FREQUENCY_FREQUENCY_K250;
break;
+ case 380:
+ freq = TWI_FREQUENCY_FREQUENCY_K380;
+ break;
case 400:
freq = TWI_FREQUENCY_FREQUENCY_K400;
break;
diff --git a/hw/mcu/nordic/src/ext/nrfx/mdk/nrf52840_bitfields.h b/hw/mcu/nordic/src/ext/nrfx/mdk/nrf52840_bitfields.h
index 6d1990bb1e..5707d49cac 100644
--- a/hw/mcu/nordic/src/ext/nrfx/mdk/nrf52840_bitfields.h
+++ b/hw/mcu/nordic/src/ext/nrfx/mdk/nrf52840_bitfields.h
@@ -13599,6 +13599,7 @@ POSSIBILITY OF SUCH DAMAGE.
#define TWI_FREQUENCY_FREQUENCY_Msk (0xFFFFFFFFUL << TWI_FREQUENCY_FREQUENCY_Pos) /*!< Bit mask of FREQUENCY field. */
#define TWI_FREQUENCY_FREQUENCY_K100 (0x01980000UL) /*!< 100 kbps */
#define TWI_FREQUENCY_FREQUENCY_K250 (0x04000000UL) /*!< 250 kbps */
+#define TWI_FREQUENCY_FREQUENCY_K380 (0x06147ae9UL) /*!< 380 kbps */
#define TWI_FREQUENCY_FREQUENCY_K400 (0x06680000UL) /*!< 400 kbps (actual rate 410.256 kbps) */
/* Register: TWI_ADDRESS */
@@ -13956,6 +13957,7 @@ POSSIBILITY OF SUCH DAMAGE.
#define TWIM_FREQUENCY_FREQUENCY_Msk (0xFFFFFFFFUL << TWIM_FREQUENCY_FREQUENCY_Pos) /*!< Bit mask of FREQUENCY field. */
#define TWIM_FREQUENCY_FREQUENCY_K100 (0x01980000UL) /*!< 100 kbps */
#define TWIM_FREQUENCY_FREQUENCY_K250 (0x04000000UL) /*!< 250 kbps */
+#define TWIM_FREQUENCY_FREQUENCY_K380 (0x06147ae9UL) /*!< 380 kbps */
#define TWIM_FREQUENCY_FREQUENCY_K400 (0x06400000UL) /*!< 400 kbps */
/* Register: TWIM_RXD_PTR */
diff --git a/hw/mcu/nordic/src/ext/nrfx/mdk/nrf52_bitfields.h b/hw/mcu/nordic/src/ext/nrfx/mdk/nrf52_bitfields.h
index 10a59a743c..73db237656 100644
--- a/hw/mcu/nordic/src/ext/nrfx/mdk/nrf52_bitfields.h
+++ b/hw/mcu/nordic/src/ext/nrfx/mdk/nrf52_bitfields.h
@@ -11169,6 +11169,7 @@ POSSIBILITY OF SUCH DAMAGE.
#define TWI_FREQUENCY_FREQUENCY_Msk (0xFFFFFFFFUL << TWI_FREQUENCY_FREQUENCY_Pos) /*!< Bit mask of FREQUENCY field. */
#define TWI_FREQUENCY_FREQUENCY_K100 (0x01980000UL) /*!< 100 kbps */
#define TWI_FREQUENCY_FREQUENCY_K250 (0x04000000UL) /*!< 250 kbps */
+#define TWI_FREQUENCY_FREQUENCY_K380 (0x06147ae9UL) /*!< 380 kbps */
#define TWI_FREQUENCY_FREQUENCY_K400 (0x06680000UL) /*!< 400 kbps (actual rate 410.256 kbps) */
/* Register: TWI_ADDRESS */
@@ -11428,6 +11429,7 @@ POSSIBILITY OF SUCH DAMAGE.
#define TWIM_FREQUENCY_FREQUENCY_Msk (0xFFFFFFFFUL << TWIM_FREQUENCY_FREQUENCY_Pos) /*!< Bit mask of FREQUENCY field. */
#define TWIM_FREQUENCY_FREQUENCY_K100 (0x01980000UL) /*!< 100 kbps */
#define TWIM_FREQUENCY_FREQUENCY_K250 (0x04000000UL) /*!< 250 kbps */
+#define TWIM_FREQUENCY_FREQUENCY_K380 (0x06147ae9UL) /*!< 380 kbps */
#define TWIM_FREQUENCY_FREQUENCY_K400 (0x06400000UL) /*!< 400 kbps */
/* Register: TWIM_RXD_PTR */
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services