| Message ID | 20221118113028.145348-1-y.oudjana@protonmail.com |
|---|---|
| Headers | show |
| Series | MediaTek pinctrl DT binding cleanup and MT6735 pinctrl support | expand |
Il 18/11/22 12:30, Yassine Oudjana ha scritto: > From: Yassine Oudjana <y.oudjana@protonmail.com> > > Combine MT6795 pin controller document into MT6779 one. In the > process, amend the example with comments and additional pinctrl > nodes from the MT6795 example, replace the current interrupts > property description with the one from the MT6795 document since > it makes more sense and define its items using conditionals > as they now vary between variants. Also use conditionals to define > valid values for the drive-strength property as well as items of > the interrupts property for each variant since they are different > on MT6795. > > Signed-off-by: Yassine Oudjana <y.oudjana@protonmail.com> > --- > .../pinctrl/mediatek,mt6779-pinctrl.yaml | 78 +++++- > .../pinctrl/mediatek,pinctrl-mt6795.yaml | 227 ------------------ > 2 files changed, 73 insertions(+), 232 deletions(-) > delete mode 100644 Documentation/devicetree/bindings/pinctrl/mediatek,pinctrl-mt6795.yaml > > diff --git a/Documentation/devicetree/bindings/pinctrl/mediatek,mt6779-pinctrl.yaml b/Documentation/devicetree/bindings/pinctrl/mediatek,mt6779-pinctrl.yaml > index 9d481311cc6b..f26584af5c8c 100644 > --- a/Documentation/devicetree/bindings/pinctrl/mediatek,mt6779-pinctrl.yaml > +++ b/Documentation/devicetree/bindings/pinctrl/mediatek,mt6779-pinctrl.yaml > @@ -8,6 +8,7 @@ title: Mediatek MT6779 Pin Controller > > maintainers: > - Andy Teng <andy.teng@mediatek.com> > + - AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com> > - Sean Wang <sean.wang@kernel.org> > > description: > @@ -18,6 +19,7 @@ properties: > compatible: > enum: > - mediatek,mt6779-pinctrl > + - mediatek,mt6795-pinctrl > - mediatek,mt6797-pinctrl > > reg: > @@ -43,9 +45,7 @@ properties: > interrupt-controller: true > > interrupts: > - maxItems: 1 > - description: | > - Specifies the summary IRQ. > + description: Interrupt outputs to the system interrupt controller (sysirq). > > "#interrupt-cells": > const: 2 > @@ -81,6 +81,48 @@ allOf: > - const: iocfg_lt > - const: iocfg_tl > - const: eint > + > + interrupts: > + items: > + - description: EINT interrupt > + > + patternProperties: > + '-pins$': > + patternProperties: > + '^pins': > + properties: > + drive-strength: > + enum: [2, 4, 8, 12, 16] > + > + - if: > + properties: > + compatible: > + contains: > + const: mediatek,mt6795-pinctrl > + then: > + properties: > + reg: > + minItems: 2 > + maxItems: 2 > + > + reg-names: > + items: > + - const: base > + - const: eint > + > + interrupts: > + items: > + - description: EINT interrupt > + - description: EINT event_b interrupt On MT6795 (and many others!), event_b is optional. minItems: 1 Regards, Angelo > + > + patternProperties: > + '-pins$': > + patternProperties: > + '^pins': > + properties: > + drive-strength: > + enum: [2, 4, 6, 8, 10, 12, 14, 16] > + > - if: > properties: > compatible: > @@ -99,6 +141,19 @@ allOf: > - const: iocfgb > - const: iocfgr > - const: iocfgt > + > + interrupts: > + items: > + - description: EINT interrupt > + > + patternProperties: > + '-pins$': > + patternProperties: > + '^pins': > + properties: > + drive-strength: > + enum: [2, 4, 8, 12, 16] > + > - if: > properties: > reg-names: > @@ -169,8 +224,7 @@ patternProperties: > > input-schmitt-disable: true > > - drive-strength: > - enum: [2, 4, 8, 12, 16] > + drive-strength: true > > slew-rate: > enum: [0, 1] > @@ -260,6 +314,20 @@ examples: > mediatek,pull-up-adv = <0>; > }; > }; > + > + /* GPIO0 set as multifunction GPIO0 */ > + gpio-pins { > + pins { > + pinmux = <PINMUX_GPIO0__FUNC_GPIO0>; > + }; > + }; > + > + /* GPIO52 set as multifunction SDA0 */ > + i2c0-pins { > + pins { > + pinmux = <PINMUX_GPIO52__FUNC_SDA0>; > + }; > + }; > }; > > mmc0 { > diff --git a/Documentation/devicetree/bindings/pinctrl/mediatek,pinctrl-mt6795.yaml b/Documentation/devicetree/bindings/pinctrl/mediatek,pinctrl-mt6795.yaml > deleted file mode 100644 > index 9399e0215526..000000000000 > --- a/Documentation/devicetree/bindings/pinctrl/mediatek,pinctrl-mt6795.yaml > +++ /dev/null > @@ -1,227 +0,0 @@ > -# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) > -%YAML 1.2 > ---- > -$id: http://devicetree.org/schemas/pinctrl/mediatek,pinctrl-mt6795.yaml# > -$schema: http://devicetree.org/meta-schemas/core.yaml# > - > -title: Mediatek MT6795 Pin Controller > - > -maintainers: > - - AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com> > - - Sean Wang <sean.wang@kernel.org> > - > -description: | > - The Mediatek's Pin controller is used to control SoC pins. > - > -properties: > - compatible: > - const: mediatek,mt6795-pinctrl > - > - gpio-controller: true > - > - '#gpio-cells': > - description: | > - Number of cells in GPIO specifier. Since the generic GPIO binding is used, > - the amount of cells must be specified as 2. See the below > - mentioned gpio binding representation for description of particular cells. > - const: 2 > - > - gpio-ranges: > - description: GPIO valid number range. > - maxItems: 1 > - > - reg: > - description: > - Physical address base for gpio base and eint registers. > - minItems: 2 > - > - reg-names: > - items: > - - const: base > - - const: eint > - > - interrupt-controller: true > - > - '#interrupt-cells': > - const: 2 > - > - interrupts: > - description: Interrupt outputs to the system interrupt controller (sysirq). > - minItems: 1 > - items: > - - description: EINT interrupt > - - description: EINT event_b interrupt > - > -# PIN CONFIGURATION NODES > -patternProperties: > - '-pins$': > - type: object > - additionalProperties: false > - patternProperties: > - '^pins': > - type: object > - additionalProperties: false > - description: | > - A pinctrl node should contain at least one subnodes representing the > - pinctrl groups available on the machine. Each subnode will list the > - pins it needs, and how they should be configured, with regard to muxer > - configuration, pullups, drive strength, input enable/disable and > - input schmitt. > - An example of using macro: > - pincontroller { > - /* GPIO0 set as multifunction GPIO0 */ > - gpio-pins { > - pins { > - pinmux = <PINMUX_GPIO0__FUNC_GPIO0>; > - } > - }; > - /* GPIO45 set as multifunction SDA0 */ > - i2c0-pins { > - pins { > - pinmux = <PINMUX_GPIO45__FUNC_SDA0>; > - } > - }; > - }; > - $ref: "pinmux-node.yaml" > - > - properties: > - pinmux: > - description: | > - Integer array, represents gpio pin number and mux setting. > - Supported pin number and mux varies for different SoCs, and are > - defined as macros in dt-bindings/pinctrl/<soc>-pinfunc.h > - directly. > - > - drive-strength: > - enum: [2, 4, 6, 8, 10, 12, 14, 16] > - > - bias-pull-down: > - oneOf: > - - type: boolean > - - enum: [100, 101, 102, 103] > - description: mt6795 pull down PUPD/R0/R1 type define value. > - description: | > - For normal pull down type, it is not necessary to specify R1R0 > - values; When pull down type is PUPD/R0/R1, adding R1R0 defines > - will set different resistance values. > - > - bias-pull-up: > - oneOf: > - - type: boolean > - - enum: [100, 101, 102, 103] > - description: mt6795 pull up PUPD/R0/R1 type define value. > - description: | > - For normal pull up type, it is not necessary to specify R1R0 > - values; When pull up type is PUPD/R0/R1, adding R1R0 defines > - will set different resistance values. > - > - bias-disable: true > - > - output-high: true > - > - output-low: true > - > - input-enable: true > - > - input-disable: true > - > - input-schmitt-enable: true > - > - input-schmitt-disable: true > - > - mediatek,pull-up-adv: > - description: | > - Pull up setings for 2 pull resistors, R0 and R1. User can > - configure those special pins. Valid arguments are described as below: > - 0: (R1, R0) = (0, 0) which means R1 disabled and R0 disabled. > - 1: (R1, R0) = (0, 1) which means R1 disabled and R0 enabled. > - 2: (R1, R0) = (1, 0) which means R1 enabled and R0 disabled. > - 3: (R1, R0) = (1, 1) which means R1 enabled and R0 enabled. > - $ref: /schemas/types.yaml#/definitions/uint32 > - enum: [0, 1, 2, 3] > - > - mediatek,pull-down-adv: > - description: | > - Pull down settings for 2 pull resistors, R0 and R1. User can > - configure those special pins. Valid arguments are described as below: > - 0: (R1, R0) = (0, 0) which means R1 disabled and R0 disabled. > - 1: (R1, R0) = (0, 1) which means R1 disabled and R0 enabled. > - 2: (R1, R0) = (1, 0) which means R1 enabled and R0 disabled. > - 3: (R1, R0) = (1, 1) which means R1 enabled and R0 enabled. > - $ref: /schemas/types.yaml#/definitions/uint32 > - enum: [0, 1, 2, 3] > - > - required: > - - pinmux > - > -allOf: > - - $ref: "pinctrl.yaml#" > - > -required: > - - compatible > - - reg > - - reg-names > - - interrupts > - - interrupt-controller > - - '#interrupt-cells' > - - gpio-controller > - - '#gpio-cells' > - - gpio-ranges > - > -additionalProperties: false > - > -examples: > - - | > - #include <dt-bindings/interrupt-controller/arm-gic.h> > - #include <dt-bindings/interrupt-controller/irq.h> > - #include <dt-bindings/pinctrl/mt6795-pinfunc.h> > - > - soc { > - #address-cells = <2>; > - #size-cells = <2>; > - > - pio: pinctrl@10005000 { > - compatible = "mediatek,mt6795-pinctrl"; > - reg = <0 0x10005000 0 0x1000>, <0 0x1000b000 0 0x1000>; > - reg-names = "base", "eint"; > - gpio-controller; > - #gpio-cells = <2>; > - gpio-ranges = <&pio 0 0 196>; > - interrupt-controller; > - interrupts = <GIC_SPI 153 IRQ_TYPE_LEVEL_HIGH>; > - #interrupt-cells = <2>; > - > - i2c0-pins { > - pins-sda-scl { > - pinmux = <PINMUX_GPIO45__FUNC_SDA0>, > - <PINMUX_GPIO46__FUNC_SCL0>; > - }; > - }; > - > - mmc0-pins { > - pins-cmd-dat { > - pinmux = <PINMUX_GPIO154__FUNC_MSDC0_DAT0>, > - <PINMUX_GPIO155__FUNC_MSDC0_DAT1>, > - <PINMUX_GPIO156__FUNC_MSDC0_DAT2>, > - <PINMUX_GPIO157__FUNC_MSDC0_DAT3>, > - <PINMUX_GPIO158__FUNC_MSDC0_DAT4>, > - <PINMUX_GPIO159__FUNC_MSDC0_DAT5>, > - <PINMUX_GPIO160__FUNC_MSDC0_DAT6>, > - <PINMUX_GPIO161__FUNC_MSDC0_DAT7>, > - <PINMUX_GPIO162__FUNC_MSDC0_CMD>; > - input-enable; > - bias-pull-up = <MTK_PUPD_SET_R1R0_01>; > - }; > - > - pins-clk { > - pinmux = <PINMUX_GPIO163__FUNC_MSDC0_CLK>; > - bias-pull-down = <MTK_PUPD_SET_R1R0_10>; > - }; > - > - pins-rst { > - pinmux = <PINMUX_GPIO165__FUNC_MSDC0_RSTB>; > - bias-pull-up = <MTK_PUPD_SET_R1R0_10>; > - }; > - }; > - }; > - };
Il 18/11/22 12:30, Yassine Oudjana ha scritto: > From: Yassine Oudjana <y.oudjana@protonmail.com> > > Add bindings for the pin controller found on MediaTek MT6735 and > MT6735M SoCs, including describing a method to manually specify > a pin and function in the pinmux property making defining bindings > for each pin/function combination unnecessary. The pin controllers > on those SoCs are generally identical, with the only difference > being the lack of MSDC2 pins (198-203) on MT6735M. > > Signed-off-by: Yassine Oudjana <y.oudjana@protonmail.com> > Reviewed-by: Rob Herring <robh@kernel.org> > --- > .../pinctrl/mediatek,mt6779-pinctrl.yaml | 55 ++++++++++++++++++- > MAINTAINERS | 6 ++ > 2 files changed, 60 insertions(+), 1 deletion(-) > ..snip.. > @@ -352,18 +391,32 @@ examples: > }; > > /* GPIO0 set as multifunction GPIO0 */ > - gpio-pins { > + gpio0-pins { > pins { > pinmux = <PINMUX_GPIO0__FUNC_GPIO0>; > }; > }; > > + /* GPIO1 set to function 0 (GPIO) */ > + gpio1-pins { > + pins { > + pinmux = <(MTK_PIN_NO(1) | 0)>; Please follow the same format that you can find in all of the mtXXXX-pinfunc.h. What you wrote here (MTK_PIN_NO(x) | func) is defined in there for the purpose of providing a definition name that actually means something (for both readability and documentation purposes). This means that your GPIO1 set to function 0 (gpio) should be pinmux = <PINMUX_GPIO1__FUNC_GPIO1>; > + }; > + }; > + > /* GPIO52 set as multifunction SDA0 */ > i2c0-pins { > pins { > pinmux = <PINMUX_GPIO52__FUNC_SDA0>; > }; > }; > + > + /* GPIO62 set to function 1 (primary function) */ > + i2c1-pins { > + pins { > + pinmux = <(MTK_PIN_NO(62) | 1)>; pinmux = <PINMUX_GPIO62__FUNC_SDA1>; (is it sda1??) This means that you should as well add a mediatek,mt6735-pinfunc.h binding... Regards, Angelo
On Fri, Nov 18, 2022 at 02:30:22PM +0300, Yassine Oudjana wrote: > From: Yassine Oudjana <y.oudjana@protonmail.com> > > mediatek,pinctrl-mt6795.yaml has different node name patterns which match > bindings of other MediaTek pin controllers, ref for pinmux-node.yaml which > has a description of the pinmux property, as well as some additional > descriptions for some pin configuration properties. Pull those changes > into mediatek,mt6779-pinctrl.yaml and adjust the example DTS to match in > preparation to combine the MT6795 document into it. > > Signed-off-by: Yassine Oudjana <y.oudjana@protonmail.com> > --- > .../pinctrl/mediatek,mt6779-pinctrl.yaml | 38 ++++++++++++++----- > 1 file changed, 28 insertions(+), 10 deletions(-) > > diff --git a/Documentation/devicetree/bindings/pinctrl/mediatek,mt6779-pinctrl.yaml b/Documentation/devicetree/bindings/pinctrl/mediatek,mt6779-pinctrl.yaml > index a2141eb0854e..d6231d11e949 100644 > --- a/Documentation/devicetree/bindings/pinctrl/mediatek,mt6779-pinctrl.yaml > +++ b/Documentation/devicetree/bindings/pinctrl/mediatek,mt6779-pinctrl.yaml > @@ -111,19 +111,21 @@ allOf: > - "#interrupt-cells" > > patternProperties: > - '-[0-9]*$': > + '-pins$': > type: object > additionalProperties: false > > patternProperties: > - '-pins*$': > + '^pins': > type: object > description: | > A pinctrl node should contain at least one subnodes representing the > pinctrl groups available on the machine. Each subnode will list the > pins it needs, and how they should be configured, with regard to muxer > configuration, pullups, drive strength, input enable/disable and input schmitt. > - $ref: "/schemas/pinctrl/pincfg-node.yaml" > + allOf: > + - $ref: pinmux-node.yaml > + - $ref: pincfg-node.yaml > > properties: > pinmux: > @@ -134,9 +136,25 @@ patternProperties: > > bias-disable: true > > - bias-pull-up: true > - > - bias-pull-down: true > + bias-pull-up: > + oneOf: > + - type: boolean > + - enum: [100, 101, 102, 103] > + description: Pull up PUPD/R0/R1 type define value. > + description: | > + For normal pull up type, it is not necessary to specify R1R0 > + values; When pull up type is PUPD/R0/R1, adding R1R0 defines > + will set different resistance values. > + > + bias-pull-down: > + oneOf: > + - type: boolean > + - enum: [100, 101, 102, 103] 'bias-pull-down' is defined to be in Ohms. This doesn't look like it's Ohms. > + description: Pull down PUPD/R0/R1 type define value. > + description: | > + For normal pull down type, it is not necessary to specify R1R0 > + values; When pull down type is PUPD/R0/R1, adding R1R0 defines > + will set different resistance values. > > input-enable: true > > @@ -218,8 +236,8 @@ examples: > #interrupt-cells = <2>; > interrupts = <GIC_SPI 204 IRQ_TYPE_LEVEL_HIGH>; > > - mmc0_pins_default: mmc0-0 { > - cmd-dat-pins { > + mmc0_pins_default: mmc0-pins { > + pins-cmd-dat { > pinmux = <PINMUX_GPIO168__FUNC_MSDC0_DAT0>, > <PINMUX_GPIO172__FUNC_MSDC0_DAT1>, > <PINMUX_GPIO169__FUNC_MSDC0_DAT2>, > @@ -232,11 +250,11 @@ examples: > input-enable; > mediatek,pull-up-adv = <1>; > }; > - clk-pins { > + pins-clk { > pinmux = <PINMUX_GPIO176__FUNC_MSDC0_CLK>; > mediatek,pull-down-adv = <2>; > }; > - rst-pins { > + pins-rst { > pinmux = <PINMUX_GPIO178__FUNC_MSDC0_RSTB>; > mediatek,pull-up-adv = <0>; > }; > -- > 2.38.1 > >
On Fri, 18 Nov 2022 14:30:24 +0300, Yassine Oudjana wrote: > From: Yassine Oudjana <y.oudjana@protonmail.com> > > Combine MT6795 pin controller document into MT6779 one. In the > process, amend the example with comments and additional pinctrl > nodes from the MT6795 example, replace the current interrupts > property description with the one from the MT6795 document since > it makes more sense and define its items using conditionals > as they now vary between variants. Also use conditionals to define > valid values for the drive-strength property as well as items of > the interrupts property for each variant since they are different > on MT6795. > > Signed-off-by: Yassine Oudjana <y.oudjana@protonmail.com> > --- > .../pinctrl/mediatek,mt6779-pinctrl.yaml | 78 +++++- > .../pinctrl/mediatek,pinctrl-mt6795.yaml | 227 ------------------ > 2 files changed, 73 insertions(+), 232 deletions(-) > delete mode 100644 Documentation/devicetree/bindings/pinctrl/mediatek,pinctrl-mt6795.yaml > Acked-by: Rob Herring <robh@kernel.org>
From: Yassine Oudjana <y.oudjana@protonmail.com> This series adds a driver for the pin controller found on the MediaTek MT6735 and MT6735M SoCs. The two differ in the last 6 physical pins, which are used for MSDC2 on MT6735 but don't exist on MT6735M (since MSDC2 doesn't exist on it to begin with). In preparation to document DT bindings for this pin controller, the existing documents for MT67xx SoCs are combined into one in order to eliminate duplicate property definitions and standardize pin configuration node names. Necessary cleanup is done along the way. Changes since v4: - Remove patches that were applied previously. - Define interrupts items for each variant (bringing back maxItems: 1 to the top level definition then adding maxItems: 2 under the MT6795 condition causes a dt_binding_check error for some reason) - Move example changes to the patch they belong to - Don't unnecessarily move the allOf block. Yassine Oudjana (7): dt-bindings: pinctrl: mediatek,mt6779-pinctrl: Pull pinctrl node changes from MT6795 document dt-bindings: pinctrl: mediatek,mt6779-pinctrl: Improve pinctrl subnode and property descriptions dt-bindings: pinctrl: mediatek,mt6779-pinctrl: Add MT6795 arm64: dts: mediatek: mt6797: Make pin configuration nodes follow DT bindings dt-bindings: pinctrl: mediatek,mt6779-pinctrl: Document MT6765 pin controller dt-bindings: pinctrl: mediatek,mt6779-pinctrl: Document MT6735 pin controller pinctrl: mediatek: Add MT6735 pinctrl driver .../pinctrl/mediatek,mt6779-pinctrl.yaml | 220 +- .../pinctrl/mediatek,pinctrl-mt6795.yaml | 227 - MAINTAINERS | 8 + arch/arm64/boot/dts/mediatek/mt6797.dtsi | 20 +- drivers/pinctrl/mediatek/Kconfig | 6 + drivers/pinctrl/mediatek/Makefile | 1 + drivers/pinctrl/mediatek/pinctrl-mt6735.c | 584 +++ drivers/pinctrl/mediatek/pinctrl-mtk-mt6735.h | 3993 +++++++++++++++++ 8 files changed, 4800 insertions(+), 259 deletions(-) delete mode 100644 Documentation/devicetree/bindings/pinctrl/mediatek,pinctrl-mt6795.yaml create mode 100644 drivers/pinctrl/mediatek/pinctrl-mt6735.c create mode 100644 drivers/pinctrl/mediatek/pinctrl-mtk-mt6735.h