diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-05-01 23:07:02 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-05-01 23:07:02 +0300 |
| commit | 6fb41cbd7d82f7b9e41db6245f6a46c84ca3083e (patch) | |
| tree | ad5838e0b8ecb22bc5d78fb476d1569ecbe82372 /Documentation | |
| parent | 5c6ba7d53274b5e8b13ecbc727d8eb1ea4a2bcdc (diff) | |
| parent | 2c1175c2e8e5487233cabde358a19577562ac83e (diff) | |
| download | linux-6fb41cbd7d82f7b9e41db6245f6a46c84ca3083e.tar.xz | |
Merge tag 'for-linux-4.12' of git://github.com/cminyard/linux-ipmi
Pull IPMI updates from Corey Minyard:
"A few fixes of things in the IPMI area, the watchdog would have issues
at panic time cause by a recently introduced change, a problem with
device numbering, one possible panic in the I2C driver (destined for
stable).
Nothing earth-shattering, but some things that need to go in"
* tag 'for-linux-4.12' of git://github.com/cminyard/linux-ipmi:
ipmi/watchdog: fix wdog hang on panic waiting for ipmi response
ipmi_si: use smi_num for init_name
ipmi: bt-bmc: Add ast2500 compatible string
ACPI / IPMI: change warning to debug on timeout
ACPI / IPMI: allow ACPI_IPMI with IPMI_SSIF
ipmi_ssif: use setup_timer
ipmi: Fix kernel panic at ipmi_ssif_thread()
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/devicetree/bindings/ipmi/aspeed,ast2400-ibt-bmc.txt | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Documentation/devicetree/bindings/ipmi/aspeed,ast2400-ibt-bmc.txt b/Documentation/devicetree/bindings/ipmi/aspeed,ast2400-ibt-bmc.txt index 6f28969af9dc..028268fd99ee 100644 --- a/Documentation/devicetree/bindings/ipmi/aspeed,ast2400-ibt-bmc.txt +++ b/Documentation/devicetree/bindings/ipmi/aspeed,ast2400-ibt-bmc.txt @@ -6,7 +6,9 @@ perform in-band IPMI communication with their host. Required properties: -- compatible : should be "aspeed,ast2400-ibt-bmc" +- compatible : should be one of + "aspeed,ast2400-ibt-bmc" + "aspeed,ast2500-ibt-bmc" - reg: physical address and size of the registers Optional properties: |