Skip to content

Commit f2ef397

Browse files
committed
Merge tag 'spi-v6.13' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi
Pull spi updates from Mark Brown: "The only real core work we've got this time around is the completion of the transition to the new host/target naming for the core APIs, Kconfig still needs doing but that's a lot less invasive. Otherwise the big changes are the new drivers that have been added: - Completion of the conversion to spi_alloc_host()/_target() and removal of the old naming. - Cleanups for Rockchip drivers, these brought in a new logging helper in the driver core for warnings during probe. - Support for configuration of the word delay via spidev_test. - Support for AMD HID2 controllers, Apple SPI controller and Realtek SPI-NAND controllers" * tag 'spi-v6.13' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi: (58 commits) spi: imx: support word delay spi: imx: pass struct spi_transfer to prepare_transfer() spi: cs42l43: Add GPIO speaker id support to the bridge configuration spi: Delete useless checks spi: apple: Remove unnecessary .owner for apple_spi_driver spi: spidev_test: add support for word delay spi: apple: Add driver for Apple SPI controller spi: dt-bindings: apple,spi: Add binding for Apple SPI controllers spi: Use of_property_present() for non-boolean properties spi: zynqmp-gqspi: Undo runtime PM changes at driver exit time​ spi: spi-mem: rtl-snand: Correctly handle DMA transfers spi: tegra210-quad: Avoid shift-out-of-bounds spi: axi-spi-engine: Emit trace events for spi transfers dt-bindings: spi: sprd,sc9860-spi: convert to YAML spi: Replace deprecated PCI functions spi: dt-bindings: samsung: Add a compatible for samsung,exynos8895-spi spi: spi-mem: Add Realtek SPI-NAND controller dt-bindings: spi: Add realtek,rtl9301-snand spi: make class structs const spi: dt-bindings: brcm,bcm2835-aux-spi: Convert to dtschema ...
2 parents 4bd37a9 + 26470a2 commit f2ef397

File tree

126 files changed

+2186
-489
lines changed

Some content is hidden

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

126 files changed

+2186
-489
lines changed
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
What: /sys/devices/.../intel_spi_protected
2+
Date: Feb 2025
3+
KernelVersion: 6.13
4+
Contact: Alexander Usyskin <alexander.usyskin@intel.com>
5+
Description: This attribute allows the userspace to check if the
6+
Intel SPI flash controller is write protected from the host.
7+
8+
What: /sys/devices/.../intel_spi_locked
9+
Date: Feb 2025
10+
KernelVersion: 6.13
11+
Contact: Alexander Usyskin <alexander.usyskin@intel.com>
12+
Description: This attribute allows the user space to check if the
13+
Intel SPI flash controller locks supported opcodes.
14+
15+
What: /sys/devices/.../intel_spi_bios_locked
16+
Date: Feb 2025
17+
KernelVersion: 6.13
18+
Contact: Alexander Usyskin <alexander.usyskin@intel.com>
19+
Description: This attribute allows the user space to check if the
20+
Intel SPI flash controller BIOS region is locked for writes.
Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/spi/apple,spi.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Apple ARM SoC SPI controller
8+
9+
allOf:
10+
- $ref: spi-controller.yaml#
11+
12+
maintainers:
13+
- Hector Martin <marcan@marcan.st>
14+
15+
properties:
16+
compatible:
17+
items:
18+
- enum:
19+
- apple,t8103-spi
20+
- apple,t8112-spi
21+
- apple,t6000-spi
22+
- const: apple,spi
23+
24+
reg:
25+
maxItems: 1
26+
27+
clocks:
28+
maxItems: 1
29+
30+
interrupts:
31+
maxItems: 1
32+
33+
power-domains:
34+
maxItems: 1
35+
36+
required:
37+
- compatible
38+
- reg
39+
- clocks
40+
- interrupts
41+
42+
unevaluatedProperties: false
43+
44+
examples:
45+
- |
46+
#include <dt-bindings/interrupt-controller/apple-aic.h>
47+
#include <dt-bindings/interrupt-controller/irq.h>
48+
49+
soc {
50+
#address-cells = <2>;
51+
#size-cells = <2>;
52+
53+
spi@39b104000 {
54+
compatible = "apple,t6000-spi", "apple,spi";
55+
reg = <0x3 0x9b104000 0x0 0x4000>;
56+
interrupt-parent = <&aic>;
57+
interrupts = <AIC_IRQ 0 1107 IRQ_TYPE_LEVEL_HIGH>;
58+
#address-cells = <1>;
59+
#size-cells = <0>;
60+
clocks = <&clk>;
61+
};
62+
};

Documentation/devicetree/bindings/spi/brcm,bcm2835-aux-spi.txt

Lines changed: 0 additions & 38 deletions
This file was deleted.
Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/spi/brcm,bcm2835-aux-spi.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Broadcom BCM2835 Auxiliary SPI1/2 Controller
8+
9+
maintainers:
10+
- Karan Sanghavi <karansanghvi98@gmail.com>
11+
12+
description:
13+
The BCM2835 contains two forms of SPI master controller. One is known simply
14+
as SPI0, and the other as the "Universal SPI Master," which is part of the
15+
auxiliary block. This binding applies to the SPI1 and SPI2 auxiliary
16+
controllers.
17+
18+
allOf:
19+
- $ref: spi-controller.yaml#
20+
21+
properties:
22+
compatible:
23+
enum:
24+
- brcm,bcm2835-aux-spi
25+
26+
reg:
27+
maxItems: 1
28+
29+
interrupts:
30+
maxItems: 1
31+
32+
clocks:
33+
maxItems: 1
34+
35+
required:
36+
- compatible
37+
- reg
38+
- interrupts
39+
- clocks
40+
41+
unevaluatedProperties: false
42+
43+
examples:
44+
- |
45+
#include <dt-bindings/clock/bcm2835-aux.h>
46+
spi@7e215080 {
47+
compatible = "brcm,bcm2835-aux-spi";
48+
reg = <0x7e215080 0x40>;
49+
interrupts = <1 29>;
50+
clocks = <&aux_clocks BCM2835_AUX_CLOCK_SPI1>;
51+
#address-cells = <1>;
52+
#size-cells = <0>;
53+
};
Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/spi/realtek,rtl9301-snand.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: SPI-NAND Flash Controller for Realtek RTL9300 SoCs
8+
9+
maintainers:
10+
- Chris Packham <chris.packham@alliedtelesis.co.nz>
11+
12+
description:
13+
The Realtek RTL9300 SoCs have a built in SPI-NAND controller. It supports
14+
typical SPI-NAND page cache operations in single, dual or quad IO mode.
15+
16+
properties:
17+
compatible:
18+
oneOf:
19+
- items:
20+
- enum:
21+
- realtek,rtl9302b-snand
22+
- realtek,rtl9302c-snand
23+
- realtek,rtl9303-snand
24+
- const: realtek,rtl9301-snand
25+
- const: realtek,rtl9301-snand
26+
27+
reg:
28+
maxItems: 1
29+
30+
interrupts:
31+
maxItems: 1
32+
33+
clocks:
34+
maxItems: 1
35+
36+
required:
37+
- compatible
38+
- reg
39+
- interrupts
40+
- clocks
41+
42+
allOf:
43+
- $ref: /schemas/spi/spi-controller.yaml#
44+
45+
unevaluatedProperties: false
46+
47+
examples:
48+
- |
49+
spi@1a400 {
50+
compatible = "realtek,rtl9302c-snand", "realtek,rtl9301-snand";
51+
reg = <0x1a400 0x44>;
52+
interrupt-parent = <&intc>;
53+
interrupts = <19>;
54+
clocks = <&lx_clk>;
55+
#address-cells = <1>;
56+
#size-cells = <0>;
57+
58+
flash@0 {
59+
compatible = "spi-nand";
60+
reg = <0>;
61+
};
62+
};

Documentation/devicetree/bindings/spi/samsung,spi.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,10 @@ properties:
2626
- samsung,exynos850-spi
2727
- samsung,exynosautov9-spi
2828
- tesla,fsd-spi
29+
- items:
30+
- enum:
31+
- samsung,exynos8895-spi
32+
- const: samsung,exynos850-spi
2933
- const: samsung,exynos7-spi
3034
deprecated: true
3135

Documentation/devicetree/bindings/spi/spi-sprd.txt

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

Documentation/devicetree/bindings/spi/spi-zynqmp-qspi.yaml

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,14 @@ title: Xilinx Zynq UltraScale+ MPSoC GQSPI controller
99
maintainers:
1010
- Michal Simek <michal.simek@amd.com>
1111

12-
allOf:
13-
- $ref: spi-controller.yaml#
14-
1512
properties:
1613
compatible:
1714
enum:
1815
- xlnx,versal-qspi-1.0
1916
- xlnx,zynqmp-qspi-1.0
2017

2118
reg:
19+
minItems: 1
2220
maxItems: 2
2321

2422
interrupts:
@@ -47,6 +45,24 @@ required:
4745

4846
unevaluatedProperties: false
4947

48+
allOf:
49+
- $ref: spi-controller.yaml#
50+
51+
- if:
52+
properties:
53+
compatible:
54+
contains:
55+
const: xlnx,zynqmp-qspi-1.0
56+
then:
57+
properties:
58+
reg:
59+
minItems: 2
60+
61+
else:
62+
properties:
63+
reg:
64+
maxItems: 1
65+
5066
examples:
5167
- |
5268
#include <dt-bindings/clock/xlnx-zynqmp-clk.h>

0 commit comments

Comments
 (0)