Skip to content

Commit 34aac0a

Browse files
committed
Merge tag 'spi-v6.7' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi
Pull spi updates from Mark Brown: "This is a very quiet release for SPI, we've got cleanups and minor fixes but only a few new driver specific features. The bulk of the changes in terms of diffstat are the cleanups, plus one bit of performance work for McSPI. - Conversions to use devm_clk_get_enabled() and to remove outdated terms for controller and device - Device mode support for the Renesas CSI - Cleanups and improvements to the device tree bindings aimed at making validation better - PIO FIFO usage for the OMAP2 McSPI, improving performance" * tag 'spi-v6.7' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi: (75 commits) spi: omap2-mcspi: Add FIFO support without DMA spi: stm32: Explicitly include correct DT includes spi: Export acpi_spi_find_controller_by_adev() spi: nxp-fspi: use the correct ioremap function spi: Don't use flexible array in struct spi_message definition spi: bcm2835: add a sentinel at the end of the lookup array spi: spi-geni-qcom: Rename the label unmap_if_dma spi: rzv2m-csi: Add target mode support spi: renesas,rzv2m-csi: Add CSI (SPI) target related property spi: spidev: make spidev_class constant spi: mpc52xx-psc: Make mpc52xx_psc_spi_transfer_one_message() static spi: spi-cadence-quadspi: Fix missing unwind goto warnings spi: omap2-mcspi: Fix hardcoded reference clock spi: dt-bindings: Make "additionalProperties: true" explicit spi: at91-usart: Remove some dead code spi: dt-bindings: st,stm32-spi: Move "st,spi-midi-ns" to spi-peripheral-props.yaml spi: qup: Vote for interconnect bandwidth to DRAM spi: dt-bindings: qup: Document interconnects spi: qup: Parse OPP table for DVFS support spi: dt-bindings: qup: Document power-domains and OPP ...
2 parents 9d6c80f + 1b2e883 commit 34aac0a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

64 files changed

+1211
-1274
lines changed

Documentation/devicetree/bindings/spi/allwinner,sun4i-a10-spi.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,8 @@ properties:
4646
patternProperties:
4747
"^.*@[0-9a-f]+":
4848
type: object
49+
additionalProperties: true
50+
4951
properties:
5052
reg:
5153
items:

Documentation/devicetree/bindings/spi/allwinner,sun6i-a31-spi.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,8 @@ properties:
6868
patternProperties:
6969
"^.*@[0-9a-f]+":
7070
type: object
71+
additionalProperties: true
72+
7173
properties:
7274
reg:
7375
items:
Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
# SPDX-License-Identifier: GPL-2.0
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/spi/arm,pl022-peripheral-props.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Peripheral-specific properties for Arm PL022 SPI controller
8+
9+
maintainers:
10+
- Linus Walleij <[email protected]>
11+
12+
select: false
13+
14+
properties:
15+
pl022,interface:
16+
description: SPI interface type
17+
$ref: /schemas/types.yaml#/definitions/uint32
18+
enum:
19+
- 0 # SPI
20+
- 1 # Texas Instruments Synchronous Serial Frame Format
21+
- 2 # Microwire (Half Duplex)
22+
23+
pl022,com-mode:
24+
description: Specifies the transfer mode
25+
$ref: /schemas/types.yaml#/definitions/uint32
26+
enum:
27+
- 0 # interrupt mode
28+
- 1 # polling mode
29+
- 2 # DMA mode
30+
default: 1
31+
32+
pl022,rx-level-trig:
33+
description: Rx FIFO watermark level
34+
$ref: /schemas/types.yaml#/definitions/uint32
35+
minimum: 0
36+
maximum: 4
37+
38+
pl022,tx-level-trig:
39+
description: Tx FIFO watermark level
40+
$ref: /schemas/types.yaml#/definitions/uint32
41+
minimum: 0
42+
maximum: 4
43+
44+
pl022,ctrl-len:
45+
description: Microwire interface - Control length
46+
$ref: /schemas/types.yaml#/definitions/uint32
47+
minimum: 0x03
48+
maximum: 0x1f
49+
50+
pl022,wait-state:
51+
description: Microwire interface - Wait state
52+
$ref: /schemas/types.yaml#/definitions/uint32
53+
enum: [0, 1]
54+
55+
pl022,duplex:
56+
description: Microwire interface - Full/Half duplex
57+
$ref: /schemas/types.yaml#/definitions/uint32
58+
enum: [0, 1]
59+
60+
additionalProperties: true
61+
...

Documentation/devicetree/bindings/spi/nvidia,tegra210-quad.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ properties:
5050
patternProperties:
5151
"@[0-9a-f]+$":
5252
type: object
53+
additionalProperties: true
5354

5455
properties:
5556
spi-rx-bus-width:

Documentation/devicetree/bindings/spi/qcom,spi-qup.yaml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,17 @@ properties:
4444
- const: tx
4545
- const: rx
4646

47+
interconnects:
48+
maxItems: 1
49+
4750
interrupts:
4851
maxItems: 1
4952

53+
operating-points-v2: true
54+
55+
power-domains:
56+
maxItems: 1
57+
5058
reg:
5159
maxItems: 1
5260

@@ -62,7 +70,9 @@ unevaluatedProperties: false
6270
examples:
6371
- |
6472
#include <dt-bindings/clock/qcom,gcc-msm8996.h>
73+
#include <dt-bindings/interconnect/qcom,msm8996.h>
6574
#include <dt-bindings/interrupt-controller/arm-gic.h>
75+
#include <dt-bindings/power/qcom-rpmpd.h>
6676
6777
spi@7575000 {
6878
compatible = "qcom,spi-qup-v2.2.1";
@@ -76,6 +86,9 @@ examples:
7686
pinctrl-1 = <&blsp1_spi1_sleep>;
7787
dmas = <&blsp1_dma 12>, <&blsp1_dma 13>;
7888
dma-names = "tx", "rx";
89+
power-domains = <&rpmpd MSM8996_VDDCX>;
90+
operating-points-v2 = <&spi_opp_table>;
91+
interconnects = <&pnoc MASTER_BLSP_1 &bimc SLAVE_EBI_CH0>;
7992
#address-cells = <1>;
8093
#size-cells = <0>;
8194
};

Documentation/devicetree/bindings/spi/renesas,rzv2m-csi.yaml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,12 @@ properties:
3939
power-domains:
4040
maxItems: 1
4141

42+
renesas,csi-no-ss:
43+
type: boolean
44+
description:
45+
The CSI Slave Selection (SS) pin won't be used to enable transmission and
46+
reception. Only available when in target mode.
47+
4248
required:
4349
- compatible
4450
- reg
@@ -50,6 +56,9 @@ required:
5056
- '#address-cells'
5157
- '#size-cells'
5258

59+
dependencies:
60+
renesas,csi-no-ss: [ spi-slave ]
61+
5362
unevaluatedProperties: false
5463

5564
examples:

Documentation/devicetree/bindings/spi/rockchip-sfc.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,8 @@ properties:
4747
patternProperties:
4848
"^flash@[0-3]$":
4949
type: object
50+
additionalProperties: true
51+
5052
properties:
5153
reg:
5254
minimum: 0

Documentation/devicetree/bindings/spi/snps,dw-apb-ssi.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -160,6 +160,8 @@ properties:
160160
patternProperties:
161161
"^.*@[0-9a-f]+$":
162162
type: object
163+
additionalProperties: true
164+
163165
properties:
164166
reg:
165167
minimum: 0

Documentation/devicetree/bindings/spi/spi-peripheral-props.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,8 +113,14 @@ properties:
113113
minItems: 2
114114
maxItems: 4
115115

116+
st,spi-midi-ns:
117+
description: |
118+
Only for STM32H7, (Master Inter-Data Idleness) minimum time
119+
delay in nanoseconds inserted between two consecutive data frames.
120+
116121
# The controller specific properties go here.
117122
allOf:
123+
- $ref: arm,pl022-peripheral-props.yaml#
118124
- $ref: cdns,qspi-nor-peripheral-props.yaml#
119125
- $ref: samsung,spi-peripheral-props.yaml#
120126
- $ref: nvidia,tegra210-quad-peripheral-props.yaml#

Documentation/devicetree/bindings/spi/spi-pl022.yaml

Lines changed: 0 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -74,57 +74,6 @@ properties:
7474
resets:
7575
maxItems: 1
7676

77-
patternProperties:
78-
"^[a-zA-Z][a-zA-Z0-9,+\\-._]{0,63}@[0-9a-f]+$":
79-
type: object
80-
# SPI slave nodes must be children of the SPI master node and can
81-
# contain the following properties.
82-
properties:
83-
pl022,interface:
84-
description: SPI interface type
85-
$ref: /schemas/types.yaml#/definitions/uint32
86-
enum:
87-
- 0 # SPI
88-
- 1 # Texas Instruments Synchronous Serial Frame Format
89-
- 2 # Microwire (Half Duplex)
90-
91-
pl022,com-mode:
92-
description: Specifies the transfer mode
93-
$ref: /schemas/types.yaml#/definitions/uint32
94-
enum:
95-
- 0 # interrupt mode
96-
- 1 # polling mode
97-
- 2 # DMA mode
98-
default: 1
99-
100-
pl022,rx-level-trig:
101-
description: Rx FIFO watermark level
102-
$ref: /schemas/types.yaml#/definitions/uint32
103-
minimum: 0
104-
maximum: 4
105-
106-
pl022,tx-level-trig:
107-
description: Tx FIFO watermark level
108-
$ref: /schemas/types.yaml#/definitions/uint32
109-
minimum: 0
110-
maximum: 4
111-
112-
pl022,ctrl-len:
113-
description: Microwire interface - Control length
114-
$ref: /schemas/types.yaml#/definitions/uint32
115-
minimum: 0x03
116-
maximum: 0x1f
117-
118-
pl022,wait-state:
119-
description: Microwire interface - Wait state
120-
$ref: /schemas/types.yaml#/definitions/uint32
121-
enum: [0, 1]
122-
123-
pl022,duplex:
124-
description: Microwire interface - Full/Half duplex
125-
$ref: /schemas/types.yaml#/definitions/uint32
126-
enum: [0, 1]
127-
12877
required:
12978
- compatible
13079
- reg

0 commit comments

Comments
 (0)