diff options
author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2020-06-06 10:45:37 -0700 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2020-06-06 10:45:37 -0700 |
commit | 8dd06ef34b6e2f41b29fbf5fc1663780f2524285 (patch) | |
tree | d59152f37ea7b36c3cf1778e20b85239f89c4e77 /Documentation/devicetree/bindings/mfd/atmel-gpbr.txt | |
parent | Input: synaptics - add a second working PNP_ID for Lenovo T470s (diff) | |
parent | Input: iqs269a - add missing I2C dependency (diff) | |
download | linux-dev-8dd06ef34b6e2f41b29fbf5fc1663780f2524285.tar.xz linux-dev-8dd06ef34b6e2f41b29fbf5fc1663780f2524285.zip |
Merge branch 'next' into for-linus
Prepare input updates for 5.8 merge window.
Diffstat (limited to 'Documentation/devicetree/bindings/mfd/atmel-gpbr.txt')
-rw-r--r-- | Documentation/devicetree/bindings/mfd/atmel-gpbr.txt | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Documentation/devicetree/bindings/mfd/atmel-gpbr.txt b/Documentation/devicetree/bindings/mfd/atmel-gpbr.txt index a28569540683..e8c525569f10 100644 --- a/Documentation/devicetree/bindings/mfd/atmel-gpbr.txt +++ b/Documentation/devicetree/bindings/mfd/atmel-gpbr.txt @@ -3,7 +3,9 @@ The GPBR are a set of battery-backed registers. Required properties: -- compatible: "atmel,at91sam9260-gpbr", "syscon" +- compatible: Should be one of the following: + "atmel,at91sam9260-gpbr", "syscon" + "microchip,sam9x60-gpbr", "syscon" - reg: contains offset/length value of the GPBR memory region. |