Skip to content

Commit 48de4ab

Browse files
committed
Revert "dts: bindings: spi: Fix "nordic,nrf-spis" binding"
This reverts commit 7072460. Signed-off-by: Benjamin Cabé <benjamin@zephyrproject.org>
1 parent c47926e commit 48de4ab

File tree

4 files changed

+4
-17
lines changed

4 files changed

+4
-17
lines changed

dts/bindings/spi/nordic,nrf-spi-common.yaml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,7 @@
33

44
# Common fields for Nordic nRF family SPI peripherals
55

6-
include:
7-
- pinctrl-device.yaml
8-
- nordic-clockpin.yaml
6+
include: [spi-controller.yaml, pinctrl-device.yaml, nordic-clockpin.yaml]
97

108
properties:
119
reg:
@@ -28,11 +26,8 @@ properties:
2826
property must be set at SoC level DTS files.
2927
3028
overrun-character:
31-
type: int
3229
default: 0xff
3330
description: |
34-
The overrun character (ORC) is used when all bytes from the TX buffer
35-
are sent, but the transfer continues due to RX.
3631
Configurable, defaults to 0xff (line high), the most common value used
3732
in SPI transfers.
3833

dts/bindings/spi/nordic,nrf-spi.yaml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,4 @@ description: Nordic nRF family SPI (SPI master)
55

66
compatible: "nordic,nrf-spi"
77

8-
include:
9-
- spi-controller.yaml
10-
- nordic,nrf-spi-common.yaml
8+
include: nordic,nrf-spi-common.yaml

dts/bindings/spi/nordic,nrf-spim.yaml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,7 @@ description: Nordic nRF family SPIM (SPI master with EasyDMA)
55

66
compatible: "nordic,nrf-spim"
77

8-
include:
9-
- spi-controller.yaml
10-
- nordic,nrf-spi-common.yaml
11-
- memory-region.yaml
8+
include: ["nordic,nrf-spi-common.yaml", "memory-region.yaml"]
129

1310
properties:
1411
anomaly-58-workaround:

dts/bindings/spi/nordic,nrf-spis.yaml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,7 @@ description: Nordic nRF family SPIS (SPI slave with EasyDMA)
55

66
compatible: "nordic,nrf-spis"
77

8-
include:
9-
- base.yaml
10-
- nordic,nrf-spi-common.yaml
11-
- memory-region.yaml
8+
include: ["nordic,nrf-spi-common.yaml", "memory-region.yaml"]
129

1310
properties:
1411
def-char:

0 commit comments

Comments
 (0)