| From 0ef35f6a7b886d709029c3a7f74b1f10411177c5 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Thu, 6 May 2021 08:11:35 -0300 |
| Subject: ARM: dts: rockchip: Fix the timer clocks order |
| |
| 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 2298a8d840ba..2c08ae60e4a1 100644 |
| --- a/arch/arm/boot/dts/rk3188.dtsi |
| +++ b/arch/arm/boot/dts/rk3188.dtsi |
| @@ -150,16 +150,16 @@ |
| 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 fb2e89aa71c9..49b196546cdf 100644 |
| --- a/arch/arm/boot/dts/rk3288.dtsi |
| +++ b/arch/arm/boot/dts/rk3288.dtsi |
| @@ -240,8 +240,8 @@ |
| 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 |
| |