lkml.org 
[lkml]   [2021]   [Jul]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 5.4 05/51] ARM: dts: rockchip: Fix the timer clocks order
    Date
    From: Ezequiel Garcia <ezequiel@collabora.com>

    [ Upstream commit 7b46d674ac000b101fdad92cf16cc11d90b72f86 ]

    Fixed order is the device-tree convention.
    The timer driver currently gets clocks by name,
    so no changes are needed there.

    Signed-off-by: Ezequiel Garcia <ezequiel@collabora.com>
    Link: https://lore.kernel.org/r/20210506111136.3941-3-ezequiel@collabora.com
    Signed-off-by: Heiko Stuebner <heiko@sntech.de>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    arch/arm/boot/dts/rk3188.dtsi | 8 ++++----
    arch/arm/boot/dts/rk3288.dtsi | 4 ++--
    2 files changed, 6 insertions(+), 6 deletions(-)

    diff --git a/arch/arm/boot/dts/rk3188.dtsi b/arch/arm/boot/dts/rk3188.dtsi
    index 10ede65d90f3..41de555df844 100644
    --- a/arch/arm/boot/dts/rk3188.dtsi
    +++ b/arch/arm/boot/dts/rk3188.dtsi
    @@ -150,16 +150,16 @@ timer3: timer@2000e000 {
    compatible = "rockchip,rk3188-timer", "rockchip,rk3288-timer";
    reg = <0x2000e000 0x20>;
    interrupts = <GIC_SPI 46 IRQ_TYPE_LEVEL_HIGH>;
    - clocks = <&cru SCLK_TIMER3>, <&cru PCLK_TIMER3>;
    - clock-names = "timer", "pclk";
    + clocks = <&cru PCLK_TIMER3>, <&cru SCLK_TIMER3>;
    + clock-names = "pclk", "timer";
    };

    timer6: timer@200380a0 {
    compatible = "rockchip,rk3188-timer", "rockchip,rk3288-timer";
    reg = <0x200380a0 0x20>;
    interrupts = <GIC_SPI 64 IRQ_TYPE_LEVEL_HIGH>;
    - clocks = <&cru SCLK_TIMER6>, <&cru PCLK_TIMER0>;
    - clock-names = "timer", "pclk";
    + clocks = <&cru PCLK_TIMER0>, <&cru SCLK_TIMER6>;
    + clock-names = "pclk", "timer";
    };

    i2s0: i2s@1011a000 {
    diff --git a/arch/arm/boot/dts/rk3288.dtsi b/arch/arm/boot/dts/rk3288.dtsi
    index a452d4ea3938..6f145b82780d 100644
    --- a/arch/arm/boot/dts/rk3288.dtsi
    +++ b/arch/arm/boot/dts/rk3288.dtsi
    @@ -238,8 +238,8 @@ timer: timer@ff810000 {
    compatible = "rockchip,rk3288-timer";
    reg = <0x0 0xff810000 0x0 0x20>;
    interrupts = <GIC_SPI 72 IRQ_TYPE_LEVEL_HIGH>;
    - clocks = <&xin24m>, <&cru PCLK_TIMER>;
    - clock-names = "timer", "pclk";
    + clocks = <&cru PCLK_TIMER>, <&xin24m>;
    + clock-names = "pclk", "timer";
    };

    display-subsystem {
    --
    2.30.2
    \
     
     \ /
      Last update: 2021-07-14 22:10    [W:4.161 / U:0.384 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site