From: Xianwei Zhao <xianwei.zhao@xxxxxxxxxxx> Move #gpio-cells property from common yaml file to lower-level yaml files. Signed-off-by: Xianwei Zhao <xianwei.zhao@xxxxxxxxxxx> --- .../devicetree/bindings/pinctrl/amlogic,meson-pinctrl-a1.yaml | 3 +++ .../devicetree/bindings/pinctrl/amlogic,meson-pinctrl-common.yaml | 3 --- .../devicetree/bindings/pinctrl/amlogic,meson-pinctrl-g12a-aobus.yaml | 3 +++ .../bindings/pinctrl/amlogic,meson-pinctrl-g12a-periphs.yaml | 3 +++ .../devicetree/bindings/pinctrl/amlogic,meson8-pinctrl-aobus.yaml | 3 +++ .../devicetree/bindings/pinctrl/amlogic,meson8-pinctrl-cbus.yaml | 3 +++ 6 files changed, 15 insertions(+), 3 deletions(-) diff --git a/Documentation/devicetree/bindings/pinctrl/amlogic,meson-pinctrl-a1.yaml b/Documentation/devicetree/bindings/pinctrl/amlogic,meson-pinctrl-a1.yaml index d9e0b2c48e84..a43d6d2a336d 100644 --- a/Documentation/devicetree/bindings/pinctrl/amlogic,meson-pinctrl-a1.yaml +++ b/Documentation/devicetree/bindings/pinctrl/amlogic,meson-pinctrl-a1.yaml @@ -38,6 +38,9 @@ patternProperties: - const: mux - const: gpio + "#gpio-cells": + const: 2 + gpio-line-names: minItems: 62 # A1 maxItems: 82 # S4 diff --git a/Documentation/devicetree/bindings/pinctrl/amlogic,meson-pinctrl-common.yaml b/Documentation/devicetree/bindings/pinctrl/amlogic,meson-pinctrl-common.yaml index e707c222a07f..7b2d129845f1 100644 --- a/Documentation/devicetree/bindings/pinctrl/amlogic,meson-pinctrl-common.yaml +++ b/Documentation/devicetree/bindings/pinctrl/amlogic,meson-pinctrl-common.yaml @@ -35,9 +35,6 @@ $defs: properties: gpio-controller: true - "#gpio-cells": - const: 2 - gpio-ranges: maxItems: 1 diff --git a/Documentation/devicetree/bindings/pinctrl/amlogic,meson-pinctrl-g12a-aobus.yaml b/Documentation/devicetree/bindings/pinctrl/amlogic,meson-pinctrl-g12a-aobus.yaml index 108719bde0d0..9488bb7c8da3 100644 --- a/Documentation/devicetree/bindings/pinctrl/amlogic,meson-pinctrl-g12a-aobus.yaml +++ b/Documentation/devicetree/bindings/pinctrl/amlogic,meson-pinctrl-g12a-aobus.yaml @@ -36,6 +36,9 @@ patternProperties: - const: ds - const: gpio + "#gpio-cells": + const: 2 + gpio-line-names: maxItems: 15 diff --git a/Documentation/devicetree/bindings/pinctrl/amlogic,meson-pinctrl-g12a-periphs.yaml b/Documentation/devicetree/bindings/pinctrl/amlogic,meson-pinctrl-g12a-periphs.yaml index dc277f2e2edf..b6f72b2c3d38 100644 --- a/Documentation/devicetree/bindings/pinctrl/amlogic,meson-pinctrl-g12a-periphs.yaml +++ b/Documentation/devicetree/bindings/pinctrl/amlogic,meson-pinctrl-g12a-periphs.yaml @@ -38,6 +38,9 @@ patternProperties: - const: mux - const: ds + "#gpio-cells": + const: 2 + gpio-line-names: maxItems: 85 diff --git a/Documentation/devicetree/bindings/pinctrl/amlogic,meson8-pinctrl-aobus.yaml b/Documentation/devicetree/bindings/pinctrl/amlogic,meson8-pinctrl-aobus.yaml index add83c676327..1315e6203f44 100644 --- a/Documentation/devicetree/bindings/pinctrl/amlogic,meson8-pinctrl-aobus.yaml +++ b/Documentation/devicetree/bindings/pinctrl/amlogic,meson8-pinctrl-aobus.yaml @@ -44,6 +44,9 @@ patternProperties: - const: pull - const: gpio + "#gpio-cells": + const: 2 + gpio-line-names: minItems: 11 # GXL maxItems: 16 # Meson8 diff --git a/Documentation/devicetree/bindings/pinctrl/amlogic,meson8-pinctrl-cbus.yaml b/Documentation/devicetree/bindings/pinctrl/amlogic,meson8-pinctrl-cbus.yaml index 412bbcc276f3..07fc77403c6f 100644 --- a/Documentation/devicetree/bindings/pinctrl/amlogic,meson8-pinctrl-cbus.yaml +++ b/Documentation/devicetree/bindings/pinctrl/amlogic,meson8-pinctrl-cbus.yaml @@ -45,6 +45,9 @@ patternProperties: - const: pull-enable - const: gpio + "#gpio-cells": + const: 2 + gpio-line-names: minItems: 86 # AXG maxItems: 120 # Meson8 -- 2.37.1