| Message ID | f6f127efb44fb1012f18c483fa522918f8f82d7c.1492588180.git.guillaume.tucker@collabora.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Am Mittwoch, 19. April 2017, 09:06:18 CEST schrieb Guillaume Tucker: > Add Mali GPU device tree node for the rk3288 SoC, with devfreq > opp table. > > Tested-by: Enric Balletbo i Serra <enric.balletbo@collabora.com> > Signed-off-by: Guillaume Tucker <guillaume.tucker@collabora.com> > --- > arch/arm/boot/dts/rk3288.dtsi | 22 ++++++++++++++++++++++ > 1 file changed, 22 insertions(+) > > diff --git a/arch/arm/boot/dts/rk3288.dtsi b/arch/arm/boot/dts/rk3288.dtsi > index df8a0dbe9d91..187eed528f83 100644 > --- a/arch/arm/boot/dts/rk3288.dtsi > +++ b/arch/arm/boot/dts/rk3288.dtsi > @@ -43,6 +43,7 @@ > #include <dt-bindings/interrupt-controller/arm-gic.h> > #include <dt-bindings/pinctrl/rockchip.h> > #include <dt-bindings/clock/rk3288-cru.h> > +#include <dt-bindings/power/rk3288-power.h> > #include <dt-bindings/thermal/thermal.h> > #include <dt-bindings/power/rk3288-power.h> > #include <dt-bindings/soc/rockchip,boot-mode.h> > @@ -227,6 +228,27 @@ > ports = <&vopl_out>, <&vopb_out>; > }; > > + gpu: mali@ffa30000 { please sort nodes by address. ffa30000 should be placed below hdmi@ff980000 and above qos@ffaa0000 . > + compatible = "arm,mali-t760", "arm,mali-midgard"; As indicated before I don't trust that a generic binding will work for everything, so I would feel safer if we had a "rockchip,rk3288-mali" in front for future purposes, making it a compatible = "rockchip,rk3288-mali", "arm,mali-t760", "arm,mali-midgard"; > + reg = <0xffa30000 0x10000>; > + interrupts = <GIC_SPI 6 IRQ_TYPE_LEVEL_HIGH>, > + <GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>, > + <GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>; > + interrupt-names = "job", "mmu", "gpu"; > + clocks = <&cru ACLK_GPU>; > + operating-points = < > + /* KHz uV */ > + 100000 950000 > + 200000 950000 > + 300000 1000000 > + 400000 1100000 > + 500000 1200000 > + 600000 1250000 > + >; Wasn't there a wish for opp-v2 in a previous version? Thanks Heiko > + power-domains = <&power RK3288_PD_GPU>; > + status = "disabled"; > + }; > + > sdmmc: dwmmc@ff0c0000 { > compatible = "rockchip,rk3288-dw-mshc"; > max-frequency = <150000000>; >
Hi Heiko, On 19/04/17 09:59, Heiko Stuebner wrote: > Am Mittwoch, 19. April 2017, 09:06:18 CEST schrieb Guillaume Tucker: >> Add Mali GPU device tree node for the rk3288 SoC, with devfreq >> opp table. >> >> Tested-by: Enric Balletbo i Serra <enric.balletbo@collabora.com> >> Signed-off-by: Guillaume Tucker <guillaume.tucker@collabora.com> >> --- >> arch/arm/boot/dts/rk3288.dtsi | 22 ++++++++++++++++++++++ >> 1 file changed, 22 insertions(+) >> >> diff --git a/arch/arm/boot/dts/rk3288.dtsi b/arch/arm/boot/dts/rk3288.dtsi >> index df8a0dbe9d91..187eed528f83 100644 >> --- a/arch/arm/boot/dts/rk3288.dtsi >> +++ b/arch/arm/boot/dts/rk3288.dtsi >> @@ -43,6 +43,7 @@ >> #include <dt-bindings/interrupt-controller/arm-gic.h> >> #include <dt-bindings/pinctrl/rockchip.h> >> #include <dt-bindings/clock/rk3288-cru.h> >> +#include <dt-bindings/power/rk3288-power.h> >> #include <dt-bindings/thermal/thermal.h> >> #include <dt-bindings/power/rk3288-power.h> >> #include <dt-bindings/soc/rockchip,boot-mode.h> >> @@ -227,6 +228,27 @@ >> ports = <&vopl_out>, <&vopb_out>; >> }; >> >> + gpu: mali@ffa30000 { > > please sort nodes by address. ffa30000 should be placed below hdmi@ff980000 > and above qos@ffaa0000 . Sure, will fix that in v4. >> + compatible = "arm,mali-t760", "arm,mali-midgard"; > > As indicated before I don't trust that a generic binding will work for > everything, so I would feel safer if we had a "rockchip,rk3288-mali" in > front for future purposes, making it a > > compatible = "rockchip,rk3288-mali", "arm,mali-t760", "arm,mali-midgard"; OK, sorry I overlooked this part. I'll add it in v4 with a vendor compatible string in the binding documentation. >> + reg = <0xffa30000 0x10000>; >> + interrupts = <GIC_SPI 6 IRQ_TYPE_LEVEL_HIGH>, >> + <GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>, >> + <GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>; >> + interrupt-names = "job", "mmu", "gpu"; >> + clocks = <&cru ACLK_GPU>; >> + operating-points = < >> + /* KHz uV */ >> + 100000 950000 >> + 200000 950000 >> + 300000 1000000 >> + 400000 1100000 >> + 500000 1200000 >> + 600000 1250000 >> + >; > > Wasn't there a wish for opp-v2 in a previous version? Well it wasn't entirely clear to me in Rob's email whether it was necessary to use opp-v2 now or rather if it would be a potential option whenever opp-v2 was needed. If operating-points (v1) are being deprecated then I can change that in my next patch v4. Using operating-points-v2 with the Mali driver works as far as I can tell on rk3288 so that's not an issue. Thanks, Guillaume
Hi Guillaume, Am Donnerstag, 20. April 2017, 06:44:56 CEST schrieb Guillaume Tucker: > On 19/04/17 09:59, Heiko Stuebner wrote: > > Am Mittwoch, 19. April 2017, 09:06:18 CEST schrieb Guillaume Tucker: > >> Add Mali GPU device tree node for the rk3288 SoC, with devfreq > >> opp table. > >> > >> Tested-by: Enric Balletbo i Serra <enric.balletbo@collabora.com> > >> Signed-off-by: Guillaume Tucker <guillaume.tucker@collabora.com> > >> --- > >> arch/arm/boot/dts/rk3288.dtsi | 22 ++++++++++++++++++++++ > >> 1 file changed, 22 insertions(+) > >> > >> diff --git a/arch/arm/boot/dts/rk3288.dtsi b/arch/arm/boot/dts/rk3288.dtsi > >> index df8a0dbe9d91..187eed528f83 100644 > >> --- a/arch/arm/boot/dts/rk3288.dtsi > >> +++ b/arch/arm/boot/dts/rk3288.dtsi > >> @@ -43,6 +43,7 @@ > >> #include <dt-bindings/interrupt-controller/arm-gic.h> > >> #include <dt-bindings/pinctrl/rockchip.h> > >> #include <dt-bindings/clock/rk3288-cru.h> > >> +#include <dt-bindings/power/rk3288-power.h> > >> #include <dt-bindings/thermal/thermal.h> > >> #include <dt-bindings/power/rk3288-power.h> > >> #include <dt-bindings/soc/rockchip,boot-mode.h> > >> @@ -227,6 +228,27 @@ > >> ports = <&vopl_out>, <&vopb_out>; > >> }; > >> > >> + gpu: mali@ffa30000 { > > > > please sort nodes by address. ffa30000 should be placed below hdmi@ff980000 > > and above qos@ffaa0000 . > > Sure, will fix that in v4. > > >> + compatible = "arm,mali-t760", "arm,mali-midgard"; > > > > As indicated before I don't trust that a generic binding will work for > > everything, so I would feel safer if we had a "rockchip,rk3288-mali" in > > front for future purposes, making it a > > > > compatible = "rockchip,rk3288-mali", "arm,mali-t760", "arm,mali-midgard"; > > OK, sorry I overlooked this part. I'll add it in v4 with a > vendor compatible string in the binding documentation. great, thanks :-) > > >> + reg = <0xffa30000 0x10000>; > >> + interrupts = <GIC_SPI 6 IRQ_TYPE_LEVEL_HIGH>, > >> + <GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>, > >> + <GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>; > >> + interrupt-names = "job", "mmu", "gpu"; > >> + clocks = <&cru ACLK_GPU>; > >> + operating-points = < > >> + /* KHz uV */ > >> + 100000 950000 > >> + 200000 950000 > >> + 300000 1000000 > >> + 400000 1100000 > >> + 500000 1200000 > >> + 600000 1250000 > >> + >; > > > > Wasn't there a wish for opp-v2 in a previous version? > > Well it wasn't entirely clear to me in Rob's email whether it was > necessary to use opp-v2 now or rather if it would be a potential > option whenever opp-v2 was needed. If operating-points (v1) are > being deprecated then I can change that in my next patch v4. > Using operating-points-v2 with the Mali driver works as far as I > can tell on rk3288 so that's not an issue. I don't care to much either way, just remembered it being mentioned in the previous version. So lets see what Rob says. Heiko
diff --git a/arch/arm/boot/dts/rk3288.dtsi b/arch/arm/boot/dts/rk3288.dtsi index df8a0dbe9d91..187eed528f83 100644 --- a/arch/arm/boot/dts/rk3288.dtsi +++ b/arch/arm/boot/dts/rk3288.dtsi @@ -43,6 +43,7 @@ #include <dt-bindings/interrupt-controller/arm-gic.h> #include <dt-bindings/pinctrl/rockchip.h> #include <dt-bindings/clock/rk3288-cru.h> +#include <dt-bindings/power/rk3288-power.h> #include <dt-bindings/thermal/thermal.h> #include <dt-bindings/power/rk3288-power.h> #include <dt-bindings/soc/rockchip,boot-mode.h> @@ -227,6 +228,27 @@ ports = <&vopl_out>, <&vopb_out>; }; + gpu: mali@ffa30000 { + compatible = "arm,mali-t760", "arm,mali-midgard"; + reg = <0xffa30000 0x10000>; + interrupts = <GIC_SPI 6 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>; + interrupt-names = "job", "mmu", "gpu"; + clocks = <&cru ACLK_GPU>; + operating-points = < + /* KHz uV */ + 100000 950000 + 200000 950000 + 300000 1000000 + 400000 1100000 + 500000 1200000 + 600000 1250000 + >; + power-domains = <&power RK3288_PD_GPU>; + status = "disabled"; + }; + sdmmc: dwmmc@ff0c0000 { compatible = "rockchip,rk3288-dw-mshc"; max-frequency = <150000000>;