All of lore.kernel.org
 help / color / mirror / Atom feed
From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: Ezequiel Garcia <ezequiel@collabora.com>,
	Heiko Stuebner <heiko@sntech.de>, Sasha Levin <sashal@kernel.org>,
	linux-arm-kernel@lists.infradead.org,
	linux-rockchip@lists.infradead.org, devicetree@vger.kernel.org
Subject: [PATCH AUTOSEL 4.19 05/39] ARM: dts: rockchip: Fix the timer clocks order
Date: Wed, 14 Jul 2021 15:45:50 -0400	[thread overview]
Message-ID: <20210714194625.55303-5-sashal@kernel.org> (raw)
In-Reply-To: <20210714194625.55303-1-sashal@kernel.org>

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 aa123f93f181..3b7cae6f4127 100644
--- a/arch/arm/boot/dts/rk3188.dtsi
+++ b/arch/arm/boot/dts/rk3188.dtsi
@@ -73,16 +73,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 545f991924fe..c38c853f5f50 100644
--- a/arch/arm/boot/dts/rk3288.dtsi
+++ b/arch/arm/boot/dts/rk3288.dtsi
@@ -234,8 +234,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


WARNING: multiple messages have this Message-ID (diff)
From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: Ezequiel Garcia <ezequiel@collabora.com>,
	Heiko Stuebner <heiko@sntech.de>, Sasha Levin <sashal@kernel.org>,
	linux-arm-kernel@lists.infradead.org,
	linux-rockchip@lists.infradead.org, devicetree@vger.kernel.org
Subject: [PATCH AUTOSEL 4.19 05/39] ARM: dts: rockchip: Fix the timer clocks order
Date: Wed, 14 Jul 2021 15:45:50 -0400	[thread overview]
Message-ID: <20210714194625.55303-5-sashal@kernel.org> (raw)
In-Reply-To: <20210714194625.55303-1-sashal@kernel.org>

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 aa123f93f181..3b7cae6f4127 100644
--- a/arch/arm/boot/dts/rk3188.dtsi
+++ b/arch/arm/boot/dts/rk3188.dtsi
@@ -73,16 +73,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 545f991924fe..c38c853f5f50 100644
--- a/arch/arm/boot/dts/rk3288.dtsi
+++ b/arch/arm/boot/dts/rk3288.dtsi
@@ -234,8 +234,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


_______________________________________________
Linux-rockchip mailing list
Linux-rockchip@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-rockchip

WARNING: multiple messages have this Message-ID (diff)
From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: Ezequiel Garcia <ezequiel@collabora.com>,
	Heiko Stuebner <heiko@sntech.de>, Sasha Levin <sashal@kernel.org>,
	linux-arm-kernel@lists.infradead.org,
	linux-rockchip@lists.infradead.org, devicetree@vger.kernel.org
Subject: [PATCH AUTOSEL 4.19 05/39] ARM: dts: rockchip: Fix the timer clocks order
Date: Wed, 14 Jul 2021 15:45:50 -0400	[thread overview]
Message-ID: <20210714194625.55303-5-sashal@kernel.org> (raw)
In-Reply-To: <20210714194625.55303-1-sashal@kernel.org>

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 aa123f93f181..3b7cae6f4127 100644
--- a/arch/arm/boot/dts/rk3188.dtsi
+++ b/arch/arm/boot/dts/rk3188.dtsi
@@ -73,16 +73,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 545f991924fe..c38c853f5f50 100644
--- a/arch/arm/boot/dts/rk3288.dtsi
+++ b/arch/arm/boot/dts/rk3288.dtsi
@@ -234,8 +234,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


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

  parent reply	other threads:[~2021-07-14 19:58 UTC|newest]

Thread overview: 69+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-07-14 19:45 [PATCH AUTOSEL 4.19 01/39] ARM: dts: gemini: rename mdio to the right name Sasha Levin
2021-07-14 19:45 ` [PATCH AUTOSEL 4.19 02/39] ARM: dts: gemini: add device_type on pci Sasha Levin
2021-07-14 19:45 ` [PATCH AUTOSEL 4.19 03/39] ARM: dts: rockchip: fix pinctrl sleep nodename for rk3036-kylin and rk3288 Sasha Levin
2021-07-14 19:45   ` Sasha Levin
2021-07-14 19:45   ` Sasha Levin
2021-07-14 19:45 ` [PATCH AUTOSEL 4.19 04/39] arm64: dts: rockchip: fix pinctrl sleep nodename for rk3399.dtsi Sasha Levin
2021-07-14 19:45   ` Sasha Levin
2021-07-14 19:45   ` Sasha Levin
2021-07-14 19:45 ` Sasha Levin [this message]
2021-07-14 19:45   ` [PATCH AUTOSEL 4.19 05/39] ARM: dts: rockchip: Fix the timer clocks order Sasha Levin
2021-07-14 19:45   ` Sasha Levin
2021-07-14 19:45 ` [PATCH AUTOSEL 4.19 06/39] ARM: dts: rockchip: Fix IOMMU nodes properties on rk322x Sasha Levin
2021-07-14 19:45   ` Sasha Levin
2021-07-14 19:45   ` Sasha Levin
2021-07-14 19:45 ` [PATCH AUTOSEL 4.19 07/39] ARM: dts: rockchip: Fix power-controller node names for rk3288 Sasha Levin
2021-07-14 19:45   ` Sasha Levin
2021-07-14 19:45   ` Sasha Levin
2021-07-14 19:45 ` [PATCH AUTOSEL 4.19 08/39] arm64: dts: rockchip: Fix power-controller node names for rk3328 Sasha Levin
2021-07-14 19:45   ` Sasha Levin
2021-07-14 19:45   ` Sasha Levin
2021-07-14 19:45 ` [PATCH AUTOSEL 4.19 09/39] reset: ti-syscon: fix to_ti_syscon_reset_data macro Sasha Levin
2021-07-14 19:45 ` [PATCH AUTOSEL 4.19 10/39] ARM: brcmstb: dts: fix NAND nodes names Sasha Levin
2021-07-14 19:45   ` Sasha Levin
2021-07-14 19:45 ` [PATCH AUTOSEL 4.19 11/39] ARM: Cygnus: " Sasha Levin
2021-07-14 19:45   ` Sasha Levin
2021-07-14 19:45 ` [PATCH AUTOSEL 4.19 12/39] ARM: NSP: " Sasha Levin
2021-07-14 19:45   ` Sasha Levin
2021-07-14 19:45 ` [PATCH AUTOSEL 4.19 13/39] ARM: dts: BCM63xx: Fix " Sasha Levin
2021-07-14 19:45 ` [PATCH AUTOSEL 4.19 14/39] ARM: dts: Hurricane 2: " Sasha Levin
2021-07-14 19:45   ` Sasha Levin
2021-07-14 19:46 ` [PATCH AUTOSEL 4.19 15/39] ARM: dts: imx25-pinfunc: Fix gpio function name for pads GPIO_[A-F] Sasha Levin
2021-07-14 19:46   ` Sasha Levin
2021-07-14 19:46 ` [PATCH AUTOSEL 4.19 16/39] ARM: dts: imx6: phyFLEX: Fix UART hardware flow control Sasha Levin
2021-07-14 19:46   ` Sasha Levin
2021-07-14 19:46 ` [PATCH AUTOSEL 4.19 17/39] ARM: imx: pm-imx5: Fix references to imx5_cpu_suspend_info Sasha Levin
2021-07-14 19:46   ` Sasha Levin
2021-07-14 19:46 ` [PATCH AUTOSEL 4.19 18/39] rtc: mxc_v2: add missing MODULE_DEVICE_TABLE Sasha Levin
2021-07-14 19:46 ` [PATCH AUTOSEL 4.19 19/39] ARM: dts: am335x: align GPIO hog names with dt-schema Sasha Levin
2021-07-14 19:46 ` [PATCH AUTOSEL 4.19 20/39] ARM: dts: am437x: align gpio " Sasha Levin
2021-07-14 19:46 ` [PATCH AUTOSEL 4.19 21/39] ARM: dts: omap5-board-common: " Sasha Levin
2021-07-14 19:46 ` [PATCH AUTOSEL 4.19 22/39] ARM: dts: dra7x-evm: Align GPIO " Sasha Levin
2021-07-14 19:46 ` [PATCH AUTOSEL 4.19 23/39] ARM: dts: stm32: fix gpio-keys node on STM32 MCU boards Sasha Levin
2021-07-14 19:46   ` Sasha Levin
2021-07-14 19:46 ` [PATCH AUTOSEL 4.19 24/39] ARM: dts: stm32: fix RCC node name on stm32f429 MCU Sasha Levin
2021-07-14 19:46   ` Sasha Levin
2021-07-14 19:46 ` [PATCH AUTOSEL 4.19 25/39] ARM: dts: stm32: fix timer nodes on STM32 MCU to prevent warnings Sasha Levin
2021-07-14 19:46   ` Sasha Levin
2021-07-14 19:46 ` [PATCH AUTOSEL 4.19 26/39] arm64: dts: juno: Update SCPI nodes as per the YAML schema Sasha Levin
2021-07-14 19:46   ` Sasha Levin
2021-07-14 19:46 ` [PATCH AUTOSEL 4.19 27/39] ARM: dts: rockchip: fix supply properties in io-domains nodes Sasha Levin
2021-07-14 19:46   ` Sasha Levin
2021-07-14 19:46   ` Sasha Levin
2021-07-14 19:46 ` [PATCH AUTOSEL 4.19 28/39] ARM: dts: stm32: fix i2c node name on stm32f746 to prevent warnings Sasha Levin
2021-07-14 19:46   ` Sasha Levin
2021-07-14 19:46 ` [PATCH AUTOSEL 4.19 29/39] ARM: dts: stm32: move stmmac axi config in ethernet node on stm32mp15 Sasha Levin
2021-07-14 19:46   ` Sasha Levin
2021-07-14 19:46 ` [PATCH AUTOSEL 4.19 30/39] soc/tegra: fuse: Fix Tegra234-only builds Sasha Levin
2021-07-14 19:46 ` [PATCH AUTOSEL 4.19 31/39] arm64: dts: ls208xa: remove bus-num from dspi node Sasha Levin
2021-07-14 19:46   ` Sasha Levin
2021-07-23 20:11   ` Pavel Machek
2021-07-23 20:11     ` Pavel Machek
2021-07-14 19:46 ` [PATCH AUTOSEL 4.19 32/39] thermal/core: Correct function name thermal_zone_device_unregister() Sasha Levin
2021-07-14 19:46 ` [PATCH AUTOSEL 4.19 33/39] kbuild: mkcompile_h: consider timestamp if KBUILD_BUILD_TIMESTAMP is set Sasha Levin
2021-07-14 19:46 ` [PATCH AUTOSEL 4.19 34/39] rtc: max77686: Do not enforce (incorrect) interrupt trigger type Sasha Levin
2021-07-14 19:46 ` [PATCH AUTOSEL 4.19 35/39] scsi: aic7xxx: Fix unintentional sign extension issue on left shift of u8 Sasha Levin
2021-07-14 19:46 ` [PATCH AUTOSEL 4.19 36/39] scsi: libsas: Add LUN number check in .slave_alloc callback Sasha Levin
2021-07-14 19:46 ` [PATCH AUTOSEL 4.19 37/39] scsi: be2iscsi: Fix some missing space in some messages Sasha Levin
2021-07-14 19:46 ` [PATCH AUTOSEL 4.19 38/39] scsi: libfc: Fix array index out of bound exception Sasha Levin
2021-07-14 19:46 ` [PATCH AUTOSEL 4.19 39/39] sched/fair: Fix CFS bandwidth hrtimer expiry type Sasha Levin

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210714194625.55303-5-sashal@kernel.org \
    --to=sashal@kernel.org \
    --cc=devicetree@vger.kernel.org \
    --cc=ezequiel@collabora.com \
    --cc=heiko@sntech.de \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-rockchip@lists.infradead.org \
    --cc=stable@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.