* [PATCH 1/2] clk: ti: Move dra7 clock devices out of the legacy section
@ 2021-12-17 11:55 Tony Lindgren
2021-12-17 11:55 ` [PATCH 2/2] ARM: dts: Don't use legacy clock defines for dra7 clkctrl Tony Lindgren
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Tony Lindgren @ 2021-12-17 11:55 UTC (permalink / raw)
To: linux-omap
Cc: Benoît Cousson, devicetree, linux-clk, Stephen Boyd, Tero Kristo
I accidentally added some dra7 clock defines to the legacy section that
we want to stop using. Let's move the defines to the right location.
Note that this is just a cosmetic fix.
Cc: linux-clk@vger.kernel.org
Cc: Stephen Boyd <sboyd@kernel.org>
Cc: Tero Kristo <kristo@kernel.org>
Signed-off-by: Tony Lindgren <tony@atomide.com>
---
include/dt-bindings/clock/dra7.h | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/include/dt-bindings/clock/dra7.h b/include/dt-bindings/clock/dra7.h
--- a/include/dt-bindings/clock/dra7.h
+++ b/include/dt-bindings/clock/dra7.h
@@ -84,17 +84,10 @@
#define DRA7_L3_MAIN_2_CLKCTRL DRA7_CLKCTRL_INDEX(0x20)
#define DRA7_L3_INSTR_CLKCTRL DRA7_CLKCTRL_INDEX(0x28)
-/* iva clocks */
-#define DRA7_IVA_CLKCTRL DRA7_CLKCTRL_INDEX(0x20)
-#define DRA7_SL2IF_CLKCTRL DRA7_CLKCTRL_INDEX(0x28)
-
/* dss clocks */
#define DRA7_DSS_CORE_CLKCTRL DRA7_CLKCTRL_INDEX(0x20)
#define DRA7_BB2D_CLKCTRL DRA7_CLKCTRL_INDEX(0x30)
-/* gpu clocks */
-#define DRA7_GPU_CLKCTRL DRA7_CLKCTRL_INDEX(0x20)
-
/* l3init clocks */
#define DRA7_MMC1_CLKCTRL DRA7_CLKCTRL_INDEX(0x28)
#define DRA7_MMC2_CLKCTRL DRA7_CLKCTRL_INDEX(0x30)
@@ -267,10 +260,17 @@
#define DRA7_L3INSTR_L3_MAIN_2_CLKCTRL DRA7_CLKCTRL_INDEX(0x20)
#define DRA7_L3INSTR_L3_INSTR_CLKCTRL DRA7_CLKCTRL_INDEX(0x28)
+/* iva clocks */
+#define DRA7_IVA_CLKCTRL DRA7_CLKCTRL_INDEX(0x20)
+#define DRA7_SL2IF_CLKCTRL DRA7_CLKCTRL_INDEX(0x28)
+
/* dss clocks */
#define DRA7_DSS_DSS_CORE_CLKCTRL DRA7_CLKCTRL_INDEX(0x20)
#define DRA7_DSS_BB2D_CLKCTRL DRA7_CLKCTRL_INDEX(0x30)
+/* gpu clocks */
+#define DRA7_GPU_CLKCTRL DRA7_CLKCTRL_INDEX(0x20)
+
/* l3init clocks */
#define DRA7_L3INIT_MMC1_CLKCTRL DRA7_CLKCTRL_INDEX(0x28)
#define DRA7_L3INIT_MMC2_CLKCTRL DRA7_CLKCTRL_INDEX(0x30)
--
2.34.1
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH 2/2] ARM: dts: Don't use legacy clock defines for dra7 clkctrl
2021-12-17 11:55 [PATCH 1/2] clk: ti: Move dra7 clock devices out of the legacy section Tony Lindgren
@ 2021-12-17 11:55 ` Tony Lindgren
2021-12-21 18:16 ` [PATCH 1/2] clk: ti: Move dra7 clock devices out of the legacy section Rob Herring
2022-01-12 2:50 ` Stephen Boyd
2 siblings, 0 replies; 4+ messages in thread
From: Tony Lindgren @ 2021-12-17 11:55 UTC (permalink / raw)
To: linux-omap
Cc: Benoît Cousson, devicetree, Tero Kristo, Stephen Boyd, linux-clk
Looks like we are still using legacy clock defines for dra7. We want to
stop using these as it prevents dropping the legacy clocks. Note that
this is just a cosmetic fix.
Cc: Tero Kristo <kristo@kernel.org>
Signed-off-by: Tony Lindgren <tony@atomide.com>
---
arch/arm/boot/dts/dra7.dtsi | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/arch/arm/boot/dts/dra7.dtsi b/arch/arm/boot/dts/dra7.dtsi
--- a/arch/arm/boot/dts/dra7.dtsi
+++ b/arch/arm/boot/dts/dra7.dtsi
@@ -160,7 +160,7 @@ l4_per1: interconnect@48000000 {
target-module@48210000 {
compatible = "ti,sysc-omap4-simple", "ti,sysc";
power-domains = <&prm_mpu>;
- clocks = <&mpu_clkctrl DRA7_MPU_CLKCTRL 0>;
+ clocks = <&mpu_clkctrl DRA7_MPU_MPU_CLKCTRL 0>;
clock-names = "fck";
#address-cells = <1>;
#size-cells = <1>;
@@ -875,10 +875,10 @@ target-module@58000000 {
<0x58000014 4>;
reg-names = "rev", "syss";
ti,syss-mask = <1>;
- clocks = <&dss_clkctrl DRA7_DSS_CORE_CLKCTRL 0>,
- <&dss_clkctrl DRA7_DSS_CORE_CLKCTRL 9>,
- <&dss_clkctrl DRA7_DSS_CORE_CLKCTRL 10>,
- <&dss_clkctrl DRA7_DSS_CORE_CLKCTRL 11>;
+ clocks = <&dss_clkctrl DRA7_DSS_DSS_CORE_CLKCTRL 0>,
+ <&dss_clkctrl DRA7_DSS_DSS_CORE_CLKCTRL 9>,
+ <&dss_clkctrl DRA7_DSS_DSS_CORE_CLKCTRL 10>,
+ <&dss_clkctrl DRA7_DSS_DSS_CORE_CLKCTRL 11>;
clock-names = "fck", "hdmi_clk", "sys_clk", "tv_clk";
#address-cells = <1>;
#size-cells = <1>;
@@ -912,7 +912,7 @@ SYSC_OMAP2_ENAWAKEUP |
SYSC_OMAP2_SOFTRESET |
SYSC_OMAP2_AUTOIDLE)>;
ti,syss-mask = <1>;
- clocks = <&dss_clkctrl DRA7_DSS_CORE_CLKCTRL 8>;
+ clocks = <&dss_clkctrl DRA7_DSS_DSS_CORE_CLKCTRL 8>;
clock-names = "fck";
#address-cells = <1>;
#size-cells = <1>;
@@ -939,8 +939,8 @@ target-module@40000 {
<SYSC_IDLE_SMART>,
<SYSC_IDLE_SMART_WKUP>;
ti,sysc-mask = <(SYSC_OMAP4_SOFTRESET)>;
- clocks = <&dss_clkctrl DRA7_DSS_CORE_CLKCTRL 9>,
- <&dss_clkctrl DRA7_DSS_CORE_CLKCTRL 8>;
+ clocks = <&dss_clkctrl DRA7_DSS_DSS_CORE_CLKCTRL 9>,
+ <&dss_clkctrl DRA7_DSS_DSS_CORE_CLKCTRL 8>;
clock-names = "fck", "dss_clk";
#address-cells = <1>;
#size-cells = <1>;
@@ -979,7 +979,7 @@ bb2d: gpu@0 {
compatible = "vivante,gc";
reg = <0x0 0x700>;
interrupts = <GIC_SPI 120 IRQ_TYPE_LEVEL_HIGH>;
- clocks = <&dss_clkctrl DRA7_BB2D_CLKCTRL 0>;
+ clocks = <&dss_clkctrl DRA7_DSS_BB2D_CLKCTRL 0>;
clock-names = "core";
};
};
@@ -1333,7 +1333,7 @@ &timer1_target {
ti,no-reset-on-init;
ti,no-idle;
timer@0 {
- assigned-clocks = <&wkupaon_clkctrl DRA7_TIMER1_CLKCTRL 24>;
+ assigned-clocks = <&wkupaon_clkctrl DRA7_WKUPAON_TIMER1_CLKCTRL 24>;
assigned-clock-parents = <&sys_32k_ck>;
};
};
--
2.34.1
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH 1/2] clk: ti: Move dra7 clock devices out of the legacy section
2021-12-17 11:55 [PATCH 1/2] clk: ti: Move dra7 clock devices out of the legacy section Tony Lindgren
2021-12-17 11:55 ` [PATCH 2/2] ARM: dts: Don't use legacy clock defines for dra7 clkctrl Tony Lindgren
@ 2021-12-21 18:16 ` Rob Herring
2022-01-12 2:50 ` Stephen Boyd
2 siblings, 0 replies; 4+ messages in thread
From: Rob Herring @ 2021-12-21 18:16 UTC (permalink / raw)
To: Tony Lindgren
Cc: Benoît Cousson, devicetree, Tero Kristo, linux-omap,
Stephen Boyd, linux-clk
On Fri, 17 Dec 2021 13:55:58 +0200, Tony Lindgren wrote:
> I accidentally added some dra7 clock defines to the legacy section that
> we want to stop using. Let's move the defines to the right location.
> Note that this is just a cosmetic fix.
>
> Cc: linux-clk@vger.kernel.org
> Cc: Stephen Boyd <sboyd@kernel.org>
> Cc: Tero Kristo <kristo@kernel.org>
> Signed-off-by: Tony Lindgren <tony@atomide.com>
> ---
> include/dt-bindings/clock/dra7.h | 14 +++++++-------
> 1 file changed, 7 insertions(+), 7 deletions(-)
>
Acked-by: Rob Herring <robh@kernel.org>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH 1/2] clk: ti: Move dra7 clock devices out of the legacy section
2021-12-17 11:55 [PATCH 1/2] clk: ti: Move dra7 clock devices out of the legacy section Tony Lindgren
2021-12-17 11:55 ` [PATCH 2/2] ARM: dts: Don't use legacy clock defines for dra7 clkctrl Tony Lindgren
2021-12-21 18:16 ` [PATCH 1/2] clk: ti: Move dra7 clock devices out of the legacy section Rob Herring
@ 2022-01-12 2:50 ` Stephen Boyd
2 siblings, 0 replies; 4+ messages in thread
From: Stephen Boyd @ 2022-01-12 2:50 UTC (permalink / raw)
To: Tony Lindgren, linux-omap
Cc: Benoît Cousson, devicetree, linux-clk, Tero Kristo
Quoting Tony Lindgren (2021-12-17 03:55:58)
> I accidentally added some dra7 clock defines to the legacy section that
> we want to stop using. Let's move the defines to the right location.
> Note that this is just a cosmetic fix.
>
> Cc: linux-clk@vger.kernel.org
> Cc: Stephen Boyd <sboyd@kernel.org>
> Cc: Tero Kristo <kristo@kernel.org>
> Signed-off-by: Tony Lindgren <tony@atomide.com>
> ---
Acked-by: Stephen Boyd <sboyd@kernel.org>
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2022-01-12 2:50 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-12-17 11:55 [PATCH 1/2] clk: ti: Move dra7 clock devices out of the legacy section Tony Lindgren
2021-12-17 11:55 ` [PATCH 2/2] ARM: dts: Don't use legacy clock defines for dra7 clkctrl Tony Lindgren
2021-12-21 18:16 ` [PATCH 1/2] clk: ti: Move dra7 clock devices out of the legacy section Rob Herring
2022-01-12 2:50 ` Stephen Boyd
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).