Skip to content

Commit ad9c6ee

Browse files
committed
Merge tag 'spi-v5.18' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi
Pull spi updates from Mark Brown: "The overwhelming bulk of this pull request is a change from Uwe Kleine-König which changes the return type of the remove() function to void as part of some wider work he's doing to do this for all bus types, causing updates to most SPI device drivers. The branch with that on has been cross merged with a couple of other trees which added new SPI drivers this cycle, I'm not expecting any build issues resulting from the change. Otherwise it's been a relatively quiet release with some new device support, a few minor features and the welcome completion of the conversion of the subsystem to use GPIO descriptors rather than numbers: - Change return type of remove() to void. - Completion of the conversion of SPI controller drivers to use GPIO descriptors rather than numbers. - Quite a few DT schema conversions. - Support for multiple SPI devices on a bus in ACPI systems. - Big overhaul of the PXA2xx SPI driver. - Support for AMD AMDI0062, Intel Raptor Lake, Mediatek MT7986 and MT8186, nVidia Tegra210 and Tegra234, Renesas RZ/V2L, Tesla FSD and Sunplus SP7021" [ And this is obviously where that spi change that snuck into the regulator tree _should_ have been :^] * tag 'spi-v5.18' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi: (124 commits) spi: fsi: Implement a timeout for polling status spi: Fix erroneous sgs value with min_t() spi: tegra20: Use of_device_get_match_data() spi: mediatek: add ipm design support for MT7986 spi: Add compatible for MT7986 spi: sun4i: fix typos in comments spi: mediatek: support tick_delay without enhance_timing spi: Update clock-names property for arm pl022 spi: rockchip-sfc: fix platform_get_irq.cocci warning spi: s3c64xx: Add spi port configuration for Tesla FSD SoC spi: dt-bindings: samsung: Add fsd spi compatible spi: topcliff-pch: Prevent usage of potentially stale DMA device spi: tegra210-quad: combined sequence mode spi: tegra210-quad: add acpi support spi: npcm-fiu: Fix typo ("npxm") spi: Fix Tegra QSPI example spi: qup: replace spin_lock_irqsave by spin_lock in hard IRQ spi: cadence: fix platform_get_irq.cocci warning spi: Update NXP Flexspi maintainer details dt-bindings: mfd: maxim,max77802: Convert to dtschema ...
2 parents d6ccf45 + 89b35e3 commit ad9c6ee

290 files changed

Lines changed: 4444 additions & 2412 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/extcon/maxim,max77843.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Maxim MAX77843 MicroUSB and Companion Power Management IC Extcon
8+
9+
maintainers:
10+
- Chanwoo Choi <cw00.choi@samsung.com>
11+
- Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
12+
13+
description: |
14+
This is a part of device tree bindings for Maxim MAX77843 MicroUSB
15+
Integrated Circuit (MUIC).
16+
17+
See also Documentation/devicetree/bindings/mfd/maxim,max77843.yaml for
18+
additional information and example.
19+
20+
properties:
21+
compatible:
22+
const: maxim,max77843-muic
23+
24+
connector:
25+
$ref: /schemas/connector/usb-connector.yaml#
26+
27+
ports:
28+
$ref: /schemas/graph.yaml#/properties/port
29+
description:
30+
Any connector to the data bus of this controller should be modelled using
31+
the OF graph bindings specified
32+
properties:
33+
port:
34+
$ref: /schemas/graph.yaml#/properties/port
35+
36+
required:
37+
- compatible
38+
- connector
39+
40+
additionalProperties: false

Documentation/devicetree/bindings/mfd/google,cros-ec.yaml

Lines changed: 17 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ properties:
3131

3232
controller-data:
3333
description:
34-
SPI controller data, see bindings/spi/spi-samsung.txt
34+
SPI controller data, see bindings/spi/samsung,spi-peripheral-props.yaml
3535
type: object
3636

3737
google,cros-ec-spi-pre-delay:
@@ -148,18 +148,21 @@ patternProperties:
148148
required:
149149
- compatible
150150

151-
if:
152-
properties:
153-
compatible:
154-
contains:
155-
enum:
156-
- google,cros-ec-i2c
157-
- google,cros-ec-rpmsg
158-
then:
159-
properties:
160-
google,cros-ec-spi-pre-delay: false
161-
google,cros-ec-spi-msg-delay: false
162-
spi-max-frequency: false
151+
allOf:
152+
- if:
153+
properties:
154+
compatible:
155+
contains:
156+
enum:
157+
- google,cros-ec-i2c
158+
- google,cros-ec-rpmsg
159+
then:
160+
properties:
161+
google,cros-ec-spi-pre-delay: false
162+
google,cros-ec-spi-msg-delay: false
163+
spi-max-frequency: false
164+
else:
165+
$ref: /schemas/spi/spi-peripheral-props.yaml
163166

164167
additionalProperties: false
165168

@@ -200,7 +203,7 @@ examples:
200203
spi-max-frequency = <5000000>;
201204
202205
proximity {
203-
compatible = "google,cros-ec-mkbp-proximity";
206+
compatible = "google,cros-ec-mkbp-proximity";
204207
};
205208
206209
cbas {

Documentation/devicetree/bindings/mfd/max14577.txt

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

Documentation/devicetree/bindings/mfd/max77802.txt

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

0 commit comments

Comments
 (0)