Skip to content

Commit 89555ee

Browse files
committed
Merge tag 'i2c-for-6.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux
Pull i2c updates from Wolfram Sang: "Mostly fixes for DTs or DT handling this time. And a few driver bugfixes" * tag 'i2c-for-6.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux: (28 commits) i2c: xiic: xiic_xfer(): Fix runtime PM leak on error path i2c: cadence: cdns_i2c_master_xfer(): Fix runtime PM leak on error path i2c: omap: Improve error reporting for problems during .remove() i2c: cadence: Add reset controller support dt-bindings: i2c: cadence: Document `resets` property i2c: mediatek: add support for MT7981 SoC dt-bindings: i2c: i2c-mt65xx: add MediaTek MT7981 SoC dt-bindings: i2c: Drop unneeded quotes i2c: brcmstb: use devm_platform_ioremap_resource_byname() i2c: cadence: Detect maximum transfer size i2c: cadence: Allow to specify the FIFO depth dt-bindings: i2c: cadence: Document `fifo-depth` property i2c: xiic: Use devm_platform_get_and_ioremap_resource() i2c: mpc: Use i2c-scl-clk-low-timeout-us i2c property i2c: mpc: Use of_property_read_u32 instead of of_get_property dt-bindings: i2c: mpc: Mark "fsl,timeout" as deprecated i2c: xiic: hide OF related data for COMPILE_TEST i2c: synquacer: mark OF related data as maybe unused dt-bindings: i2c: i2c-mt65xx: Add compatible for MT6795 Helio X10 i2c: imx: Simplify using devm_clk_get_enabled() ...
2 parents d91f6a7 + 38c8782 commit 89555ee

24 files changed

+181
-93
lines changed

Documentation/devicetree/bindings/i2c/amlogic,meson6-i2c.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
# Copyright 2019 BayLibre, SAS
33
%YAML 1.2
44
---
5-
$id: "http://devicetree.org/schemas/i2c/amlogic,meson6-i2c.yaml#"
6-
$schema: "http://devicetree.org/meta-schemas/core.yaml#"
5+
$id: http://devicetree.org/schemas/i2c/amlogic,meson6-i2c.yaml#
6+
$schema: http://devicetree.org/meta-schemas/core.yaml#
77

88
title: Amlogic Meson I2C Controller
99

Documentation/devicetree/bindings/i2c/apple,i2c.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
22
%YAML 1.2
33
---
4-
$id: "http://devicetree.org/schemas/i2c/apple,i2c.yaml#"
5-
$schema: "http://devicetree.org/meta-schemas/core.yaml#"
4+
$id: http://devicetree.org/schemas/i2c/apple,i2c.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
66

77
title: Apple/PASemi I2C controller
88

Documentation/devicetree/bindings/i2c/atmel,at91sam-i2c.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ required:
7575
- clocks
7676

7777
allOf:
78-
- $ref: "i2c-controller.yaml"
78+
- $ref: i2c-controller.yaml
7979
- if:
8080
properties:
8181
compatible:

Documentation/devicetree/bindings/i2c/cdns,i2c-r1p10.yaml

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
22
%YAML 1.2
33
---
4-
$id: "http://devicetree.org/schemas/i2c/cdns,i2c-r1p10.yaml#"
5-
$schema: "http://devicetree.org/meta-schemas/core.yaml#"
4+
$id: http://devicetree.org/schemas/i2c/cdns,i2c-r1p10.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
66

77
title: Cadence I2C controller
88

@@ -24,6 +24,9 @@ properties:
2424
clocks:
2525
minItems: 1
2626

27+
resets:
28+
maxItems: 1
29+
2730
interrupts:
2831
maxItems: 1
2932

@@ -38,6 +41,13 @@ properties:
3841
description: |
3942
Input clock name.
4043
44+
fifo-depth:
45+
description:
46+
Size of the data FIFO in bytes.
47+
$ref: /schemas/types.yaml#/definitions/uint32
48+
default: 16
49+
enum: [2, 4, 8, 16, 32, 64, 128, 256]
50+
4151
required:
4252
- compatible
4353
- reg
@@ -52,9 +62,11 @@ examples:
5262
i2c@e0004000 {
5363
compatible = "cdns,i2c-r1p10";
5464
clocks = <&clkc 38>;
65+
resets = <&rstc 288>;
5566
interrupts = <GIC_SPI 25 IRQ_TYPE_LEVEL_HIGH>;
5667
reg = <0xe0004000 0x1000>;
5768
clock-frequency = <400000>;
5869
#address-cells = <1>;
5970
#size-cells = <0>;
71+
fifo-depth = <8>;
6072
};

Documentation/devicetree/bindings/i2c/i2c-mpc.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ properties:
4343
4444
fsl,timeout:
4545
$ref: /schemas/types.yaml#/definitions/uint32
46+
deprecated: true
4647
description: |
4748
I2C bus timeout in microseconds
4849
@@ -95,6 +96,6 @@ examples:
9596
interrupts = <43 2>;
9697
interrupt-parent = <&mpic>;
9798
clock-frequency = <400000>;
98-
fsl,timeout = <10000>;
99+
i2c-scl-clk-low-timeout-us = <10000>;
99100
};
100101
...

Documentation/devicetree/bindings/i2c/i2c-mt65xx.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ properties:
2323
- const: mediatek,mt6577-i2c
2424
- const: mediatek,mt6589-i2c
2525
- const: mediatek,mt7622-i2c
26+
- const: mediatek,mt7981-i2c
2627
- const: mediatek,mt7986-i2c
2728
- const: mediatek,mt8168-i2c
2829
- const: mediatek,mt8173-i2c
@@ -45,6 +46,10 @@ properties:
4546
- enum:
4647
- mediatek,mt8365-i2c
4748
- const: mediatek,mt8168-i2c
49+
- items:
50+
- enum:
51+
- mediatek,mt6795-i2c
52+
- const: mediatek,mt8173-i2c
4853
- items:
4954
- enum:
5055
- mediatek,mt8195-i2c

Documentation/devicetree/bindings/i2c/i2c-mux-gpio.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ properties:
4545

4646
i2c-parent:
4747
description: phandle of the I2C bus that this multiplexer's master-side port is connected to
48-
$ref: "/schemas/types.yaml#/definitions/phandle"
48+
$ref: /schemas/types.yaml#/definitions/phandle
4949

5050
mux-gpios:
5151
description: list of GPIOs used to control the muxer
@@ -55,7 +55,7 @@ properties:
5555
idle-state:
5656
description: Value to set the muxer to when idle. When no value is given, it defaults to the
5757
last value used.
58-
$ref: "/schemas/types.yaml#/definitions/uint32"
58+
$ref: /schemas/types.yaml#/definitions/uint32
5959

6060
allOf:
6161
- $ref: i2c-mux.yaml

Documentation/devicetree/bindings/i2c/qcom,i2c-geni-qcom.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
22
%YAML 1.2
33
---
4-
$id: "http://devicetree.org/schemas/i2c/qcom,i2c-geni-qcom.yaml#"
5-
$schema: "http://devicetree.org/meta-schemas/core.yaml#"
4+
$id: http://devicetree.org/schemas/i2c/qcom,i2c-geni-qcom.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
66

77
title: Qualcomm Geni based QUP I2C Controller
88

Documentation/devicetree/bindings/i2c/st,stm32-i2c.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ properties:
9090
st,syscfg-fmp:
9191
description: Use to set Fast Mode Plus bit within SYSCFG when Fast Mode
9292
Plus speed is selected by slave.
93-
$ref: "/schemas/types.yaml#/definitions/phandle-array"
93+
$ref: /schemas/types.yaml#/definitions/phandle-array
9494
items:
9595
- items:
9696
- description: phandle to syscfg

Documentation/devicetree/bindings/i2c/xlnx,xps-iic-2.00.a.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
22
%YAML 1.2
33
---
4-
$id: "http://devicetree.org/schemas/i2c/xlnx,xps-iic-2.00.a.yaml#"
5-
$schema: "http://devicetree.org/meta-schemas/core.yaml#"
4+
$id: http://devicetree.org/schemas/i2c/xlnx,xps-iic-2.00.a.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
66

77
title: Xilinx IIC controller
88

0 commit comments

Comments
 (0)