diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2017-08-16 23:41:03 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2017-08-16 23:41:03 +0200 |
| commit | 4fda1e738758dddb84b014f17cc1d3917c19f854 (patch) | |
| tree | 69b287be875cd2453edc6a6dba22c36bab9b1382 /Documentation/devicetree/bindings/gpu | |
| parent | Merge tag 'mvebu-dt64-4.14-1' of git://git.infradead.org/linux-mvebu into nex... (diff) | |
| parent | arm64: dts: rockchip: update dynamic-power-coefficient for rk3399 (diff) | |
| download | linux-4fda1e738758dddb84b014f17cc1d3917c19f854.tar.xz linux-4fda1e738758dddb84b014f17cc1d3917c19f854.zip | |
Merge tag 'v4.14-rockchip-dts64-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into next/dt64
Pull "Rockchip dts64 changes for 4.14" from Heiko Stübner:
64bit Rockchip devicetree changes containing fixes for pinctrl typos
and the use of keep-power-in-suspend in non-sdio nodes as well as the
removal of the deprecated num-slots property from dwmmc nodes.
rk3328 gets support for spdif, io-domains and usb (including enablement
of usb on the evaluation board), while rk3368 gains support for spdif.
The biggest chunk of course aims for the rk3399 with a number of pcie
changes, support for the mali gpu, a new power-domain, sdmmc support
on the firefly board and dynamic-power-coefficients.
The gru family also gets support for their quite central pwm regulators
using the newly introduced vctrl regulator types.
* tag 'v4.14-rockchip-dts64-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
arm64: dts: rockchip: update dynamic-power-coefficient for rk3399
arm64: dts: rockchip: add rk3328 spdif node
arm64: dts: rockchip: add rk3368 spdif node
arm64: dts: rockchip: enable sdmmc controller on rk3399-firefly
arm64: dts: rockchip: Add rk3328 io-domain node
arm64: dts: rockchip: kill pcie_clkreqn and pcie_clkreqnb for rk3399
arm64: dts: rockchip: change clkreq mode for rk3399-firefly
arm64: dts: rockchip: enable the GPU for RK3399-GRU
arm64: dts: rockchip: add ARM Mali GPU node for RK3399 SoCs
dt-bindings: gpu: add the RK3399 mali for rockchip specifics
arm64: dts: rockchip: remove abused keep-power-in-suspend
arm64: dts: rockchip: remove num-slots from all platforms
arm64: dts: rockchip: change clkreq mode for rk3399-evb
arm64: dts: rockchip: add SdioAudio pd control for rk3399
arm64: dts: rockchip: enable usb2 for RK3328 evaluation board
arm64: dts: rockchip: add usb2 nodes for RK3328 SoCs
arm64: dts: rockchip: set rk3399 dynamic CPU power coefficients
arm64: dts: rockchip: Use vctrl regulators for dynamic CPU voltages on Gru/Kevin
arm64: dts: rockchip: Update CPU regulator voltage ranges for Gru
arm64: dts: rockchip: fix typo in mmc pinctrl
Diffstat (limited to 'Documentation/devicetree/bindings/gpu')
| -rw-r--r-- | Documentation/devicetree/bindings/gpu/arm,mali-midgard.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/gpu/arm,mali-midgard.txt b/Documentation/devicetree/bindings/gpu/arm,mali-midgard.txt index 5aa5926029ee..039219df05c5 100644 --- a/Documentation/devicetree/bindings/gpu/arm,mali-midgard.txt +++ b/Documentation/devicetree/bindings/gpu/arm,mali-midgard.txt @@ -17,6 +17,7 @@ Required properties: * which must be preceded by one of the following vendor specifics: + "amlogic,meson-gxm-mali" + "rockchip,rk3288-mali" + + "rockchip,rk3399-mali" - reg : Physical base address of the device and length of the register area. |