Skip to content

Commit 11ba282

Browse files
brooniebroonie
committed
Merge remote-tracking branch 'spi/for-5.9' into spi-next
2 parents 8ade0c2 + 1d5cd4e commit 11ba282

Some content is hidden

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

87 files changed

+2490
-1358
lines changed

‎Documentation/devicetree/bindings/memory-controllers/renesas,rpc-if.yaml

Lines changed: 88 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,88 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/memory-controllers/renesas,rpc-if.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Renesas Reduced Pin Count Interface (RPC-IF)
8+
9+
maintainers:
10+
- Sergei Shtylyov <[email protected]>
11+
12+
description: |
13+
Renesas RPC-IF allows a SPI flash or HyperFlash connected to the SoC to
14+
be accessed via the external address space read mode or the manual mode.
15+
16+
The flash chip itself should be represented by a subnode of the RPC-IF node.
17+
The flash interface is selected based on the "compatible" property of this
18+
subnode:
19+
- if it contains "jedec,spi-nor", then SPI is used;
20+
- if it contains "cfi-flash", then HyperFlash is used.
21+
22+
allOf:
23+
- $ref: "/schemas/spi/spi-controller.yaml#"
24+
25+
properties:
26+
compatible:
27+
items:
28+
- enum:
29+
- renesas,r8a77970-rpc-if # R-Car V3M
30+
- renesas,r8a77980-rpc-if # R-Car V3H
31+
- renesas,r8a77995-rpc-if # R-Car D3
32+
- const: renesas,rcar-gen3-rpc-if # a generic R-Car gen3 device
33+
34+
reg:
35+
items:
36+
- description: RPC-IF registers
37+
- description: direct mapping read mode area
38+
- description: write buffer area
39+
40+
reg-names:
41+
items:
42+
- const: regs
43+
- const: dirmap
44+
- const: wbuf
45+
46+
clocks:
47+
maxItems: 1
48+
49+
power-domains:
50+
maxItems: 1
51+
52+
resets:
53+
maxItems: 1
54+
55+
patternProperties:
56+
"flash@[0-9a-f]+$":
57+
type: object
58+
properties:
59+
compatible:
60+
enum:
61+
- cfi-flash
62+
- jedec,spi-nor
63+
64+
examples:
65+
- |
66+
#include <dt-bindings/clock/renesas-cpg-mssr.h>
67+
#include <dt-bindings/power/r8a77995-sysc.h>
68+
69+
spi@ee200000 {
70+
compatible = "renesas,r8a77995-rpc-if", "renesas,rcar-gen3-rpc-if";
71+
reg = <0xee200000 0x200>,
72+
<0x08000000 0x4000000>,
73+
<0xee208000 0x100>;
74+
reg-names = "regs", "dirmap", "wbuf";
75+
clocks = <&cpg CPG_MOD 917>;
76+
power-domains = <&sysc R8A77995_PD_ALWAYS_ON>;
77+
resets = <&cpg 917>;
78+
#address-cells = <1>;
79+
#size-cells = <0>;
80+
81+
flash@0 {
82+
compatible = "jedec,spi-nor";
83+
reg = <0>;
84+
spi-max-frequency = <40000000>;
85+
spi-tx-bus-width = <1>;
86+
spi-rx-bus-width = <1>;
87+
};
88+
};

‎Documentation/devicetree/bindings/spi/fsl-imx-cspi.txt

Lines changed: 0 additions & 56 deletions
This file was deleted.

‎Documentation/devicetree/bindings/spi/fsl-imx-cspi.yaml

Lines changed: 97 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,97 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/spi/fsl-imx-cspi.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Freescale (Enhanced) Configurable Serial Peripheral Interface (CSPI/eCSPI) for i.MX
8+
9+
maintainers:
10+
- Shawn Guo <[email protected]>
11+
12+
allOf:
13+
- $ref: "/schemas/spi/spi-controller.yaml#"
14+
15+
properties:
16+
compatible:
17+
oneOf:
18+
- const: fsl,imx1-cspi
19+
- const: fsl,imx21-cspi
20+
- const: fsl,imx27-cspi
21+
- const: fsl,imx31-cspi
22+
- const: fsl,imx35-cspi
23+
- const: fsl,imx51-ecspi
24+
- const: fsl,imx53-ecspi
25+
- items:
26+
- enum:
27+
- fsl,imx50-ecspi
28+
- fsl,imx6q-ecspi
29+
- fsl,imx6sx-ecspi
30+
- fsl,imx6sl-ecspi
31+
- fsl,imx6sll-ecspi
32+
- fsl,imx6ul-ecspi
33+
- fsl,imx7d-ecspi
34+
- fsl,imx8mq-ecspi
35+
- fsl,imx8mm-ecspi
36+
- fsl,imx8mn-ecspi
37+
- fsl,imx8mp-ecspi
38+
- const: fsl,imx51-ecspi
39+
40+
reg:
41+
maxItems: 1
42+
43+
interrupts:
44+
maxItems: 1
45+
46+
clocks:
47+
items:
48+
- description: SoC SPI ipg clock
49+
- description: SoC SPI per clock
50+
51+
clock-names:
52+
items:
53+
- const: ipg
54+
- const: per
55+
56+
dmas:
57+
items:
58+
- description: DMA controller phandle and request line for RX
59+
- description: DMA controller phandle and request line for TX
60+
61+
dma-names:
62+
items:
63+
- const: rx
64+
- const: tx
65+
66+
fsl,spi-rdy-drctl:
67+
$ref: /schemas/types.yaml#/definitions/uint32
68+
description: |
69+
Integer, representing the value of DRCTL, the register controlling
70+
the SPI_READY handling. Note that to enable the DRCTL consideration,
71+
the SPI_READY mode-flag needs to be set too.
72+
Valid values are: 0 (disabled), 1 (edge-triggered burst) and 2 (level-triggered burst).
73+
enum: [0, 1, 2]
74+
75+
required:
76+
- compatible
77+
- reg
78+
- interrupts
79+
- clocks
80+
- clock-names
81+
82+
unevaluatedProperties: false
83+
84+
examples:
85+
- |
86+
#include <dt-bindings/clock/imx5-clock.h>
87+
88+
spi@70010000 {
89+
#address-cells = <1>;
90+
#size-cells = <0>;
91+
compatible = "fsl,imx51-ecspi";
92+
reg = <0x70010000 0x4000>;
93+
interrupts = <36>;
94+
clocks = <&clks IMX5_CLK_ECSPI1_IPG_GATE>,
95+
<&clks IMX5_CLK_ECSPI1_PER_GATE>;
96+
clock-names = "ipg", "per";
97+
};

‎Documentation/devicetree/bindings/spi/mxs-spi.txt

Lines changed: 0 additions & 26 deletions
This file was deleted.

‎Documentation/devicetree/bindings/spi/mxs-spi.yaml

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/spi/mxs-spi.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Freescale MX233/MX28 SSP/SPI
8+
9+
maintainers:
10+
- Marek Vasut <[email protected]>
11+
12+
allOf:
13+
- $ref: "/schemas/spi/spi-controller.yaml#"
14+
15+
properties:
16+
compatible:
17+
enum:
18+
- fsl,imx23-spi
19+
- fsl,imx28-spi
20+
21+
reg:
22+
maxItems: 1
23+
24+
interrupts:
25+
maxItems: 1
26+
27+
dmas:
28+
maxItems: 1
29+
30+
dma-names:
31+
const: rx-tx
32+
33+
clock-frequency:
34+
description: input clock frequency to the SPI block in Hz.
35+
default: 160000000
36+
37+
required:
38+
- compatible
39+
- reg
40+
- interrupts
41+
- dmas
42+
- dma-names
43+
44+
unevaluatedProperties: false
45+
46+
examples:
47+
- |
48+
spi@80010000 {
49+
#address-cells = <1>;
50+
#size-cells = <0>;
51+
compatible = "fsl,imx28-spi";
52+
reg = <0x80010000 0x2000>;
53+
interrupts = <96>;
54+
dmas = <&dma_apbh 0>;
55+
dma-names = "rx-tx";
56+
};

‎Documentation/devicetree/bindings/spi/renesas,sh-msiof.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ properties:
2121
# device
2222
- items:
2323
- enum:
24+
- renesas,msiof-r8a7742 # RZ/G1H
2425
- renesas,msiof-r8a7743 # RZ/G1M
2526
- renesas,msiof-r8a7744 # RZ/G1N
2627
- renesas,msiof-r8a7745 # RZ/G1E
@@ -37,6 +38,7 @@ properties:
3738
- renesas,msiof-r8a774a1 # RZ/G2M
3839
- renesas,msiof-r8a774b1 # RZ/G2N
3940
- renesas,msiof-r8a774c0 # RZ/G2E
41+
- renesas,msiof-r8a774e1 # RZ/G2H
4042
- renesas,msiof-r8a7795 # R-Car H3
4143
- renesas,msiof-r8a7796 # R-Car M3-W
4244
- renesas,msiof-r8a77965 # R-Car M3-N

‎Documentation/devicetree/bindings/spi/spi-davinci.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
Davinci SPI controller device bindings
22

33
Links on DM:
4-
Keystone 2 - http://www.ti.com/lit/ug/sprugp2a/sprugp2a.pdf
5-
dm644x - http://www.ti.com/lit/ug/sprue32a/sprue32a.pdf
4+
Keystone 2 - https://www.ti.com/lit/ug/sprugp2a/sprugp2a.pdf
5+
dm644x - https://www.ti.com/lit/ug/sprue32a/sprue32a.pdf
66
OMAP-L138/da830 - http://www.ti.com/lit/ug/spruh77a/spruh77a.pdf
77

88
Required properties:

‎Documentation/devicetree/bindings/spi/spi-fsl-lpspi.txt

Lines changed: 0 additions & 29 deletions
This file was deleted.

0 commit comments

Comments
 (0)