2021-05-20 12:26:33

by Fabien Parent

[permalink] [raw]
Subject: [PATCH v2 1/4] dt-bindings: i2c: i2c-mt65xx: convert doc to yaml schema format

Convert the binding documentation for i2c-mt65xx driver to the
YAML schema format.

Signed-off-by: Fabien Parent <[email protected]>
---

v2:
* write compatibles in a more compact way
* set the node pattern to be "^i2c@[0-9a-f]+$" instead of
"^i2c[0-9]*@[0-9a-f]+"$

.../devicetree/bindings/i2c/i2c-mt65xx.txt | 49 ----------
.../devicetree/bindings/i2c/i2c-mt65xx.yaml | 93 +++++++++++++++++++
2 files changed, 93 insertions(+), 49 deletions(-)
delete mode 100644 Documentation/devicetree/bindings/i2c/i2c-mt65xx.txt
create mode 100644 Documentation/devicetree/bindings/i2c/i2c-mt65xx.yaml

diff --git a/Documentation/devicetree/bindings/i2c/i2c-mt65xx.txt b/Documentation/devicetree/bindings/i2c/i2c-mt65xx.txt
deleted file mode 100644
index 7f0194fdd0cc..000000000000
--- a/Documentation/devicetree/bindings/i2c/i2c-mt65xx.txt
+++ /dev/null
@@ -1,49 +0,0 @@
-* MediaTek's I2C controller
-
-The MediaTek's I2C controller is used to interface with I2C devices.
-
-Required properties:
- - compatible: value should be either of the following.
- "mediatek,mt2701-i2c", "mediatek,mt6577-i2c": for MediaTek MT2701
- "mediatek,mt2712-i2c": for MediaTek MT2712
- "mediatek,mt6577-i2c": for MediaTek MT6577
- "mediatek,mt6589-i2c": for MediaTek MT6589
- "mediatek,mt6797-i2c", "mediatek,mt6577-i2c": for MediaTek MT6797
- "mediatek,mt7622-i2c": for MediaTek MT7622
- "mediatek,mt7623-i2c", "mediatek,mt6577-i2c": for MediaTek MT7623
- "mediatek,mt7629-i2c", "mediatek,mt2712-i2c": for MediaTek MT7629
- "mediatek,mt8173-i2c": for MediaTek MT8173
- "mediatek,mt8183-i2c": for MediaTek MT8183
- "mediatek,mt8192-i2c": for MediaTek MT8192
- "mediatek,mt8516-i2c", "mediatek,mt2712-i2c": for MediaTek MT8516
- - reg: physical base address of the controller and dma base, length of memory
- mapped region.
- - interrupts: interrupt number to the cpu.
- - clock-div: the fixed value for frequency divider of clock source in i2c
- module. Each IC may be different.
- - clocks: clock name from clock manager
- - clock-names: Must include "main" and "dma", "arb" is for multi-master that
- one bus has more than two i2c controllers, if enable have-pmic need include
- "pmic" extra.
-
-Optional properties:
- - clock-frequency: Frequency in Hz of the bus when transfer, the default value
- is 100000.
- - mediatek,have-pmic: platform can control i2c form special pmic side.
- Only mt6589 and mt8135 support this feature.
- - mediatek,use-push-pull: IO config use push-pull mode.
-
-Example:
-
- i2c0: i2c@1100d000 {
- compatible = "mediatek,mt6577-i2c";
- reg = <0x1100d000 0x70>,
- <0x11000300 0x80>;
- interrupts = <GIC_SPI 44 IRQ_TYPE_LEVEL_LOW>;
- clock-frequency = <400000>;
- mediatek,have-pmic;
- clock-div = <16>;
- clocks = <&i2c0_ck>, <&ap_dma_ck>;
- clock-names = "main", "dma";
- };
-
diff --git a/Documentation/devicetree/bindings/i2c/i2c-mt65xx.yaml b/Documentation/devicetree/bindings/i2c/i2c-mt65xx.yaml
new file mode 100644
index 000000000000..41cedb4930de
--- /dev/null
+++ b/Documentation/devicetree/bindings/i2c/i2c-mt65xx.yaml
@@ -0,0 +1,93 @@
+# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
+%YAML 1.2
+---
+$id: "http://devicetree.org/schemas/i2c/i2c-mt65xx.yaml#"
+$schema: "http://devicetree.org/meta-schemas/core.yaml#"
+
+title: MediaTek I2C Controller
+
+maintainers:
+ - Qii Wang <[email protected]>
+ - Matthias Brugger <[email protected]>
+
+allOf:
+ - $ref: /schemas/i2c/i2c-controller.yaml#
+
+properties:
+ $nodename:
+ pattern: "^i2c@[0-9a-f]+$"
+
+ compatible:
+ oneOf:
+ - enum:
+ - mediatek,mt2712-i2c
+ - mediatek,mt6577-i2c
+ - mediatek,mt6589-i2c
+ - mediatek,mt7622-i2c
+ - mediatek,mt8173-i2c
+ - mediatek,mt8183-i2c
+ - mediatek,mt8192-i2c
+ - items:
+ - enum:
+ - mediatek,mt2701-i2c
+ - mediatek,mt6797-i2c
+ - mediatek,mt7623-i2c
+ - const: mediatek,mt6577-i2c
+ - items:
+ - enum:
+ - mediatek,mt7629-i2c
+ - mediatek,mt8516-i2c
+ - const: mediatek,mt2712-i2c
+
+ clocks:
+ minItems: 2
+ maxItems: 4
+ items:
+ - description: Controller clock
+ - description: DMA clock
+ - description: ARB clock for multi-master when a bus has more than
+ one i2c controllers
+ - description: PMIC clock. Only when mediatek,have-pmic is set.
+
+ clock-names:
+ minItems: 2
+ maxItems: 4
+ items:
+ - const: main
+ - const: dma
+ - const: arb
+ - const: pmic
+
+ mediatek,have-pmic:
+ $ref: /schemas/types.yaml#/definitions/flag
+ description: Platform can control I2C from the PMIC
+
+ mediatek,use-push-pull:
+ $ref: /schemas/types.yaml#/definitions/flag
+ description: IO config use push-pull mode.
+
+required:
+ - compatible
+ - reg
+ - interrupts
+ - clocks
+ - clock-names
+ - clock-div
+
+unevaluatedProperties: false
+
+examples:
+ - |
+ #include <dt-bindings/interrupt-controller/irq.h>
+ #include <dt-bindings/interrupt-controller/arm-gic.h>
+ i2c0: i2c@1100d000 {
+ compatible = "mediatek,mt6577-i2c";
+ reg = <0x1100d000 0x70>,
+ <0x11000300 0x80>;
+ interrupts = <GIC_SPI 44 IRQ_TYPE_LEVEL_LOW>;
+ clock-frequency = <400000>;
+ mediatek,have-pmic;
+ clock-div = <16>;
+ clocks = <&i2c0_ck>, <&ap_dma_ck>;
+ clock-names = "main", "dma";
+ };
--
2.31.1


2021-05-21 02:26:06

by Fabien Parent

[permalink] [raw]
Subject: [PATCH v2 2/4] dt-bindings: i2c: i2c-mt65xx: add binding for MT8365 SoC

Add binding documentation for the MT8365 I2C controllers.

Signed-off-by: Fabien Parent <[email protected]>
Acked-by: Rob Herring <[email protected]>
---

v2: No change

Documentation/devicetree/bindings/i2c/i2c-mt65xx.yaml | 1 +
1 file changed, 1 insertion(+)

diff --git a/Documentation/devicetree/bindings/i2c/i2c-mt65xx.yaml b/Documentation/devicetree/bindings/i2c/i2c-mt65xx.yaml
index 41cedb4930de..2c437368532e 100644
--- a/Documentation/devicetree/bindings/i2c/i2c-mt65xx.yaml
+++ b/Documentation/devicetree/bindings/i2c/i2c-mt65xx.yaml
@@ -27,6 +27,7 @@ properties:
- mediatek,mt8173-i2c
- mediatek,mt8183-i2c
- mediatek,mt8192-i2c
+ - mediatek,mt8365-i2c
- items:
- enum:
- mediatek,mt2701-i2c
--
2.31.1

2021-05-21 02:26:19

by Fabien Parent

[permalink] [raw]
Subject: [PATCH v2 3/4] i2c: i2c-mt65xx: add MT8365 SoC support

Add support for I2C on MT8365 SoCs.

Signed-off-by: Fabien Parent <[email protected]>
---

v2: No change

drivers/i2c/busses/i2c-mt65xx.c | 14 ++++++++++++++
1 file changed, 14 insertions(+)

diff --git a/drivers/i2c/busses/i2c-mt65xx.c b/drivers/i2c/busses/i2c-mt65xx.c
index 5ddfa4e56ee2..0e6ad84e0e47 100644
--- a/drivers/i2c/busses/i2c-mt65xx.c
+++ b/drivers/i2c/busses/i2c-mt65xx.c
@@ -404,6 +404,19 @@ static const struct mtk_i2c_compatible mt8192_compat = {
.max_dma_support = 36,
};

+static const struct mtk_i2c_compatible mt8365_compat = {
+ .regs = mt_i2c_regs_v1,
+ .pmic_i2c = 0,
+ .dcm = 1,
+ .auto_restart = 1,
+ .aux_len_reg = 1,
+ .timing_adjust = 1,
+ .dma_sync = 1,
+ .ltiming_adjust = 0,
+ .apdma_sync = 0,
+ .max_dma_support = 33,
+};
+
static const struct of_device_id mtk_i2c_of_match[] = {
{ .compatible = "mediatek,mt2712-i2c", .data = &mt2712_compat },
{ .compatible = "mediatek,mt6577-i2c", .data = &mt6577_compat },
@@ -412,6 +425,7 @@ static const struct of_device_id mtk_i2c_of_match[] = {
{ .compatible = "mediatek,mt8173-i2c", .data = &mt8173_compat },
{ .compatible = "mediatek,mt8183-i2c", .data = &mt8183_compat },
{ .compatible = "mediatek,mt8192-i2c", .data = &mt8192_compat },
+ { .compatible = "mediatek,mt8365-i2c", .data = &mt8365_compat },
{}
};
MODULE_DEVICE_TABLE(of, mtk_i2c_of_match);
--
2.31.1

2021-05-21 02:27:33

by Fabien Parent

[permalink] [raw]
Subject: [PATCH v2 4/4] arm64: dts: mediatek: mt8192: fix i2c node names

Fix the i2c node names to be compliant to the YAML schema. The
I2C node name should match the following pattern: "^i2c@[0-9a-f]+$".

Signed-off-by: Fabien Parent <[email protected]>
---

v2: New patch

arch/arm64/boot/dts/mediatek/mt8192.dtsi | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/arch/arm64/boot/dts/mediatek/mt8192.dtsi b/arch/arm64/boot/dts/mediatek/mt8192.dtsi
index 9757138a8bbd..684e8e32af16 100644
--- a/arch/arm64/boot/dts/mediatek/mt8192.dtsi
+++ b/arch/arm64/boot/dts/mediatek/mt8192.dtsi
@@ -436,7 +436,7 @@ nor_flash: spi@11234000 {
status = "disable";
};

- i2c3: i2c3@11cb0000 {
+ i2c3: i2c@11cb0000 {
compatible = "mediatek,mt8192-i2c";
reg = <0 0x11cb0000 0 0x1000>,
<0 0x10217300 0 0x80>;
@@ -449,7 +449,7 @@ i2c3: i2c3@11cb0000 {
status = "disabled";
};

- i2c7: i2c7@11d00000 {
+ i2c7: i2c@11d00000 {
compatible = "mediatek,mt8192-i2c";
reg = <0 0x11d00000 0 0x1000>,
<0 0x10217600 0 0x180>;
@@ -462,7 +462,7 @@ i2c7: i2c7@11d00000 {
status = "disabled";
};

- i2c8: i2c8@11d01000 {
+ i2c8: i2c@11d01000 {
compatible = "mediatek,mt8192-i2c";
reg = <0 0x11d01000 0 0x1000>,
<0 0x10217780 0 0x180>;
@@ -475,7 +475,7 @@ i2c8: i2c8@11d01000 {
status = "disabled";
};

- i2c9: i2c9@11d02000 {
+ i2c9: i2c@11d02000 {
compatible = "mediatek,mt8192-i2c";
reg = <0 0x11d02000 0 0x1000>,
<0 0x10217900 0 0x180>;
@@ -488,7 +488,7 @@ i2c9: i2c9@11d02000 {
status = "disabled";
};

- i2c1: i2c1@11d20000 {
+ i2c1: i2c@11d20000 {
compatible = "mediatek,mt8192-i2c";
reg = <0 0x11d20000 0 0x1000>,
<0 0x10217100 0 0x80>;
@@ -501,7 +501,7 @@ i2c1: i2c1@11d20000 {
status = "disabled";
};

- i2c2: i2c2@11d21000 {
+ i2c2: i2c@11d21000 {
compatible = "mediatek,mt8192-i2c";
reg = <0 0x11d21000 0 0x1000>,
<0 0x10217180 0 0x180>;
@@ -514,7 +514,7 @@ i2c2: i2c2@11d21000 {
status = "disabled";
};

- i2c4: i2c4@11d22000 {
+ i2c4: i2c@11d22000 {
compatible = "mediatek,mt8192-i2c";
reg = <0 0x11d22000 0 0x1000>,
<0 0x10217380 0 0x180>;
@@ -527,7 +527,7 @@ i2c4: i2c4@11d22000 {
status = "disabled";
};

- i2c5: i2c5@11e00000 {
+ i2c5: i2c@11e00000 {
compatible = "mediatek,mt8192-i2c";
reg = <0 0x11e00000 0 0x1000>,
<0 0x10217500 0 0x80>;
@@ -540,7 +540,7 @@ i2c5: i2c5@11e00000 {
status = "disabled";
};

- i2c0: i2c0@11f00000 {
+ i2c0: i2c@11f00000 {
compatible = "mediatek,mt8192-i2c";
reg = <0 0x11f00000 0 0x1000>,
<0 0x10217080 0 0x80>;
@@ -553,7 +553,7 @@ i2c0: i2c0@11f00000 {
status = "disabled";
};

- i2c6: i2c6@11f01000 {
+ i2c6: i2c@11f01000 {
compatible = "mediatek,mt8192-i2c";
reg = <0 0x11f01000 0 0x1000>,
<0 0x10217580 0 0x80>;
--
2.31.1

2021-05-21 20:06:14

by Rob Herring (Arm)

[permalink] [raw]
Subject: Re: [PATCH v2 1/4] dt-bindings: i2c: i2c-mt65xx: convert doc to yaml schema format

On Thu, May 20, 2021 at 01:21:02PM +0200, Fabien Parent wrote:
> Convert the binding documentation for i2c-mt65xx driver to the
> YAML schema format.
>
> Signed-off-by: Fabien Parent <[email protected]>
> ---
>
> v2:
> * write compatibles in a more compact way
> * set the node pattern to be "^i2c@[0-9a-f]+$" instead of
> "^i2c[0-9]*@[0-9a-f]+"$
>
> .../devicetree/bindings/i2c/i2c-mt65xx.txt | 49 ----------
> .../devicetree/bindings/i2c/i2c-mt65xx.yaml | 93 +++++++++++++++++++
> 2 files changed, 93 insertions(+), 49 deletions(-)
> delete mode 100644 Documentation/devicetree/bindings/i2c/i2c-mt65xx.txt
> create mode 100644 Documentation/devicetree/bindings/i2c/i2c-mt65xx.yaml
>
> diff --git a/Documentation/devicetree/bindings/i2c/i2c-mt65xx.txt b/Documentation/devicetree/bindings/i2c/i2c-mt65xx.txt
> deleted file mode 100644
> index 7f0194fdd0cc..000000000000
> --- a/Documentation/devicetree/bindings/i2c/i2c-mt65xx.txt
> +++ /dev/null
> @@ -1,49 +0,0 @@
> -* MediaTek's I2C controller
> -
> -The MediaTek's I2C controller is used to interface with I2C devices.
> -
> -Required properties:
> - - compatible: value should be either of the following.
> - "mediatek,mt2701-i2c", "mediatek,mt6577-i2c": for MediaTek MT2701
> - "mediatek,mt2712-i2c": for MediaTek MT2712
> - "mediatek,mt6577-i2c": for MediaTek MT6577
> - "mediatek,mt6589-i2c": for MediaTek MT6589
> - "mediatek,mt6797-i2c", "mediatek,mt6577-i2c": for MediaTek MT6797
> - "mediatek,mt7622-i2c": for MediaTek MT7622
> - "mediatek,mt7623-i2c", "mediatek,mt6577-i2c": for MediaTek MT7623
> - "mediatek,mt7629-i2c", "mediatek,mt2712-i2c": for MediaTek MT7629
> - "mediatek,mt8173-i2c": for MediaTek MT8173
> - "mediatek,mt8183-i2c": for MediaTek MT8183
> - "mediatek,mt8192-i2c": for MediaTek MT8192
> - "mediatek,mt8516-i2c", "mediatek,mt2712-i2c": for MediaTek MT8516
> - - reg: physical base address of the controller and dma base, length of memory
> - mapped region.
> - - interrupts: interrupt number to the cpu.
> - - clock-div: the fixed value for frequency divider of clock source in i2c
> - module. Each IC may be different.
> - - clocks: clock name from clock manager
> - - clock-names: Must include "main" and "dma", "arb" is for multi-master that
> - one bus has more than two i2c controllers, if enable have-pmic need include
> - "pmic" extra.
> -
> -Optional properties:
> - - clock-frequency: Frequency in Hz of the bus when transfer, the default value
> - is 100000.
> - - mediatek,have-pmic: platform can control i2c form special pmic side.
> - Only mt6589 and mt8135 support this feature.
> - - mediatek,use-push-pull: IO config use push-pull mode.
> -
> -Example:
> -
> - i2c0: i2c@1100d000 {
> - compatible = "mediatek,mt6577-i2c";
> - reg = <0x1100d000 0x70>,
> - <0x11000300 0x80>;
> - interrupts = <GIC_SPI 44 IRQ_TYPE_LEVEL_LOW>;
> - clock-frequency = <400000>;
> - mediatek,have-pmic;
> - clock-div = <16>;
> - clocks = <&i2c0_ck>, <&ap_dma_ck>;
> - clock-names = "main", "dma";
> - };
> -
> diff --git a/Documentation/devicetree/bindings/i2c/i2c-mt65xx.yaml b/Documentation/devicetree/bindings/i2c/i2c-mt65xx.yaml
> new file mode 100644
> index 000000000000..41cedb4930de
> --- /dev/null
> +++ b/Documentation/devicetree/bindings/i2c/i2c-mt65xx.yaml
> @@ -0,0 +1,93 @@
> +# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
> +%YAML 1.2
> +---
> +$id: "http://devicetree.org/schemas/i2c/i2c-mt65xx.yaml#"
> +$schema: "http://devicetree.org/meta-schemas/core.yaml#"
> +
> +title: MediaTek I2C Controller
> +
> +maintainers:
> + - Qii Wang <[email protected]>
> + - Matthias Brugger <[email protected]>
> +
> +allOf:
> + - $ref: /schemas/i2c/i2c-controller.yaml#
> +
> +properties:
> + $nodename:
> + pattern: "^i2c@[0-9a-f]+$"
> +
> + compatible:
> + oneOf:
> + - enum:
> + - mediatek,mt2712-i2c
> + - mediatek,mt6577-i2c
> + - mediatek,mt6589-i2c
> + - mediatek,mt7622-i2c
> + - mediatek,mt8173-i2c
> + - mediatek,mt8183-i2c
> + - mediatek,mt8192-i2c
> + - items:
> + - enum:
> + - mediatek,mt2701-i2c
> + - mediatek,mt6797-i2c
> + - mediatek,mt7623-i2c
> + - const: mediatek,mt6577-i2c
> + - items:
> + - enum:
> + - mediatek,mt7629-i2c
> + - mediatek,mt8516-i2c
> + - const: mediatek,mt2712-i2c
> +
> + clocks:
> + minItems: 2
> + maxItems: 4
> + items:
> + - description: Controller clock
> + - description: DMA clock
> + - description: ARB clock for multi-master when a bus has more than
> + one i2c controllers
> + - description: PMIC clock. Only when mediatek,have-pmic is set.
> +
> + clock-names:
> + minItems: 2
> + maxItems: 4
> + items:
> + - const: main
> + - const: dma
> + - const: arb
> + - const: pmic
> +
> + mediatek,have-pmic:
> + $ref: /schemas/types.yaml#/definitions/flag
> + description: Platform can control I2C from the PMIC
> +
> + mediatek,use-push-pull:
> + $ref: /schemas/types.yaml#/definitions/flag
> + description: IO config use push-pull mode.
> +
> +required:
> + - compatible
> + - reg
> + - interrupts
> + - clocks
> + - clock-names
> + - clock-div

This isn't documented.

> +
> +unevaluatedProperties: false
> +
> +examples:
> + - |
> + #include <dt-bindings/interrupt-controller/irq.h>
> + #include <dt-bindings/interrupt-controller/arm-gic.h>
> + i2c0: i2c@1100d000 {
> + compatible = "mediatek,mt6577-i2c";
> + reg = <0x1100d000 0x70>,
> + <0x11000300 0x80>;
> + interrupts = <GIC_SPI 44 IRQ_TYPE_LEVEL_LOW>;
> + clock-frequency = <400000>;
> + mediatek,have-pmic;
> + clock-div = <16>;
> + clocks = <&i2c0_ck>, <&ap_dma_ck>;
> + clock-names = "main", "dma";
> + };
> --
> 2.31.1
>