| Message ID | 20200425143837.18706-1-jbx6244@gmail.com (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | c604fd810bda667bdc20b2c041917baa7803e0fb |
| Headers | show |
| Series | arm64: dts: rockchip: swap interrupts interrupt-names rk3399 gpu node | expand |
On Sat, 25 Apr 2020 16:38:37 +0200, Johan Jonker wrote: > 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 > > [...] Applied, thanks! [1/1] arm64: dts: rockchip: swap interrupts interrupt-names rk3399 gpu node commit: c604fd810bda667bdc20b2c041917baa7803e0fb Best regards,
diff --git a/arch/arm64/boot/dts/rockchip/rk3399.dtsi b/arch/arm64/boot/dts/rockchip/rk3399.dtsi index 74f2c3d49..a08340fc8 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399.dtsi @@ -1883,10 +1883,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>; #cooling-cells = <2>; power-domains = <&power RK3399_PD_GPU>;
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> --- arch/arm64/boot/dts/rockchip/rk3399.dtsi | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)