lkml.org 
[lkml]   [2020]   [Jun]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 5.6 255/606] ARM: dts: rockchip: swap clock-names of gpu nodes
    Date
    From: Johan Jonker <jbx6244@gmail.com>

    [ 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>
    ---
    arch/arm/boot/dts/rk3036.dtsi | 2 +-
    arch/arm/boot/dts/rk322x.dtsi | 2 +-
    arch/arm/boot/dts/rk3xxx.dtsi | 2 +-
    3 files changed, 3 insertions(+), 3 deletions(-)

    diff --git a/arch/arm/boot/dts/rk3036.dtsi b/arch/arm/boot/dts/rk3036.dtsi
    index cf36e25195b4..8c4b8f56c9e0 100644
    --- a/arch/arm/boot/dts/rk3036.dtsi
    +++ b/arch/arm/boot/dts/rk3036.dtsi
    @@ -128,7 +128,7 @@ gpu: gpu@10090000 {
    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 4e90efdc9630..729119952c68 100644
    --- a/arch/arm/boot/dts/rk322x.dtsi
    +++ b/arch/arm/boot/dts/rk322x.dtsi
    @@ -561,7 +561,7 @@ gpu: gpu@20000000 {
    "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 241f43e29c77..bb5ff10b9110 100644
    --- a/arch/arm/boot/dts/rk3xxx.dtsi
    +++ b/arch/arm/boot/dts/rk3xxx.dtsi
    @@ -84,7 +84,7 @@ gpu: gpu@10090000 {
    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>;
    --
    2.25.1
    \
     
     \ /
      Last update: 2020-06-09 02:23    [W:2.461 / U:0.176 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site