ARM: dts: rockchip: swap clock-names of gpu nodes

[ Upstream commit b14f3898d2c25a9b47a61fb879d0b1f3af92c59b ]

Dts files with Rockchip 'gpu' nodes were manually verified.
In order to automate this process arm,mali-utgard.txt
has been converted to yaml. In the new setup dtbs_check with
arm,mali-utgard.yaml expects clock-names values
in the same order, so fix that.

Signed-off-by: Johan Jonker <jbx6244@gmail.com>
Link: https://lore.kernel.org/r/20200425192500.1808-1-jbx6244@gmail.com
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/arch/arm/boot/dts/rk3036.dtsi b/arch/arm/boot/dts/rk3036.dtsi
index cf36e25195b412ac17993df1704737086ff685ec..8c4b8f56c9e04af19e88fc180b7d8399db4acbc6 100644 (file)
--- a/arch/arm/boot/dts/rk3036.dtsi
+++ b/arch/arm/boot/dts/rk3036.dtsi
@@ -128,7 +128,7 @@
                assigned-clocks = <&cru SCLK_GPU>;
                assigned-clock-rates = <100000000>;
                clocks = <&cru SCLK_GPU>, <&cru SCLK_GPU>;
-               clock-names = "core", "bus";
+               clock-names = "bus", "core";
                resets = <&cru SRST_GPU>;
                status = "disabled";
        };

diff --git a/arch/arm/boot/dts/rk322x.dtsi b/arch/arm/boot/dts/rk322x.dtsi
index 4e90efdc9630a0a33f14356cde68d3cf0add1427..729119952c687d8bf32e15d10b6c1b38353e2d0e 100644 (file)
--- a/arch/arm/boot/dts/rk322x.dtsi
+++ b/arch/arm/boot/dts/rk322x.dtsi
@@ -561,7 +561,7 @@
                                  "pp1",
                                  "ppmmu1";
                clocks = <&cru ACLK_GPU>, <&cru ACLK_GPU>;
-               clock-names = "core", "bus";
+               clock-names = "bus", "core";
                resets = <&cru SRST_GPU_A>;
                status = "disabled";
        };

diff --git a/arch/arm/boot/dts/rk3xxx.dtsi b/arch/arm/boot/dts/rk3xxx.dtsi
index 241f43e29c7746a99bd75c74d39f70791035b810..bb5ff10b911065fdecce9db51196dd4cd7c0c5ad 100644 (file)
--- a/arch/arm/boot/dts/rk3xxx.dtsi
+++ b/arch/arm/boot/dts/rk3xxx.dtsi
@@ -84,7 +84,7 @@
                compatible = "arm,mali-400";
                reg = <0x10090000 0x10000>;
                clocks = <&cru ACLK_GPU>, <&cru ACLK_GPU>;
-               clock-names = "core", "bus";
+               clock-names = "bus", "core";
                assigned-clocks = <&cru ACLK_GPU>;
                assigned-clock-rates = <100000000>;
                resets = <&cru SRST_GPU>;