diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-08-14 13:35:22 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-08-14 13:35:22 -0700 |
| commit | 8652892ed44914edfb488c280ccf79301fd89117 (patch) | |
| tree | 16b49cb72d4962742855ae639a82c393cbf4c158 /Documentation/devicetree/bindings/gpu/arm,mali-midgard.txt | |
| parent | 5551ad1e9fad2cf06288c6e93cb95f879b8cdf5e (diff) | |
| parent | ef954844c7ace62f773f4f23e28d2d915adc419f (diff) | |
| download | linux-8652892ed44914edfb488c280ccf79301fd89117.tar.bz2 | |
Merge 4.13-rc5 into staging-next
We need it here for iio fixes.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'Documentation/devicetree/bindings/gpu/arm,mali-midgard.txt')
| -rw-r--r-- | Documentation/devicetree/bindings/gpu/arm,mali-midgard.txt | 2 |
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>, |