Skip to content

Commit 2bca25e

Browse files
committed
Merge tag 'spi-v6.1' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi
Pull spi updates from Mark Brown: "With the exception of some refactoring to fix long standing issues where we weren't handling cache syncs properly for messages which had PIO and DMA transfers going to the same page correctly there has been no work on the core this time around, and it's also been quite a quiet release for the drivers too: - Fix cache syncs for cases where we have DMA and PIO transfers in the same message going to the same page - Update the fsl_spi driver to use transfer_one() rather than a custom transfer function - Support for configuring transfer speeds with the AMD SPI controller - Support for a second chip select and 64K erase on Intel SPI - Support for Microchip coreQSPI, Nuvoton NPCM845, NXP i.MX93, and Rockchip RK3128 and RK3588" * tag 'spi-v6.1' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi: (73 commits) spi: Ensure that sg_table won't be used after being freed spi: spi-gxp: Use devm_platform_ioremap_resource() spi: s3c64xx: Fix large transfers with DMA spi: Split transfers larger than max size spi: Fix cache corruption due to DMA/PIO overlap spi: Save current RX and TX DMA devices spi: mt65xx: Add dma max segment size declaration spi: migrate mt7621 text bindings to YAML spi: renesas,sh-msiof: Add r8a779g0 support spi: spi-fsl-qspi: Use devm_platform_ioremap_resource_byname() spi: spi-fsl-lpspi: Use devm_platform_get_and_ioremap_resource() spi: spi-fsl-dspi: Use devm_platform_get_and_ioremap_resource() spi/omap100k:Fix PM disable depth imbalance in omap1_spi100k_probe spi: dw: Fix PM disable depth imbalance in dw_spi_bt1_probe spi: cadence-quadspi: Fix PM disable depth imbalance in cqspi_probe spi: s3c24xx: Switch to use devm_spi_alloc_master() spi: xilinx: Switch to use devm_spi_alloc_master() spi: img-spfi: using pm_runtime_resume_and_get instead of pm_runtime_get_sync spi: aspeed: Remove redundant dev_err call spi: spi-mpc52xx: switch to using gpiod API ...
2 parents d40c874 + 8e9204c commit 2bca25e

Some content is hidden

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

51 files changed

+1430
-416
lines changed

Documentation/devicetree/bindings/display/panel/kingdisplay,kd035g6-54nt.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@ properties:
2323
reg: true
2424
reset-gpios: true
2525

26+
spi-3wire: true
27+
2628
required:
2729
- compatible
2830
- power-supply

Documentation/devicetree/bindings/display/panel/leadtek,ltk035c5444t.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@ properties:
2424
reg: true
2525
reset-gpios: true
2626

27+
spi-3wire: true
28+
2729
required:
2830
- compatible
2931
- power-supply

Documentation/devicetree/bindings/display/panel/samsung,s6e63m0.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,10 @@ properties:
2424
default-brightness: true
2525
max-brightness: true
2626

27+
spi-3wire: true
28+
spi-cpha: true
29+
spi-cpol: true
30+
2731
vdd3-supply:
2832
description: VDD regulator
2933

Documentation/devicetree/bindings/spi/microchip,mpfs-spi.yaml

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,11 @@
44
$id: http://devicetree.org/schemas/spi/microchip,mpfs-spi.yaml#
55
$schema: http://devicetree.org/meta-schemas/core.yaml#
66

7-
title: Microchip MPFS {Q,}SPI Controller Device Tree Bindings
7+
title: Microchip FPGA {Q,}SPI Controllers
8+
9+
description:
10+
SPI and QSPI controllers on Microchip PolarFire SoC and the "soft"/
11+
fabric IP cores they are based on
812

913
maintainers:
1014
- Conor Dooley <conor.dooley@microchip.com>
@@ -14,9 +18,12 @@ allOf:
1418

1519
properties:
1620
compatible:
17-
enum:
18-
- microchip,mpfs-spi
19-
- microchip,mpfs-qspi
21+
oneOf:
22+
- items:
23+
- const: microchip,mpfs-qspi
24+
- const: microchip,coreqspi-rtl-v2
25+
- const: microchip,coreqspi-rtl-v2 #FPGA QSPI
26+
- const: microchip,mpfs-spi
2027

2128
reg:
2229
maxItems: 1

Documentation/devicetree/bindings/spi/nuvoton,npcm-pspi.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@ Nuvoton NPCM Peripheral Serial Peripheral Interface(PSPI) controller driver
33
Nuvoton NPCM7xx SOC support two PSPI channels.
44

55
Required properties:
6-
- compatible : "nuvoton,npcm750-pspi" for NPCM7XX BMC
6+
- compatible : "nuvoton,npcm750-pspi" for Poleg NPCM7XX.
7+
"nuvoton,npcm845-pspi" for Arbel NPCM8XX.
78
- #address-cells : should be 1. see spi-bus.txt
89
- #size-cells : should be 0. see spi-bus.txt
910
- specifies physical base address and size of the register.

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,5 +29,4 @@ properties:
2929
minimum: 0
3030
maximum: 255
3131

32-
unevaluatedProperties: true
33-
32+
additionalProperties: true
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-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/spi/ralink,mt7621-spi.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
maintainers:
8+
- Sergio Paracuellos <sergio.paracuellos@gmail.com>
9+
10+
title: Mediatek MT7621/MT7628 SPI controller
11+
12+
allOf:
13+
- $ref: /schemas/spi/spi-controller.yaml#
14+
15+
properties:
16+
compatible:
17+
const: ralink,mt7621-spi
18+
19+
reg:
20+
maxItems: 1
21+
22+
clocks:
23+
maxItems: 1
24+
25+
clock-names:
26+
const: spi
27+
28+
resets:
29+
maxItems: 1
30+
31+
reset-names:
32+
const: spi
33+
34+
required:
35+
- compatible
36+
- reg
37+
- resets
38+
- "#address-cells"
39+
- "#size-cells"
40+
41+
unevaluatedProperties: false
42+
43+
examples:
44+
- |
45+
#include <dt-bindings/clock/mt7621-clk.h>
46+
#include <dt-bindings/reset/mt7621-reset.h>
47+
48+
spi@b00 {
49+
compatible = "ralink,mt7621-spi";
50+
reg = <0xb00 0x100>;
51+
clocks = <&sysc MT7621_CLK_SPI>;
52+
clock-names = "spi";
53+
resets = <&sysc MT7621_RST_SPI>;
54+
reset-names = "spi";
55+
56+
#address-cells = <1>;
57+
#size-cells = <0>;
58+
59+
pinctrl-names = "default";
60+
pinctrl-0 = <&spi_pins>;
61+
};

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

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,15 @@ properties:
4747
- renesas,msiof-r8a77980 # R-Car V3H
4848
- renesas,msiof-r8a77990 # R-Car E3
4949
- renesas,msiof-r8a77995 # R-Car D3
50-
- renesas,msiof-r8a779a0 # R-Car V3U
5150
- const: renesas,rcar-gen3-msiof # generic R-Car Gen3 and RZ/G2
5251
# compatible device
52+
- items:
53+
- enum:
54+
- renesas,msiof-r8a779a0 # R-Car V3U
55+
- renesas,msiof-r8a779f0 # R-Car S4-8
56+
- renesas,msiof-r8a779g0 # R-Car V4H
57+
- const: renesas,rcar-gen4-msiof # generic R-Car Gen4
58+
# compatible device
5359
- items:
5460
- const: renesas,sh-msiof # deprecated
5561

@@ -69,6 +75,12 @@ properties:
6975
clocks:
7076
maxItems: 1
7177

78+
power-domains:
79+
maxItems: 1
80+
81+
resets:
82+
maxItems: 1
83+
7284
num-cs:
7385
description: |
7486
Total number of chip selects (default is 1).

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,6 @@ properties:
104104
const: spi
105105

106106
reg-io-width:
107-
$ref: /schemas/types.yaml#/definitions/uint32
108107
description: I/O register width (in bytes) implemented by this device
109108
default: 4
110109
enum: [ 2, 4 ]

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,11 @@ patternProperties:
9696
$ref: spi-peripheral-props.yaml
9797

9898
properties:
99+
spi-3wire:
100+
$ref: /schemas/types.yaml#/definitions/flag
101+
description:
102+
The device requires 3-wire mode.
103+
99104
spi-cpha:
100105
$ref: /schemas/types.yaml#/definitions/flag
101106
description:

0 commit comments

Comments
 (0)