From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 14 Apr 2021 05:05:51 +0000 (+1000)
Subject: Merge remote-tracking branch 'devicetree/for-next'
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=29807c7f13a83d7c4966b89ff18a6bb6c63d55b9;p=users%2Fjedix%2Flinux-maple.git

Merge remote-tracking branch 'devicetree/for-next'

# Conflicts:
#	drivers/of/of_net.c
---

29807c7f13a83d7c4966b89ff18a6bb6c63d55b9
diff --cc Documentation/devicetree/bindings/input/input.yaml
index caba93209ae7,3fc37478c0c0..74244d21d2b3
--- a/Documentation/devicetree/bindings/input/input.yaml
+++ b/Documentation/devicetree/bindings/input/input.yaml
@@@ -32,13 -32,5 +32,12 @@@ properties
        Duration in seconds which the key should be kept pressed for device to
        power off automatically. Device with key pressed shutdown feature can
        specify this property.
-     $ref: /schemas/types.yaml#/definitions/uint32
  
 +  reset-time-sec:
 +    description:
 +      Duration in seconds which the key should be kept pressed for device to
 +      reset automatically. Device with key pressed reset feature can specify
 +      this property.
 +    $ref: /schemas/types.yaml#/definitions/uint32
 +
  additionalProperties: true
diff --cc Documentation/devicetree/bindings/vendor-prefixes.yaml
index 3926e4d5666e,ab3bb1020d8d..b12020fb6651
--- a/Documentation/devicetree/bindings/vendor-prefixes.yaml
+++ b/Documentation/devicetree/bindings/vendor-prefixes.yaml
@@@ -1030,10 -1024,10 +1032,12 @@@ patternProperties
      description: Silergy Corp.
    "^silex-insight,.*":
      description: Silex Insight
+   "^siliconfile,.*":
+     description: Siliconfile Technologies lnc.
    "^siliconmitus,.*":
      description: Silicon Mitus, Inc.
 +  "^siemens,.*":
 +    description: Siemens AG
    "^simtek,.*":
      description: Cypress Semiconductor Corporation (Simtek Corporation)
    "^sinlinx,.*":