This patchset adds :
- Optional reset properties in the midgard bindings
- Mali T820 Node in Amlogic Meson GXM DTSI
Christian Hewitt (1):
arm64: dts: meson-gxm: Add Mali-T820 node
Neil Armstrong (1):
dt-bindings: gpu: mali-midgard: Add resets property
.../bindings/gpu/arm,mali-midgard.txt | 2 ++
arch/arm64/boot/dts/amlogic/meson-gxm.dtsi | 27 +++++++++++++++++++
2 files changed, 29 insertions(+)
--
2.19.2
The Amlogic ARM Mali Midgard requires reset controls to power on and
software reset the GPU, adds these as optional in the bindings.
Signed-off-by: Neil Armstrong <[email protected]>
---
Documentation/devicetree/bindings/gpu/arm,mali-midgard.txt | 2 ++
1 file changed, 2 insertions(+)
diff --git a/Documentation/devicetree/bindings/gpu/arm,mali-midgard.txt b/Documentation/devicetree/bindings/gpu/arm,mali-midgard.txt
index 18a2cde2e5f3..24d83ec952f1 100644
--- a/Documentation/devicetree/bindings/gpu/arm,mali-midgard.txt
+++ b/Documentation/devicetree/bindings/gpu/arm,mali-midgard.txt
@@ -37,6 +37,8 @@ Optional properties:
- operating-points-v2 : Refer to Documentation/devicetree/bindings/opp/opp.txt
for details.
+- resets : Phandle to the reset controls for the Mali Midgard device.
+
Example for a Mali-T760:
--
2.19.2
From: Christian Hewitt <[email protected]>
The Amlogic Meson GXM SoC embeds an ARM Mali T820 GPU.
This patch adds the node with all the needed properties to power
on the GPU.
This has been tested with the work-in-progress PanFrost project
aiming support for ARM Mali Midgard and later GPUs.
Signed-off-by: Christian Hewitt <[email protected]>
Signed-off-by: Neil Armstrong <[email protected]>
---
arch/arm64/boot/dts/amlogic/meson-gxm.dtsi | 27 ++++++++++++++++++++++
1 file changed, 27 insertions(+)
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxm.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxm.dtsi
index 247888d68a3a..35e59d390903 100644
--- a/arch/arm64/boot/dts/amlogic/meson-gxm.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-gxm.dtsi
@@ -91,6 +91,33 @@
reset-names = "phy";
status = "okay";
};
+
+ mali: gpu@c0000 {
+ compatible = "amlogic,meson-gxm-mali", "arm,mali-t820";
+ reg = <0x0 0xc0000 0x0 0x40000>;
+ interrupt-parent = <&gic>;
+ interrupts = <GIC_SPI 160 IRQ_TYPE_LEVEL_HIGH>,
+ <GIC_SPI 161 IRQ_TYPE_LEVEL_HIGH>,
+ <GIC_SPI 162 IRQ_TYPE_LEVEL_HIGH>;
+ interrupt-names = "gpu", "mmu", "job";
+ clocks = <&clkc CLKID_MALI>;
+ resets = <&reset RESET_MALI_CAPB3>, <&reset RESET_MALI>;
+
+ /*
+ * Mali clocking is provided by two identical clock paths
+ * MALI_0 and MALI_1 muxed to a single clock by a glitch
+ * free mux to safely change frequency while running.
+ */
+ assigned-clocks = <&clkc CLKID_MALI_0_SEL>,
+ <&clkc CLKID_MALI_0>,
+ <&clkc CLKID_MALI>; /* Glitch free mux */
+ assigned-clock-parents = <&clkc CLKID_FCLK_DIV3>,
+ <0>, /* Do Nothing */
+ <&clkc CLKID_MALI_0>;
+ assigned-clock-rates = <0>, /* Do Nothing */
+ <666666666>,
+ <0>; /* Do Nothing */
+ };
};
&clkc_AO {
--
2.19.2
Neil Armstrong <[email protected]> writes:
> This patchset adds :
> - Optional reset properties in the midgard bindings
> - Mali T820 Node in Amlogic Meson GXM DTSI
>
> Christian Hewitt (1):
> arm64: dts: meson-gxm: Add Mali-T820 node
>
> Neil Armstrong (1):
> dt-bindings: gpu: mali-midgard: Add resets property
Queued for v4.21 (branch: dt64)
Thanks,
Kevin
On Mon, Dec 10, 2018 at 7:22 AM Neil Armstrong <[email protected]> wrote:
>
> The Amlogic ARM Mali Midgard requires reset controls to power on and
> software reset the GPU, adds these as optional in the bindings.
>
> Signed-off-by: Neil Armstrong <[email protected]>
> ---
> Documentation/devicetree/bindings/gpu/arm,mali-midgard.txt | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/Documentation/devicetree/bindings/gpu/arm,mali-midgard.txt b/Documentation/devicetree/bindings/gpu/arm,mali-midgard.txt
> index 18a2cde2e5f3..24d83ec952f1 100644
> --- a/Documentation/devicetree/bindings/gpu/arm,mali-midgard.txt
> +++ b/Documentation/devicetree/bindings/gpu/arm,mali-midgard.txt
> @@ -37,6 +37,8 @@ Optional properties:
> - operating-points-v2 : Refer to Documentation/devicetree/bindings/opp/opp.txt
> for details.
>
> +- resets : Phandle to the reset controls for the Mali Midgard device.
How many? Sounds like 1, but the dts has 2. There's also a similar
patch for Allwinner[1]. I don't want to see a different number of
resets and different names for each vendor. So first figure out how
many resets the IP block has. You'll have to find someone with access
to the TRM.
Rob
[1] https://patchwork.ozlabs.org/patch/1003654/
On 11/12/2018 17:58, Rob Herring wrote:
> On Mon, Dec 10, 2018 at 7:22 AM Neil Armstrong <[email protected]> wrote:
>>
>> The Amlogic ARM Mali Midgard requires reset controls to power on and
>> software reset the GPU, adds these as optional in the bindings.
>>
>> Signed-off-by: Neil Armstrong <[email protected]>
>> ---
>> Documentation/devicetree/bindings/gpu/arm,mali-midgard.txt | 2 ++
>> 1 file changed, 2 insertions(+)
>>
>> diff --git a/Documentation/devicetree/bindings/gpu/arm,mali-midgard.txt b/Documentation/devicetree/bindings/gpu/arm,mali-midgard.txt
>> index 18a2cde2e5f3..24d83ec952f1 100644
>> --- a/Documentation/devicetree/bindings/gpu/arm,mali-midgard.txt
>> +++ b/Documentation/devicetree/bindings/gpu/arm,mali-midgard.txt
>> @@ -37,6 +37,8 @@ Optional properties:
>> - operating-points-v2 : Refer to Documentation/devicetree/bindings/opp/opp.txt
>> for details.
>>
>> +- resets : Phandle to the reset controls for the Mali Midgard device.
>
> How many? Sounds like 1, but the dts has 2. There's also a similar
> patch for Allwinner[1]. I don't want to see a different number of
> resets and different names for each vendor. So first figure out how
> many resets the IP block has. You'll have to find someone with access
> to the TRM.
I can answer for Amlogic, they have a reset for the bus interface and the GPU IP itself.
You are asking something impossible ;-) We can assume it has a single reset interface,
but vendors can add more to reset some glue HW. So we will need some variant per-vendor,
sorry to annoy you !
Neil
>
> Rob
>
> [1] https://patchwork.ozlabs.org/patch/1003654/
>