From: Rob Herring <robh@kernel.org>
Date: Wed, 29 Jun 2022 21:11:43 +0000 (-0600)
Subject: Merge branch 'dt/linus' into dt/next
X-Git-Tag: block-6.0-2022-08-12~12^2~44
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=ef314d213dd57af1454b32fdd332223f41d03833;p=linux-block.git

Merge branch 'dt/linus' into dt/next

Pull in the binding fixes so we don't have all the warnings.
---

ef314d213dd57af1454b32fdd332223f41d03833
diff --cc Documentation/devicetree/bindings/vendor-prefixes.yaml
index 93a836400328,0496773a3c4d..7bd0a85c38f5
--- a/Documentation/devicetree/bindings/vendor-prefixes.yaml
+++ b/Documentation/devicetree/bindings/vendor-prefixes.yaml
@@@ -141,10 -141,11 +141,13 @@@ patternProperties
      description: ASIX Electronics Corporation
    "^aspeed,.*":
      description: ASPEED Technology Inc.
 +  "^asrock,.*":
 +    description: ASRock Inc.
    "^asus,.*":
      description: AsusTek Computer Inc.
+   "^atheros,.*":
+     description: Qualcomm Atheros, Inc. (deprecated, use qca)
+     deprecated: true
    "^atlas,.*":
      description: Atlas Scientific LLC
    "^atmel,.*":