Message ID | 20230426-stmpe-dt-bindings-v4-1-36fdd53d9919@linaro.org |
---|---|
State | Accepted |
Commit | 6c19974d1e83fba2cca1cbea2fbf250f093eb5ed |
Headers | show |
Series | [v4,1/2] dt-bindings: gpio: Convert STMPE GPIO to YAML schema | expand |
On 08/05/2023 14:35, Linus Walleij wrote: > This rewrites the STMPE GPIO bindings to a YAML schema. > > We add the properties that are used in the widely used > STMPE GPIO device nodes found in the wild, most notably > interrupt support, so interrupt-cells and > interrupt-controller is now part of the bindings. > > Signed-off-by: Linus Walleij <linus.walleij@linaro.org> Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> Best regards, Krzysztof
On Mon, May 8, 2023 at 2:35 PM Linus Walleij <linus.walleij@linaro.org> wrote: > > This rewrites the STMPE GPIO bindings to a YAML schema. > > We add the properties that are used in the widely used > STMPE GPIO device nodes found in the wild, most notably > interrupt support, so interrupt-cells and > interrupt-controller is now part of the bindings. > > Signed-off-by: Linus Walleij <linus.walleij@linaro.org> > --- > ChangeLog v3->v4: > - Realize that there were actually some old bindings so we > need to get rid of them as part of this patch. > - Fix blank lines after description: keyword. > ChangeLog v2->v3: > - Use a compact hog node schema backed by the standard hog > schema. > ChangeLog v1->v2: > - New patch split off from the MFD patch. > --- > .../devicetree/bindings/gpio/gpio-stmpe.txt | 17 ------- > .../devicetree/bindings/gpio/st,stmpe-gpio.yaml | 53 ++++++++++++++++++++++ > 2 files changed, 53 insertions(+), 17 deletions(-) > > diff --git a/Documentation/devicetree/bindings/gpio/gpio-stmpe.txt b/Documentation/devicetree/bindings/gpio/gpio-stmpe.txt > deleted file mode 100644 > index b33f8f02c0d7..000000000000 > --- a/Documentation/devicetree/bindings/gpio/gpio-stmpe.txt > +++ /dev/null > @@ -1,17 +0,0 @@ > -STMPE gpio > ----------- > - > -Required properties: > - - compatible: "st,stmpe-gpio" > - > -Optional properties: > - - st,norequest-mask: bitmask specifying which GPIOs should _not_ be requestable > - due to different usage (e.g. touch, keypad) > - > -Node should be child node of stmpe node to which it belongs. > - > -Example: > - stmpe_gpio { > - compatible = "st,stmpe-gpio"; > - st,norequest-mask = <0x20>; //gpio 5 can't be used > - }; > diff --git a/Documentation/devicetree/bindings/gpio/st,stmpe-gpio.yaml b/Documentation/devicetree/bindings/gpio/st,stmpe-gpio.yaml > new file mode 100644 > index 000000000000..22c0cae73425 > --- /dev/null > +++ b/Documentation/devicetree/bindings/gpio/st,stmpe-gpio.yaml > @@ -0,0 +1,53 @@ > +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) > +%YAML 1.2 > +--- > +$id: http://devicetree.org/schemas/gpio/st,stmpe-gpio.yaml# > +$schema: http://devicetree.org/meta-schemas/core.yaml# > + > +title: STMicroelectonics Port Expander (STMPE) GPIO Block > + > +description: > + STMicroelectronics Port Expander (STMPE) is a series of slow > + bus controllers for various expanded peripherals such as GPIO, keypad, > + touchscreen, ADC, PWM or rotator. It can contain one or several different > + peripherals connected to SPI or I2C. These bindings pertain to the > + GPIO portions of these expanders. > + > +maintainers: > + - Linus Walleij <linus.walleij@linaro.org> > + > +properties: > + compatible: > + const: st,stmpe-gpio > + > + "#gpio-cells": > + const: 2 > + > + "#interrupt-cells": > + const: 2 > + > + gpio-controller: true > + > + interrupt-controller: true > + > + st,norequest-mask: > + description: > + A bitmask of GPIO lines that cannot be requested because for > + for example not being connected to anything on the system > + $ref: /schemas/types.yaml#/definitions/uint32 > + > +patternProperties: > + "^.+-hog(-[0-9]+)?$": > + type: object > + > + required: > + - gpio-hog > + > +additionalProperties: false > + > +required: > + - compatible > + - "#gpio-cells" > + - "#interrupt-cells" > + - gpio-controller > + - interrupt-controller > > -- > 2.34.1 > Applied, thanks! Bart
On Thu, May 11, 2023 at 4:58 PM Bartosz Golaszewski <brgl@bgdev.pl> wrote:
> Applied, thanks!
That works ... but patch 2/2 depends on this one. (uses $ref).
You'd have to give Lee an immutable branch that he can pull
before applying patch 2/2 so he has the dependency, or let him
apply both.
Yours,
Linus Walleij
On Thu, May 11, 2023 at 10:39 PM Linus Walleij <linus.walleij@linaro.org> wrote: > > On Thu, May 11, 2023 at 4:58 PM Bartosz Golaszewski <brgl@bgdev.pl> wrote: > > > Applied, thanks! > > That works ... but patch 2/2 depends on this one. (uses $ref). > You'd have to give Lee an immutable branch that he can pull > before applying patch 2/2 so he has the dependency, or let him > apply both. > > Yours, > Linus Walleij Sure: The following changes since commit ac9a78681b921877518763ba0e89202254349d1b: Linux 6.4-rc1 (2023-05-07 13:34:35 -0700) are available in the Git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git tags/v6.4-stmpe-gpio for you to fetch changes up to 6c19974d1e83fba2cca1cbea2fbf250f093eb5ed: dt-bindings: gpio: Convert STMPE GPIO to YAML schema (2023-05-11 16:58:04 +0200) Bart
On Tue, May 16, 2023 at 5:34 PM Bartosz Golaszewski <brgl@bgdev.pl> wrote: > On Thu, May 11, 2023 at 10:39 PM Linus Walleij <linus.walleij@linaro.org> wrote: > > > > On Thu, May 11, 2023 at 4:58 PM Bartosz Golaszewski <brgl@bgdev.pl> wrote: > > > > > Applied, thanks! > > > > That works ... but patch 2/2 depends on this one. (uses $ref). > > You'd have to give Lee an immutable branch that he can pull > > before applying patch 2/2 so he has the dependency, or let him > > apply both. > > > > Yours, > > Linus Walleij > > Sure: > > The following changes since commit ac9a78681b921877518763ba0e89202254349d1b: > > Linux 6.4-rc1 (2023-05-07 13:34:35 -0700) > > are available in the Git repository at: > > git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git > tags/v6.4-stmpe-gpio > > for you to fetch changes up to 6c19974d1e83fba2cca1cbea2fbf250f093eb5ed: > > dt-bindings: gpio: Convert STMPE GPIO to YAML schema (2023-05-11 > 16:58:04 +0200) Hey cool :D Lee if you pull this in you can apply 2/2 on top if it checks out. Yours, Linus Walleij
diff --git a/Documentation/devicetree/bindings/gpio/gpio-stmpe.txt b/Documentation/devicetree/bindings/gpio/gpio-stmpe.txt deleted file mode 100644 index b33f8f02c0d7..000000000000 --- a/Documentation/devicetree/bindings/gpio/gpio-stmpe.txt +++ /dev/null @@ -1,17 +0,0 @@ -STMPE gpio ----------- - -Required properties: - - compatible: "st,stmpe-gpio" - -Optional properties: - - st,norequest-mask: bitmask specifying which GPIOs should _not_ be requestable - due to different usage (e.g. touch, keypad) - -Node should be child node of stmpe node to which it belongs. - -Example: - stmpe_gpio { - compatible = "st,stmpe-gpio"; - st,norequest-mask = <0x20>; //gpio 5 can't be used - }; diff --git a/Documentation/devicetree/bindings/gpio/st,stmpe-gpio.yaml b/Documentation/devicetree/bindings/gpio/st,stmpe-gpio.yaml new file mode 100644 index 000000000000..22c0cae73425 --- /dev/null +++ b/Documentation/devicetree/bindings/gpio/st,stmpe-gpio.yaml @@ -0,0 +1,53 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/gpio/st,stmpe-gpio.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: STMicroelectonics Port Expander (STMPE) GPIO Block + +description: + STMicroelectronics Port Expander (STMPE) is a series of slow + bus controllers for various expanded peripherals such as GPIO, keypad, + touchscreen, ADC, PWM or rotator. It can contain one or several different + peripherals connected to SPI or I2C. These bindings pertain to the + GPIO portions of these expanders. + +maintainers: + - Linus Walleij <linus.walleij@linaro.org> + +properties: + compatible: + const: st,stmpe-gpio + + "#gpio-cells": + const: 2 + + "#interrupt-cells": + const: 2 + + gpio-controller: true + + interrupt-controller: true + + st,norequest-mask: + description: + A bitmask of GPIO lines that cannot be requested because for + for example not being connected to anything on the system + $ref: /schemas/types.yaml#/definitions/uint32 + +patternProperties: + "^.+-hog(-[0-9]+)?$": + type: object + + required: + - gpio-hog + +additionalProperties: false + +required: + - compatible + - "#gpio-cells" + - "#interrupt-cells" + - gpio-controller + - interrupt-controller
This rewrites the STMPE GPIO bindings to a YAML schema. We add the properties that are used in the widely used STMPE GPIO device nodes found in the wild, most notably interrupt support, so interrupt-cells and interrupt-controller is now part of the bindings. Signed-off-by: Linus Walleij <linus.walleij@linaro.org> --- ChangeLog v3->v4: - Realize that there were actually some old bindings so we need to get rid of them as part of this patch. - Fix blank lines after description: keyword. ChangeLog v2->v3: - Use a compact hog node schema backed by the standard hog schema. ChangeLog v1->v2: - New patch split off from the MFD patch. --- .../devicetree/bindings/gpio/gpio-stmpe.txt | 17 ------- .../devicetree/bindings/gpio/st,stmpe-gpio.yaml | 53 ++++++++++++++++++++++ 2 files changed, 53 insertions(+), 17 deletions(-)