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/10/16 18:09:59 UTC
[GitHub] andrzej-kaczmarek closed pull request #1456: hw/mcu: Allow SPI_2
for MCU_NRF52832, add SPI_3 for MCU_NRF52840.
andrzej-kaczmarek closed pull request #1456: hw/mcu: Allow SPI_2 for MCU_NRF52832, add SPI_3 for MCU_NRF52840.
URL: https://github.com/apache/mynewt-core/pull/1456
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/syscfg.yml b/hw/mcu/nordic/nrf52xxx/syscfg.yml
index 379973ed31..2028a3c07c 100644
--- a/hw/mcu/nordic/nrf52xxx/syscfg.yml
+++ b/hw/mcu/nordic/nrf52xxx/syscfg.yml
@@ -147,7 +147,6 @@ syscfg.defs:
value: 0
restrictions:
- "!SPI_2_SLAVE"
- - "MCU_NRF52840"
SPI_2_MASTER_PIN_SCK:
description: 'SCK pin for SPI_2_MASTER'
value: ''
@@ -163,7 +162,6 @@ syscfg.defs:
value: 0
restrictions:
- "!SPI_2_MASTER"
- - "MCU_NRF52840"
SPI_2_SLAVE_PIN_SCK:
description: 'SCK pin for SPI_2_SLAVE'
value: ''
@@ -177,6 +175,41 @@ syscfg.defs:
description: 'SS pin for SPI_2_SLAVE'
value: ''
+ SPI_3_MASTER:
+ description: 'Enable nRF52xxx SPI Master 3'
+ value: 0
+ restrictions:
+ - "!SPI_3_SLAVE"
+ - "MCU_NRF52840"
+ SPI_3_MASTER_PIN_SCK:
+ description: 'SCK pin for SPI_3_MASTER'
+ value: ''
+ SPI_3_MASTER_PIN_MOSI:
+ description: 'MOSI pin for SPI_3_MASTER'
+ value: ''
+ SPI_3_MASTER_PIN_MISO:
+ description: 'MISO pin for SPI_3_MASTER'
+ value: ''
+
+ SPI_3_SLAVE:
+ description: 'Enable nRF52xxx SPI Slave 3'
+ value: 0
+ restrictions:
+ - "!SPI_3_MASTER"
+ - "MCU_NRF52840"
+ SPI_3_SLAVE_PIN_SCK:
+ description: 'SCK pin for SPI_3_SLAVE'
+ value: ''
+ SPI_3_SLAVE_PIN_MOSI:
+ description: 'MOSI pin for SPI_3_SLAVE'
+ value: ''
+ SPI_3_SLAVE_PIN_MISO:
+ description: 'MISO pin for SPI_3_SLAVE'
+ value: ''
+ SPI_3_SLAVE_PIN_SS:
+ description: 'SS pin for SPI_3_SLAVE'
+ value: ''
+
ADC_0:
description: 'Enable nRF52xxx ADC 0'
value: 0
@@ -368,8 +401,10 @@ syscfg.restrictions:
- "!SPI_0_MASTER || (SPI_0_MASTER_PIN_SCK && SPI_0_MASTER_PIN_MOSI && SPI_0_MASTER_PIN_MISO)"
- "!SPI_1_MASTER || (SPI_1_MASTER_PIN_SCK && SPI_1_MASTER_PIN_MOSI && SPI_1_MASTER_PIN_MISO)"
- "!SPI_2_MASTER || (SPI_2_MASTER_PIN_SCK && SPI_2_MASTER_PIN_MOSI && SPI_2_MASTER_PIN_MISO)"
+ - "!SPI_3_MASTER || (SPI_3_MASTER_PIN_SCK && SPI_3_MASTER_PIN_MOSI && SPI_3_MASTER_PIN_MISO)"
- "!SPI_0_SLAVE || (SPI_0_SLAVE_PIN_SCK && SPI_0_SLAVE_PIN_MOSI && SPI_0_SLAVE_PIN_MISO && SPI_0_SLAVE_PIN_SS)"
- "!SPI_1_SLAVE || (SPI_1_SLAVE_PIN_SCK && SPI_1_SLAVE_PIN_MOSI && SPI_1_SLAVE_PIN_MISO && SPI_1_SLAVE_PIN_SS)"
- "!SPI_2_SLAVE || (SPI_2_SLAVE_PIN_SCK && SPI_2_SLAVE_PIN_MOSI && SPI_2_SLAVE_PIN_MISO && SPI_2_SLAVE_PIN_SS)"
+ - "!SPI_3_SLAVE || (SPI_3_SLAVE_PIN_SCK && SPI_3_SLAVE_PIN_MOSI && SPI_3_SLAVE_PIN_MISO && SPI_3_SLAVE_PIN_SS)"
- "!UART_0 || (UART_0_PIN_TX && UART_0_PIN_RX)"
- "!UART_1 || (UART_1_PIN_TX && UART_1_PIN_RX)"
----------------------------------------------------------------
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