diff options
| author |   Olof Johansson <olof@lixom.net> | 2018-05-25 15:12:32 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2018-05-25 15:12:32 -0700 |
| commit | 4b9743e84cab9ca3f9277ccb7ffa614567969e2e (patch) | |
| tree | 9c3f8fe2e5f6aa98dae52b282d13d0e60a83a04c /Documentation/devicetree/bindings/vendor-prefixes.txt | |
| parent | arm64: dts: sprd: fix typo in 'remote-endpoint' (diff) | |
| parent | ARM: dts: Aspeed: Enable USB ports on eval board. (diff) | |
| download | linux-dev-4b9743e84cab9ca3f9277ccb7ffa614567969e2e.tar.xz linux-dev-4b9743e84cab9ca3f9277ccb7ffa614567969e2e.zip | |
Merge tag 'aspeed-4.18-devicetree' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/aspeed into next/dt
ASPEED device tree updates for 4.18
New hardware support added:
USB controllers for AST2400 and AST2500 which have drivers
merged in 4.18.
Hardware random number generator which we made enhancements to many
releases ago, but never added the device tree parts.
Misc changes to support watchdog and gpio-keys features used by
OpenBMC systems.
New machines:
Intel S2600WF, an Intel platform family with an ASPEED AST2500 BMC.
Inventec Lanyang, a Power 9 platform with AST2500.
Portwell Neptune, a x86 server development kit with an AST2500.
* tag 'aspeed-4.18-devicetree' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/aspeed:
ARM: dts: Aspeed: Enable USB ports on eval board.
ARM: dts: Add Aspeed SoC USB controllers to device-tree
ARM: dts: aspeed: Add S2600WF BMC Machine
ARM: dts: aspeed: Add Inventec Lanyang BMC
ARM: dts: aspeed: Add Portwell Neptune machine
ARM: dts: aspeed: witherspoon: Set alternate boot
ARM: dts: aspeed: witherspoon: Add gpio keys for power supply presence
ARM: dts: aspeed: witherspoon: Enable checkstop and cooling gpio keys
ARM: dts: aspeed: zaius: Add pcie-e2b-present gpio key
ARM: dts: aspeed: romulus: Add id-button gpio key
ARM: dts: aspeed: Describe random number device
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'Documentation/devicetree/bindings/vendor-prefixes.txt')
| -rw-r--r-- | Documentation/devicetree/bindings/vendor-prefixes.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/vendor-prefixes.txt b/Documentation/devicetree/bindings/vendor-prefixes.txt index cd93661954e6..883d72dc9027 100644 --- a/Documentation/devicetree/bindings/vendor-prefixes.txt +++ b/Documentation/devicetree/bindings/vendor-prefixes.txt @@ -280,6 +280,7 @@ pine64 Pine64 pixcir PIXCIR MICROELECTRONICS Co., Ltd plathome Plat'Home Co., Ltd. plda PLDA +portwell Portwell Inc. poslab Poslab Technology Co., Ltd. powervr PowerVR (deprecated, use img) probox2 PROBOX2 (by W2COMP Co., Ltd.) |