70 lines
2.5 KiB
Diff
70 lines
2.5 KiB
Diff
|
From 3e6f8124a78840d074fab36853ee1f5a2e7cffe5 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Johan Jonker <jbx6244@gmail.com>
|
||
|
|
Date: Sat, 28 Aug 2021 12:26:59 +0200
|
||
|
|
Subject: [PATCH 068/478] ARM: dts: rockchip: swap timer clock-names
|
||
|
|
|
||
|
|
With the conversion of rockchip,rk-timer.yaml the clock-names order
|
||
|
|
was set to "pclk", "timer", but nothing was fixed in the ARM dts section
|
||
|
|
of the mainline kernel, so the swap timer clock-names that don't fit.
|
||
|
|
|
||
|
|
make ARCH=arm dtbs_check
|
||
|
|
DT_SCHEMA_FILES=Documentation/devicetree/bindings/timer/rockchip,rk-timer.yaml
|
||
|
|
|
||
|
|
Signed-off-by: Johan Jonker <jbx6244@gmail.com>
|
||
|
|
Link: https://lore.kernel.org/r/20210828102659.7348-1-jbx6244@gmail.com
|
||
|
|
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
|
||
|
|
---
|
||
|
|
arch/arm/boot/dts/rk3036.dtsi | 4 ++--
|
||
|
|
arch/arm/boot/dts/rk322x.dtsi | 4 ++--
|
||
|
|
arch/arm/boot/dts/rv1108.dtsi | 4 ++--
|
||
|
|
3 files changed, 6 insertions(+), 6 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/arch/arm/boot/dts/rk3036.dtsi b/arch/arm/boot/dts/rk3036.dtsi
|
||
|
|
index ffa9bc7ed3d0..6864b8668ec0 100644
|
||
|
|
--- a/arch/arm/boot/dts/rk3036.dtsi
|
||
|
|
+++ b/arch/arm/boot/dts/rk3036.dtsi
|
||
|
|
@@ -416,8 +416,8 @@ timer: timer@20044000 {
|
||
|
|
compatible = "rockchip,rk3036-timer", "rockchip,rk3288-timer";
|
||
|
|
reg = <0x20044000 0x20>;
|
||
|
|
interrupts = <GIC_SPI 28 IRQ_TYPE_LEVEL_HIGH>;
|
||
|
|
- clocks = <&xin24m>, <&cru PCLK_TIMER>;
|
||
|
|
- clock-names = "timer", "pclk";
|
||
|
|
+ clocks = <&cru PCLK_TIMER>, <&xin24m>;
|
||
|
|
+ clock-names = "pclk", "timer";
|
||
|
|
};
|
||
|
|
|
||
|
|
pwm0: pwm@20050000 {
|
||
|
|
diff --git a/arch/arm/boot/dts/rk322x.dtsi b/arch/arm/boot/dts/rk322x.dtsi
|
||
|
|
index 4021e92e0fdc..dea025a6469f 100644
|
||
|
|
--- a/arch/arm/boot/dts/rk322x.dtsi
|
||
|
|
+++ b/arch/arm/boot/dts/rk322x.dtsi
|
||
|
|
@@ -477,8 +477,8 @@ timer: timer@110c0000 {
|
||
|
|
compatible = "rockchip,rk3228-timer", "rockchip,rk3288-timer";
|
||
|
|
reg = <0x110c0000 0x20>;
|
||
|
|
interrupts = <GIC_SPI 43 IRQ_TYPE_LEVEL_HIGH>;
|
||
|
|
- clocks = <&xin24m>, <&cru PCLK_TIMER>;
|
||
|
|
- clock-names = "timer", "pclk";
|
||
|
|
+ clocks = <&cru PCLK_TIMER>, <&xin24m>;
|
||
|
|
+ clock-names = "pclk", "timer";
|
||
|
|
};
|
||
|
|
|
||
|
|
cru: clock-controller@110e0000 {
|
||
|
|
diff --git a/arch/arm/boot/dts/rv1108.dtsi b/arch/arm/boot/dts/rv1108.dtsi
|
||
|
|
index 0380c3fa4577..668fb15137cc 100644
|
||
|
|
--- a/arch/arm/boot/dts/rv1108.dtsi
|
||
|
|
+++ b/arch/arm/boot/dts/rv1108.dtsi
|
||
|
|
@@ -300,8 +300,8 @@ timer: timer@10350000 {
|
||
|
|
compatible = "rockchip,rv1108-timer", "rockchip,rk3288-timer";
|
||
|
|
reg = <0x10350000 0x20>;
|
||
|
|
interrupts = <GIC_SPI 35 IRQ_TYPE_LEVEL_HIGH>;
|
||
|
|
- clocks = <&xin24m>, <&cru PCLK_TIMER>;
|
||
|
|
- clock-names = "timer", "pclk";
|
||
|
|
+ clocks = <&cru PCLK_TIMER>, <&xin24m>;
|
||
|
|
+ clock-names = "pclk", "timer";
|
||
|
|
};
|
||
|
|
|
||
|
|
watchdog: watchdog@10360000 {
|
||
|
|
--
|
||
|
|
2.35.3
|
||
|
|
|