From: Xianwei Zhao <xianwei.zhao@xxxxxxxxxxx> Move #gpio-cells and gpio-controller properties 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 | 5 +++++ .../devicetree/bindings/pinctrl/amlogic,meson-pinctrl-common.yaml | 5 ----- .../bindings/pinctrl/amlogic,meson-pinctrl-g12a-aobus.yaml | 5 +++++ .../bindings/pinctrl/amlogic,meson-pinctrl-g12a-periphs.yaml | 5 +++++ .../devicetree/bindings/pinctrl/amlogic,meson8-pinctrl-aobus.yaml | 5 +++++ .../devicetree/bindings/pinctrl/amlogic,meson8-pinctrl-cbus.yaml | 5 +++++ 6 files changed, 25 insertions(+), 5 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..f841367878a0 100644 --- a/Documentation/devicetree/bindings/pinctrl/amlogic,meson-pinctrl-a1.yaml +++ b/Documentation/devicetree/bindings/pinctrl/amlogic,meson-pinctrl-a1.yaml @@ -38,6 +38,11 @@ patternProperties: - const: mux - const: gpio + gpio-controller: true + + "#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..e3765010f6a8 100644 --- a/Documentation/devicetree/bindings/pinctrl/amlogic,meson-pinctrl-common.yaml +++ b/Documentation/devicetree/bindings/pinctrl/amlogic,meson-pinctrl-common.yaml @@ -33,11 +33,6 @@ $defs: type: object 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..47607ba59237 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,11 @@ patternProperties: - const: ds - const: gpio + gpio-controller: true + + "#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..adbcda6ce18e 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,11 @@ patternProperties: - const: mux - const: ds + gpio-controller: true + + "#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..15e04f2ef9e8 100644 --- a/Documentation/devicetree/bindings/pinctrl/amlogic,meson8-pinctrl-aobus.yaml +++ b/Documentation/devicetree/bindings/pinctrl/amlogic,meson8-pinctrl-aobus.yaml @@ -44,6 +44,11 @@ patternProperties: - const: pull - const: gpio + gpio-controller: true + + "#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..c63e057cca92 100644 --- a/Documentation/devicetree/bindings/pinctrl/amlogic,meson8-pinctrl-cbus.yaml +++ b/Documentation/devicetree/bindings/pinctrl/amlogic,meson8-pinctrl-cbus.yaml @@ -45,6 +45,11 @@ patternProperties: - const: pull-enable - const: gpio + gpio-controller: true + + "#gpio-cells": + const: 2 + gpio-line-names: minItems: 86 # AXG maxItems: 120 # Meson8 -- 2.37.1