Peter sent a patchset out back in April to enable Lima support on HiKey, but there's not been much action on it since since.
I've been carrying the patchset in my tree, and figured I'd send out just these three dt-bindings changes just so hopefully they can go in and the dependent driver changes can be more easily pushed later on.
thanks -john
Cc: David Airlie airlied@linux.ie Cc: Daniel Vetter daniel@ffwll.ch Cc: Rob Herring robh+dt@kernel.org Cc: Mark Rutland mark.rutland@arm.com Cc: Philipp Zabel p.zabel@pengutronix.de Cc: Peter Griffin peter.griffin@linaro.org Cc: dri-devel@lists.freedesktop.org Cc: devicetree@vger.kernel.org
Peter Griffin (3): dt-bindings: gpu: mali-utgard: add hisilicon,hi6220-mali compatible dt-bindings: reset: hisilicon: Update compatible documentation dt-bindings: reset: hisilicon: Add ao reset controller
Documentation/devicetree/bindings/gpu/arm,mali-utgard.txt | 5 +++++ .../devicetree/bindings/reset/hisilicon,hi6220-reset.txt | 1 + include/dt-bindings/reset/hisi,hi6220-resets.h | 7 +++++++ 3 files changed, 13 insertions(+)
From: Peter Griffin peter.griffin@linaro.org
The Hisilicon hi6220 uses a Mali-450MP4 with 4 PPs, so add a compatible for it.
Cc: David Airlie airlied@linux.ie Cc: Daniel Vetter daniel@ffwll.ch Cc: Rob Herring robh+dt@kernel.org Cc: Mark Rutland mark.rutland@arm.com Cc: Philipp Zabel p.zabel@pengutronix.de Cc: dri-devel@lists.freedesktop.org Cc: devicetree@vger.kernel.org Reviewed-by: Rob Herring robh@kernel.org Signed-off-by: Peter Griffin peter.griffin@linaro.org Signed-off-by: John Stultz john.stultz@linaro.org --- Documentation/devicetree/bindings/gpu/arm,mali-utgard.txt | 5 +++++ 1 file changed, 5 insertions(+)
diff --git a/Documentation/devicetree/bindings/gpu/arm,mali-utgard.txt b/Documentation/devicetree/bindings/gpu/arm,mali-utgard.txt index b352a6851a06..ba895efe3039 100644 --- a/Documentation/devicetree/bindings/gpu/arm,mali-utgard.txt +++ b/Documentation/devicetree/bindings/gpu/arm,mali-utgard.txt @@ -24,6 +24,7 @@ Required properties: + rockchip,rk3228-mali + rockchip,rk3328-mali + stericsson,db8500-mali + + hisilicon,hi6220-mali
- reg: Physical base address and length of the GPU registers
@@ -98,6 +99,10 @@ to specify one more vendor-specific compatible, among: * interrupt-names and interrupts: + combined: combined interrupt of all of the above lines
+ - hisilicon,hi6220-mali + Required properties: + * resets: phandles to the reset lines for the GPU + Example:
mali: gpu@1c40000 {
From: Peter Griffin peter.griffin@linaro.org
The reset driver now supports the ao reset controller, so update the documentation to match.
Cc: David Airlie airlied@linux.ie Cc: Daniel Vetter daniel@ffwll.ch Cc: Rob Herring robh+dt@kernel.org Cc: Mark Rutland mark.rutland@arm.com Cc: Philipp Zabel p.zabel@pengutronix.de Cc: dri-devel@lists.freedesktop.org Cc: devicetree@vger.kernel.org Reviewed-by: Rob Herring robh@kernel.org Signed-off-by: Peter Griffin peter.griffin@linaro.org Signed-off-by: John Stultz john.stultz@linaro.org --- .../devicetree/bindings/reset/hisilicon,hi6220-reset.txt | 1 + 1 file changed, 1 insertion(+)
diff --git a/Documentation/devicetree/bindings/reset/hisilicon,hi6220-reset.txt b/Documentation/devicetree/bindings/reset/hisilicon,hi6220-reset.txt index c25da39df707..ea0a6a9734c1 100644 --- a/Documentation/devicetree/bindings/reset/hisilicon,hi6220-reset.txt +++ b/Documentation/devicetree/bindings/reset/hisilicon,hi6220-reset.txt @@ -11,6 +11,7 @@ Required properties: - compatible: should be one of the following: - "hisilicon,hi6220-sysctrl", "syscon" : For peripheral reset controller. - "hisilicon,hi6220-mediactrl", "syscon" : For media reset controller. + - "hisilicon,hi6220-aoctrl", "syscon" : For ao reset controller. - reg: should be register base and length as documented in the datasheet - #reset-cells: 1, see below
From: Peter Griffin peter.griffin@linaro.org
This is required to bring Mali450 gpu out of reset.
Cc: David Airlie airlied@linux.ie Cc: Daniel Vetter daniel@ffwll.ch Cc: Rob Herring robh+dt@kernel.org Cc: Mark Rutland mark.rutland@arm.com Cc: Philipp Zabel p.zabel@pengutronix.de Cc: dri-devel@lists.freedesktop.org Cc: devicetree@vger.kernel.org Reviewed-by: Rob Herring robh@kernel.org Signed-off-by: Peter Griffin peter.griffin@linaro.org Signed-off-by: John Stultz john.stultz@linaro.org --- include/dt-bindings/reset/hisi,hi6220-resets.h | 7 +++++++ 1 file changed, 7 insertions(+)
diff --git a/include/dt-bindings/reset/hisi,hi6220-resets.h b/include/dt-bindings/reset/hisi,hi6220-resets.h index e7c362a81a97..63aff7d8aa45 100644 --- a/include/dt-bindings/reset/hisi,hi6220-resets.h +++ b/include/dt-bindings/reset/hisi,hi6220-resets.h @@ -73,4 +73,11 @@ #define MEDIA_MMU 6 #define MEDIA_XG2RAM1 7
+#define AO_G3D 1 +#define AO_CODECISP 2 +#define AO_MCPU 4 +#define AO_BBPHARQMEM 5 +#define AO_HIFI 8 +#define AO_ACPUSCUL2C 12 + #endif /*_DT_BINDINGS_RESET_CONTROLLER_HI6220*/
On Mon, Aug 19, 2019 at 6:48 PM John Stultz john.stultz@linaro.org wrote:
Peter sent a patchset out back in April to enable Lima support on HiKey, but there's not been much action on it since since.
I've been carrying the patchset in my tree, and figured I'd send out just these three dt-bindings changes just so hopefully they can go in and the dependent driver changes can be more easily pushed later on.
As it's all binding changes, I've applied them to the DT tree.
Rob
dri-devel@lists.freedesktop.org
-
John Stultz -
Rob Herring