From 9980367104cdc4ab19a3f64143fb8a62e33366c8 Mon Sep 17 00:00:00 2001
From: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Date: Sun, 16 Oct 2022 13:22:12 -0400
Subject: [PATCH] FROMGIT: dt-bindings: pinctrl: qcom,sc7280: use common TLMM
 pin schema

The common Qualcomm TLMM pin controller schema for pin mux and config
already brings requirement of function for gpio pins and the definition
of drive-strength.

Acked-by: Rob Herring <robh@kernel.org>
Link: https://lore.kernel.org/r/20221016172212.49105-18-krzysztof.kozlowski@linaro.org
Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
(cherry picked from commit b4997c1cb7d4c3900aab6fe5dad521f59369f93d
 git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-dt.git next/qcom-pinctrl)

BUG=none
TEST=build herobrine

Change-Id: I365293c25c99b4a87946acb39f302328572cf607
Signed-off-by: Matthias Kaehlcke <mka@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/kernel/+/4087135
Reviewed-by: Sean Paul <sean@poorly.run>
Reviewed-by: Douglas Anderson <dianders@chromium.org>
---
 .../bindings/pinctrl/qcom,sc7280-pinctrl.yaml  | 18 ++----------------
 1 file changed, 2 insertions(+), 16 deletions(-)

diff --git a/Documentation/devicetree/bindings/pinctrl/qcom,sc7280-pinctrl.yaml b/Documentation/devicetree/bindings/pinctrl/qcom,sc7280-pinctrl.yaml
index 5ddb4050f8b447343c7e3310602bda66785a5f41..503e36cfebe8de2136cfeb6f23c21aeb150a1afb 100644
--- a/Documentation/devicetree/bindings/pinctrl/qcom,sc7280-pinctrl.yaml
+++ b/Documentation/devicetree/bindings/pinctrl/qcom,sc7280-pinctrl.yaml
@@ -54,6 +54,7 @@ patternProperties:
     description:
       Pinctrl node's client devices use subnodes for desired pin configuration.
       Client device subnodes use below standard properties.
+    $ref: qcom,tlmm-common.yaml#/$defs/qcom-tlmm-state
 
     properties:
       pins:
@@ -102,16 +103,11 @@ patternProperties:
                 uim1_clk, uim1_data, uim1_present, uim1_reset, usb2phy_ac,
                 usb_phy, vfr_0, vfr_1, vsense_trigger ]
 
-      drive-strength:
-        enum: [2, 4, 6, 8, 10, 12, 14, 16]
-        default: 2
-        description:
-          Selects the drive strength for the specified pins, in mA.
-
       bias-pull-down: true
       bias-pull-up: true
       bias-bus-hold: true
       bias-disable: true
+      drive-strength: true
       input-enable: true
       output-high: true
       output-low: true
@@ -119,16 +115,6 @@ patternProperties:
     required:
       - pins
 
-    allOf:
-      - $ref: /schemas/pinctrl/pincfg-node.yaml
-      - if:
-          properties:
-            pins:
-              pattern: "^gpio([0-9]|[1-9][0-9]|1[0-7][0-9]|18[0-2])$"
-        then:
-          required:
-            - function
-
     additionalProperties: false
 
 allOf:
-- 
2.39.0.rc1.256.g54fd8350bd-goog