summaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2017-08-04 12:48:46 +0200
committerArnd Bergmann <arnd@arndb.de>2017-08-04 12:48:46 +0200
commite86c86bc8e6f7a5ac28464276b187035e65c3c15 (patch)
tree083001c4b79c2d89c93c4bb2cdbc44b46e22e830 /Documentation
parent1d20d8a9fce8f1e2ef00a0f3d068fa18d59ddf8f (diff)
parentca12437303f35b0a5b97c856d88886ce9df6a0d7 (diff)
downloadlinux-e86c86bc8e6f7a5ac28464276b187035e65c3c15.tar.gz
linux-e86c86bc8e6f7a5ac28464276b187035e65c3c15.tar.bz2
linux-e86c86bc8e6f7a5ac28464276b187035e65c3c15.zip
Merge tag 'v4.13-rockchip-dts32fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into fixes
Pull "Rockchip dts32 fixes for 4.13" from Heiko Stübner: Fix for the recently added mali dt support. The example showed a wrong value, so fix it before it gets copy-pasted to much. * tag 'v4.13-rockchip-dts32fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip: ARM: dts: rockchip: fix mali gpu node on rk3288 dt-bindings: gpu: drop wrong compatible from midgard binding example
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/devicetree/bindings/gpu/arm,mali-midgard.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/devicetree/bindings/gpu/arm,mali-midgard.txt b/Documentation/devicetree/bindings/gpu/arm,mali-midgard.txt
index d3b6e1a4713a..5aa5926029ee 100644
--- a/Documentation/devicetree/bindings/gpu/arm,mali-midgard.txt
+++ b/Documentation/devicetree/bindings/gpu/arm,mali-midgard.txt
@@ -40,7 +40,7 @@ Optional properties:
Example for a Mali-T760:
gpu@ffa30000 {
- compatible = "rockchip,rk3288-mali", "arm,mali-t760", "arm,mali-midgard";
+ compatible = "rockchip,rk3288-mali", "arm,mali-t760";
reg = <0xffa30000 0x10000>;
interrupts = <GIC_SPI 6 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>,