* [PATCH 1/2] dt-bindings: gpu: drop wrong compatible from midgard binding example
@ 2017-07-10 12:12 Heiko Stuebner
2017-07-10 12:12 ` [PATCH 2/2] ARM: dts: rockchip: remove arm, mali-midgard compatible from rk3288 Heiko Stuebner
` (2 more replies)
0 siblings, 3 replies; 8+ messages in thread
From: Heiko Stuebner @ 2017-07-10 12:12 UTC (permalink / raw)
To: linux-arm-kernel
The binding rightfully only specifies compatibles for actual implementations
and not for the whole family. In the example an arm,mali-midgard slipped
through from downstream devicetrees though. So drop that to not confuse
people reading (or copying) that example.
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
---
Documentation/devicetree/bindings/gpu/arm,mali-midgard.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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 at 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>,
--
2.11.0
^ permalink raw reply related [flat|nested] 8+ messages in thread* [PATCH 2/2] ARM: dts: rockchip: remove arm, mali-midgard compatible from rk3288 2017-07-10 12:12 [PATCH 1/2] dt-bindings: gpu: drop wrong compatible from midgard binding example Heiko Stuebner @ 2017-07-10 12:12 ` Heiko Stuebner 2017-07-11 3:00 ` [PATCH 2/2] ARM: dts: rockchip: remove arm,mali-midgard " Rob Herring ` (2 more replies) 2017-07-11 3:03 ` [PATCH 1/2] dt-bindings: gpu: drop wrong compatible from midgard binding example Rob Herring 2017-07-13 17:11 ` Heiko Stuebner 2 siblings, 3 replies; 8+ messages in thread From: Heiko Stuebner @ 2017-07-10 12:12 UTC (permalink / raw) To: linux-arm-kernel The binding specifies the actual implementations only (mali-t760 for example) but not the arm,mali-midgard used in some vendor kernels. So drop that compatible property from the rk3288 where it had slipped in. Signed-off-by: Heiko Stuebner <heiko@sntech.de> --- arch/arm/boot/dts/rk3288.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/rk3288.dtsi b/arch/arm/boot/dts/rk3288.dtsi index cb1d415d1201..e99d7ff4c939 100644 --- a/arch/arm/boot/dts/rk3288.dtsi +++ b/arch/arm/boot/dts/rk3288.dtsi @@ -1135,7 +1135,7 @@ }; gpu: mali at 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>, -- 2.11.0 ^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH 2/2] ARM: dts: rockchip: remove arm,mali-midgard compatible from rk3288 2017-07-10 12:12 ` [PATCH 2/2] ARM: dts: rockchip: remove arm, mali-midgard compatible from rk3288 Heiko Stuebner @ 2017-07-11 3:00 ` Rob Herring 2017-07-11 8:04 ` [PATCH 2/2] ARM: dts: rockchip: remove arm, mali-midgard " Caesar Wang 2017-07-13 17:13 ` Heiko Stuebner 2 siblings, 0 replies; 8+ messages in thread From: Rob Herring @ 2017-07-11 3:00 UTC (permalink / raw) To: linux-arm-kernel On Mon, Jul 10, 2017 at 02:12:27PM +0200, Heiko Stuebner wrote: > The binding specifies the actual implementations only (mali-t760 > for example) but not the arm,mali-midgard used in some vendor kernels. > So drop that compatible property from the rk3288 where it had slipped in. > > Signed-off-by: Heiko Stuebner <heiko@sntech.de> > --- > arch/arm/boot/dts/rk3288.dtsi | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/arch/arm/boot/dts/rk3288.dtsi b/arch/arm/boot/dts/rk3288.dtsi > index cb1d415d1201..e99d7ff4c939 100644 > --- a/arch/arm/boot/dts/rk3288.dtsi > +++ b/arch/arm/boot/dts/rk3288.dtsi > @@ -1135,7 +1135,7 @@ > }; > > gpu: mali at ffa30000 { This should also be gpu at ..., not mali. > - 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>, > -- > 2.11.0 > ^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH 2/2] ARM: dts: rockchip: remove arm, mali-midgard compatible from rk3288 2017-07-10 12:12 ` [PATCH 2/2] ARM: dts: rockchip: remove arm, mali-midgard compatible from rk3288 Heiko Stuebner 2017-07-11 3:00 ` [PATCH 2/2] ARM: dts: rockchip: remove arm,mali-midgard " Rob Herring @ 2017-07-11 8:04 ` Caesar Wang 2017-07-11 11:47 ` Heiko Stuebner 2017-07-13 17:13 ` Heiko Stuebner 2 siblings, 1 reply; 8+ messages in thread From: Caesar Wang @ 2017-07-11 8:04 UTC (permalink / raw) To: linux-arm-kernel Heiko, ? 2017?07?10? 20:12, Heiko Stuebner ??: > The binding specifies the actual implementations only (mali-t760 > for example) but not the arm,mali-midgard used in some vendor kernels. > So drop that compatible property from the rk3288 where it had slipped in. > > Signed-off-by: Heiko Stuebner <heiko@sntech.de> > --- > arch/arm/boot/dts/rk3288.dtsi | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/arch/arm/boot/dts/rk3288.dtsi b/arch/arm/boot/dts/rk3288.dtsi > index cb1d415d1201..e99d7ff4c939 100644 > --- a/arch/arm/boot/dts/rk3288.dtsi > +++ b/arch/arm/boot/dts/rk3288.dtsi > @@ -1135,7 +1135,7 @@ > }; > > gpu: mali at ffa30000 { > - compatible = "rockchip,rk3288-mali", "arm,mali-t760", "arm,mali-midgard"; > + compatible = "rockchip,rk3288-mali", "arm,mali-t760"; If we remove the "arm,mali-midgard", the mali driver maybe need update first. From the lastest MALI driver on ARM supply, the compatible only two property. mali_kbase_core_linux.c 4163: { .compatible = "arm,malit6xx" }, 4164: { .compatible = "arm,mali-midgard" }, That's odd with the two compatible, the driver should support the more. -Caesar > reg = <0xffa30000 0x10000>; > interrupts = <GIC_SPI 6 IRQ_TYPE_LEVEL_HIGH>, > <GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>, ^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH 2/2] ARM: dts: rockchip: remove arm, mali-midgard compatible from rk3288 2017-07-11 8:04 ` [PATCH 2/2] ARM: dts: rockchip: remove arm, mali-midgard " Caesar Wang @ 2017-07-11 11:47 ` Heiko Stuebner 0 siblings, 0 replies; 8+ messages in thread From: Heiko Stuebner @ 2017-07-11 11:47 UTC (permalink / raw) To: linux-arm-kernel Hi Caesar, Am Dienstag, 11. Juli 2017, 16:04:38 CEST schrieb Caesar Wang: > Heiko, > > ? 2017?07?10? 20:12, Heiko Stuebner ??: > > The binding specifies the actual implementations only (mali-t760 > > for example) but not the arm,mali-midgard used in some vendor kernels. > > So drop that compatible property from the rk3288 where it had slipped in. > > > > Signed-off-by: Heiko Stuebner <heiko@sntech.de> > > --- > > arch/arm/boot/dts/rk3288.dtsi | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/arch/arm/boot/dts/rk3288.dtsi b/arch/arm/boot/dts/rk3288.dtsi > > index cb1d415d1201..e99d7ff4c939 100644 > > --- a/arch/arm/boot/dts/rk3288.dtsi > > +++ b/arch/arm/boot/dts/rk3288.dtsi > > @@ -1135,7 +1135,7 @@ > > }; > > > > gpu: mali at ffa30000 { > > - compatible = "rockchip,rk3288-mali", "arm,mali-t760", "arm,mali-midgard"; > > + compatible = "rockchip,rk3288-mali", "arm,mali-t760"; > > If we remove the "arm,mali-midgard", the mali driver maybe need update > first. > > From the lastest MALI driver on ARM supply, the compatible only two > property. > mali_kbase_core_linux.c > 4163: { .compatible = "arm,malit6xx" }, > 4164: { .compatible = "arm,mali-midgard" }, > > That's odd with the two compatible, the driver should support the more. Correct, the driver should be updated anyway. In general the official dt-binding (the one in the linux kernel) should be followed, not the random out-of-tree one distributed by vendor drivers :-) . If you look for example at utgard (mali400 for example), the sane binding used in the kernel, differs a lot from the binding used by the vendor-driver as well (io-areas, irq-names etc). In any case, as you use the mali vendor-driver with you vendor-tree, it should be possible to do both in sync (dt-change from mainline; driver change to use better compatibles). Heiko ^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH 2/2] ARM: dts: rockchip: remove arm, mali-midgard compatible from rk3288 2017-07-10 12:12 ` [PATCH 2/2] ARM: dts: rockchip: remove arm, mali-midgard compatible from rk3288 Heiko Stuebner 2017-07-11 3:00 ` [PATCH 2/2] ARM: dts: rockchip: remove arm,mali-midgard " Rob Herring 2017-07-11 8:04 ` [PATCH 2/2] ARM: dts: rockchip: remove arm, mali-midgard " Caesar Wang @ 2017-07-13 17:13 ` Heiko Stuebner 2 siblings, 0 replies; 8+ messages in thread From: Heiko Stuebner @ 2017-07-13 17:13 UTC (permalink / raw) To: linux-arm-kernel Am Montag, 10. Juli 2017, 14:12:27 CEST schrieb Heiko Stuebner: > The binding specifies the actual implementations only (mali-t760 > for example) but not the arm,mali-midgard used in some vendor kernels. > So drop that compatible property from the rk3288 where it had slipped in. > > Signed-off-by: Heiko Stuebner <heiko@sntech.de> applied as fix for 4.13 after also fixing the node name to gpu at ... as spotted by Rob. ^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH 1/2] dt-bindings: gpu: drop wrong compatible from midgard binding example 2017-07-10 12:12 [PATCH 1/2] dt-bindings: gpu: drop wrong compatible from midgard binding example Heiko Stuebner 2017-07-10 12:12 ` [PATCH 2/2] ARM: dts: rockchip: remove arm, mali-midgard compatible from rk3288 Heiko Stuebner @ 2017-07-11 3:03 ` Rob Herring 2017-07-13 17:11 ` Heiko Stuebner 2 siblings, 0 replies; 8+ messages in thread From: Rob Herring @ 2017-07-11 3:03 UTC (permalink / raw) To: linux-arm-kernel On Mon, Jul 10, 2017 at 02:12:26PM +0200, Heiko Stuebner wrote: > The binding rightfully only specifies compatibles for actual implementations > and not for the whole family. In the example an arm,mali-midgard slipped > through from downstream devicetrees though. So drop that to not confuse > people reading (or copying) that example. > > Signed-off-by: Heiko Stuebner <heiko@sntech.de> > --- > Documentation/devicetree/bindings/gpu/arm,mali-midgard.txt | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) Acked-by: Rob Herring <robh@kernel.org> I'm assuming this will go thru same route arm,mali-midgard.txt got added. Rob ^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH 1/2] dt-bindings: gpu: drop wrong compatible from midgard binding example 2017-07-10 12:12 [PATCH 1/2] dt-bindings: gpu: drop wrong compatible from midgard binding example Heiko Stuebner 2017-07-10 12:12 ` [PATCH 2/2] ARM: dts: rockchip: remove arm, mali-midgard compatible from rk3288 Heiko Stuebner 2017-07-11 3:03 ` [PATCH 1/2] dt-bindings: gpu: drop wrong compatible from midgard binding example Rob Herring @ 2017-07-13 17:11 ` Heiko Stuebner 2 siblings, 0 replies; 8+ messages in thread From: Heiko Stuebner @ 2017-07-13 17:11 UTC (permalink / raw) To: linux-arm-kernel Am Montag, 10. Juli 2017, 14:12:26 CEST schrieb Heiko Stuebner: > The binding rightfully only specifies compatibles for actual implementations > and not for the whole family. In the example an arm,mali-midgard slipped > through from downstream devicetrees though. So drop that to not confuse > people reading (or copying) that example. > > Signed-off-by: Heiko Stuebner <heiko@sntech.de> applied as fix for 4.13 with Robs Ack ^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2017-07-13 17:13 UTC | newest] Thread overview: 8+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2017-07-10 12:12 [PATCH 1/2] dt-bindings: gpu: drop wrong compatible from midgard binding example Heiko Stuebner 2017-07-10 12:12 ` [PATCH 2/2] ARM: dts: rockchip: remove arm, mali-midgard compatible from rk3288 Heiko Stuebner 2017-07-11 3:00 ` [PATCH 2/2] ARM: dts: rockchip: remove arm,mali-midgard " Rob Herring 2017-07-11 8:04 ` [PATCH 2/2] ARM: dts: rockchip: remove arm, mali-midgard " Caesar Wang 2017-07-11 11:47 ` Heiko Stuebner 2017-07-13 17:13 ` Heiko Stuebner 2017-07-11 3:03 ` [PATCH 1/2] dt-bindings: gpu: drop wrong compatible from midgard binding example Rob Herring 2017-07-13 17:11 ` Heiko Stuebner
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).