| From 2b309c44ef587e6021c30d7f79cbd7a06b9227c8 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Sat, 25 Apr 2020 16:38:37 +0200 |
| Subject: arm64: dts: rockchip: swap interrupts interrupt-names rk3399 gpu node |
| |
| From: Johan Jonker <jbx6244@gmail.com> |
| |
| [ Upstream commit c604fd810bda667bdc20b2c041917baa7803e0fb ] |
| |
| Dts files with Rockchip rk3399 'gpu' nodes were manually verified. |
| In order to automate this process arm,mali-midgard.txt |
| has been converted to yaml. In the new setup dtbs_check with |
| arm,mali-midgard.yaml expects interrupts and interrupt-names values |
| in the same order. Fix this for rk3399. |
| |
| make ARCH=arm64 dtbs_check |
| DT_SCHEMA_FILES=Documentation/devicetree/bindings/gpu/ |
| arm,mali-midgard.yaml |
| |
| Signed-off-by: Johan Jonker <jbx6244@gmail.com> |
| Link: https://lore.kernel.org/r/20200425143837.18706-1-jbx6244@gmail.com |
| Signed-off-by: Heiko Stuebner <heiko@sntech.de> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| arch/arm64/boot/dts/rockchip/rk3399.dtsi | 8 ++++---- |
| 1 file changed, 4 insertions(+), 4 deletions(-) |
| |
| diff --git a/arch/arm64/boot/dts/rockchip/rk3399.dtsi b/arch/arm64/boot/dts/rockchip/rk3399.dtsi |
| index ff8df7fd44a7..b63d9653ff55 100644 |
| --- a/arch/arm64/boot/dts/rockchip/rk3399.dtsi |
| +++ b/arch/arm64/boot/dts/rockchip/rk3399.dtsi |
| @@ -1691,10 +1691,10 @@ |
| gpu: gpu@ff9a0000 { |
| compatible = "rockchip,rk3399-mali", "arm,mali-t860"; |
| reg = <0x0 0xff9a0000 0x0 0x10000>; |
| - interrupts = <GIC_SPI 19 IRQ_TYPE_LEVEL_HIGH 0>, |
| - <GIC_SPI 20 IRQ_TYPE_LEVEL_HIGH 0>, |
| - <GIC_SPI 21 IRQ_TYPE_LEVEL_HIGH 0>; |
| - interrupt-names = "gpu", "job", "mmu"; |
| + interrupts = <GIC_SPI 20 IRQ_TYPE_LEVEL_HIGH 0>, |
| + <GIC_SPI 21 IRQ_TYPE_LEVEL_HIGH 0>, |
| + <GIC_SPI 19 IRQ_TYPE_LEVEL_HIGH 0>; |
| + interrupt-names = "job", "mmu", "gpu"; |
| clocks = <&cru ACLK_GPU>; |
| power-domains = <&power RK3399_PD_GPU>; |
| status = "disabled"; |
| -- |
| 2.25.1 |
| |